Changeset 5692

Timestamp:

02/28/10 01:52:44 (3 years ago)

Author:

blogic

Message:

adds cbi_create_instance to allow creating instances of template references

Location:

luci2/cbi2

Files:

• cbi.c (modified) (7 diffs)
• cbi.h (modified) (3 diffs)
• example.uvl (modified) (2 diffs)
• network.luci (modified) (2 diffs)
• sources/uci.c (modified) (1 diff)
• widget.c (modified) (2 diffs)
• widgets/foreach.c (modified) (1 diff)
• widgets/option.c (modified) (1 diff)
• widgets/section.c (modified) (1 diff)

luci2/cbi2/cbi.c

@@ -98 +98 @@
             return p->value;
     }
-    if(e->ref)
-        list_for_each(q, &e->ref->properties)
-        {
-            struct cbi_property *p = container_of(q, struct cbi_property, list);
-            if(!strcmp(p->key, key))
-                return p->value;
-        }
     return 0;
 }
@@ -191 +184 @@
         }
     }
-    if(e->ref)
-        return cbi_find_element(e->ref, id);
     return 0;
 }
@@ -248 +239 @@
         return 0;
     }
+    element = element2;
+    rem = rem2;
     for(;
         (blob_pad_len(element2) <= rem2) && (blob_pad_len(element2) >= sizeof(struct blob_attr));
@@ -269 +262 @@
         }
     }
+    if(e->w->caps & CAP_TEMPLATE)
+    {
+        e->blob = (struct cbi_blob*)malloc(sizeof(struct cbi_blob));
+        e->blob->rem = rem;
+        e->blob->blob = malloc(rem);
+        memcpy(e->blob->blob, element, rem);
+    }
     return e;
+}
+
+void cbi_create_instance(struct cbi_ctx *ctx, struct cbi_element *e1, struct cbi_element *e2)
+{
+    struct blob_attr *element = (struct blob_attr*)e2->blob->blob;
+    int rem = e2->blob->rem;
+    int sub_count = 0;
+    for(;
+        (blob_pad_len(element) <= rem) && (blob_pad_len(element) >= sizeof(struct blob_attr));
+        rem -= blob_pad_len(element), element = blob_next(element))
+    {
+        struct cbi_element *sub_e;
+        switch(blob_id(element))
+        {
+        case CBI_PROPERTY:
+        case CBI_VALUE:
+            break;
+        case CBI_ELEMENT:
+            sub_e = cbi_parse_element(ctx, element, &sub_count, e1);
+            if(sub_e)
+                list_add_tail(&sub_e->list, &e1->elements);
+            break;
+        default:
+            LOG("unknown blob_id %d unknown\n", blob_id(element));
+            abort();
+            break;
+        }
+    }
 }
 
@@ -288 +316 @@
 {
     struct list_head *p;
+    if(e->w->caps & CAP_TEMPLATE)
+        return;
     widget_verify(ctx, e);
     if(e->broken)
@@ -481 +511 @@
     if(e->w->caps & CAP_TEMPLATE)
         return;
-    if(e->ref)
-        if(!nl && !list_empty(&e->ref->elements))
-            nl = '\n';
     print_spaces(depth);
     printf("<%s:%s", e->namespace, e->widget);
@@ -505 +532 @@
         cbi_dump_element(e, depth + 1);
     }
-    if(e->ref)
-        list_for_each(p, &e->ref->elements)
-        {
-            struct cbi_element *e = container_of(p, struct cbi_element, list);
-            cbi_dump_element(e, depth + 1);
-        }
     if(nl)
         print_spaces(depth);

luci2/cbi2/cbi.h

@@ -88 +88 @@
 };
 
+struct cbi_blob
+{
+    int rem;
+    void *blob;
+};
+
 struct cbi_element
 {
@@ -98 +104 @@
 
     struct cbi_element *parent;
-    struct cbi_element *ref;
+    struct cbi_blob *blob;
     struct cbi_source *source;
     void *source_priv;
@@ -130 +136 @@
 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);
 
 void cbi_widget_register(char *name, struct cbi_widget *w);

luci2/cbi2/example.uvl

@@ -31 +31 @@
         },
         option {
+            name = "mtu",
+            type = "ipaddr",
+        },
+        option {
+            name = "gateway",
+            type = "netmask",
+        },
+        option {
             name = "ipaddr",
             type = "ipaddr",
@@ -36 +44 @@
         option {
             name = "netmask",
+            type = "netmask",
+        },
+        option {
+            name = "dns1",
+            type = "ipaddr",
+        },
+        option {
+            name = "dns2",
             type = "netmask",
         },

luci2/cbi2/network.luci

@@ -28 +28 @@
 <luci:tsection name="dhcp_lease">
     <luci:title>DHCP lease</luci:title>
-    <luci:option src=".ipaddr">IP</luci:option>
+    <luci:option src=".ipaddr1">IP</luci:option>
     <luci:option src=".netmask" >Netmask</luci:option>
 </luci:tsection>
@@ -34 +34 @@
 <luci:page src="network">
     <luci:section ref="network.simple" src="wan">
-        <luci:section package="dhcp" src="dhcp">
+        <luci:section package="dhcp" src="dhcp.dhcp">
             <luci:option src=".enable">Enable</luci:option>
             <luci:option src=".start">start_ip</luci:option>
             <luci:option src=".stop">stop_ip</luci:option>
-            <luci:foreach ref="network.dhcp_lease" package="dhcp" src=".leases">
+            <luci:foreach ref="network.dhcp_lease" src=".leases">
                 <luci:filter net="wan"/>
             </luci:foreach>

luci2/cbi2/sources/uci.c

@@ -111 +111 @@
     } else if(!dot1 && !dot2)
     {
-        if(use_parent || (e->w->caps & CAP_OPTION))
+        if(e->w->caps & CAP_OPTION)
             p->option = strdup(tmp);
         else if(e->w->caps & CAP_SECTION)

luci2/cbi2/widget.c

@@ -107 +107 @@
 {
     const char *ref = cbi_find_prop(e, "ref");
+    struct cbi_element *r;
     if(!ref)
         return 0;
-    e->ref = cbi_resolv(ctx, e, ref);
-    if(!e->ref)
+    r = cbi_resolv(ctx, e, ref);
+    if(!r)
     {
         CBI_BROKEN(e);
@@ -116 +117 @@
         return 1;
     }
+    cbi_create_instance(ctx, e, r);
     return 0;
 }

luci2/cbi2/widgets/foreach.c

@@ -9 +9 @@
     { "src", PROP_REQUIRED },
     { "id", PROP_REQUIRED },
-    { "package", PROP_OPTIONAL },
 };
 
 struct cbi_widget foreach = {
-    .caps = CAP_DATA | CAP_PAGE | CAP_PACKAGE,
+    .caps = CAP_DATA | CAP_PACKAGE | CAP_SECTION,
     .parent_caps = CAP_SECTION,
     .init = foreach_init,

luci2/cbi2/widgets/option.c

@@ -4 +4 @@
     { "src", PROP_REQUIRED },
     { "id", PROP_REQUIRED },
-    { "section", PROP_OPTIONAL },
-    { "package", PROP_OPTIONAL },
 };
 

luci2/cbi2/widgets/section.c

@@ -9 +9 @@
     { "id", PROP_REQUIRED },
     { "src", PROP_OPTIONAL },
-    { "package", PROP_OPTIONAL },
     { "ref", PROP_OPTIONAL },
 };