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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: runtime/bin/socket_macos.cc

Issue 910183003: Reafctor to use 'const RawAddr&' or 'RawAddr*' in the eventhandler code (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Minor change Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« runtime/bin/socket_linux.cc ('K') | « runtime/bin/socket_linux.cc ('k') | runtime/bin/socket_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/socket_macos.cc
diff --git a/runtime/bin/socket_macos.cc b/runtime/bin/socket_macos.cc
index 239bb4536661b8c2b57dc695c9b86f0c21113009..205793bc11689161d110091970eb11f8c7faff9f 100644
--- a/runtime/bin/socket_macos.cc
+++ b/runtime/bin/socket_macos.cc
@@ -28,17 +28,17 @@ namespace bin {
SocketAddress::SocketAddress(struct sockaddr* sa) {
ASSERT(INET6_ADDRSTRLEN >= INET_ADDRSTRLEN);
if (!Socket::FormatNumericAddress(
- reinterpret_cast<RawAddr*>(sa), as_string_, INET6_ADDRSTRLEN)) {
+ *reinterpret_cast<RawAddr*>(sa), as_string_, INET6_ADDRSTRLEN)) {
as_string_[0] = 0;
}
- socklen_t salen = GetAddrLength(reinterpret_cast<RawAddr*>(sa));
+ socklen_t salen = GetAddrLength(*reinterpret_cast<RawAddr*>(sa));
memmove(reinterpret_cast<void *>(&addr_), sa, salen);
}
-bool Socket::FormatNumericAddress(RawAddr* addr, char* address, int len) {
+bool Socket::FormatNumericAddress(const RawAddr& addr, char* address, int len) {
socklen_t salen = SocketAddress::GetAddrLength(addr);
- if (NO_RETRY_EXPECTED(getnameinfo(&addr->addr,
+ if (NO_RETRY_EXPECTED(getnameinfo(&addr.addr,
salen,
address,
len,
@@ -57,7 +57,7 @@ bool Socket::Initialize() {
}
-static intptr_t Create(RawAddr addr) {
+static intptr_t Create(const RawAddr& addr) {
intptr_t fd;
fd = NO_RETRY_EXPECTED(socket(addr.ss.ss_family, SOCK_STREAM, 0));
if (fd < 0) {
@@ -68,10 +68,9 @@ static intptr_t Create(RawAddr addr) {
}
-static intptr_t Connect(intptr_t fd, RawAddr addr, const intptr_t port) {
- SocketAddress::SetAddrPort(&addr, port);
+static intptr_t Connect(intptr_t fd, const RawAddr& addr) {
intptr_t result = TEMP_FAILURE_RETRY(
- connect(fd, &addr.addr, SocketAddress::GetAddrLength(&addr)));
+ connect(fd, &addr.addr, SocketAddress::GetAddrLength(addr)));
if (result == 0 || errno == EINPROGRESS) {
return fd;
}
@@ -80,7 +79,7 @@ static intptr_t Connect(intptr_t fd, RawAddr addr, const intptr_t port) {
}
-intptr_t Socket::CreateConnect(const RawAddr& addr, const intptr_t port) {
+intptr_t Socket::CreateConnect(const RawAddr& addr) {
intptr_t fd = Create(addr);
if (fd < 0) {
return fd;
@@ -88,12 +87,11 @@ intptr_t Socket::CreateConnect(const RawAddr& addr, const intptr_t port) {
FDUtils::SetNonBlocking(fd);
- return Connect(fd, addr, port);
+ return Connect(fd, addr);
}
intptr_t Socket::CreateBindConnect(const RawAddr& addr,
- const intptr_t port,
const RawAddr& source_addr) {
intptr_t fd = Create(addr);
if (fd < 0) {
@@ -101,13 +99,13 @@ intptr_t Socket::CreateBindConnect(const RawAddr& addr,
}
intptr_t result = TEMP_FAILURE_RETRY(
- bind(fd, &source_addr.addr, SocketAddress::GetAddrLength(&source_addr)));
+ bind(fd, &source_addr.addr, SocketAddress::GetAddrLength(source_addr)));
if (result != 0 && errno != EINPROGRESS) {
VOID_TEMP_FAILURE_RETRY(close(fd));
return -1;
}
- return Connect(fd, addr, port);
+ return Connect(fd, addr);
}
@@ -129,8 +127,8 @@ intptr_t Socket::Read(intptr_t fd, void* buffer, intptr_t num_bytes) {
}
-intptr_t Socket::RecvFrom(intptr_t fd, void* buffer, intptr_t num_bytes,
- RawAddr* addr) {
+intptr_t Socket::RecvFrom(
+ intptr_t fd, void* buffer, intptr_t num_bytes, RawAddr* addr) {
ASSERT(fd >= 0);
socklen_t addr_len = sizeof(addr->ss);
ssize_t read_bytes = TEMP_FAILURE_RETRY(
@@ -157,12 +155,12 @@ intptr_t Socket::Write(intptr_t fd, const void* buffer, intptr_t num_bytes) {
}
-intptr_t Socket::SendTo(intptr_t fd, const void* buffer, intptr_t num_bytes,
- RawAddr addr) {
+intptr_t Socket::SendTo(
+ intptr_t fd, const void* buffer, intptr_t num_bytes, const RawAddr& addr) {
ASSERT(fd >= 0);
ssize_t written_bytes = TEMP_FAILURE_RETRY(
sendto(fd, buffer, num_bytes, 0,
- &addr.addr, SocketAddress::GetAddrLength(&addr)));
+ &addr.addr, SocketAddress::GetAddrLength(addr)));
ASSERT(EAGAIN == EWOULDBLOCK);
if (written_bytes == -1 && errno == EWOULDBLOCK) {
// If the would block we need to retry and therefore return 0 as
@@ -180,7 +178,7 @@ intptr_t Socket::GetPort(intptr_t fd) {
if (NO_RETRY_EXPECTED(getsockname(fd, &raw.addr, &size))) {
return 0;
}
- return SocketAddress::GetAddrPort(&raw);
+ return SocketAddress::GetAddrPort(raw);
}
@@ -191,7 +189,7 @@ SocketAddress* Socket::GetRemotePeer(intptr_t fd, intptr_t* port) {
if (NO_RETRY_EXPECTED(getpeername(fd, &raw.addr, &size))) {
return NULL;
}
- *port = SocketAddress::GetAddrPort(&raw);
+ *port = SocketAddress::GetAddrPort(raw);
return new SocketAddress(&raw.addr);
}
@@ -259,14 +257,14 @@ AddressList<SocketAddress>* Socket::LookupAddress(const char* host,
}
-bool Socket::ReverseLookup(RawAddr addr,
+bool Socket::ReverseLookup(const RawAddr& addr,
char* host,
intptr_t host_len,
OSError** os_error) {
ASSERT(host_len >= NI_MAXHOST);
int status = NO_RETRY_EXPECTED(getnameinfo(
&addr.addr,
- SocketAddress::GetAddrLength(&addr),
+ SocketAddress::GetAddrLength(addr),
host,
host_len,
NULL,
@@ -295,11 +293,10 @@ bool Socket::ParseAddress(int type, const char* address, RawAddr* addr) {
}
-intptr_t Socket::CreateBindDatagram(
- RawAddr* addr, intptr_t port, bool reuseAddress) {
+intptr_t Socket::CreateBindDatagram(const RawAddr& addr, bool reuseAddress) {
intptr_t fd;
- fd = NO_RETRY_EXPECTED(socket(addr->addr.sa_family, SOCK_DGRAM, IPPROTO_UDP));
+ fd = NO_RETRY_EXPECTED(socket(addr.addr.sa_family, SOCK_DGRAM, IPPROTO_UDP));
if (fd < 0) return -1;
FDUtils::SetCloseOnExec(fd);
@@ -310,9 +307,8 @@ intptr_t Socket::CreateBindDatagram(
setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &optval, sizeof(optval)));
}
- SocketAddress::SetAddrPort(addr, port);
if (NO_RETRY_EXPECTED(
- bind(fd, &addr->addr, SocketAddress::GetAddrLength(addr))) < 0) {
+ bind(fd, &addr.addr, SocketAddress::GetAddrLength(addr))) < 0) {
VOID_TEMP_FAILURE_RETRY(close(fd));
return -1;
}
@@ -373,8 +369,7 @@ AddressList<InterfaceSocketAddress>* Socket::ListInterfaces(
}
-intptr_t ServerSocket::CreateBindListen(RawAddr addr,
- intptr_t port,
+intptr_t ServerSocket::CreateBindListen(const RawAddr& addr,
intptr_t backlog,
bool v6_only) {
intptr_t fd;
@@ -394,18 +389,17 @@ intptr_t ServerSocket::CreateBindListen(RawAddr addr,
setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, &optval, sizeof(optval)));
}
- SocketAddress::SetAddrPort(&addr, port);
if (NO_RETRY_EXPECTED(
- bind(fd, &addr.addr, SocketAddress::GetAddrLength(&addr))) < 0) {
+ bind(fd, &addr.addr, SocketAddress::GetAddrLength(addr))) < 0) {
VOID_TEMP_FAILURE_RETRY(close(fd));
return -1;
}
// Test for invalid socket port 65535 (some browsers disallow it).
- if (port == 0 && Socket::GetPort(fd) == 65535) {
+ if (SocketAddress::GetAddrPort(addr) == 0 && Socket::GetPort(fd) == 65535) {
// Don't close the socket until we have created a new socket, ensuring
// that we do not get the bad port number again.
- intptr_t new_fd = CreateBindListen(addr, 0, backlog, v6_only);
+ intptr_t new_fd = CreateBindListen(addr, backlog, v6_only);
int err = errno;
VOID_TEMP_FAILURE_RETRY(close(fd));
errno = err;
@@ -568,18 +562,18 @@ bool Socket::SetBroadcast(intptr_t fd, bool enabled) {
static bool JoinOrLeaveMulticast(intptr_t fd,
- RawAddr* addr,
- RawAddr* interface,
+ const RawAddr& addr,
+ const RawAddr& interface,
int interfaceIndex,
bool join) {
- if (addr->addr.sa_family == AF_INET) {
- ASSERT(interface->addr.sa_family == AF_INET);
+ if (addr.addr.sa_family == AF_INET) {
+ ASSERT(interface.addr.sa_family == AF_INET);
struct ip_mreq mreq;
memmove(&mreq.imr_multiaddr,
- &addr->in.sin_addr,
+ &addr.in.sin_addr,
SocketAddress::GetInAddrLength(addr));
memmove(&mreq.imr_interface,
- &interface->in.sin_addr,
+ &interface.in.sin_addr,
SocketAddress::GetInAddrLength(interface));
if (join) {
return NO_RETRY_EXPECTED(setsockopt(
@@ -589,10 +583,10 @@ static bool JoinOrLeaveMulticast(intptr_t fd,
fd, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mreq, sizeof(mreq))) == 0;
}
} else {
- ASSERT(addr->addr.sa_family == AF_INET6);
+ ASSERT(addr.addr.sa_family == AF_INET6);
struct ipv6_mreq mreq;
memmove(&mreq.ipv6mr_multiaddr,
- &addr->in6.sin6_addr,
+ &addr.in6.sin6_addr,
SocketAddress::GetInAddrLength(addr));
mreq.ipv6mr_interface = interfaceIndex;
if (join) {
@@ -605,14 +599,18 @@ static bool JoinOrLeaveMulticast(intptr_t fd,
}
}
-bool Socket::JoinMulticast(
- intptr_t fd, RawAddr* addr, RawAddr* interface, int interfaceIndex) {
+bool Socket::JoinMulticast(intptr_t fd,
+ const RawAddr& addr,
+ const RawAddr& interface,
+ int interfaceIndex) {
return JoinOrLeaveMulticast(fd, addr, interface, interfaceIndex, true);
}
-bool Socket::LeaveMulticast(
- intptr_t fd, RawAddr* addr, RawAddr* interface, int interfaceIndex) {
+bool Socket::LeaveMulticast(intptr_t fd,
+ const RawAddr& addr,
+ const RawAddr& interface,
+ int interfaceIndex) {
return JoinOrLeaveMulticast(fd, addr, interface, interfaceIndex, false);
}
« runtime/bin/socket_linux.cc ('K') | « runtime/bin/socket_linux.cc ('k') | runtime/bin/socket_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698