webrtc/base/natserver.h - Issue 1342543004: Consolidate constructormagic macros with Chromium version and remove Chromium override.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: webrtc/base/natserver.h

Issue 1342543004: Consolidate constructormagic macros with Chromium version and remove Chromium override. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Rebase. Created 5 years, 3 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

OLD	NEW
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 91 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
102 typedef std::map<SocketAddressPair, TransEntry*, RouteCmp> InternalMap;	102 typedef std::map<SocketAddressPair, TransEntry*, RouteCmp> InternalMap;

103 typedef std::map<SocketAddress, TransEntry*> ExternalMap;	103 typedef std::map<SocketAddress, TransEntry*> ExternalMap;

104	104

105 /* Creates a new entry that translates the given route. */	105 /* Creates a new entry that translates the given route. */

106 void Translate(const SocketAddressPair& route);	106 void Translate(const SocketAddressPair& route);

107	107

108 /* Determines whether the NAT would filter out a packet from this address. */	108 /* Determines whether the NAT would filter out a packet from this address. */

109 bool ShouldFilterOut(TransEntry* entry, const SocketAddress& ext_addr);	109 bool ShouldFilterOut(TransEntry* entry, const SocketAddress& ext_addr);

110	110

111 NAT* nat_;	111 NAT* nat_;

112 SocketFactory* internal_;

113 SocketFactory* external_;	112 SocketFactory* external_;

114 SocketAddress external_ip_;	113 SocketAddress external_ip_;

115 AsyncUDPSocket* udp_server_socket_;	114 AsyncUDPSocket* udp_server_socket_;

116 ProxyServer* tcp_proxy_server_;	115 ProxyServer* tcp_proxy_server_;

117 InternalMap* int_map_;	116 InternalMap* int_map_;

118 ExternalMap* ext_map_;	117 ExternalMap* ext_map_;

119 RTC_DISALLOW_COPY_AND_ASSIGN(NATServer);	118 RTC_DISALLOW_COPY_AND_ASSIGN(NATServer);

120 };	119 };

121	120

122 } // namespace rtc	121 } // namespace rtc

123	122

124 #endif // WEBRTC_BASE_NATSERVER_H_	123 #endif // WEBRTC_BASE_NATSERVER_H_

OLD	NEW

« no previous file with comments | « webrtc/base/logging.cc ('k') | webrtc/base/socket.h » ('j') | no next file with comments »