Revert "Reland "Remove GICE (gone forever!) and PORTALLOCATOR_ENABLE_SHARED_UFRAG (enabled forever)…

webrtc/p2p/base/session.cc

 /*
  *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 19 matching lines @@
 using rtc::Bind;
 
 TransportProxy::~TransportProxy() {
   for (ChannelMap::iterator iter = channels_.begin();
        iter != channels_.end(); ++iter) {
     iter->second->SignalDestroyed(iter->second);
     delete iter->second;
   }
 }
 
+const std::string& TransportProxy::type() const {
+  return transport_->get()->type();
+}
+
 TransportChannel* TransportProxy::GetChannel(int component) {
   ASSERT(rtc::Thread::Current() == worker_thread_);
   return GetChannelProxy(component);
 }
 
 TransportChannel* TransportProxy::CreateChannel(int component) {
   ASSERT(rtc::Thread::Current() == worker_thread_);
   ASSERT(GetChannel(component) == NULL);
   ASSERT(!transport_->get()->HasChannel(component));
 
@@ skipping 278 matching lines @@
                          const std::string& sid,
                          const std::string& content_type,
                          bool initiator)
     : state_(STATE_INIT),
       error_(ERROR_NONE),
       signaling_thread_(signaling_thread),
       worker_thread_(worker_thread),
       port_allocator_(port_allocator),
       sid_(sid),
       content_type_(content_type),
+      transport_type_(NS_GINGLE_P2P),
       initiator_(initiator),
       identity_(NULL),
       ssl_max_version_(rtc::SSL_PROTOCOL_DTLS_10),
       ice_tiebreaker_(rtc::CreateRandomId64()),
       role_switch_(false),
       ice_receiving_timeout_(-1) {
   ASSERT(signaling_thread->IsCurrent());
 }
 
 BaseSession::~BaseSession() {
@@ skipping 218 matching lines @@
 void BaseSession::DestroyTransportProxy(
     const std::string& content_name) {
   TransportMap::iterator iter = transports_.find(content_name);
   if (iter != transports_.end()) {
     delete iter->second;
     transports_.erase(content_name);
   }
 }
 
 Transport* BaseSession::CreateTransport(const std::string& content_name) {
+  ASSERT(transport_type_ == NS_GINGLE_P2P);
   Transport* transport = new DtlsTransport<P2PTransport>(
       signaling_thread(), worker_thread(), content_name, port_allocator(),
       identity_);
   transport->SetChannelReceivingTimeout(ice_receiving_timeout_);
   return transport;
 }
 
 void BaseSession::SetState(State state) {
   ASSERT(signaling_thread_->IsCurrent());
   if (state != state_) {
@@ skipping 179 matching lines @@
     // Role will be reverse of initial role setting.
     IceRole role = initiator_ ? ICEROLE_CONTROLLED : ICEROLE_CONTROLLING;
     iter->second->SetIceRole(role);
   }
 }
 
 void BaseSession::LogState(State old_state, State new_state) {
   LOG(LS_INFO) << "Session:" << id()
                << " Old state:" << StateToString(old_state)
                << " New state:" << StateToString(new_state)
-               << " Type:" << content_type();
+               << " Type:" << content_type()
+               << " Transport:" << transport_type();
 }
 
 // static
 bool BaseSession::GetTransportDescription(const SessionDescription* description,
                                           const std::string& content_name,
                                           TransportDescription* tdesc) {
   if (!description || !tdesc) {
     return false;
   }
   const TransportInfo* transport_info =
@@ skipping 21 matching lines @@
 
     default:
       // Explicitly ignoring some states here.
       break;
     }
     break;
   }
 }
 
 }  // namespace cricket