Changeset 21246 for lang/cplusplus/llv8call

Timestamp:

10/13/08 19:23:00 (5 years ago)

Author:

tokuhirom

Message:

r27679@skinny (orig r21241): tokuhirom | 2008-10-13 18:04:20 +0900
unix socket support(work in progress)

Location:

lang/cplusplus/llv8call/trunk

Files:

• ext/include/llv8-macros.h (modified) (1 diff)
• ext/socket/socket.cc (modified) (7 diffs)
• t/100_socket/05_unix_socket.js (added)

lang/cplusplus/llv8call/trunk/ext/include/llv8-macros.h

@@ -55 +55 @@
 #define ARG_obj(v,i) v8::Local<v8::Object> v=args[i]->ToObject();
 #define ARG_bool(v,i) bool v=args[(i)]->BooleanValue();
+#define ARG_array(name, c) \
+                if (!args[(c)]->IsArray()) { \
+                        std::ostringstream __k7_e; \
+                        __k7_e << "Exception: argument error." << __func__ << " expects array for argument " << c << "."; \
+                        return ThrowException(String::New(__k7_e.str().c_str())); \
+                } \
+                Handle<Array> name = Handle<Array>::Cast(args[(c)])
 #define END return v8::ThrowException(v8::String::New("Don't reach here... this function doesn't return value.")); }
  

lang/cplusplus/llv8call/trunk/ext/socket/socket.cc

@@ -33 +33 @@
 #  include <netinet/in.h>
 #  include <arpa/inet.h>
+#  include <sys/un.h>
 #  include <unistd.h>
 #  include <sys/param.h>
 #  include <netdb.h>
 #endif
+
+typedef union sock_addr {
+    struct sockaddr_in in;
+#ifdef AF_UNIX
+    struct sockaddr_un un;
+#endif
+} sock_addr_t;
 
 /** DESCRIPTION:
@@ -68 +76 @@
     Handle<Array> ret = Array::New(2);
     switch (addr.sa_family) {
+#if defined(AF_UNIX)
+    case AF_UNIX:
+        {
+            sockaddr_un * addr_un = (sockaddr_un*)&addr;
+            ret->Set(Int32::New(0), String::New(addr_un->sun_path));
+        }
+        break;
+#endif
     case AF_INET:
         {
@@ -89 +105 @@
 // TODO: support unix domain socket
 // TODO: support inet6
-static inline void _gen_sockaddr(Handle<Array> &args, int family, struct sockaddr* addr_ret, socklen_t * len) {
+static inline void _gen_sockaddr(Handle<Array> &args, int family, sock_addr_t* addr_ret, socklen_t * len) {
     switch (family) {
+#if defined(AF_UNIX)
+    case AF_UNIX:
+        {
+            puts("AF_UNIX");
+            if (args->Length() != 1) {
+                ThrowException(String::New("invalid args: AF_UNIX => (socket file)"));
+                return;
+            }
+            struct sockaddr_un *addr = (struct sockaddr_un*)addr_ret;
+            memset(addr, 0, sizeof(sockaddr_un)); // clear
+
+            String::Utf8Value path(args->Get(Int32::New(0)));
+            addr->sun_family = AF_UNIX;
+            puts(*path);
+            strncpy(addr->sun_path, *path, 104);
+            puts(addr->sun_path);
+            *len = sizeof(sockaddr_un);
+        }
+        break;
+#endif
     case AF_INET:
         {
             if (args->Length() != 2) {
-                ThrowException(String::New("invalid args: (host, port)"));
+                ThrowException(String::New("invalid args: AF_INET => (host, port)"));
                 return;
             }
@@ -159 +195 @@
 FUNCTION(_bind)
     EXTERNAL_SOCKET();
-    struct sockaddr addr;
+    sock_addr_t addr;
     socklen_t len;
     int family = args.This()->Get(String::New("family"))->Int32Value();
-    Handle<Array> addrsrc = Handle<Array>::Cast(args[0]);
+    ARG_array(addrsrc, 0);
+    printf("BIND: %d\n", sock);
     _gen_sockaddr(addrsrc, family, &addr, &len);
-    if (bind(sock, &addr, len) == 0) {
+    printf("BIND: %d\n", sock);
+    printf("HEY: %d, %d, %d, %s\n", addr.un.sun_family, AF_UNIX, AF_INET, addr.un.sun_path);
+    if (bind(sock, (sockaddr*)&addr, len) == 0) {
         return Undefined();
     } else {
@@ -216 +255 @@
 FUNCTION(_connect)
     EXTERNAL_SOCKET();
-    struct sockaddr addr;
+    sock_addr_t addr;
     socklen_t len;
     int family = args.This()->Get(String::New("family"))->Int32Value();
-    Handle<Array> addrsrc = Handle<Array>::Cast(args[0]);
+    ARG_array(addrsrc, 0);
     _gen_sockaddr(addrsrc, family, &addr, &len);
-    if (connect(sock, &addr, len) == 0) {
+    if (connect(sock, (sockaddr*)&addr, len) == 0) {
         return Undefined();
     } else {
@@ -307 +346 @@
         addrsrc = Handle<Array>::Cast(args[1]);
     }
-    struct sockaddr addr;
+    sock_addr_t addr;
     socklen_t len;
     int family = args.This()->Get(String::New("family"))->Int32Value();
     _gen_sockaddr(addrsrc, family, &addr, &len);
-    ssize_t size = sendto(sock, *str, str.length(), _flags, &addr, len);
+    ssize_t size = sendto(sock, *str, str.length(), _flags, (sockaddr*)&addr, len);
     if (size >= 0) {
         return Int32::New(size);
@@ -393 +432 @@
         BIND_CI("SOCK_SEQPACKET", SOCK_SEQPACKET);
 
+#if defined(AF_UNIX)
         BIND_CI("AF_UNIX",        AF_UNIX);
+#endif
         BIND_CI("AF_INET",        AF_INET);
         BIND_CI("AF_INET6",       AF_INET6);