Revert change which removes GICE

webrtc/p2p/base/transportdescription.h

 /*
  *  Copyright 2012 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 17 matching lines @@
 // SEC_DISABLED: No crypto in outgoing offer, ignore any supplied crypto.
 // SEC_ENABLED:  Crypto in outgoing offer and answer (if supplied in offer).
 // SEC_REQUIRED: Crypto in outgoing offer and answer. Fail any offer with absent
 //               or unsupported crypto.
 enum SecurePolicy {
   SEC_DISABLED,
   SEC_ENABLED,
   SEC_REQUIRED
 };
 
+// The transport protocol we've elected to use.
+enum TransportProtocol {
+  ICEPROTO_GOOGLE,  // Google version of ICE protocol.
+  ICEPROTO_HYBRID,  // ICE, but can fall back to the Google version.
+  ICEPROTO_RFC5245  // Standard RFC 5245 version of ICE.
+};
+// The old name for TransportProtocol.
+// TODO(juberti): remove this.
+typedef TransportProtocol IceProtocolType;
+
 // Whether our side of the call is driving the negotiation, or the other side.
 enum IceRole {
   ICEROLE_CONTROLLING = 0,
   ICEROLE_CONTROLLED,
   ICEROLE_UNKNOWN
 };
 
 // ICE RFC 5245 implementation type.
 enum IceMode {
   ICEMODE_FULL,  // As defined in http://tools.ietf.org/html/rfc5245#section-4.1
@@ skipping 21 matching lines @@
 bool StringToConnectionRole(const std::string& role_str, ConnectionRole* role);
 bool ConnectionRoleToString(const ConnectionRole& role, std::string* role_str);
 
 typedef std::vector<Candidate> Candidates;
 
 struct TransportDescription {
   TransportDescription()
       : ice_mode(ICEMODE_FULL),
         connection_role(CONNECTIONROLE_NONE) {}
 
-  TransportDescription(const std::vector<std::string>& transport_options,
+  TransportDescription(const std::string& transport_type,
+                       const std::vector<std::string>& transport_options,
                        const std::string& ice_ufrag,
                        const std::string& ice_pwd,
                        IceMode ice_mode,
                        ConnectionRole role,
                        const rtc::SSLFingerprint* identity_fingerprint,
                        const Candidates& candidates)
-      : transport_options(transport_options),
+      : transport_type(transport_type),
+        transport_options(transport_options),
         ice_ufrag(ice_ufrag),
         ice_pwd(ice_pwd),
         ice_mode(ice_mode),
         connection_role(role),
         identity_fingerprint(CopyFingerprint(identity_fingerprint)),
         candidates(candidates) {}
-  TransportDescription(const std::string& ice_ufrag,
+  TransportDescription(const std::string& transport_type,
+                       const std::string& ice_ufrag,
                        const std::string& ice_pwd)
-      : ice_ufrag(ice_ufrag),
+      : transport_type(transport_type),
+        ice_ufrag(ice_ufrag),
         ice_pwd(ice_pwd),
         ice_mode(ICEMODE_FULL),
         connection_role(CONNECTIONROLE_NONE) {}
   TransportDescription(const TransportDescription& from)
-      : transport_options(from.transport_options),
+      : transport_type(from.transport_type),
+        transport_options(from.transport_options),
         ice_ufrag(from.ice_ufrag),
         ice_pwd(from.ice_pwd),
         ice_mode(from.ice_mode),
         connection_role(from.connection_role),
         identity_fingerprint(CopyFingerprint(from.identity_fingerprint.get())),
         candidates(from.candidates) {}
 
   TransportDescription& operator=(const TransportDescription& from) {
     // Self-assignment
     if (this == &from)
       return *this;
 
+    transport_type = from.transport_type;
     transport_options = from.transport_options;
     ice_ufrag = from.ice_ufrag;
     ice_pwd = from.ice_pwd;
     ice_mode = from.ice_mode;
     connection_role = from.connection_role;
 
     identity_fingerprint.reset(CopyFingerprint(
         from.identity_fingerprint.get()));
     candidates = from.candidates;
     return *this;
   }
 
   bool HasOption(const std::string& option) const {
     return (std::find(transport_options.begin(), transport_options.end(),
                       option) != transport_options.end());
   }
   void AddOption(const std::string& option) {
     transport_options.push_back(option);
   }
   bool secure() const { return identity_fingerprint != NULL; }
 
   static rtc::SSLFingerprint* CopyFingerprint(
       const rtc::SSLFingerprint* from) {
     if (!from)
       return NULL;
 
     return new rtc::SSLFingerprint(*from);
   }
 
+  std::string transport_type;  // xmlns of <transport>
   std::vector<std::string> transport_options;
   std::string ice_ufrag;
   std::string ice_pwd;
   IceMode ice_mode;
   ConnectionRole connection_role;
 
   rtc::scoped_ptr<rtc::SSLFingerprint> identity_fingerprint;
   Candidates candidates;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_TRANSPORTDESCRIPTION_H_