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

Side by Side Diff: webrtc/p2p/base/tcpport.h

Issue 1516613002: Only try to pair protocol matching candidates for creating connections. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: merge 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/stunport.cc ('k') | webrtc/p2p/base/tcpport.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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
48 virtual ~TCPPort(); 48 virtual ~TCPPort();
49 49
50 virtual Connection* CreateConnection(const Candidate& address, 50 virtual Connection* CreateConnection(const Candidate& address,
51 CandidateOrigin origin); 51 CandidateOrigin origin);
52 52
53 virtual void PrepareAddress(); 53 virtual void PrepareAddress();
54 54
55 virtual int GetOption(rtc::Socket::Option opt, int* value); 55 virtual int GetOption(rtc::Socket::Option opt, int* value);
56 virtual int SetOption(rtc::Socket::Option opt, int value); 56 virtual int SetOption(rtc::Socket::Option opt, int value);
57 virtual int GetError(); 57 virtual int GetError();
58 virtual bool SupportsProtocol(const std::string& protocol) const {
59 return protocol == TCP_PROTOCOL_NAME || protocol == SSLTCP_PROTOCOL_NAME;
60 }
58 61
59 protected: 62 protected:
60 TCPPort(rtc::Thread* thread, 63 TCPPort(rtc::Thread* thread,
61 rtc::PacketSocketFactory* factory, 64 rtc::PacketSocketFactory* factory,
62 rtc::Network* network, 65 rtc::Network* network,
63 const rtc::IPAddress& ip, 66 const rtc::IPAddress& ip,
64 uint16_t min_port, 67 uint16_t min_port,
65 uint16_t max_port, 68 uint16_t max_port,
66 const std::string& username, 69 const std::string& username,
67 const std::string& password, 70 const std::string& password,
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 176
174 // Allow test case to overwrite the default timeout period. 177 // Allow test case to overwrite the default timeout period.
175 int reconnection_timeout_; 178 int reconnection_timeout_;
176 179
177 friend class TCPPort; 180 friend class TCPPort;
178 }; 181 };
179 182
180 } // namespace cricket 183 } // namespace cricket
181 184
182 #endif // WEBRTC_P2P_BASE_TCPPORT_H_ 185 #endif // WEBRTC_P2P_BASE_TCPPORT_H_
OLDNEW
« no previous file with comments | « webrtc/p2p/base/stunport.cc ('k') | webrtc/p2p/base/tcpport.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698