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

Unified Diff: runtime/bin/socket_win.cc

Issue 59213003: Rename remoteHost to remoteAddress on *Socket. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Added mac/win/android versions. Created 7 years, 1 month 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
« no previous file with comments | « runtime/bin/socket_patch.dart ('k') | sdk/lib/io/http.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/socket_win.cc
diff --git a/runtime/bin/socket_win.cc b/runtime/bin/socket_win.cc
index a5d55a9fff5c39717e2f5ce14e92fd3cfabbbdeb..0f4ecf5bbe643d55d9784ccdc8a92de9d1673e2d 100644
--- a/runtime/bin/socket_win.cc
+++ b/runtime/bin/socket_win.cc
@@ -85,7 +85,7 @@ intptr_t Socket::GetPort(intptr_t fd) {
}
-bool Socket::GetRemotePeer(intptr_t fd, char *host, intptr_t *port) {
+SocketAddress* Socket::GetRemotePeer(intptr_t fd, intptr_t* port) {
ASSERT(reinterpret_cast<Handle*>(fd)->is_socket());
SocketHandle* socket_handle = reinterpret_cast<SocketHandle*>(fd);
RawAddr raw;
@@ -94,23 +94,10 @@ bool Socket::GetRemotePeer(intptr_t fd, char *host, intptr_t *port) {
&raw.addr,
&size)) {
Log::PrintErr("Error getpeername: %d\n", WSAGetLastError());
- return false;
+ return NULL;
}
*port = SocketAddress::GetAddrPort(&raw);
- // Clear the port before calling WSAAddressToString as WSAAddressToString
- // includes the port in the formatted string.
- SocketAddress::SetAddrPort(&raw, 0);
- DWORD len = INET6_ADDRSTRLEN;
- int err = WSAAddressToStringA(&raw.addr,
- sizeof(raw),
- NULL,
- host,
- &len);
- if (err != 0) {
- Log::PrintErr("Error WSAAddressToString: %d\n", WSAGetLastError());
- return false;
- }
- return true;
+ return new SocketAddress(&raw.addr);
}
« no previous file with comments | « runtime/bin/socket_patch.dart ('k') | sdk/lib/io/http.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698