Changeset 21332 for lang/cplusplus/llv8call

Timestamp:

10/14/08 23:42:18 (5 years ago)

Author:

tokuhirom

Message:

support AF_INET6

Location:

lang/cplusplus/llv8call/trunk

Files:

• TODO (modified) (1 diff)
• ext/socket/socket.cc (modified) (5 diffs)
• lib/org/coderepos/test/tcp.js (modified) (2 diffs)
• t/100_socket/07_ipv6.js (added)

lang/cplusplus/llv8call/trunk/TODO

@@ -6 +6 @@
 -- base64.js
 -- etc.
-- added unix domain socket support
 - add socket.*
 - org.coderepos.subprocess module

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

@@ -41 +41 @@
 typedef union sock_addr {
     struct sockaddr_in in;
-#ifdef AF_UNIX
+#if defined(AF_UNIX)
     struct sockaddr_un un;
+#endif
+#if defined(AF_INET6)
+    struct sockaddr_in6 in6;
 #endif
 } sock_addr_t;
@@ -81 +84 @@
             sockaddr_un * addr_un = (sockaddr_un*)&addr;
             ret->Set(Int32::New(0), String::New(addr_un->sun_path));
+        }
+        break;
+#endif
+#if defined(AF_INET6)
+    case AF_INET6:
+        {
+            char buf[NI_MAXHOST];
+            if (getnameinfo(&addr, sizeof(sockaddr_in6), buf, sizeof(buf), NULL, 0, NI_NUMERICHOST)) {
+                throw_stderr(__func__);
+                return ret;
+            }
+            sockaddr_in6 * addr_in6 = (sockaddr_in6*)&addr;
+            ret->Set(Int32::New(0), String::New(buf));
+            ret->Set(Int32::New(1), Int32::New(ntohs(addr_in6->sin6_port)));
         }
         break;
@@ -104 +121 @@
 
 // TODO: support unix domain socket
-// TODO: support inet6
 static inline void _gen_sockaddr(Handle<Array> &args, int family, sock_addr_t* addr_ret, socklen_t * len) {
     switch (family) {
@@ -126 +142 @@
             addr->sun_path[path.length()] = '\0';
             *len = path.length() + (sizeof(*addr) - sizeof(addr->sun_path));
+        }
+        break;
+#endif
+#if defined(AF_INET6)
+    case AF_INET6:
+        {
+            if (args->Length() != 2) {
+                ThrowException(String::New("invalid args: AF_INET => (host, port)"));
+                return;
+            }
+            String::Utf8Value host(args->Get(Int32::New(0)));
+            int32_t port = args->Get(Int32::New(1))->Int32Value();
+
+            struct sockaddr_in6 *addr = (struct sockaddr_in6*)addr_ret;
+            memset(addr, 0, sizeof(*addr)); // clear
+            addr->sin6_family = AF_INET6;
+            int pton_ret = inet_pton(AF_INET6, *host, addr->sin6_addr.s6_addr);
+            if (pton_ret == 0) {
+                ThrowException(String::New("invalid ip form"));
+                return;
+            } else if (pton_ret == -1) {
+                ThrowException(String::New("unknown protocol family"));
+                return;
+            }
+            addr->sin6_port = htons((short)port);
+            *len = sizeof(*addr);
         }
         break;
@@ -538 +580 @@
 #endif
         BIND_CI("AF_INET",        AF_INET);
+#if defined(AF_INET6)
         BIND_CI("AF_INET6",       AF_INET6);
+#endif
 
         // grep '"SOL_' Modules/socketmodule.c|perl -lne 'print "#if defined($1)\n        BIND_CI(\"$1\", $1)\n#endif" if /"(SOL_\w+)"/' 

lang/cplusplus/llv8call/trunk/lib/org/coderepos/test/tcp.js

@@ -41 +41 @@
             throw "empty port not found";
         },
-        "waitPort" : function (port) {
+        "waitPort" : function (port, family) {
+            if (!family) { family = Socket.AF_INET }
             var _check_port = function (port) {
-                var sock = new Socket();
+                var sock = new Socket(family);
                 try {
-                    sock.connect(["127.0.0.1", port]);
+                    sock.connect([family == Socket.AF_INET ? '127.0.0.1' : 'fe80::1%lo0', port]);
                     sock.close();
                     return true;
@@ -62 +63 @@
         },
         "testTCP" : function (args) {
+            var family = args['family'] ? args['family'] : Socket.AF_INET;
             var pid = posix.fork();
             if (pid) {
                 // parent
-                Test.TCP.waitPort(args.port);
+                Test.TCP.waitPort(args.port, family);
                 args.client(args.port);
             } else if (pid == 0) {