Changeset 6724

Timestamp:

01/14/11 00:26:19 (2 years ago)

Author:

jow

Message:

libs/nixio: fix sendto(), implement support for unix domain sockets (#140)

Files:

• luci/trunk/libs/nixio/src/io.c (modified) (5 diffs)

luci/trunk/libs/nixio/src/io.c

@@ -30 +30 @@
 static int nixio_sock__sendto(lua_State *L, int to) {
     nixio_sock *sock = nixio__checksock(L);
+    struct sockaddr_storage addr_in;
+#ifndef __WINNT__
+    struct sockaddr_un addr_un;
+#endif
     struct sockaddr *addr = NULL;
     socklen_t alen = 0;
@@ -36 +40 @@
     if (to) {
         argoff += 2;
-        const char *address = luaL_checkstring(L, 3);
-        struct sockaddr_storage addrstor;
-        addr = (struct sockaddr*)&addrstor;
-
-        nixio_addr naddr;
-        memset(&naddr, 0, sizeof(naddr));
-        strncpy(naddr.host, address, sizeof(naddr.host) - 1);
-        naddr.port = (uint16_t)luaL_checkinteger(L, 4);
-        naddr.family = sock->domain;
-
-        if (nixio__addr_write(&naddr, addr)) {
-            return nixio__perror_s(L);
-        }
+        if (sock->domain == AF_INET || sock->domain == AF_INET6) {
+            const char *address = luaL_checkstring(L, 3);
+            addr = (struct sockaddr*)&addr_in;
+            alen = sizeof(addr_in);
+
+            nixio_addr naddr;
+            memset(&naddr, 0, sizeof(naddr));
+            strncpy(naddr.host, address, sizeof(naddr.host) - 1);
+            naddr.port = (uint16_t)luaL_checkinteger(L, 4);
+            naddr.family = sock->domain;
+
+            if (nixio__addr_write(&naddr, addr)) {
+                return nixio__perror_s(L);
+            }
+        }
+
+#ifndef __WINNT__
+        else if (sock->domain == AF_UNIX) {
+            size_t pathlen;
+            const char *path = luaL_checklstring(L, 3, &pathlen);
+
+            addr_un.sun_family = AF_UNIX;
+            luaL_argcheck(L, pathlen < sizeof(addr_un.sun_path), 3, "out of range");
+            strncpy(addr_un.sun_path, path, sizeof(addr_un.sun_path));
+
+            addr = (struct sockaddr*)&addr_un;
+            alen = sizeof(addr_un);
+        }
+#endif
     }
 
@@ -104 +124 @@
     nixio_sock *sock = nixio__checksock(L);
     char buffer[NIXIO_BUFFERSIZE];
-    struct sockaddr_storage addrobj;
+    struct sockaddr_storage addr_in;
+#ifndef __WINNT__
+    struct sockaddr_un addr_un;
+#endif
+    struct sockaddr *addr = NULL;
+    socklen_t alen = 0;
     uint req = luaL_checkinteger(L, 2);
     int readc;
 
-    if (from && sock->domain != AF_INET && sock->domain != AF_INET6) {
-        return luaL_argerror(L, 1, "supported families: inet, inet6");
-    }
-
-    struct sockaddr *addr = (from) ? (struct sockaddr*)&addrobj : NULL;
-    socklen_t alen = (from) ? sizeof(addrobj) : 0;
+    if (sock->domain == AF_INET || sock->domain == AF_INET6) {
+        addr = (from) ? (struct sockaddr*)&addr_in : NULL;
+        alen = (from) ? sizeof(addr_in) : 0;
+    }
+#ifndef __WINNT__
+    else if (sock->domain == AF_UNIX) {
+        addr = (from) ? (struct sockaddr*)&addr_un : NULL;
+        alen = (from) ? sizeof(addr_un) : 0;
+    }
+#endif
 
     /* We limit the readsize to NIXIO_BUFFERSIZE */
@@ -138 +167 @@
         if (!from) {
             return 1;
-        } else {
+        }
+        /* push address. */
+        if (sock->domain == AF_INET || sock->domain == AF_INET6) {
             nixio_addr naddr;
-            if (!nixio__addr_parse(&naddr, (struct sockaddr *)&addrobj)) {
+            if (!nixio__addr_parse(&naddr, (struct sockaddr *)&addr_in)) {
                 lua_pushstring(L, naddr.host);
                 lua_pushinteger(L, naddr.port);
@@ -148 +179 @@
             }
         }
-    }
+#ifndef __WINNT__
+        else if (sock->domain == AF_UNIX) {
+            lua_pushstring(L, addr_un.sun_path);
+            return 2;
+        }
+#endif
+    }
+    return 1;
 }