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

Side by Side Diff: webrtc/p2p/base/stunport.cc

Issue 1535943004: Multi-networking with Android L. Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years 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/packetsocketfactory.h ('k') | webrtc/p2p/base/turnport.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 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 ready_(false), 208 ready_(false),
209 stun_keepalive_delay_(KEEPALIVE_DELAY), 209 stun_keepalive_delay_(KEEPALIVE_DELAY),
210 emit_local_for_anyaddress_(emit_local_for_anyaddress) { 210 emit_local_for_anyaddress_(emit_local_for_anyaddress) {
211 requests_.set_origin(origin); 211 requests_.set_origin(origin);
212 } 212 }
213 213
214 bool UDPPort::Init() { 214 bool UDPPort::Init() {
215 if (!SharedSocket()) { 215 if (!SharedSocket()) {
216 ASSERT(socket_ == NULL); 216 ASSERT(socket_ == NULL);
217 socket_ = socket_factory()->CreateUdpSocket( 217 socket_ = socket_factory()->CreateUdpSocket(
218 rtc::SocketAddress(ip(), 0), min_port(), max_port()); 218 rtc::SocketAddress(ip(), 0), min_port(), max_port(), Network());
219 if (!socket_) { 219 if (!socket_) {
220 LOG_J(LS_WARNING, this) << "UDP socket creation failed"; 220 LOG_J(LS_WARNING, this) << "UDP socket creation failed";
221 return false; 221 return false;
222 } 222 }
223 socket_->SignalReadPacket.connect(this, &UDPPort::OnReadPacket); 223 socket_->SignalReadPacket.connect(this, &UDPPort::OnReadPacket);
224 } 224 }
225 socket_->SignalSentPacket.connect(this, &UDPPort::OnSentPacket); 225 socket_->SignalSentPacket.connect(this, &UDPPort::OnSentPacket);
226 socket_->SignalReadyToSend.connect(this, &UDPPort::OnReadyToSend); 226 socket_->SignalReadyToSend.connect(this, &UDPPort::OnReadyToSend);
227 socket_->SignalAddressReady.connect(this, &UDPPort::OnLocalAddressReady); 227 socket_->SignalAddressReady.connect(this, &UDPPort::OnLocalAddressReady);
228 requests_.SignalSendPacket.connect(this, &UDPPort::OnSendPacket); 228 requests_.SignalSendPacket.connect(this, &UDPPort::OnSendPacket);
(...skipping 275 matching lines...) Expand 10 before | Expand all | Expand 10 after
504 const std::vector<Candidate>& existing_candidates = Candidates(); 504 const std::vector<Candidate>& existing_candidates = Candidates();
505 std::vector<Candidate>::const_iterator it = existing_candidates.begin(); 505 std::vector<Candidate>::const_iterator it = existing_candidates.begin();
506 for (; it != existing_candidates.end(); ++it) { 506 for (; it != existing_candidates.end(); ++it) {
507 if (it->address() == addr) 507 if (it->address() == addr)
508 return true; 508 return true;
509 } 509 }
510 return false; 510 return false;
511 } 511 }
512 512
513 } // namespace cricket 513 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/p2p/base/packetsocketfactory.h ('k') | webrtc/p2p/base/turnport.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698