Extend dart:io error handling to all socket functions

runtime/bin/socket.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/socket.h"
 #include "bin/dartutils.h"
 #include "bin/thread.h"
 #include "bin/utils.h"
 #include "platform/thread.h"
 #include "platform/utils.h"
 
 #include "include/dart_api.h"
 
 dart::Mutex Socket::mutex_;
 int Socket::service_ports_size_ = 0;
 Dart_Port* Socket::service_ports_ = NULL;
 int Socket::service_ports_index_ = 0;
 
 void FUNCTION_NAME(Socket_CreateConnect)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle socketobj = Dart_GetNativeArgument(args, 0);
   const char* host = DartUtils::GetStringValue(Dart_GetNativeArgument(args, 1));
   int64_t port = DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 2));
   intptr_t socket = Socket::CreateConnect(host, port);
-  DartUtils::SetIntegerField(socketobj, DartUtils::kIdFieldName, socket);
-  Dart_SetReturnValue(args, Dart_NewBoolean(socket >= 0));
+  if (socket >= 0) {
+    DartUtils::SetIntegerField(socketobj, DartUtils::kIdFieldName, socket);
+    Dart_SetReturnValue(args, Dart_True());
+  } else {
+    Dart_SetReturnValue(args, DartUtils::NewDartOSError());
+  }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_Available)(Dart_NativeArguments args) {
   Dart_EnterScope();
   int64_t socket = DartUtils::GetIntegerField(Dart_GetNativeArgument(args, 0),
                                               DartUtils::kIdFieldName);
   intptr_t available = Socket::Available(socket);
   Dart_SetReturnValue(args, Dart_NewInteger(available));
@@ skipping 27 matching lines @@
   intptr_t bytes_read = Socket::Read(socket, buffer, length);
   if (bytes_read > 0) {
     Dart_Handle result =
         Dart_ListSetAsBytes(buffer_obj, offset, buffer, bytes_read);
     if (Dart_IsError(result)) {
       delete[] buffer;
       Dart_PropagateError(result);
     }
   }
   delete[] buffer;
-  Dart_SetReturnValue(args, Dart_NewInteger(bytes_read));
+  if (bytes_read >= 0) {
+    Dart_SetReturnValue(args, Dart_NewInteger(bytes_read));
+  } else {
+    Dart_SetReturnValue(args, DartUtils::NewDartOSError());
+  }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_WriteList)(Dart_NativeArguments args) {
   Dart_EnterScope();
   intptr_t socket =
       DartUtils::GetIntegerField(Dart_GetNativeArgument(args, 0),
                                  DartUtils::kIdFieldName);
   Dart_Handle buffer_obj = Dart_GetNativeArgument(args, 1);
@@ skipping 28 matching lines @@
                                  chunk_length);
     if (Dart_IsError(result)) {
       delete[] buffer;
       Dart_PropagateError(result);
     }
     bytes_written =
         Socket::Write(socket, reinterpret_cast<void*>(buffer), chunk_length);
     total_bytes_written += bytes_written;
   } while (bytes_written > 0 && total_bytes_written < length);
   delete[] buffer;
-  Dart_SetReturnValue(args, Dart_NewInteger(total_bytes_written));
+  if (bytes_written >= 0) {
+    Dart_SetReturnValue(args, Dart_NewInteger(total_bytes_written));
+  } else {
+    Dart_SetReturnValue(args, DartUtils::NewDartOSError());
+  }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(Socket_GetPort)(Dart_NativeArguments args) {
   Dart_EnterScope();
   intptr_t socket =
       DartUtils::GetIntegerField(Dart_GetNativeArgument(args, 0),
                                  DartUtils::kIdFieldName);
+  OSError os_error;
   intptr_t port = Socket::GetPort(socket);
-  Dart_SetReturnValue(args, Dart_NewInteger(port));
+  if (port > 0) {
+    Dart_SetReturnValue(args, Dart_NewInteger(port));
+  } else {
+    Dart_SetReturnValue(args, DartUtils::NewDartOSError());
+  }
   Dart_ExitScope();
 }
 
+
+void FUNCTION_NAME(Socket_GetError)(Dart_NativeArguments args) {
+  Dart_EnterScope();
+  intptr_t socket =
+      DartUtils::GetIntegerField(Dart_GetNativeArgument(args, 0),
+                                 DartUtils::kIdFieldName);
+  OSError os_error;
+  Socket::GetError(socket, &os_error);
+  Dart_SetReturnValue(args, DartUtils::NewDartOSError(&os_error));
+  Dart_ExitScope();
+}
+
 
 void FUNCTION_NAME(Socket_GetStdioHandle)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle socketobj = Dart_GetNativeArgument(args, 0);
   intptr_t num =
       DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 1));
   ASSERT(num == 0 || num == 1 || num == 2);
   intptr_t socket = Socket::GetStdioHandle(num);
   DartUtils::SetIntegerField(
       socketobj, DartUtils::kIdFieldName, socket);
   Dart_SetReturnValue(args, Dart_NewBoolean(socket >= 0));
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(ServerSocket_CreateBindListen)(Dart_NativeArguments args) {
   Dart_EnterScope();
   Dart_Handle socketobj = Dart_GetNativeArgument(args, 0);
   const char* bindAddress =
       DartUtils::GetStringValue(Dart_GetNativeArgument(args, 1));
   intptr_t port = DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 2));
   intptr_t backlog =
       DartUtils::GetIntegerValue(Dart_GetNativeArgument(args, 3));
   intptr_t socket =
       ServerSocket::CreateBindListen(bindAddress, port, backlog);
-  DartUtils::SetIntegerField(
-      socketobj, DartUtils::kIdFieldName, socket);
-  Dart_SetReturnValue(args, Dart_NewBoolean(socket >= 0));
+  if (socket >= 0) {
+    DartUtils::SetIntegerField(
+        socketobj, DartUtils::kIdFieldName, socket);
+    Dart_SetReturnValue(args, Dart_True());
+  } else {
+    Dart_SetReturnValue(args, DartUtils::NewDartOSError());
+  }
   Dart_ExitScope();
 }
 
 
 void FUNCTION_NAME(ServerSocket_Accept)(Dart_NativeArguments args) {
   Dart_EnterScope();
   intptr_t socket =
       DartUtils::GetIntegerField(Dart_GetNativeArgument(args, 0),
                                  DartUtils::kIdFieldName);
   Dart_Handle socketobj = Dart_GetNativeArgument(args, 1);
   intptr_t newSocket = ServerSocket::Accept(socket);
   if (newSocket >= 0) {
     DartUtils::SetIntegerField(
         socketobj, DartUtils::kIdFieldName, newSocket);
+    Dart_SetReturnValue(args, Dart_True());
+  } else {
+    Dart_SetReturnValue(args, DartUtils::NewDartOSError());
   }
-  Dart_SetReturnValue(args, Dart_NewBoolean(newSocket >= 0));
   Dart_ExitScope();
 }
 
 
 static CObject* LookupRequest(const CObjectArray& request) {
   if (request.Length() == 2 && request[1]->IsString()) {
     CObjectString host(request[1]);
     CObject* result = NULL;
     OSError* os_error = NULL;
     const char* ip_address =
@@ skipping 62 matching lines @@
   Dart_EnterScope();
   Dart_SetReturnValue(args, Dart_Null());
   Dart_Port service_port = Socket::GetServicePort();
   if (service_port != kIllegalPort) {
     // Return a send port for the service port.
     Dart_Handle send_port = Dart_NewSendPort(service_port);
     Dart_SetReturnValue(args, send_port);
   }
   Dart_ExitScope();
 }