Add signaling to support ICE renomination.

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 42 matching lines @@
 // 'actpass': The endpoint is willing to accept an incoming
 //            connection or to initiate an outgoing connection.
 enum ConnectionRole {
   CONNECTIONROLE_NONE = 0,
   CONNECTIONROLE_ACTIVE,
   CONNECTIONROLE_PASSIVE,
   CONNECTIONROLE_ACTPASS,
   CONNECTIONROLE_HOLDCONN,
 };
 
+struct IceParameters {
+  std::string ufrag;
+  std::string pwd;
+  bool renomination;

[Taylor Brandstetter, 2016/08/08 22:28:16]

Why not have "renomination = false" here and then use a default constructor
("IceParameters() = default;") below?

[honghaiz3, 2016/08/11 04:57:57]

Done. Thanks!

+  IceParameters() : renomination(false) {}
+  IceParameters(const std::string& ice_ufrag,
+                const std::string& ice_pwd,
+                bool ice_renomination)
+      : ufrag(ice_ufrag), pwd(ice_pwd), renomination(ice_renomination) {}

[Taylor Brandstetter, 2016/08/08 22:28:16]

nit: The "ice_" prefix in the names seems redundant, since it's an IceParameters
struct.

[honghaiz3, 2016/08/11 04:57:57]

I generally prefer that the parameter names are different from the member
variables to avoid potential confusion and shadowing, even though there is no
immediate problem here. 

[Taylor Brandstetter, 2016/08/11 22:36:50]

Acknowledged; that's a fair point.

[honghaiz3, 2016/08/12 18:26:40]

Acknowledged.

+
+  bool operator==(const IceParameters& other) {
+    return ufrag == other.ufrag && pwd == other.pwd &&
+           renomination == other.renomination;
+  }
+  bool operator!=(const IceParameters& other) { return !(*this == other); }
+};
+
 extern const char CONNECTIONROLE_ACTIVE_STR[];
 extern const char CONNECTIONROLE_PASSIVE_STR[];
 extern const char CONNECTIONROLE_ACTPASS_STR[];
 extern const char CONNECTIONROLE_HOLDCONN_STR[];
 
+constexpr auto ICE_RENOMINATION_STR = "renomination";
+
 bool StringToConnectionRole(const std::string& role_str, ConnectionRole* role);
 bool ConnectionRoleToString(const ConnectionRole& role, std::string* role_str);
 
 struct TransportDescription {
   TransportDescription()
       : ice_mode(ICEMODE_FULL),
         connection_role(CONNECTIONROLE_NONE) {}
 
   TransportDescription(const std::vector<std::string>& transport_options,
                        const std::string& ice_ufrag,
@@ skipping 40 matching lines @@
 
   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; }
 
+  IceParameters GetIceParameters() {
+    return IceParameters(ice_ufrag, ice_pwd, HasOption(ICE_RENOMINATION_STR));
+  }
+
   static rtc::SSLFingerprint* CopyFingerprint(
       const rtc::SSLFingerprint* from) {
     if (!from)
       return NULL;
 
     return new rtc::SSLFingerprint(*from);
   }
 
   std::vector<std::string> transport_options;
   std::string ice_ufrag;
   std::string ice_pwd;
   IceMode ice_mode;
   ConnectionRole connection_role;
 
   std::unique_ptr<rtc::SSLFingerprint> identity_fingerprint;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_TRANSPORTDESCRIPTION_H_