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

Side by Side Diff: webrtc/base/virtualsocketserver.cc

Issue 2861533005: fixing braces around initialization of subobject (Closed)
Patch Set: Created 3 years, 7 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 | « no previous file | no next file » | 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
11 #include "webrtc/base/virtualsocketserver.h" 11 #include "webrtc/base/virtualsocketserver.h"
12 12
13 #include <errno.h> 13 #include <errno.h>
14 #include <math.h> 14 #include <math.h>
15 15
16 #include <algorithm> 16 #include <algorithm>
17 #include <map> 17 #include <map>
18 #include <memory> 18 #include <memory>
19 #include <vector> 19 #include <vector>
20 20
21 #include "webrtc/base/checks.h" 21 #include "webrtc/base/checks.h"
22 #include "webrtc/base/logging.h" 22 #include "webrtc/base/logging.h"
23 #include "webrtc/base/physicalsocketserver.h" 23 #include "webrtc/base/physicalsocketserver.h"
24 #include "webrtc/base/socketaddresspair.h" 24 #include "webrtc/base/socketaddresspair.h"
25 #include "webrtc/base/thread.h" 25 #include "webrtc/base/thread.h"
26 #include "webrtc/base/timeutils.h" 26 #include "webrtc/base/timeutils.h"
27 27
28 namespace rtc { 28 namespace rtc {
29 #if defined(WEBRTC_WIN) 29 #if defined(WEBRTC_WIN)
30 const in_addr kInitialNextIPv4 = { {0x01, 0, 0, 0} }; 30 const in_addr kInitialNextIPv4 = { { { 0x01, 0, 0, 0 } } };
31 #else 31 #else
32 // This value is entirely arbitrary, hence the lack of concern about endianness. 32 // This value is entirely arbitrary, hence the lack of concern about endianness.
33 const in_addr kInitialNextIPv4 = { 0x01000000 }; 33 const in_addr kInitialNextIPv4 = { 0x01000000 };
34 #endif 34 #endif
35 // Starts at ::2 so as to not cause confusion with ::1. 35 // Starts at ::2 so as to not cause confusion with ::1.
36 const in6_addr kInitialNextIPv6 = { { { 36 const in6_addr kInitialNextIPv6 = { { {
37 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2 37 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2
38 } } }; 38 } } };
39 39
40 const uint16_t kFirstEphemeralPort = 49152; 40 const uint16_t kFirstEphemeralPort = 49152;
(...skipping 1149 matching lines...) Expand 10 before | Expand all | Expand 10 after
1190 void VirtualSocketServer::SetDefaultRoute(const IPAddress& from_addr) { 1190 void VirtualSocketServer::SetDefaultRoute(const IPAddress& from_addr) {
1191 RTC_DCHECK(!IPIsAny(from_addr)); 1191 RTC_DCHECK(!IPIsAny(from_addr));
1192 if (from_addr.family() == AF_INET) { 1192 if (from_addr.family() == AF_INET) {
1193 default_route_v4_ = from_addr; 1193 default_route_v4_ = from_addr;
1194 } else if (from_addr.family() == AF_INET6) { 1194 } else if (from_addr.family() == AF_INET6) {
1195 default_route_v6_ = from_addr; 1195 default_route_v6_ = from_addr;
1196 } 1196 }
1197 } 1197 }
1198 1198
1199 } // namespace rtc 1199 } // namespace rtc
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698