Changeset 5686

Timestamp:

02/26/10 02:22:37 (3 years ago)

Author:

blogic

Message:

adss handling of datasource and macros for loging

Location:

luci2/cbi2

Files:

• cbi.c (modified) (8 diffs)
• cbi.h (modified) (6 diffs)
• lang.c (modified) (1 diff)
• log.c (added)
• log.h (added)
• luci.c (modified) (4 diffs)
• Makefile (modified) (3 diffs)
• network.luci (modified) (2 diffs)
• session.h (added)
• source.c (added)
• source.h (added)
• sources (added)
• sources/uci.c (added)
• widget.c (modified) (8 diffs)
• widgets/section.c (modified) (1 diff)
• widgets/tsection.c (modified) (1 diff)

luci2/cbi2/cbi.c

@@ -162 +162 @@
     *buffer = 0;
     cbi_get_element_id(e->parent, buffer, 1);
-    printf("generating id for %s\n", tmp);
+    LOG("generating id for %s\n", tmp);
     (*count)++;
 }
@@ -238 +238 @@
             break;
         default:
-            printf("unknown blob_id %d unknown\n", blob_id(element));
+            LOG("unknown blob_id %d unknown\n", blob_id(element));
             abort();
             break;
@@ -259 +259 @@
             break;
         default:
-            printf("unknown blob_id %d unknown\n", blob_id(element2));
+            LOG("unknown blob_id %d unknown\n", blob_id(element2));
             abort();
             break;
