Changeset 6193

Timestamp:

05/31/10 14:45:13 (3 years ago)

Author:

Cyrus

Message:

Merge socket code to usock, fix regression from ulog and ubox hash changes

Location:

luci2

Files:

• cbi2/cbi.h (modified) (1 diff)
• cbi2/luci_cli.c (modified) (2 diffs)
• cbi2/Makefile (modified) (3 diffs)
• cbi2/u_sock.c (modified) (3 diffs)
• cbi2/widgets/luci/content.c (modified) (1 diff)
• cbi2/widgets/luci/menu.c (modified) (2 diffs)
• cbi2/widgets/luci/option.c (modified) (1 diff)
• libubox/ulog.h (modified) (1 diff)
• libubox/usock.c (modified) (3 diffs)
• libubox/usock.h (modified) (1 diff)
• libustream/core.c (modified) (2 diffs)
• ubus/libubus.c (modified) (4 diffs)
• ubus/ubus.h (modified) (1 diff)
• ubus/ubus_core.c (modified) (2 diffs)
• ubus/ubus_dispatch.c (modified) (1 diff)
• ubus/ubus_msg.c (modified) (1 diff)
• zhttpd/tcp.c (modified) (2 diffs)

luci2/cbi2/cbi.h

@@ -12 +12 @@
 #include <lmo.h>
 #include "lang.h"
+#include <libubox/hash.h>
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))

luci2/cbi2/luci_cli.c

@@ -6 +6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <sys/un.h>
+#include <libubox/usock.h>
 
 #define SOCK_PATH "/tmp/luci2-socket"
@@ -16 +16 @@
 #define MAX_SOCKET_DATA 512
     int s, len;
-    struct sockaddr_un remote;
     char reply[4096];
     if(argc != 2)
         return 1;
