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

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

Issue 2099023002: Fix the turn and udp port type. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Merge with head Created 4 years, 5 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/stunport_unittest.cc ('k') | webrtc/p2p/base/turnport_unittest.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 2012 The WebRTC Project Authors. All rights reserved. 2 * Copyright 2012 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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 rtc::PacketSocketFactory* factory, 183 rtc::PacketSocketFactory* factory,
184 rtc::Network* network, 184 rtc::Network* network,
185 rtc::AsyncPacketSocket* socket, 185 rtc::AsyncPacketSocket* socket,
186 const std::string& username, 186 const std::string& username,
187 const std::string& password, 187 const std::string& password,
188 const ProtocolAddress& server_address, 188 const ProtocolAddress& server_address,
189 const RelayCredentials& credentials, 189 const RelayCredentials& credentials,
190 int server_priority, 190 int server_priority,
191 const std::string& origin) 191 const std::string& origin)
192 : Port(thread, 192 : Port(thread,
193 RELAY_PORT_TYPE,
193 factory, 194 factory,
194 network, 195 network,
195 socket->GetLocalAddress().ipaddr(), 196 socket->GetLocalAddress().ipaddr(),
196 username, 197 username,
197 password), 198 password),
198 server_address_(server_address), 199 server_address_(server_address),
199 credentials_(credentials), 200 credentials_(credentials),
200 socket_(socket), 201 socket_(socket),
201 resolver_(NULL), 202 resolver_(NULL),
202 error_(0), 203 error_(0),
(...skipping 1330 matching lines...) Expand 10 before | Expand all | Expand 10 after
1533 } else { 1534 } else {
1534 state_ = STATE_UNBOUND; 1535 state_ = STATE_UNBOUND;
1535 port_->FailAndPruneConnection(ext_addr_); 1536 port_->FailAndPruneConnection(ext_addr_);
1536 } 1537 }
1537 } 1538 }
1538 void TurnEntry::OnChannelBindTimeout() { 1539 void TurnEntry::OnChannelBindTimeout() {
1539 state_ = STATE_UNBOUND; 1540 state_ = STATE_UNBOUND;
1540 port_->FailAndPruneConnection(ext_addr_); 1541 port_->FailAndPruneConnection(ext_addr_);
1541 } 1542 }
1542 } // namespace cricket 1543 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/p2p/base/stunport_unittest.cc ('k') | webrtc/p2p/base/turnport_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698