@@ -298 +298 @@
 {
     struct list_head *p;
-    printf("indexing %s\n", f->name);
+    LOG("indexing %s\n", f->name);
     list_for_each(p, &f->e.elements)
     {
@@ -325 +325 @@
 {
     struct list_head *p;
-    printf("unindexing %s\n", f->name);
+    LOG("unindexing %s\n", f->name);
     list_for_each(p, &f->e.elements)
     {
@@ -366 +366 @@
     struct list_head *p, *q;
     cbi_index_remove(file);
-    printf("dropping %s\n", file->name);
+    LOG("dropping %s\n", file->name);
     list_for_each_safe(p, q, &file->e.elements)
     {
@@ -417 +417 @@
         }
     }
-    printf("loading %s\n", filename);
+    LOG("loading %s\n", filename);
     fd = open(filename, O_RDONLY);
     if(fd < 0)
@@ -603 +603 @@
             char *out = strdup(gl.gl_pathv[i]);
             out[strlen(out) - 1] = 'o';
-            printf("compiling %s -> %s\n", gl.gl_pathv[i], out);
+            LOG("compiling %s -> %s\n", gl.gl_pathv[i], out);
             if(!lucic_main(gl.gl_pathv[i], out))
             {
-                printf("deleting %s\n", gl.gl_pathv[i]);
+                LOG("deleting %s\n", gl.gl_pathv[i]);
                 unlink(gl.gl_pathv[i]);
             } else {
-                printf("failed\n");
+                LOG("failed\n");
             }
         }

luci2/cbi2/cbi.h

@@ -9 +9 @@
 
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+
+#define CBI_BROKEN(e) {e->broken = 1;}
 
 #define CBI_LUCI        0x4C554349
@@ -42 +44 @@
 };
 
+#define SRC_PACKAGE         0x01
+#define SRC_SECTION         0x02
+#define SRC_OPTION          0x03
+#define SRC_MASK            0x03
+#define SCAP_READ           0x04
+#define SCAP_WRITE          0x08
+
+struct cbi_element;
+struct cbi_source
+{
+    struct list_head list;
+    const char *name;
+    uint64_t caps;
+    void *priv;
+    int (*init)(struct cbi_ctx *ctx, struct cbi_element *e);
+};
+
 #define CAP_SECTION         0x0001
 #define CAP_PACKAGE         0x0002
@@ -49 +68 @@
 #define CAP_FILE            0x0020
 #define CAP_TEMPLATE        0x0040
-struct cbi_element;
 struct cbi_element
 {
@@ -57 +75 @@
     struct list_head index;
 
-    unsigned long caps;
+    uint64_t caps;
     int broken;
 
     struct cbi_element *parent;
     struct cbi_element *ref;
+    struct cbi_source *source;
 
     char *namespace;
@@ -92 +111 @@
     struct list_head list;
     char *name;
-    int caps;
-    int parent_caps;
+    uint64_t caps;
+    uint64_t parent_caps;
     struct cbi_widget_property *props;
     int prop_count;
@@ -122 +141 @@
 
 #include "widget.h"
+#include "log.h"
+#include "source.h"
 
 #endif

luci2/cbi2/lang.c

@@ -8 +8 @@
     if(ctx->lmo)
         lmo_close(ctx->lmo);
-    printf("loading %s\n", cbi_virt_path(ctx, ctx->path, file));
+    LOG("loading %s\n", cbi_virt_path(ctx, ctx->path, file));
     ctx->lmo = (lmo_archive_t *)lmo_open(cbi_virt_path(ctx, ctx->path, file));
     if(!ctx->lmo)
     {
-        printf("failed to load language file %s\n", file);
+        LOG("failed to load language file %s\n", file);
         if(strcmp(lang, "en"))
             lmo_load_lang(ctx, "en");

luci2/cbi2/luci.c

@@ -11 +11 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
+#include <syslog.h>
 
 #define _GNU_SOURCE
@@ -25 +26 @@
 void handler_INT(int signo)
 {
-    printf("away we go\n");
+    LOG("away we go\n");
     loop = 0;
 }
@@ -144 +145 @@
         daemon(0,0);
 
+    log_start(daemonize);
+
     uctx = ucix_init_path(vpath, "luci", 0);
     if(uctx)
@@ -176 +179 @@
     }
     cbi_free_context(ctx);
+    closelog();
     return 0;
 }

luci2/cbi2/Makefile

@@ -8 +8 @@
 all: $(BINARY)
 
-luci: luci.c lucic.c lucip.c uci.c json.c cbi.c session.c u_sock.c validate.c uvl.c lang.c lmo_core.c lmo_hash.c blob.c widget.c validator/boolean.c widgets/page.c widgets/form.c widgets/section.c widgets/option.c widgets/field.c widgets/foreach.c widgets/file.c widgets/tsection.c 
-    $(CC) $(CFLAGS) -o $@ $^ -luci -ljson -lcrypt
+luci: luci.c lucic.c lucip.c uci.c json.c cbi.c source.c session.c u_sock.c validate.c uvl.c lang.c blob.c widget.c log.c validator/boolean.c widgets/page.c widgets/form.c widgets/section.c widgets/option.c widgets/field.c widgets/foreach.c widgets/file.c widgets/tsection.c sources/uci.c liblmo.a
+    $(CC) $(CFLAGS) -o $@ $^ -luci -ljson -lcrypt 
 
 luci-cli: luci-cli.c
@@ -20 +20 @@
     $(CC) $(CFLAGS) $(LIBS) -o $@ $^
 
-liblmo.a: lmo_core.c lmo_hash.c
+liblmo.a: lmo_core.o lmo_hash.o
     $(AR) rc $@ $^
 
@@ -28 +28 @@
 clean:
     rm -f $(BINARY) *.luco *.o widgets/*.o validators/*.o *.lmo
+    rm -rf ./root
 
 run: $(BINARY)

luci2/cbi2/network.luci

@@ -2 +2 @@
     <luci:title>Page title</luci:title>
     Page text
-    <luci:section name="wan">
+    <luci:section src="wan">
         <luci:title>Form title</luci:title>
         Form text
@@ -33 +33 @@
 
 <luci:page src="network">
-    <luci:section ref="network.simple" name="wan">
-        <luci:section package="dhcp" name="dhcp">
+    <luci:section ref="network.simple" src="wan">
+        <luci:section package="dhcp" src="dhcp">
             <luci:option src=".enable">Enable</luci:option>
             <luci:option src=".start">start_ip</luci:option>

luci2/cbi2/widget.c

@@ -19 +19 @@
     struct list_head *q;
     int i;
-    char buf[256];
-    *buf = 0;
     for(i = 0; i < w->prop_count; i++)
     {
@@ -26 +24 @@
             if(!cbi_find_prop(e, w->props[i].name))
             {
-                cbi_get_element_id(e, buf, 1);
-                printf("%s - missing required property %s\n", buf, w->props[i].name);
-                e->broken = 1;
+                CBILOG(e, "missing required property %s\n", w->props[i].name);
+                CBI_BROKEN(e);
                 return 1;
             }
@@ -37 +34 @@
         if(!widget_find_prop(w, p->key))
         {
-            cbi_get_element_id(e, buf, 1);
-            printf("%s - unknown property %s\n", buf, p->key);
-            e->broken = 1;
+            CBILOG(e, "unknown property %s\n", p->key);
+            CBI_BROKEN(e);
             return 1;
         }
@@ -47 +43 @@
 static int widget_verify_parent_caps(struct cbi_element *e, struct cbi_widget *w)
 {
-    char buf[256];
-    *buf = 0;
     if(!w->parent_caps)
         return 0;
@@ -56 +50 @@
         return 0;
 error:
-    e->broken = 1;
-    cbi_get_element_id(e, buf, 1);
-    printf("%s - parent capabilities were not meet\n", buf);
-    return 1;
-}
-
-static int widget_resolv_data(struct cbi_element *e, struct cbi_widget *w)
-{
-    if(!(w->caps | CAP_DATA))
-        return 0;
-    if(w->caps & CAP_SECTION)
-    {
-    } else if(w->caps & CAP_PACKAGE)
-    {
-    } else if(w->caps & CAP_OPTION)
-    {
-    }
+    CBI_BROKEN(e);
+    CBILOG(e, "parent capabilities were not meet\n");
     return 1;
 }
@@ -128 +107 @@
 {
     const char *ref = cbi_find_prop(e, "ref");
-    char buf[256];
-    *buf = 0;
     if(!ref)
         return 0;
@@ -135 +112 @@
     if(!e->ref)
     {
-        e->broken = 1;
-        cbi_get_element_id(e, buf, 1);
-        printf("%s - unable to resolv reference for \"%s\"\n", buf, ref);
+        CBI_BROKEN(e);
+        CBILOG(e, "unable to resolv reference for \"%s\"\n", ref);
         return 1;
     }
@@ -152 +128 @@
     if(widget_verify_props(e, w))
         return 1;
-    if(widget_resolv_data(e, w))
+    if(w->caps & CAP_DATA)
+        if(source_init_element(ctx, e))
         return 1;
     return 0;

luci2/cbi2/widgets/section.c

@@ -7 +7 @@
 
 struct cbi_widget_property section_props[] = {
-    { "name", PROP_REQUIRED },
     { "id", PROP_REQUIRED },
     { "src", PROP_OPTIONAL },

luci2/cbi2/widgets/tsection.c

@@ -12 +12 @@
 
 struct cbi_widget tsection = {
-    .caps = CAP_DATA | CAP_SECTION | CAP_TEMPLATE,
+    .caps = CAP_SECTION | CAP_TEMPLATE,
     .parent_caps = CAP_PACKAGE,
     .init = tsection_init,