-    if((s = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
-    {
-        perror("socket");
-        exit(1);
-    }
+
     printf("Trying to connect...\n");
-
-    remote.sun_family = AF_UNIX;
-    strcpy(remote.sun_path, SOCK_PATH);
-    len = strlen(remote.sun_path) + sizeof(remote.sun_family);
-    if(connect(s, (struct sockaddr *)&remote, len) == -1)
+    if((s = usock(USOCK_UNIX | USOCK_TCP, SOCK_PATH, NULL)) == -1)
     {
         perror("connect");

luci2/cbi2/Makefile

@@ -3 +3 @@
 CFLAGS+= --std=gnu99 -Wall -Werror -pedantic -I/usr/include/lua5.1/
 LDFLAGS?=
-INCLUDES?=-I../libubox/  -Ilmo/
+INCLUDES?=-I../libubox/  -Ilmo/ -I../
 BINARY=libcbi.so luci luci_cli uvl uvlc libcbi.a luci_conf widgets/luci/_builtin.so widgets/config/_builtin.so sources/_builtin.so validator/_builtin.so
 
@@ -30 +30 @@
 
 luci: luci.c
-    $(CC) $(CFLAGS) $(LDFLAGS) -g -o $@ $^ -lcbi -I../libubox/ -Ilmo/ -L.
+    $(CC) $(CFLAGS) $(LDFLAGS) -g -o $@ $^ -lcbi $(INCLUDES) -L.
 
 luci_conf: luci_conf.c
-    $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lcbi -I../libubox/ -Ilmo/ -L.
+    $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lcbi $(INCLUDES) -L.
 
 libcbi.a: lucic.o parser.o json.o cbi_element.o cbi_dump.o cbi_core.o cbi_buffer.o cbi_uci.o source.o session.o u_sock.o validate.o uvl.o lang.o widget.o log.o handler.o 
@@ -43 +43 @@
 
 luci_cli: luci_cli.o
-    $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+    $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ -lubox
 
 uvl: uvl.o uvl-cli.o

luci2/cbi2/u_sock.c

@@ -8 +8 @@
 #include <sys/types.h>
 #include <sys/socket.h>
+#include <libubox/usock.h>
 
 #include "list.h"
@@ -46 +47 @@
 void u_sock_init(struct cbi_ctx *ctx, const char *path)
 {
-    int s, len;
-    struct sockaddr_un local;
-
+    int s;
     INIT_LIST_HEAD(&ctx->sock_handlers);
 
-    if((s = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
+    path = (path)?(path):(U_SOCK_PATH);
+    unlink(path);
+    if((s = usock(USOCK_TCP | USOCK_UNIX | USOCK_SERVER, path, NULL)) == -1)
     {
         perror("socket");
@@ -57 +58 @@
     }
 
-    local.sun_family = AF_UNIX;
-    strcpy(local.sun_path, (path)?(path):(U_SOCK_PATH));
-    unlink(local.sun_path);
-    len = strlen(local.sun_path) + sizeof(local.sun_family);
-    if(bind(s, (struct sockaddr *)&local, len) == -1)
-    {
-        close(s);
-        perror("bind");
-        exit(1);
-    }
-
-    if(listen(s, 5) == -1)
-    {
-        perror("listen");
-        exit(1);
-    }
     ctx->u_sock = s;
     printf("Unix socket loaded %s\n", (path)?(path):(U_SOCK_PATH));

luci2/cbi2/widgets/luci/content.c

@@ -21 +21 @@
 {
     if(e->value)
-        e->lmo = sfh_hash(e->value, strlen(e->value));
+        e->lmo = hash_murmur2(e->value, strlen(e->value));
     return 0;
 }

luci2/cbi2/widgets/luci/menu.c

@@ -13 +13 @@
     if(!tag)
         tag = cbi_prop_find(e, "id");
-    e->lmo = sfh_hash(tag, strlen(tag));
+    e->lmo = hash_murmur2(tag, strlen(tag));
     return 0;
 }
@@ -54 +54 @@
         return 1;
     }
-    e->lmo = sfh_hash(e->value, strlen(e->value));
+    e->lmo = hash_murmur2(e->value, strlen(e->value));
     return 0;
 }

luci2/cbi2/widgets/luci/option.c

@@ -10 +10 @@
 {
     if(e->value)
-        e->lmo = sfh_hash(e->value, strlen(e->value));
+        e->lmo = hash_murmur2(e->value, strlen(e->value));
     return 0;
 }

luci2/libubox/ulog.h

@@ -26 +26 @@
 #define LOG     log_printf
 #define log_start(name, daemon) \
-    openlog(name, (daemon) ? 0 : (LOG_PERROR | LOG_CONS), LOG_USER)
-#define log_printf(...) syslog(10, __VA_ARGS__)
+    openlog(name, (LOG_PERROR | LOG_CONS), LOG_USER)
+#define log_printf(...) syslog(LOG_NOTICE, __VA_ARGS__)
 
 #endif

luci2/libubox/usock.c

@@ -14 +14 @@
     int sock = -1;
 
-    if (service && !(type & USOCK_FLAG_UNIX)) {
+    if (service && !(type & USOCK_UNIX)) {
         struct addrinfo *result, *rp;
 
         struct addrinfo hints = {
-            .ai_family = (type & USOCK_FLAG_IPV6ONLY) ? AF_INET6 :
-                (type & USOCK_FLAG_IPV4ONLY) ? AF_INET : AF_UNSPEC,
+            .ai_family = (type & USOCK_IPV6ONLY) ? AF_INET6 :
+                (type & USOCK_IPV4ONLY) ? AF_INET : AF_UNSPEC,
             .ai_socktype = ((type & 0xff) == USOCK_TCP)
                 ? SOCK_STREAM : SOCK_DGRAM,
             .ai_flags = AI_ADDRCONFIG |
-                ((type & USOCK_FLAG_SERVER) ? AI_PASSIVE : 0),
+                ((type & USOCK_SERVER) ? AI_PASSIVE : 0),
         };
 
@@ -36 +36 @@
             }
 
-            if (!(type & USOCK_FLAG_NOCLOEXEC)) {
+            if (!(type & USOCK_NOCLOEXEC)) {
                 fcntl(sock, F_SETFD, fcntl(sock, F_GETFD) | FD_CLOEXEC);
             }
 
-            if (type & USOCK_FLAG_NONBLOCK) {
+            if (type & USOCK_NONBLOCK) {
                 fcntl(sock, F_SETFL, fcntl(sock, F_GETFL) | O_NONBLOCK);
             }
 
-            if (type & USOCK_FLAG_SERVER) {
+            if (type & USOCK_SERVER) {
                 const int one = 1;
                 setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one));
@@ -76 +76 @@
         }
 
-        if (!(type & USOCK_FLAG_NOCLOEXEC)) {
+        if (!(type & USOCK_NOCLOEXEC)) {
             fcntl(sock, F_SETFD, fcntl(sock, F_GETFD) | FD_CLOEXEC);
         }
 
-        if (type & USOCK_FLAG_NONBLOCK) {
+        if (type & USOCK_NONBLOCK) {
             fcntl(sock, F_SETFL, fcntl(sock, F_GETFL) | O_NONBLOCK);
         }
 
-        if (type & USOCK_FLAG_SERVER) {
+        if (type & USOCK_SERVER) {
             if (bind(sock, (struct sockaddr*)&sun, sizeof(sun)) ||
             ((type & 0xff) == USOCK_TCP && listen(sock, SOMAXCONN))) {

luci2/libubox/usock.h

@@ -2 +2 @@
 #define USOCK_H_
 
-#define USOCK_TCP   1
-#define USOCK_UDP   2
+#define USOCK_TCP 0
+#define USOCK_UDP 1
 
-#define USOCK_FLAG_SERVER       0x0100
-#define USOCK_FLAG_NOCLOEXEC    0x0200
-#define USOCK_FLAG_NONBLOCK     0x0400
-#define USOCK_FLAG_IPV6ONLY     0x2000
-#define USOCK_FLAG_IPV4ONLY     0x4000
-#define USOCK_FLAG_UNIX         0x8000
+#define USOCK_SERVER        0x0100
+#define USOCK_NOCLOEXEC 0x0200
+#define USOCK_NONBLOCK      0x0400
+#define USOCK_IPV6ONLY      0x2000
+#define USOCK_IPV4ONLY      0x4000
+#define USOCK_UNIX          0x8000
 
 int usock(int type, const char *host, const char *service);

luci2/libustream/core.c

@@ -8 +8 @@
 #include <stdlib.h>
 #include <string.h>
+#include <libubox/usock.h>
 
 static int ustream_io_timeout = 60;
@@ -59 +60 @@
 
 USTREAM_LOCAL int ustream_io_socket (const char *host, const char *service) {
-    struct addrinfo *result, *rp;
-    int sock = -1, clstat;
-
-    struct addrinfo hints = {
-        .ai_family = AF_UNSPEC,
-        .ai_socktype = SOCK_STREAM
-    };
-
-    if (getaddrinfo(host, service, &hints, &result)) {
-        errno = ENXIO;
-        return -1;
-    }
-
-    for (rp = result; rp != NULL; rp = rp->ai_next) {
-        sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-        if (sock == -1) {
-            continue;
-        }
-
-        if (!connect(sock, rp->ai_addr, rp->ai_addrlen)) {
-            break;
-        }
-
-        clstat = close(sock);
-        sock = -1;
-    }
-
-    freeaddrinfo(result);
-    fcntl(sock, F_SETFD, fcntl(sock, F_GETFD) | FD_CLOEXEC);
+    int sock = usock(USOCK_TCP, host, service);
 
     struct timeval t = {.tv_sec = ustream_io_timeout};

luci2/ubus/libubus.c

@@ -38 +38 @@
 #include "ubus_constants.h"
 #include "hash.h"
+#include "usock.h"
 
 struct ubus_ctx
@@ -258 +259 @@
 int ubus_connect(struct ubus_ctx *ctx)
 {
-    int s, len;
-    struct sockaddr_un remote;
+    int s;
     struct pollfd p = {.fd = ctx->s, .events = POLLRDHUP | POLLHUP | POLLERR};
     if(ctx->s && !poll(&p, 1, 0))
@@ -266 +266 @@
         close(ctx->s);
 
-    if((s = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
+    if((s = usock(USOCK_UNIX | USOCK_TCP, UBUS_SOCK_PATH, NULL)) == -1)
     {
         perror("socket");
@@ -272 +272 @@
     }
 
-    remote.sun_family = AF_UNIX;
-    strcpy(remote.sun_path, UBUS_SOCK_PATH);
-    len = strlen(remote.sun_path) + sizeof(remote.sun_family);
-
-    if(connect(s, (struct sockaddr *)&remote, len) == -1)
-    {
-        close(s);
-        return -2;
-    }
     ctx->s = s;
     LOG("connected to ubus\n");

luci2/ubus/ubus.h

@@ -31 +31 @@
 #include "ubus_msg.h"
 #include "hash.h"
+#include "usock.h"
 
 struct ubus_client

luci2/ubus/ubus_core.c

@@ -71 +71 @@
 void ubus_init(const char *path)
 {
-    int len, flags;
+    int flags;
     struct epoll_event ev;
-    struct sockaddr_un local;
     INIT_LIST_HEAD(&ubus_clients);
-    if((ubusfd = socket(AF_UNIX, SOCK_STREAM, 0)) == -1)
+    path = (path)?(path):(UBUS_SOCK_PATH);
+    unlink(path);
+    if((ubusfd = usock(USOCK_TCP | USOCK_UNIX | USOCK_SERVER, path, NULL)) == -1)
     {
         perror("socket");
@@ -81 +82 @@
     }
 
-    local.sun_family = AF_UNIX;
-    strcpy(local.sun_path, (path)?(path):(UBUS_SOCK_PATH));
-    unlink(local.sun_path);
-    len = strlen(local.sun_path) + sizeof(local.sun_family);
-    if(bind(ubusfd, (struct sockaddr *)&local, len) == -1)
-    {
-        perror("bind");
-        exit(1);
-    }
-
-    if(listen(ubusfd, 20) == -1)
-    {
-        perror("listen");
-        exit(1);
-    }
     ubus_epollfd = epoll_create(32);
     flags = fcntl(ubusfd, F_GETFL, 0);

luci2/ubus/ubus_dispatch.c

@@ -148 +148 @@
     if(strcmp(ns, u->type))
     {
-        LOG("dropping, namespace mismatch\n", u->type, ns);
+        LOG("dropping, namespace mismatch\n"); //, u->type, ns);
         return;
     }

luci2/ubus/ubus_msg.c

@@ -133 +133 @@
     if(strlen(node) >= UBUS_MAX_NODE)
     {
-        LOG("node too long %s (%d)\n", node, strlen(node));
+        LOG("node too long %s (%d)\n", node, (int)strlen(node));
         return 1;
     }

luci2/zhttpd/tcp.c

@@ -33 +33 @@
 #include <fcntl.h>
 #include <arpa/inet.h>
+#include <libubox/usock.h>
 
 #include "zthread.h"
@@ -255 +256 @@
 }
 
-/* Create TCP socket */
-static int zhttpd_tcp_server_socket(const char *host, const char *service) {
-    struct addrinfo *result, *rp;
-    int sock = -1, clstat;
-
-    struct addrinfo hints = {
-        .ai_family = AF_UNSPEC,
-        .ai_socktype = SOCK_STREAM,
-        .ai_flags = AI_PASSIVE
-    };
-
-    if (getaddrinfo(host, service, &hints, &result)) {
-        return -1;
-    }
-
-    for (rp = result; rp != NULL; rp = rp->ai_next) {
-        sock = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
-        if (sock == -1) {
-            continue;
-        }
-
-        int one = 1;
-        setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (char*)&one, sizeof(one));
-        if (!bind(sock, rp->ai_addr, rp->ai_addrlen) && !listen(sock, 32)) {
-            break;
-        }
-
-        clstat = close(sock);
-        sock = -1;
-    }
-
-    freeaddrinfo(result);
-    return sock;
-}
-
 
 /* Create and spawn listening server zthread */
 int zhttpd_tcp_server(const char *host, const char *service,
 const char *tlskey, const char *tlscert, int pem) {
-    int socket = zhttpd_tcp_server_socket(host, service);
+    int socket = usock(USOCK_TCP | USOCK_NONBLOCK, host, service);
     if (socket == -1) {
         return ZHTTPD_EIO;
     }
-    fcntl(socket, F_SETFL, fcntl(socket, F_GETFL) | O_NONBLOCK);
-    fcntl(socket, F_SETFD, fcntl(socket, F_GETFD) | FD_CLOEXEC);
 
     zhttpd_tcp_t *tcp = calloc(1, sizeof(zhttpd_tcp_t));