Changeset 5786

Timestamp:

03/10/10 15:00:40 (3 years ago)

Author:

blogic

Message:

make unix socket work bi-directional, cleanups

Location:

luci2/cbi2

Files:

• cbi.h (modified) (1 diff)
• cbi_element.c (modified) (2 diffs)
• json.c (modified) (3 diffs)
• json.h (modified) (1 diff)
• log.c (modified) (1 diff)
• luci-cli.c (modified) (2 diffs)
• luci.c (modified) (1 diff)
• Makefile (modified) (1 diff)
• session.c (modified) (4 diffs)
• uci.c (modified) (1 diff)
• u_sock.c (modified) (3 diffs)
• u_sock.h (modified) (1 diff)
• widget.c (modified) (5 diffs)
• widget.h (modified) (1 diff)

luci2/cbi2/cbi.h

@@ -170 +170 @@
 
 int cbi_dump_blob(char *file);
-void cbi_request(struct cbi_ctx *ctx, char *request);
 const char* cbi_virt_path(struct cbi_ctx *ctx, const char *path, const char *file);
 void cbi_create_instance(struct cbi_ctx *ctx, struct cbi_element *e1, struct cbi_element *e2);

luci2/cbi2/cbi_element.c

@@ -173 +173 @@
         return 1;
     list_add_tail(&e->widget_ref, &e->w->refs);
-    if(widget_find_prop(e->w, "id") || (CAPS(e) & CAP_CONTAINER))
+    if(widget_prop_find(e->w, "id") || (CAPS(e) & CAP_CONTAINER))
         cbi_element_default_id(e, count);
     if(e->w->init)
@@ -348 +348 @@
 }
 
-void cbi_request(struct cbi_ctx *ctx, char *request)
-{
-    json_object *out, *in = json_tokener_parse(request);
-    if(is_error(in))
-    {
-        printf("bad json\n");
-        return;
-    }
-    out = json_request(ctx, in);
-    if(out)
-    {
-        printf("res -> %s\n", json_object_to_json_string(out));
-        json_object_put(out);
-    }
-    json_object_put(in);
-}
+

luci2/cbi2/json.c

@@ -73 +73 @@
     json_object *_pass;
     const char *pass;
+    if(!in)
+        return 0;
 
     _pass = json_object_object_get(in, "pass");
@@ -115 +117 @@
         if(!strcmp(r, "auth"))
             out = json_req_auth(ctx, vals);
-        else if(!strcmp(r, "logout"))
+        else if(!strcmp(r, "logout") && (sauth))
             out = session_logout(ctx, json_object_get_string(sauth));
         else if(!json_auth(ctx, sauth))
@@ -133 +135 @@
 }
 
+char* u_sock_json_request(struct cbi_ctx *ctx, char *request)
+{
+    json_object *out = 0, *in = json_tokener_parse(request);
+    char *answer = 0;
+    printf("in -> %s\n", request);
+    if(!is_error(in))
+        out = json_request(ctx, in);
+    if(!out)
+    {
+        out = json_object_new_object();
+        json_object_object_add(out, "error", json_object_new_string("1"));
+    }
+    answer = strdup(json_object_to_json_string(out));
+    json_object_put(out);
+    json_object_put(in);
+    printf("out -> %s\n", answer);
+    return answer;
+}

luci2/cbi2/json.h

@@ -7 +7 @@
 json_object* json_request(struct cbi_ctx *ctx, json_object *in);
 json_object* json_req_node(struct cbi_ctx *ctx, const char *node);
+char* u_sock_json_request(struct cbi_ctx *ctx, char *request);
 
 #endif

luci2/cbi2/log.c

@@ -8 +8 @@
 {
     daemonize = daemon;
-    openlog("luci2", 0, 0);
+    if(daemon)
+        openlog("luci2", 0, 0);
 }
 

luci2/cbi2/luci-cli.c

@@ -17 +17 @@
     int s, len;
     struct sockaddr_un remote;
+    char reply[4096];
     if(argc != 2)
         return 1;
@@ -41 +42 @@
         exit(1);
     }
+    len = recv(s, reply, 4095, 0);
+    if(len)
+    {
+        reply[4095] = 0;
+        printf("received -> \"%s\"\n", reply);
+    }
     close(s);
     return 0;

luci2/cbi2/luci.c

@@ -169 +169 @@
         if(spath)
             free(spath);
