system-linux: remove debug tracing

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index e32f08a29050cc3e5eb138e32af62946d6b1c153..e0652cdb79d0fc957a11db2146242a439c51fbf7 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -78,7 +78,7 @@ const struct uci_blob_param_list interface_attr_list = {
 };
 
 static void
-set_config_state(struct interface *iface, enum interface_config_state s);
+interface_set_main_dev(struct interface *iface, struct device *dev);
 static void
 interface_event(struct interface *iface, enum interface_event ev);
 
@@ -269,6 +269,7 @@ mark_interface_down(struct interface *iface)
        iface->state = IFS_DOWN;
        switch (state) {
        case IFS_UP:
+       case IFS_TEARDOWN:
                interface_event(iface, IFEV_DOWN);
                break;
        case IFS_SETUP:
@@ -284,7 +285,13 @@ mark_interface_down(struct interface *iface)
        system_flush_routes();
 }
 
-void
+static inline void
+__set_config_state(struct interface *iface, enum interface_config_state s)
+{
+       iface->config_state = s;
+}
+
+static void
 __interface_set_down(struct interface *iface, bool force)
 {
        enum interface_state state = iface->state;
@@ -292,6 +299,9 @@ __interface_set_down(struct interface *iface, bool force)
        case IFS_UP:
        case IFS_SETUP:
                iface->state = IFS_TEARDOWN;
+               if (iface->dynamic)
+                       __set_config_state(iface, IFC_REMOVE);
+
                if (state == IFS_UP)
                        interface_event(iface, IFEV_DOWN);
 
@@ -333,8 +343,11 @@ interface_check_state(struct interface *iface)
        case IFS_UP:
        case IFS_SETUP:
                if (!iface->enabled || !link_state) {
+                       iface->state = IFS_TEARDOWN;
+                       if (iface->dynamic)
+                               __set_config_state(iface, IFC_REMOVE);
+
                        interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, false);
-                       mark_interface_down(iface);
                }
                break;
        case IFS_DOWN:
@@ -518,8 +531,8 @@ interface_merge_assignment_data(struct interface *old, struct interface *new)
 
        struct interface_assignment_class *c;
        list_for_each_entry(c, &new->assignment_classes, head) {
-               // Compare list entries one-by-one to see if there was a change
-               if (list_empty(&old->assignment_classes)) // The new list is longer
+               /* Compare list entries one-by-one to see if there was a change */
+               if (list_empty(&old->assignment_classes)) /* The new list is longer */
                        changed = true;
 
                if (changed)
@@ -528,14 +541,14 @@ interface_merge_assignment_data(struct interface *old, struct interface *new)
                struct interface_assignment_class *c_old = list_first_entry(&old->assignment_classes,
                                struct interface_assignment_class, head);
 
-               if (strcmp(c_old->name, c->name)) // An entry didn't match
+               if (strcmp(c_old->name, c->name)) /* An entry didn't match */
                        break;
 
                list_del(&c_old->head);
                free(c_old);
        }
 
-       // The old list was longer than the new one or the last entry didn't match
+       /* The old list was longer than the new one or the last entry didn't match */
        if (!list_empty(&old->assignment_classes)) {
                interface_clear_assignment_classes(old);
                changed = true;
@@ -695,10 +708,8 @@ interface_handle_config_change(struct interface *iface)
                interface_do_free(iface);
                return;
        }
-       if (iface->autostart && iface->available)
+       if (iface->autostart)
                interface_set_up(iface);
-       else if (iface->dynamic)
-               set_config_state(iface, IFC_REMOVE);
 }
 
 static void
@@ -768,7 +779,7 @@ void interface_set_proto_state(struct interface *iface, struct interface_proto_s
 }
 
 struct interface *
-interface_alloc(const char *name, struct blob_attr *config)
+interface_alloc(const char *name, struct blob_attr *config, bool dynamic)
 {
        struct interface *iface;
        struct blob_attr *tb[IFACE_ATTR_MAX];
@@ -803,6 +814,7 @@ interface_alloc(const char *name, struct blob_attr *config)
 
        iface->autostart = blobmsg_get_bool_default(tb[IFACE_ATTR_AUTO], true);
        iface->force_link = blobmsg_get_bool_default(tb[IFACE_ATTR_FORCE_LINK], force_link);
+       iface->dynamic = dynamic;
        iface->proto_ip.no_defaultroute =
                !blobmsg_get_bool_default(tb[IFACE_ATTR_DEFAULTROUTE], true);
        iface->proto_ip.no_dns =
@@ -877,17 +889,11 @@ interface_alloc(const char *name, struct blob_attr *config)
        return iface;
 }
 
-void interface_set_dynamic(struct interface *iface)
-{
-       iface->dynamic = true;
-       iface->autostart = true;
-       iface->node.version = -1; // Don't delete on reload
-}
-
 static bool __interface_add(struct interface *iface, struct blob_attr *config, bool alias)
 {
        struct blob_attr *tb[IFACE_ATTR_MAX];
        struct blob_attr *cur;
+       char *name = NULL;
 
        blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb,
                      blob_data(config), blob_len(config));
