diff options
| author | jiayl@webrtc.org <jiayl@webrtc.org> | 2014-09-26 23:01:11 +0000 |
|---|---|---|
| committer | jiayl@webrtc.org <jiayl@webrtc.org> | 2014-09-26 23:01:11 +0000 |
| commit | 4888d597ff7449ffcede19a015e35a1bf4ce05e7 (patch) | |
| tree | 62c5653e3fae31fcc6448052f76c0c48f010c9cd /app | |
| parent | 96580b0f1a9b8ec09440cae28b478562f3d5c5d4 (diff) | |
| download | talk-4888d597ff7449ffcede19a015e35a1bf4ce05e7.tar.gz | |
Fix the duplicated candidate problem when using multiple STUN servers.
BUG=3723
R=pthatcher@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/26469004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/talk@7312 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'app')
| -rw-r--r-- | app/webrtc/webrtcsession_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/webrtc/webrtcsession_unittest.cc b/app/webrtc/webrtcsession_unittest.cc index 7aa87fb..388fff7 100644 --- a/app/webrtc/webrtcsession_unittest.cc +++ b/app/webrtc/webrtcsession_unittest.cc @@ -309,7 +309,8 @@ class WebRtcSessionTest : public testing::Test { ss_scope_(fss_.get()), stun_socket_addr_(rtc::SocketAddress(kStunAddrHost, cricket::STUN_SERVER_PORT)), - stun_server_(Thread::Current(), stun_socket_addr_), + stun_server_(cricket::TestStunServer::Create(Thread::Current(), + stun_socket_addr_)), turn_server_(Thread::Current(), kTurnUdpIntAddr, kTurnUdpExtAddr), mediastream_signaling_(channel_manager_.get()), ice_type_(PeerConnectionInterface::kAll) { @@ -1109,7 +1110,7 @@ class WebRtcSessionTest : public testing::Test { rtc::scoped_ptr<rtc::FirewallSocketServer> fss_; rtc::SocketServerScope ss_scope_; rtc::SocketAddress stun_socket_addr_; - cricket::TestStunServer stun_server_; + rtc::scoped_ptr<cricket::TestStunServer> stun_server_; cricket::TestTurnServer turn_server_; rtc::FakeNetworkManager network_manager_; rtc::scoped_ptr<cricket::BasicPortAllocator> allocator_; |