-        u_sock_register_handler(ctx, "json", cbi_request);
+        u_sock_register_handler(ctx, "json", u_sock_json_request);
     }
     {

luci2/cbi2/Makefile

@@ -35 +35 @@
 
 run: $(BINARY)
-    mkdir -p ./root/lib/luci2/ ./root/etc/config/
+    mkdir -p ./root/lib/luci2/ ./root/etc/config/ ./root/var/state/ ./root/tmp/.uci/
     cp apps/*.luci ./root/lib/luci2/
     cp -r ./config/* ./root/etc/config/
     ./lmo_po2lmo ./apps/en.po ./root/lib/luci2/en.lmo
     ./uvlc ./apps/network.uvl ./root/lib/luci2/test.uvo
-    ./luci -s -V ./root
+    ./luci -s -V ${PWD}/root
 
 %.o: %.c

luci2/cbi2/session.c

@@ -44 +44 @@
     ucix_add_option_int(ctx, "luci", "session", session, time(0));
     ucix_save(ctx, "luci");
-    ucix_cleanup(ctx);
+    ucix_cleanup(ctx);
     return session;
 }
@@ -63 +63 @@
     struct uci_context *ctx;
     ctx = ucix_init(cbictx, "luci", 1);
-    uci_set_savedir(ctx, "/var/state/");
     ucix_for_each_section_option(ctx, "luci", "session", session_expire_cb, ctx);
     ucix_save(ctx, "luci");
@@ -77 +76 @@
         goto out;
     ctx = ucix_init(cbictx, "luci", 1);
-    uci_set_savedir(ctx, "/var/state/");
     t = ucix_get_option_int(ctx, "luci", "session", auth, 0);
     if(t)
@@ -101 +99 @@
         goto out;
     ctx = ucix_init(cbictx, "luci", 1);
-    uci_set_savedir(ctx, "/var/state/");
     t = ucix_get_option_int(ctx, "luci", "session", sauth, 0);
     if(t)

luci2/cbi2/uci.c

@@ -23 +23 @@
         uci_set_confdir(ctx, cbi_virt_path(cbictx, "/etc/config", NULL));
     if(state)
-        uci_add_history_path(ctx, "/var/state");
+        uci_set_savedir(ctx, cbi_virt_path(cbictx, "/var/state/", NULL));
+    else
+        uci_set_savedir(ctx, cbi_virt_path(cbictx, "/tmp/.uci/", NULL));
     if(uci_load(ctx, config_file, NULL) != UCI_OK)
     {

luci2/cbi2/u_sock.c

@@ -63 +63 @@
 }
 
-void u_sock_incoming(struct cbi_ctx *ctx, char *data)
+char* u_sock_incoming(struct cbi_ctx *ctx, char *data)
 {
     char *t = strtok(data, "|");
@@ -73 +73 @@
             struct sock_handler *sh = container_of(p, struct sock_handler, list);
             if(!strcmp(t, sh->name))
-                sh->cb(ctx, &data[strlen(sh->name) + 1]);
+            {
+                char *answer = sh->cb(ctx, &data[strlen(sh->name) + 1]);
+                if(answer)
+                    return answer;
+                break;
+            }
         }
     }
+    return 0;
 }
 
@@ -95 +101 @@
     if(n > 0)
     {
+        char *answer;
         str[n] = '\0';
-        printf("incoming data -> %s\n", str);
-        u_sock_incoming(ctx, str);
+        answer = u_sock_incoming(ctx, str);
+        if(answer)
+        {
+            send(s, answer, strlen(answer), 0);
+            free(answer);
+        }
     }
     close(s);

luci2/cbi2/u_sock.h

@@ -3 +3 @@
 #include "cbi.h"
 
-typedef void (*sock_handler_func)(struct cbi_ctx *ctx, char *data);
+typedef char* (*sock_handler_func)(struct cbi_ctx *ctx, char *data);
 
 void u_sock_init(struct cbi_ctx *ctx, const char *path);

luci2/cbi2/widget.c

@@ -29 +29 @@
 }
 
-int widget_find_prop(struct cbi_widget *w, const char *name)
+int widget_prop_find(struct cbi_widget *w, const char *name)
 {
     int i;
@@ -59 +59 @@
     {
         struct cbi_property *p = container_of(q, struct cbi_property, list);
-        if(!widget_find_prop(e->w, p->key))
+        if(!widget_prop_find(e->w, p->key))
         {
             CBILOG(e, "unknown property %s\n", p->key);
@@ -78 +78 @@
 }
 
-static int widget_verify_parent_caps(struct cbi_element *e)
+static int widget_verify_parent(struct cbi_element *e)
 {
     struct cbi_element *parent;
@@ -96 +96 @@
 }
 
-static int widget_abstract(struct cbi_ctx *ctx, struct cbi_element *e)
+static int widget_verify_abstract(struct cbi_ctx *ctx, struct cbi_element *e)
 {
     const char *ref = cbi_prop_find(e, "ref");
@@ -115 +115 @@
 int widget_verify(struct cbi_ctx *ctx, struct cbi_element *e)
 {
-    if(widget_abstract(ctx, e))
+    if(widget_verify_abstract(ctx, e))
         return 1;
-    if(widget_verify_parent_caps(e))
+    if(widget_verify_parent(e))
         return 1;
     if(widget_verify_props(e))
         return 1;
-    if(e->w->caps & CAP_DATA)
+    if(CAPS(e) & CAP_DATA)
         if(source_init_element(ctx, e))
         return 1;

luci2/cbi2/widget.h

@@ -5 +5 @@
 struct cbi_widget* widget_find(const char *namespace, const char *name);
 int widget_verify(struct cbi_ctx *ctx, struct cbi_element *e);
-int widget_find_prop(struct cbi_widget *w, const char *name);
+int widget_prop_find(struct cbi_widget *w, const char *name);
 
 #endif