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

Unified Diff: runtime/bin/socket_patch.dart

Issue 18154005: Add 'address' and 'port' to SocketException, and include them in toString(). (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 7 years, 5 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
« no previous file with comments | « no previous file | sdk/lib/io/socket.dart » ('j') | sdk/lib/io/socket.dart » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/bin/socket_patch.dart
diff --git a/runtime/bin/socket_patch.dart b/runtime/bin/socket_patch.dart
index da10ad773611ea549f6947f4066367c71cefba91..6fd24f9b5d41e1f60186b14c3821fc35af76e5fb 100644
--- a/runtime/bin/socket_patch.dart
+++ b/runtime/bin/socket_patch.dart
@@ -242,7 +242,7 @@ class _NativeSocket extends NativeFieldWrapperClass1 {
return socketService.call([REVERSE_LOOKUP, addr._sockaddr_storage])
.then((response) {
if (isErrorResponse(response)) {
- throw createError(response, "Failed host name lookup");
+ throw createError(response, "Failed host name lookup", addr);
} else {
return addr._cloneWithNewHost(response);
}
@@ -299,7 +299,7 @@ class _NativeSocket extends NativeFieldWrapperClass1 {
var result = socket.nativeCreateConnect(
address._sockaddr_storage, port);
if (result is OSError) {
- throw createError(result, "Connection failed");
+ throw createError(result, "Connection failed", address, post);
Bill Hesse 2013/07/05 12:26:35 port
Anders Johnsen 2013/07/05 12:36:01 Done.
} else {
var completer = new Completer();
// Setup handlers for receiving the first write event which
@@ -311,7 +311,8 @@ class _NativeSocket extends NativeFieldWrapperClass1 {
},
error: (e) {
socket.close();
- completer.completeError(createError(e, "Connection failed"));
+ completer.completeError(
+ createError(e, "Connection failed", address, port));
}
);
socket.setListening(read: false, write: true);
@@ -343,8 +344,10 @@ class _NativeSocket extends NativeFieldWrapperClass1 {
backlog,
v6Only);
if (result is OSError) {
- throw new SocketException(
- "Failed to create server socket", result);
+ throw new SocketException("Failed to create server socket",
+ osError: result,
+ address: address,
+ port: port);
}
if (port != 0) socket.localPort = port;
return socket;
@@ -599,27 +602,33 @@ class _NativeSocket extends NativeFieldWrapperClass1 {
// Create the appropriate error/exception from different returned
// error objects.
- static createError(error, String message) {
+ static createError(error,
+ String message,
+ [InternetAddress address,
+ int port]) {
if (error is OSError) {
- return new SocketException(message, error);
+ return new SocketException(
+ message, osError: error, address: address, port: port);
} else if (error is List) {
assert(isErrorResponse(error));
switch (error[0]) {
case _ILLEGAL_ARGUMENT_RESPONSE:
return new ArgumentError();
case _OSERROR_RESPONSE:
- return new SocketException(
- message, new OSError(error[2], error[1]));
+ return new SocketException(message,
+ osError: new OSError(error[2], error[1]),
+ address: address,
+ port: port);
default:
return new Exception("Unknown error");
}
} else {
- return new SocketException(message);
+ return new SocketException(message, address: address, port: port);
}
}
void reportError(error, String message) {
- var e = createError(error, message);
+ var e = createError(error, message, address, port);
Bill Hesse 2013/07/05 12:26:35 We don't have a .port on _NativeSocket. There is
Anders Johnsen 2013/07/05 12:36:01 Done.
// Invoke the error handler if any.
if (eventHandlers[ERROR_EVENT] != null) {
eventHandlers[ERROR_EVENT](e);
« no previous file with comments | « no previous file | sdk/lib/io/socket.dart » ('j') | sdk/lib/io/socket.dart » ('J')

Powered by Google App Engine
This is Rietveld 408576698