Changeset 5830

Timestamp:

03/15/10 22:01:46 (3 years ago)

Author:

Cyrus

Message:

zhttpd: More stuff, uhtbl: Qualifier change

Location:

luci2

Files:

• libubox/uhtbl.c (modified) (1 diff)
• libubox/uhtbl.h (modified) (1 diff)
• upsd/Makefile (modified) (1 diff)
• zhttpd/cbi2 (deleted)
• zhttpd/env.c (added)
• zhttpd/env.h (added)
• zhttpd/Makefile (modified) (2 diffs)
• zhttpd/tcp.c (modified) (4 diffs)
• zhttpd/zhttpd.c (modified) (4 diffs)
• zhttpd/zhttpd.h (modified) (3 diffs)

luci2/libubox/uhtbl.c

@@ -158 +158 @@
 }
 
-UHTBL_API int uhtbl_unset(uhtbl_t *tbl, void *key, long len) {
+UHTBL_API int uhtbl_unset(uhtbl_t *tbl, const void *key, long len) {
     uhtbl_bucket_t *prev = NULL;
     uhtbl_bucket_t *bucket = _uhtbl_find(tbl, key, len, &prev, NULL);

luci2/libubox/uhtbl.h

@@ -282 +282 @@
  * Returns 0 on success or a negative error code if there was no matching bucket
  */
-UHTBL_API int uhtbl_unset(uhtbl_t *tbl, void *key, long len);
+UHTBL_API int uhtbl_unset(uhtbl_t *tbl, const void *key, long len);
 
 /**

luci2/upsd/Makefile

@@ -15 +15 @@
     LIBFLAGS+=-DUPSD_STANDALONE
 else
-    LIBFLAGS+=-lubox
+    LIBFLAGS+=-lubox -luci
 endif
 

luci2/zhttpd/Makefile

@@ -3 +3 @@
 WFLAGS:=-Wall -Werror -pedantic
 LDFLAGS?=
-LDFLAGS+=
+LDFLAGS+=-lmbox -luci
 BINARY:=zhttpd
-LIBRsRY:=libupsd.so
 
 ifeq ($(ZHTTPD_TLS),cyassl)
@@ -17 +16 @@
 all: $(BINARY)
 
-$(BINARY): *.c cbi2/*.c
-    $(CC) $(CFLAGS) $(SFLAGS) $(WFLAGS) $(LDFLAGS) -o $@ $+
+$(BINARY): *.c
+    $(CC) $(CFLAGS) $(SFLAGS) $(WFLAGS) $(LDFLAGS) -I.. -o $@ $+
 
 clean:

luci2/zhttpd/tcp.c

@@ -13 +13 @@
 #include <arpa/inet.h>
 
-#include "cbi2/hmapx.h"
 #include "zthread.h"
 #include "zhttpd.h"
 #include "tcp.h"
+#include "env.h"
 
 
@@ -42 +42 @@
 
     zhttpd_request_t *req = calloc(1, sizeof(zhttpd_request_t));
-    cbi2_hmap_t *env = cbi2_hmap_create(16);
-    if (!req || !env) {
-        goto error;
-    }
-    req->env = env;
+    if (!req || !zhttpd_env_init(&req->env, 16)) {
+        free(req);
+        close(client);
+        return ZTHREAD_BLOCKED;
+    }
     zhttpd_tcp_cloexec(client);
     zhttpd_tcp_blocking(client, 0);
@@ -76 +76 @@
     if (ia.sa.sa_family == AF_INET) {
         inet_ntop(AF_INET, &ia.sa_in.sin_addr, tmp, sizeof(tmp));
-        cbi2_hmap_set_int(env, "REMOTE_PORT", ntohs(ia.sa_in.sin_port));
-        cbi2_hmap_set_string(env, "REMOTE_ADDR", tmp);
+        zhttpd_env_set_int(&req->env, "REMOTE_PORT", ntohs(ia.sa_in.sin_port));
+        zhttpd_env_set(&req->env, "REMOTE_ADDR", tmp, strlen(tmp));
     } else if (ia.sa.sa_family == AF_INET6) {
         inet_ntop(AF_INET6, &ia.sa_in6.sin6_addr, tmp, sizeof(tmp));
-        cbi2_hmap_set_int(env, "REMOTE_PORT", ntohs(ia.sa_in6.sin6_port));
-        cbi2_hmap_set_string(env, "REMOTE_ADDR", tmp);
+        zhttpd_env_set_int(&req->env, "REMOTE_PORT",ntohs(ia.sa_in6.sin6_port));
+        zhttpd_env_set(&req->env, "REMOTE_ADDR", tmp, strlen(tmp));
     }
 
@@ -89 +89 @@
     if (ia.sa.sa_family == AF_INET) {
         inet_ntop(AF_INET, &ia.sa_in.sin_addr, tmp, sizeof(tmp));
-        cbi2_hmap_set_int(env, "SERVER_PORT", ntohs(ia.sa_in.sin_port));
-        cbi2_hmap_set_string(env, "SERVER_ADDR", tmp);
+        zhttpd_env_set_int(&req->env, "SERVER_PORT", ntohs(ia.sa_in.sin_port));
+        zhttpd_env_set(&req->env, "SERVER_ADDR", tmp, strlen(tmp));
     } else if (ia.sa.sa_family == AF_INET6) {
         inet_ntop(AF_INET6, &ia.sa_in6.sin6_addr, tmp, sizeof(tmp));
-        cbi2_hmap_set_int(env, "SERVER_PORT", ntohs(ia.sa_in6.sin6_port));
-        cbi2_hmap_set_string(env, "SERVER_ADDR", tmp);
+        zhttpd_env_set_int(&req->env, "SERVER_PORT",ntohs(ia.sa_in6.sin6_port));
+        zhttpd_env_set(&req->env, "SERVER_ADDR", tmp, strlen(tmp));
     }
 
     zthread_spawn(zhttpd.threadpool, state, zhttpd_tcp_shutdown, req);
     return ZTHREAD_BLOCKED;
-
-error:
-    free(req);
-    if (env) {
-        cbi2_hmap_unreference(env);
-    }
-    close(client);
-    return ZTHREAD_BLOCKED;
 }
 
 int zhttpd_tcp_shutdown(zthread_t *thread) {
     zhttpd_request_t *request = thread->context;
-    cbi2_hmap_unreference(request->env);
+    uhtbl_finalize(&request->env);
     if (request->handlergc) {
         request->handlergc(request->handlercontext);

luci2/zhttpd/zhttpd.c

@@ -3 +3 @@
 #include <string.h>
 #include <unistd.h>
+#include <stdio.h>
 #include <sys/epoll.h>
 #include <sys/types.h>
@@ -15 +16 @@
 
 static void daemonize() {
-    switch (fork()) {
+    pid_t pid;
+    FILE *fp;
+    switch ((pid = fork())) {
         case -1:
             exit(1);
@@ -21 +24 @@
             break;
         default:
+            fp = fopen(zhttpd.pidfile, "w");
+            if (fp) {
+                fprintf(fp, "%i\n", (int)pid);
+                fclose(fp);
+            }
             exit(0);
     }
@@ -85 +93 @@
     sigaction(SIGPIPE, &action, NULL);
 
+    zhttpd.pidfile = "/var/run/zhttpd.pid";
     int firstrun = 1;
     do {

luci2/zhttpd/zhttpd.h

@@ -9 +9 @@
 #define ZHTTPD_H_
 
+#define _FILE_OFFSET_BITS 64
+
+#include <stdint.h>
 #include <stdio.h>
 #include "zthread.h"
-#include "cbi2/hmapx.h"
+#include "libubox/uhtbl.h"
+#include "libubox/hash.h"
 
 #define ZHTTPD_OK       0
@@ -34 +38 @@
 struct zhttpd_request {
     int flags;
-    cbi2_hmap_t *env;
+    uhtbl_t env;
     zhttpd_vfs_t *virtual;
     void *handlercontext;
@@ -67 +71 @@
     int threads;
     int daemonize;
+    char *pidfile;
 };