interface: remove "dynamic" argument for interface_init, add the interface_set_dynami...

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index a79de4a..18322d7 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -43,6 +43,7 @@ enum {
        IFACE_ATTR_IP4TABLE,
        IFACE_ATTR_IP6TABLE,
        IFACE_ATTR_IP6CLASS,
+       IFACE_ATTR_DELEGATE,
        IFACE_ATTR_MAX
 };
 
@@ -61,6 +62,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
        [IFACE_ATTR_IP4TABLE] = { .name = "ip4table", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_IP6TABLE] = { .name = "ip6table", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_IP6CLASS] = { .name = "ip6class", .type = BLOBMSG_TYPE_ARRAY },
+       [IFACE_ATTR_DELEGATE] = { .name = "delegate", .type = BLOBMSG_TYPE_BOOL },
 };
 
 static const struct uci_blob_param_info iface_attr_info[IFACE_ATTR_MAX] = {
@@ -151,7 +153,7 @@ interface_add_data(struct interface *iface, const struct blob_attr *data)
 
        n = calloc(1, sizeof(*n) + blob_pad_len(data));
        memcpy(n->data, data, blob_pad_len(data));
-       n->node.key = blobmsg_name(data);
+       n->node.key = blobmsg_name(n->data);
 
        o = avl_find_element(&iface->data, n->node.key, o, node);
        if (o)
@@ -536,7 +538,7 @@ void interface_set_proto_state(struct interface *iface, struct interface_proto_s
 
 void
 interface_init(struct interface *iface, const char *name,
-              struct blob_attr *config, bool dynamic)
+              struct blob_attr *config)
 {
        struct blob_attr *tb[IFACE_ATTR_MAX];
        struct blob_attr *cur;
@@ -605,11 +607,15 @@ interface_init(struct interface *iface, const char *name,
                        DPRINTF("Failed to resolve routing table: %s\n", (char *) blobmsg_data(cur));
        }
 
+       iface->proto_ip.no_delegation = !blobmsg_get_bool_default(tb[IFACE_ATTR_DELEGATE], true);
+
        iface->config_autostart = iface->autostart;
-       iface->dynamic = dynamic;
+}
 
-       if (iface->dynamic)
-               iface->node.version = -1; // Don't delete on reload
+void interface_set_dynamic(struct interface *iface)
+{
+       iface->dynamic = true;
+       iface->node.version = -1; // Don't delete on reload
 }
 
 static bool __interface_add(struct interface *iface, struct blob_attr *config, bool alias)