remove the uci dependency from protocol handlers

diff --git a/config.c b/config.c
index a8796afae3265b676fbb2b0b065bb9fd7fa3a3da..1649ceeffe12eb51d9c552e0a8d99239699e0480 100644 (file)
--- a/config.c
+++ b/config.c
@@ -158,7 +158,11 @@ config_parse_interface(struct uci_section *s)
        if (!iface)
                return;
 
-       proto_init_interface(iface, s);
+       blob_buf_init(&b, 0);
+       if (iface->proto_handler && iface->proto_handler->config_params)
+               uci_to_blob(&b, s, iface->proto_handler->config_params);
+
+       proto_init_interface(iface, b.head);
 }
 
 void

diff --git a/proto-static.c b/proto-static.c
index 6b4cc237f406634c7c5974a65841e69a2b3be2af..15db33081988b8a7e7075b50cc32aad419067597 100644 (file)
--- a/proto-static.c
+++ b/proto-static.c
@@ -10,10 +10,38 @@
 #include "proto.h"
 #include "system.h"
 
+enum {
+       OPT_IPADDR,
+       OPT_IP6ADDR,
+       OPT_NETMASK,
+       OPT_GATEWAY,
+       OPT_IP6GW,
+       __OPT_MAX,
+};
+
+static const struct blobmsg_policy static_attrs[__OPT_MAX] = {
+       [OPT_IPADDR] = { .name = "ipaddr", .type = BLOBMSG_TYPE_ARRAY },
+       [OPT_IP6ADDR] = { .name = "ip6addr", .type = BLOBMSG_TYPE_ARRAY },
+       [OPT_NETMASK] = { .name = "netmask", .type = BLOBMSG_TYPE_STRING },
+       [OPT_GATEWAY] = { .name = "gateway", .type = BLOBMSG_TYPE_STRING },
+       [OPT_IP6GW] = { .name = "ip6gw", .type = BLOBMSG_TYPE_STRING },
+};
+
+static const union config_param_info static_attr_info[__OPT_MAX] = {
+       [OPT_IPADDR] = { .type = BLOBMSG_TYPE_STRING },
+       [OPT_IP6ADDR] = { .type = BLOBMSG_TYPE_STRING },
+};
+
+static const struct config_param_list static_attr_list = {
+       .n_params = __OPT_MAX,
+       .params = static_attrs,
+       .info = static_attr_info,
+};
+
 struct static_proto_state {
        struct interface_proto_state proto;
 
-       struct uci_section *section;
+       struct blob_attr *config;
        struct interface *iface;
 };
 
@@ -73,31 +101,26 @@ parse_addr(struct static_proto_state *state, const char *str, bool v6, int mask)
 }
 
 static int
