generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(Auto)update libjingle 72016417-> 72097588

Browse Source 
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6792 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
buildbot@webrtc.org
2014-07-28 22:26:15 +00:00
parent 8aed945842
commit 51c5508bf1
16 changed files with 389 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
talk/app/webrtc/portallocatorfactory.cc
View File

@@ -55,19 +55,15 @@ PortAllocatorFactory::~PortAllocatorFactory() {}
cricket::PortAllocator* PortAllocatorFactory::CreatePortAllocator(
const std::vector<StunConfiguration>& stun,
const std::vector<TurnConfiguration>& turn) {
std::vector<talk_base::SocketAddress> stun_hosts;
cricket::ServerAddresses stun_hosts;
typedef std::vector<StunConfiguration>::const_iterator StunIt;
for (StunIt stun_it = stun.begin(); stun_it != stun.end(); ++stun_it) {
stun_hosts.push_back(stun_it->server);
stun_hosts.insert(stun_it->server);
}
talk_base::SocketAddress stun_addr;
if (!stun_hosts.empty()) {
stun_addr = stun_hosts.front();
}
scoped_ptr<cricket::BasicPortAllocator> allocator(
new cricket::BasicPortAllocator(
network_manager_.get(), socket_factory_.get(), stun_addr));
network_manager_.get(), socket_factory_.get(), stun_hosts));
for (size_t i = 0; i < turn.size(); ++i) {
cricket::RelayCredentials credentials(turn[i].username, turn[i].password);

10
talk/app/webrtc/webrtcsession_unittest.cc
View File

@@ -306,12 +306,16 @@ class WebRtcSessionTest : public testing::Test {
cricket::STUN_SERVER_PORT)),
stun_server_(Thread::Current(), stun_socket_addr_),
turn_server_(Thread::Current(), kTurnUdpIntAddr, kTurnUdpExtAddr),
allocator_(new cricket::BasicPortAllocator(
&network_manager_, stun_socket_addr_,
SocketAddress(), SocketAddress(), SocketAddress())),
mediastream_signaling_(channel_manager_.get()),
ice_type_(PeerConnectionInterface::kAll) {
tdesc_factory_->set_protocol(cricket::ICEPROTO_HYBRID);
cricket::ServerAddresses stun_servers;
stun_servers.insert(stun_socket_addr_);
allocator_.reset(new cricket::BasicPortAllocator(
&network_manager_,
stun_servers,
SocketAddress(), SocketAddress(), SocketAddress()));
allocator_->set_flags(cricket::PORTALLOCATOR_DISABLE_TCP |
cricket::PORTALLOCATOR_DISABLE_RELAY |
cricket::PORTALLOCATOR_ENABLE_BUNDLE);