From 080fa54a858a6abe6375f7bb11dc0eee7637d6c3 Mon Sep 17 00:00:00 2001
From: Ryan <ry@tinyclouds.org>
Date: Wed, 10 Jun 2009 18:29:59 +0200
Subject: [PATCH] fix for issue 3; but now experiencing segfault on linux

---
 src/net.cc | 111 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 65 insertions(+), 46 deletions(-)

diff --git a/src/net.cc b/src/net.cc
index 27736123860..1493567acd3 100644
--- a/src/net.cc
+++ b/src/net.cc
@@ -11,6 +11,8 @@
 #include <arpa/inet.h> /* inet_ntop */
 #include <netinet/in.h> /* sockaddr_in, sockaddr_in6 */
 
+#include <pthread.h>
+
 using namespace v8;
 using namespace node;
 
@@ -183,6 +185,12 @@ Connection::Connect (const Arguments& args)
     connection->host_ = strdup(*host_sv);
   }
   
+#ifdef __APPLE__
+  /* Bypass the thread pool and do it sync on this broken ass platform */
+  eio_req *req = static_cast<eio_req*>(malloc(sizeof(eio_req)));
+  req->data = connection;
+  Connection::Resolve(req);
+#else
   /* For the moment I will do DNS lookups in the eio thread pool. This is
    * sub-optimal and cannot handle massive numbers of requests but it is 
    * quite portable. 
@@ -196,9 +204,66 @@ Connection::Connect (const Arguments& args)
             , Connection::AfterResolve
             , connection
             );
+#endif // __APPLE__
   return Undefined();
 }
 
+int
+Connection::Resolve (eio_req *req)
+{
+  Connection *connection = static_cast<Connection*> (req->data);
+  struct addrinfo *address = NULL;
+  req->result = getaddrinfo(connection->host_, connection->port_, &client_tcp_hints, &address);
+  req->ptr2 = address;
+
+  free(connection->host_);
+  connection->host_ = NULL;
+
+  free(connection->port_);
+  connection->port_ = NULL;
+
+#ifdef __APPLE__
+  Connection::AfterResolve(req);
+#endif // __APPLE__
+
+  return 0;
+}
+
+int
+Connection::AfterResolve (eio_req *req)
+{
+  Connection *connection = static_cast<Connection*> (req->data);
+  struct addrinfo *address = static_cast<struct addrinfo *>(req->ptr2);
+
+  req->ptr2 = NULL;
+
+  int r = 0;
+  if (req->result == 0) {
+    r = connection->Connect(address);
+  }
+
+  if (address) freeaddrinfo(address); 
+
+  // no error. return.
+  if (r == 0 && req->result == 0) {
+    oi_socket_attach (EV_DEFAULT_UC_ &connection->socket_);
+    goto out;
+  }
+
+  puts("net.cc: resolve failed");
+
+  connection->OnDisconnect();
+  connection->Detach();
+
+out:
+
+#ifdef __APPLE__
+  free(req);
+#endif // __APPLE__
+
+  return 0;
+}
+
 Handle<Value>
 Connection::SetEncoding (const Arguments& args)
 {
@@ -228,52 +293,6 @@ Connection::SetEncoding (const Arguments& args)
   }
 }
 
-int
-Connection::Resolve (eio_req *req)
-{
-  Connection *connection = static_cast<Connection*> (req->data);
-  struct addrinfo *address = NULL;
-  req->result = getaddrinfo(connection->host_, connection->port_, &client_tcp_hints, &address);
-  req->ptr2 = address;
-
-  free(connection->host_);
-  connection->host_ = NULL;
-
-  free(connection->port_);
-  connection->port_ = NULL;
-
-  return 0;
-}
-
-int
-Connection::AfterResolve (eio_req *req)
-{
-  Connection *connection = static_cast<Connection*> (req->data);
-  struct addrinfo *address = static_cast<struct addrinfo *>(req->ptr2);
-
-  req->ptr2 = NULL;
-
-  int r = 0;
-  if (req->result == 0) {
-    r = connection->Connect(address);
-  }
-
-  if (address) freeaddrinfo(address); 
-
-  // no error. return.
-  if (r == 0 && req->result == 0) {
-    oi_socket_attach (EV_DEFAULT_UC_ &connection->socket_);
-    return 0;
-  }
-
-  puts("net.cc: resolve failed");
-
-  connection->OnDisconnect();
-  connection->Detach();
-
-  return 0;
-}
-
 Handle<Value>
 Connection::Close (const Arguments& args)
 {