Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(988)

Side by Side Diff: webrtc/p2p/client/basicportallocator.cc

Issue 1263663002: Remove GICE. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: merge Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/p2p/base/turnport_unittest.cc ('k') | webrtc/p2p/client/connectivitychecker.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 651 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 ip_(network->GetBestIP()), 662 ip_(network->GetBestIP()),
663 config_(config), 663 config_(config),
664 state_(kInit), 664 state_(kInit),
665 flags_(flags), 665 flags_(flags),
666 udp_socket_(), 666 udp_socket_(),
667 udp_port_(NULL), 667 udp_port_(NULL),
668 phase_(0) { 668 phase_(0) {
669 } 669 }
670 670
671 bool AllocationSequence::Init() { 671 bool AllocationSequence::Init() {
672 if (IsFlagSet(PORTALLOCATOR_ENABLE_SHARED_SOCKET) &&
673 !IsFlagSet(PORTALLOCATOR_ENABLE_SHARED_UFRAG)) {
674 LOG(LS_ERROR) << "Shared socket option can't be set without "
675 << "shared ufrag.";
676 ASSERT(false);
677 return false;
678 }
679
680 if (IsFlagSet(PORTALLOCATOR_ENABLE_SHARED_SOCKET)) { 672 if (IsFlagSet(PORTALLOCATOR_ENABLE_SHARED_SOCKET)) {
681 udp_socket_.reset(session_->socket_factory()->CreateUdpSocket( 673 udp_socket_.reset(session_->socket_factory()->CreateUdpSocket(
682 rtc::SocketAddress(ip_, 0), session_->allocator()->min_port(), 674 rtc::SocketAddress(ip_, 0), session_->allocator()->min_port(),
683 session_->allocator()->max_port())); 675 session_->allocator()->max_port()));
684 if (udp_socket_) { 676 if (udp_socket_) {
685 udp_socket_->SignalReadPacket.connect( 677 udp_socket_->SignalReadPacket.connect(
686 this, &AllocationSequence::OnReadPacket); 678 this, &AllocationSequence::OnReadPacket);
687 } 679 }
688 // Continuing if |udp_socket_| is NULL, as local TCP and RelayPort using TCP 680 // Continuing if |udp_socket_| is NULL, as local TCP and RelayPort using TCP
689 // are next available options to setup a communication channel. 681 // are next available options to setup a communication channel.
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
1119 ServerAddresses servers; 1111 ServerAddresses servers;
1120 for (size_t i = 0; i < relays.size(); ++i) { 1112 for (size_t i = 0; i < relays.size(); ++i) {
1121 if (relays[i].type == turn_type && SupportsProtocol(relays[i], type)) { 1113 if (relays[i].type == turn_type && SupportsProtocol(relays[i], type)) {
1122 servers.insert(relays[i].ports.front().address); 1114 servers.insert(relays[i].ports.front().address);
1123 } 1115 }
1124 } 1116 }
1125 return servers; 1117 return servers;
1126 } 1118 }
1127 1119
1128 } // namespace cricket 1120 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/p2p/base/turnport_unittest.cc ('k') | webrtc/p2p/client/connectivitychecker.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698