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

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

Issue 2620303003: Replace ASSERT by RTC_DCHECK in all non-test code. (Closed)
Patch Set: Address final nits. Created 3 years, 11 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/base/socketadapters.cc ('k') | webrtc/base/socketpool.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 10 matching lines...) Expand all
21 #include <netinet/ip.h> 21 #include <netinet/ip.h>
22 #endif 22 #endif
23 #include <arpa/inet.h> 23 #include <arpa/inet.h>
24 #include <netdb.h> 24 #include <netdb.h>
25 #include <unistd.h> 25 #include <unistd.h>
26 #endif 26 #endif
27 27
28 #include <sstream> 28 #include <sstream>
29 29
30 #include "webrtc/base/byteorder.h" 30 #include "webrtc/base/byteorder.h"
31 #include "webrtc/base/checks.h"
31 #include "webrtc/base/common.h" 32 #include "webrtc/base/common.h"
32 #include "webrtc/base/logging.h" 33 #include "webrtc/base/logging.h"
33 #include "webrtc/base/nethelpers.h" 34 #include "webrtc/base/nethelpers.h"
34 35
35 #if defined(WEBRTC_WIN) 36 #if defined(WEBRTC_WIN)
36 #include "webrtc/base/win32.h" 37 #include "webrtc/base/win32.h"
37 #endif 38 #endif
38 39
39 namespace rtc { 40 namespace rtc {
40 41
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 ip_ = IPAddress(ip_as_host_order_integer); 114 ip_ = IPAddress(ip_as_host_order_integer);
114 scope_id_ = 0; 115 scope_id_ = 0;
115 } 116 }
116 117
117 void SocketAddress::SetResolvedIP(const IPAddress& ip) { 118 void SocketAddress::SetResolvedIP(const IPAddress& ip) {
118 ip_ = ip; 119 ip_ = ip;
119 scope_id_ = 0; 120 scope_id_ = 0;
120 } 121 }
121 122
122 void SocketAddress::SetPort(int port) { 123 void SocketAddress::SetPort(int port) {
123 ASSERT((0 <= port) && (port < 65536)); 124 RTC_DCHECK((0 <= port) && (port < 65536));
124 port_ = static_cast<uint16_t>(port); 125 port_ = static_cast<uint16_t>(port);
125 } 126 }
126 127
127 uint32_t SocketAddress::ip() const { 128 uint32_t SocketAddress::ip() const {
128 return ip_.v4AddressAsHostOrderInteger(); 129 return ip_.v4AddressAsHostOrderInteger();
129 } 130 }
130 131
131 const IPAddress& SocketAddress::ipaddr() const { 132 const IPAddress& SocketAddress::ipaddr() const {
132 return ip_; 133 return ip_;
133 } 134 }
(...skipping 196 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 SocketAddress EmptySocketAddressWithFamily(int family) { 331 SocketAddress EmptySocketAddressWithFamily(int family) {
331 if (family == AF_INET) { 332 if (family == AF_INET) {
332 return SocketAddress(IPAddress(INADDR_ANY), 0); 333 return SocketAddress(IPAddress(INADDR_ANY), 0);
333 } else if (family == AF_INET6) { 334 } else if (family == AF_INET6) {
334 return SocketAddress(IPAddress(in6addr_any), 0); 335 return SocketAddress(IPAddress(in6addr_any), 0);
335 } 336 }
336 return SocketAddress(); 337 return SocketAddress();
337 } 338 }
338 339
339 } // namespace rtc 340 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/base/socketadapters.cc ('k') | webrtc/base/socketpool.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698