| OLD | NEW | 
|---|
| 1 /* | 1 /* | 
| 2  *  Copyright 2004 The WebRTC Project Authors. All rights reserved. | 2  *  Copyright 2004 The WebRTC Project Authors. All rights reserved. | 
| 3  * | 3  * | 
| 4  *  Use of this source code is governed by a BSD-style license | 4  *  Use of this source code is governed by a BSD-style license | 
| 5  *  that can be found in the LICENSE file in the root of the source | 5  *  that can be found in the LICENSE file in the root of the source | 
| 6  *  tree. An additional intellectual property rights grant can be found | 6  *  tree. An additional intellectual property rights grant can be found | 
| 7  *  in the file PATENTS.  All contributing project authors may | 7  *  in the file PATENTS.  All contributing project authors may | 
| 8  *  be found in the AUTHORS file in the root of the source tree. | 8  *  be found in the AUTHORS file in the root of the source tree. | 
| 9  */ | 9  */ | 
| 10 | 10 | 
| (...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 719       config_(config), | 719       config_(config), | 
| 720       state_(kInit), | 720       state_(kInit), | 
| 721       flags_(flags), | 721       flags_(flags), | 
| 722       udp_socket_(), | 722       udp_socket_(), | 
| 723       udp_port_(NULL), | 723       udp_port_(NULL), | 
| 724       phase_(0) { | 724       phase_(0) { | 
| 725 } | 725 } | 
| 726 | 726 | 
| 727 bool AllocationSequence::Init() { | 727 bool AllocationSequence::Init() { | 
| 728   if (IsFlagSet(PORTALLOCATOR_ENABLE_SHARED_SOCKET)) { | 728   if (IsFlagSet(PORTALLOCATOR_ENABLE_SHARED_SOCKET)) { | 
| 729     udp_socket_.reset(session_->socket_factory()->CreateUdpSocket( | 729     udp_socket_.reset(session_->socket_factory()->CreateUdpSocketOnNetwork( | 
| 730         rtc::SocketAddress(ip_, 0), session_->allocator()->min_port(), | 730         rtc::SocketAddress(ip_, 0), session_->allocator()->min_port(), | 
| 731         session_->allocator()->max_port())); | 731         session_->allocator()->max_port(), network_)); | 
| 732     if (udp_socket_) { | 732     if (udp_socket_) { | 
| 733       udp_socket_->SignalReadPacket.connect( | 733       udp_socket_->SignalReadPacket.connect( | 
| 734           this, &AllocationSequence::OnReadPacket); | 734           this, &AllocationSequence::OnReadPacket); | 
| 735     } | 735     } | 
| 736     // Continuing if |udp_socket_| is NULL, as local TCP and RelayPort using TCP | 736     // Continuing if |udp_socket_| is NULL, as local TCP and RelayPort using TCP | 
| 737     // are next available options to setup a communication channel. | 737     // are next available options to setup a communication channel. | 
| 738   } | 738   } | 
| 739   return true; | 739   return true; | 
| 740 } | 740 } | 
| 741 | 741 | 
| (...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1185   ServerAddresses servers; | 1185   ServerAddresses servers; | 
| 1186   for (size_t i = 0; i < relays.size(); ++i) { | 1186   for (size_t i = 0; i < relays.size(); ++i) { | 
| 1187     if (relays[i].type == turn_type && SupportsProtocol(relays[i], type)) { | 1187     if (relays[i].type == turn_type && SupportsProtocol(relays[i], type)) { | 
| 1188       servers.insert(relays[i].ports.front().address); | 1188       servers.insert(relays[i].ports.front().address); | 
| 1189     } | 1189     } | 
| 1190   } | 1190   } | 
| 1191   return servers; | 1191   return servers; | 
| 1192 } | 1192 } | 
| 1193 | 1193 | 
| 1194 }  // namespace cricket | 1194 }  // namespace cricket | 
| OLD | NEW | 
|---|