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

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: fix more tests 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
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 736 matching lines...) Expand 10 before | Expand all | Expand 10 after
747 ip_(network->GetBestIP()), 747 ip_(network->GetBestIP()),
748 config_(config), 748 config_(config),
749 state_(kInit), 749 state_(kInit),
750 flags_(flags), 750 flags_(flags),
751 udp_socket_(), 751 udp_socket_(),
752 udp_port_(NULL), 752 udp_port_(NULL),
753 phase_(0) { 753 phase_(0) {
754 } 754 }
755 755
756 bool AllocationSequence::Init() { 756 bool AllocationSequence::Init() {
757 if (IsFlagSet(PORTALLOCATOR_ENABLE_SHARED_SOCKET) &&
758 !IsFlagSet(PORTALLOCATOR_ENABLE_SHARED_UFRAG)) {
759 LOG(LS_ERROR) << "Shared socket option can't be set without "
760 << "shared ufrag.";
761 ASSERT(false);
762 return false;
763 }
764
765 if (IsFlagSet(PORTALLOCATOR_ENABLE_SHARED_SOCKET)) { 757 if (IsFlagSet(PORTALLOCATOR_ENABLE_SHARED_SOCKET)) {
766 udp_socket_.reset(session_->socket_factory()->CreateUdpSocket( 758 udp_socket_.reset(session_->socket_factory()->CreateUdpSocket(
767 rtc::SocketAddress(ip_, 0), session_->allocator()->min_port(), 759 rtc::SocketAddress(ip_, 0), session_->allocator()->min_port(),
768 session_->allocator()->max_port())); 760 session_->allocator()->max_port()));
769 if (udp_socket_) { 761 if (udp_socket_) {
770 udp_socket_->SignalReadPacket.connect( 762 udp_socket_->SignalReadPacket.connect(
771 this, &AllocationSequence::OnReadPacket); 763 this, &AllocationSequence::OnReadPacket);
772 } 764 }
773 // Continuing if |udp_socket_| is NULL, as local TCP and RelayPort using TCP 765 // Continuing if |udp_socket_| is NULL, as local TCP and RelayPort using TCP
774 // are next available options to setup a communication channel. 766 // are next available options to setup a communication channel.
(...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after
1204 ServerAddresses servers; 1196 ServerAddresses servers;
1205 for (size_t i = 0; i < relays.size(); ++i) { 1197 for (size_t i = 0; i < relays.size(); ++i) {
1206 if (relays[i].type == turn_type && SupportsProtocol(relays[i], type)) { 1198 if (relays[i].type == turn_type && SupportsProtocol(relays[i], type)) {
1207 servers.insert(relays[i].ports.front().address); 1199 servers.insert(relays[i].ports.front().address);
1208 } 1200 }
1209 } 1201 }
1210 return servers; 1202 return servers;
1211 } 1203 }
1212 1204
1213 } // namespace cricket 1205 } // namespace cricket
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698