Add ufrag to the ICE candidate signaling.

webrtc/p2p/base/p2ptransportchannel.h

 /*
  *  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 12 matching lines @@
 #include <map>
 #include <string>
 #include <vector>
 #include "webrtc/p2p/base/candidate.h"
 #include "webrtc/p2p/base/p2ptransport.h"
 #include "webrtc/p2p/base/portallocator.h"
 #include "webrtc/p2p/base/portinterface.h"
 #include "webrtc/p2p/base/transport.h"
 #include "webrtc/p2p/base/transportchannelimpl.h"
 #include "webrtc/base/asyncpacketsocket.h"
+#include "webrtc/base/optional.h"
 #include "webrtc/base/sigslot.h"
 
 namespace cricket {
 
 extern const uint32_t WEAK_PING_DELAY;
 
+struct IceParameter {

[pthatcher1, 2015/12/12 00:30:34]

IceParameters

(with an "s")

Yes, I know that makes ice_parameters_ a little weird, but I think that's OK.

[honghaiz3, 2015/12/14 18:40:19]

Done.

+  std::string ufrag;
+  std::string pwd;
+  IceParameter(const std::string& ice_ufrag, const std::string& ice_pwd)
+      : ufrag(ice_ufrag), pwd(ice_pwd) {}
+  IceParameter() : ufrag(""), pwd("") {}
+  bool operator!=(const IceParameter& other) {

[pthatcher1, 2015/12/12 00:30:34]

Can you implement both == and != just to make sure we don't mess up some logic
where we use one instead of the other?

[honghaiz3, 2015/12/14 18:40:19]

Done.

+    return ufrag != other.ufrag || pwd != other.pwd;
+  }
+};
+
 // Adds the port on which the candidate originated.
 class RemoteCandidate : public Candidate {
  public:
   RemoteCandidate(const Candidate& c, PortInterface* origin_port)
       : Candidate(c), origin_port_(origin_port) {}
 
   PortInterface* origin_port() { return origin_port_; }
 
  private:
   PortInterface* origin_port_;
@@ skipping 173 matching lines @@
   void OnNominated(Connection* conn);
 
   void OnMessage(rtc::Message* pmsg) override;
   void OnSort();
   void OnCheckAndPing();
 
   void PruneConnections();
   Connection* best_nominated_connection() const;
   bool IsBackupConnection(Connection* conn) const;
 
+  rtc::Optional<IceParameter> remote_ice() {

[pthatcher1, 2015/12/12 00:30:34]

Can you leave a comment saying it's the latest remote ice parameters?

[honghaiz3, 2015/12/14 18:40:19]

Done.

+    return remote_ice_parameters_.empty()
+               ? rtc::Optional<IceParameter>()
+               : rtc::Optional<IceParameter>(remote_ice_parameters_.back());
+  }

[pthatcher1, 2015/12/12 00:30:34]

If it's too much of a problem to avoid copying with an Optional, we could just
return a IceParameter*:

return remote_ice_parameters_.empty() ? nullptr :
&remote_ice_parameters_.back();

[honghaiz3, 2015/12/14 18:40:19]

Done.

+  uint32_t remote_ice_generation() {

[pthatcher1, 2015/12/12 00:30:34]

Can you leave a comment saying it's the index of the latest remote ice
parameters, or 0 if there are none?

[honghaiz3, 2015/12/14 18:40:19]

Done.

+    // When |remote_ice_parameters_| has one element, it is generation 0.
+    return remote_ice_parameters_.empty()
+               ? 0
+               : static_cast<uint32_t>(remote_ice_parameters_.size() - 1);
+  }
+
   P2PTransport* transport_;
   PortAllocator* allocator_;
   rtc::Thread* worker_thread_;
   bool incoming_only_;
   int error_;
   std::vector<PortAllocatorSession*> allocator_sessions_;
   std::vector<PortInterface *> ports_;
   std::vector<Connection *> connections_;
   Connection* best_connection_;
   // Connection selected by the controlling agent. This should be used only
   // at controlled side when protocol type is RFC5245.
   Connection* pending_best_connection_;
   std::vector<RemoteCandidate> remote_candidates_;
   bool sort_dirty_;  // indicates whether another sort is needed right now
   bool had_connection_ = false;  // if connections_ has ever been nonempty
   typedef std::map<rtc::Socket::Option, int> OptionMap;
   OptionMap options_;
   std::string ice_ufrag_;
   std::string ice_pwd_;
-  std::string remote_ice_ufrag_;
-  std::string remote_ice_pwd_;
+  std::vector<IceParameter> remote_ice_parameters_;
   IceMode remote_ice_mode_;
   IceRole ice_role_;
   uint64_t tiebreaker_;
-  uint32_t remote_candidate_generation_;
   IceGatheringState gathering_state_;
 
   int check_receiving_delay_;
   int receiving_timeout_;
   int backup_connection_ping_interval_;
   uint32_t last_ping_sent_ms_ = 0;
   bool gather_continually_ = false;
   int weak_ping_delay_ = WEAK_PING_DELAY;
   TransportChannelState state_ = TransportChannelState::STATE_INIT;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(P2PTransportChannel);
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_P2P_BASE_P2PTRANSPORTCHANNEL_H_