@@ -903,15 +909,32 @@ static bool __interface_add(struct interface *iface, struct blob_attr *config, b
                        iface->ifname = blobmsg_data(cur);
        }
 
+       if (iface->dynamic) {
+               name = strdup(iface->name);
+
+               if (!name)
+                       return false;
+       }
+
        iface->config = config;
        vlist_add(&interfaces, &iface->node, iface->name);
+
+       if (name) {
+               iface = vlist_find(&interfaces, name, iface, node);
+               free(name);
+
+               /* Don't delete dynamic interface on reload */
+               if (iface)
+                       iface->node.version = -1;
+       }
+
        return true;
 }
 
-void
+bool
 interface_add(struct interface *iface, struct blob_attr *config)
 {
-       __interface_add(iface, config, false);
+       return __interface_add(iface, config, false);
 }
 
 bool
@@ -947,7 +970,7 @@ interface_set_l3_dev(struct interface *iface, struct device *dev)
        }
 }
 
-void
+static void
 interface_set_main_dev(struct interface *iface, struct device *dev)
 {
        bool claimed = iface->l3_dev.claimed;
@@ -971,7 +994,7 @@ interface_set_main_dev(struct interface *iface, struct device *dev)
                interface_set_l3_dev(iface, dev);
 }
 
-int
+static int
 interface_remove_link(struct interface *iface, struct device *dev)
 {
        struct device *mdev = iface->main_dev.dev;
@@ -1047,34 +1070,38 @@ out:
        return ret;
 }
 
-int
+void
 interface_set_up(struct interface *iface)
 {
        int ret;
+       const char *error = NULL;
 
        iface->autostart = true;
 
        if (iface->state != IFS_DOWN)
-               return 0;
+               return;
 
        interface_clear_errors(iface);
-       if (!iface->available) {
-               interface_add_error(iface, "interface", "NO_DEVICE", NULL, 0);
-               return -1;
-       }
-
-       if (iface->main_dev.dev) {
-               ret = device_claim(&iface->main_dev);
-               if (!ret)
-                       interface_check_state(iface);
-       }
-       else
-               ret = __interface_set_up(iface);
+       if (iface->available) {
+               if (iface->main_dev.dev) {
+                       ret = device_claim(&iface->main_dev);
+                       if (!ret)
+                               interface_check_state(iface);
+                       else
+                               error = "DEVICE_CLAIM_FAILED";
+               } else {
+                       ret = __interface_set_up(iface);
+                       if (ret)
+                               error = "SETUP_FAILED";
+               }
+       } else
+               error = "NO_DEVICE";
 
-       return ret;
+       if (error)
+               interface_add_error(iface, "interface", error, NULL, 0);
 }
 
-int
+void
 interface_set_down(struct interface *iface)
 {
        if (!iface) {
@@ -1084,8 +1111,6 @@ interface_set_down(struct interface *iface)
                iface->autostart = false;
                __interface_set_down(iface, false);
        }
-
-       return 0;
 }
 
 int
@@ -1103,7 +1128,7 @@ interface_start_pending(void)
        struct interface *iface;
 
        vlist_for_each_element(&interfaces, iface, node) {
-               if (iface->available && iface->autostart)
+               if (iface->autostart)
                        interface_set_up(iface);
        }
 }
@@ -1111,7 +1136,7 @@ interface_start_pending(void)
 static void
 set_config_state(struct interface *iface, enum interface_config_state s)
 {
-       iface->config_state = s;
+       __set_config_state(iface, s);
        if (iface->state == IFS_DOWN)
                interface_handle_config_change(iface);
        else
@@ -1173,7 +1198,7 @@ static void
 interface_change_config(struct interface *if_old, struct interface *if_new)
 {
        struct blob_attr *old_config = if_old->config;
-       bool reload = false, reload_ip = false;
+       bool reload = false, reload_ip = false, update_prefix_delegation = false;
 
 #define FIELD_CHANGED_STR(field)                                       \
                ((!!if_old->field != !!if_new->field) ||                \
@@ -1218,10 +1243,16 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
        if_old->config_autostart = if_new->config_autostart;
        if_old->ifname = if_new->ifname;
        if_old->parent_ifname = if_new->parent_ifname;
+       if_old->dynamic = if_new->dynamic;
        if_old->proto_handler = if_new->proto_handler;
        if_old->force_link = if_new->force_link;
        if_old->dns_metric = if_new->dns_metric;
 
+       if (if_old->proto_ip.no_delegation != if_new->proto_ip.no_delegation) {
+               if_old->proto_ip.no_delegation = if_new->proto_ip.no_delegation;
+               update_prefix_delegation = true;
+       }
+
        if_old->proto_ip.no_dns = if_new->proto_ip.no_dns;
        interface_replace_dns(&if_old->config_ip, &if_new->config_ip);
 
@@ -1251,6 +1282,9 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
                interface_ip_set_enabled(&if_old->config_ip, config_ip_enabled);
        }
 
+       if (update_prefix_delegation)
+               interface_update_prefix_delegation(&if_old->proto_ip);
+
        interface_write_resolv_conf();
        if (if_old->main_dev.dev)
                interface_check_state(if_old);