-parse_address_option(struct static_proto_state *state, struct uci_option *o, bool v6, int netmask)
+parse_address_option(struct static_proto_state *state, struct blob_attr *attr, bool v6, int netmask)
 {
-       struct uci_element *e;
+       struct blob_attr *cur;
        int n_addr = 0;
+       int rem;
 
-       if (o->type == UCI_TYPE_STRING) {
+       blobmsg_for_each_attr(cur, attr, rem) {
                n_addr++;
-               if (!parse_addr(state, o->v.string, v6, netmask))
+               if (!parse_addr(state, blobmsg_data(cur), v6, netmask))
                        return -1;
-       } else {
-               uci_foreach_element(&o->v.list, e) {
-                       n_addr++;
-                       if (!parse_addr(state, e->name, v6, netmask))
-                               return -1;
-               }
        }
 
        return n_addr;
 }
 
 static bool
-parse_gateway_option(struct static_proto_state *state, struct uci_option *o, bool v6)
+parse_gateway_option(struct static_proto_state *state, struct blob_attr *attr, bool v6)
 {
        struct device_route *route;
-       const char *str = o->v.string;
+       const char *str = blobmsg_data(attr);
        int af = v6 ? AF_INET6 : AF_INET;
 
        route = calloc(1, sizeof(*route));
@@ -114,36 +137,20 @@ parse_gateway_option(struct static_proto_state *state, struct uci_option *o, boo
        return true;
 }
 
-enum {
-       OPT_IPADDR,
-       OPT_IP6ADDR,
-       OPT_NETMASK,
-       OPT_GATEWAY,
-       OPT_IP6GW,
-       __OPT_MAX,
-};
-
-static const struct uci_parse_option opts[__OPT_MAX] = {
-       [OPT_IPADDR] = { .name = "ipaddr" },
-       [OPT_IP6ADDR] = { .name = "ip6addr" },
-       [OPT_NETMASK] = { .name = "netmask", .type = UCI_TYPE_STRING },
-       [OPT_GATEWAY] = { .name = "gateway", .type = UCI_TYPE_STRING },
-       [OPT_IP6GW] = { .name = "ip6gw", .type = UCI_TYPE_STRING },
-};
-
 static bool
 static_proto_setup(struct static_proto_state *state)
 {
-       struct uci_option *tb[__OPT_MAX];
+       struct blob_attr *tb[__OPT_MAX];
        struct in_addr ina;
        const char *error;
        int netmask = 32;
        int n_v4 = 0, n_v6 = 0;
 
-       uci_parse_section(state->section, opts, __OPT_MAX, tb);
+       blobmsg_parse(static_attrs, __OPT_MAX, tb, blob_data(state->config),
+               blob_len(state->config));
 
        if (tb[OPT_NETMASK]) {
-               if (!inet_aton(tb[OPT_NETMASK]->v.string, &ina)) {
+               if (!inet_aton(blobmsg_data(tb[OPT_NETMASK]), &ina)) {
                        error = "INVALID_NETMASK";
                        goto error;
                }
@@ -211,27 +218,40 @@ static_free(struct interface_proto_state *proto)
        struct static_proto_state *state;
 
        state = container_of(proto, struct static_proto_state, proto);
+       free(state->config);
        free(state);
 }
 
 struct interface_proto_state *
 static_attach(const struct proto_handler *h, struct interface *iface,
-             struct uci_section *s)
+             struct blob_attr *attr)
 {
        struct static_proto_state *state;
 
        state = calloc(1, sizeof(*state));
+       if (!state)
+               return NULL;
+
        state->iface = iface;
-       state->section = s;
+       state->config = malloc(blob_pad_len(attr));
+       if (!state->config)
+               goto error;
+
+       memcpy(state->config, attr, blob_pad_len(attr));
        state->proto.free = static_free;
        state->proto.handler = static_handler;
        state->proto.flags = PROTO_FLAG_IMMEDIATE;
 
        return &state->proto;
+
+error:
+       free(state);
+       return NULL;
 }
 
 static struct proto_handler static_proto = {
        .name = "static",
+       .config_params = &static_attr_list,
        .attach = static_attach,
 };
 

diff --git a/proto.c b/proto.c
index 7242e80c761660f99210f4c3b64c39e552be1e93..278fb0c33e736789765d4e1d4c602d66774fe641 100644 (file)
--- a/proto.c
+++ b/proto.c
@@ -35,15 +35,14 @@ invalid_proto_handler(struct interface_proto_state *proto,
 
 static int
 no_proto_handler(struct interface_proto_state *proto,
-                     enum interface_proto_cmd cmd, bool force)
+                enum interface_proto_cmd cmd, bool force)
 {
        return 0;
 }
 
 static struct interface_proto_state *
 default_proto_attach(const struct proto_handler *h,
-                    struct interface *iface,
-                    struct uci_section *s)
+                    struct interface *iface, struct blob_attr *attr)
 {
        struct interface_proto_state *proto;
 
@@ -75,16 +74,16 @@ get_proto_handler(const char *name)
 }
 
 void
-proto_init_interface(struct interface *iface, struct uci_section *s)
+proto_init_interface(struct interface *iface, struct blob_attr *attr)
 {
        const struct proto_handler *proto = iface->proto_handler;
        struct interface_proto_state *state = NULL;
 
        if (proto)
-               state = proto->attach(proto, iface, s);
+               state = proto->attach(proto, iface, attr);
 
        if (!state) {
-               state = no_proto.attach(&no_proto, iface, s);
+               state = no_proto.attach(&no_proto, iface, attr);
                state->handler = invalid_proto_handler;
        }
 

diff --git a/proto.h b/proto.h
index c59b9762eff212f0e98ae7a3709eaa17cca96acb..364a96796c2ca02d078df61400ae8af724f0d15c 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -36,13 +36,14 @@ struct proto_handler {
        struct avl_node avl;
 
        const char *name;
+       const struct config_param_list *config_params;
 
        struct interface_proto_state *(*attach)(const struct proto_handler *h,
-               struct interface *, struct uci_section *s);
+               struct interface *iface, struct blob_attr *attr);
 };
 
 void add_proto_handler(struct proto_handler *p);
-void proto_init_interface(struct interface *iface, struct uci_section *s);
+void proto_init_interface(struct interface *iface, struct blob_attr *attr);
 void proto_attach_interface(struct interface *iface, const char *proto_name);
 int interface_proto_event(struct interface_proto_state *proto,
                          enum interface_proto_cmd cmd, bool force);