preserve interface main hotplug device on reload

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index 257eaca..6e3feeb 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -17,6 +17,7 @@ enum {
        IFACE_ATTR_IFNAME,
        IFACE_ATTR_PROTO,
        IFACE_ATTR_AUTO,
        IFACE_ATTR_IFNAME,
        IFACE_ATTR_PROTO,
        IFACE_ATTR_AUTO,

+       IFACE_ATTR_DEFAULTROUTE,

        IFACE_ATTR_MAX
 };
 
        IFACE_ATTR_MAX
 };
 


@@ -24,6 +25,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
        [IFACE_ATTR_PROTO] = { .name = "proto", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_AUTO] = { .name = "auto", .type = BLOBMSG_TYPE_BOOL },
        [IFACE_ATTR_PROTO] = { .name = "proto", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
        [IFACE_ATTR_AUTO] = { .name = "auto", .type = BLOBMSG_TYPE_BOOL },

+       [IFACE_ATTR_DEFAULTROUTE] = { .name = "defaultroute", .type = BLOBMSG_TYPE_BOOL },

 };
 
 const struct config_param_list interface_attr_list = {
 };
 
 const struct config_param_list interface_attr_list = {


@@ -181,7 +183,7 @@ interface_claim_device(struct interface *iface)
 {
        struct device *dev;
 
 {
        struct device *dev;
 

-       if (iface->ifname && iface->proto_handler &&
+       if (iface->ifname &&

                !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
                dev = device_get(iface->ifname, true);
                if (dev)
                !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) {
                dev = device_get(iface->ifname, true);
                if (dev)


@@ -193,7 +195,7 @@ interface_claim_device(struct interface *iface)
 
 
 static void
 
 
 static void

-interface_cleanup(struct interface *iface)
+interface_cleanup(struct interface *iface, bool reload)

 {
        struct interface_user *dep, *tmp;
 
 {
        struct interface_user *dep, *tmp;
 


@@ -203,7 +205,8 @@ interface_cleanup(struct interface *iface)
        interface_ip_flush(&iface->config_ip);
        interface_flush_state(iface);
        interface_clear_errors(iface);
        interface_ip_flush(&iface->config_ip);
        interface_flush_state(iface);
        interface_clear_errors(iface);

-       if (iface->main_dev.dev)
+       if (iface->main_dev.dev &&
+           (!reload || !iface->main_dev.hotplug))

                device_remove_user(&iface->main_dev);
        iface->l3_dev = &iface->main_dev;
        interface_set_proto_state(iface, NULL);
                device_remove_user(&iface->main_dev);
        iface->l3_dev = &iface->main_dev;
        interface_set_proto_state(iface, NULL);


@@ -212,7 +215,7 @@ interface_cleanup(struct interface *iface)
 static void
 interface_do_free(struct interface *iface)
 {
 static void
 interface_do_free(struct interface *iface)
 {

-       interface_cleanup(iface);
+       interface_cleanup(iface, false);

        free(iface->config);
        netifd_ubus_remove_interface(iface);
        avl_delete(&interfaces.avl, &iface->node.avl);
        free(iface->config);
        netifd_ubus_remove_interface(iface);
        avl_delete(&interfaces.avl, &iface->node.avl);


@@ -222,7 +225,7 @@ interface_do_free(struct interface *iface)
 static void
 interface_do_reload(struct interface *iface)
 {
 static void
 interface_do_reload(struct interface *iface)
 {

-       interface_cleanup(iface);
+       interface_cleanup(iface, true);

        proto_init_interface(iface, iface->config);
        interface_claim_device(iface);
 }
        proto_init_interface(iface, iface->config);
        interface_claim_device(iface);
 }


@@ -326,10 +329,10 @@ interface_init(struct interface *iface, const char *name,
 
        proto_attach_interface(iface, proto_name);
 
 
        proto_attach_interface(iface, proto_name);
 

-       if ((cur = tb[IFACE_ATTR_AUTO]))
-               iface->autostart = blobmsg_get_bool(cur);
-       else
-               iface->autostart = true;
+       iface->autostart = blobmsg_get_bool_default(tb[IFACE_ATTR_AUTO], true);
+       iface->proto_ip.no_defaultroute =
+               !blobmsg_get_bool_default(tb[IFACE_ATTR_DEFAULTROUTE], true);
+

        iface->config_autostart = iface->autostart;
 }
 
        iface->config_autostart = iface->autostart;
 }
 


@@ -349,17 +352,22 @@ interface_add(struct interface *iface, struct blob_attr *config)
        vlist_add(&interfaces, &iface->node);
 }
 
        vlist_add(&interfaces, &iface->node);
 }
 

-void
+int

 interface_remove_link(struct interface *iface, struct device *dev)
 {
        struct device *mdev = iface->main_dev.dev;
 
 interface_remove_link(struct interface *iface, struct device *dev)
 {
        struct device *mdev = iface->main_dev.dev;
 

-       if (mdev && mdev->hotplug_ops) {
-               mdev->hotplug_ops->del(mdev, dev);
-               return;
-       }
+       if (mdev && mdev->hotplug_ops)
+               return mdev->hotplug_ops->del(mdev, dev);
+
+       if (!iface->main_dev.hotplug)
+               return UBUS_STATUS_INVALID_ARGUMENT;
+
+       if (dev != iface->main_dev.dev)
+               return UBUS_STATUS_INVALID_ARGUMENT;

 
        device_remove_user(&iface->main_dev);
 
        device_remove_user(&iface->main_dev);

+       return 0;

 }
 
 int
 }
 
 int


@@ -367,14 +375,21 @@ interface_add_link(struct interface *iface, struct device *dev)
 {
        struct device *mdev = iface->main_dev.dev;
 
 {
        struct device *mdev = iface->main_dev.dev;
 

-       if (mdev && mdev->hotplug_ops)
-               return mdev->hotplug_ops->add(mdev, dev);
+       if (mdev == dev)
+               return 0;

 
 

-       if (iface->main_dev.dev)
-               interface_remove_link(iface, NULL);
+       if (iface->main_dev.hotplug)
+               device_remove_user(&iface->main_dev);

 
 

-       device_add_user(&iface->main_dev, dev);
+       if (mdev) {
+               if (mdev->hotplug_ops)
+                       return mdev->hotplug_ops->add(mdev, dev);
+               else
+                       return UBUS_STATUS_NOT_SUPPORTED;
+       }

 
 

+       device_add_user(&iface->main_dev, dev);
+       iface->main_dev.hotplug = true;

        return 0;
 }
 
        return 0;
 }
 


@@ -499,6 +514,11 @@ interface_change_config(struct interface *if_old, struct interface *if_new)
                goto reload;
        }
 
                goto reload;
        }
 

+       if (if_old->proto_ip.no_defaultroute != if_new->proto_ip.no_defaultroute) {
+               if_old->proto_ip.no_defaultroute = if_new->proto_ip.no_defaultroute;
+               interface_ip_set_enabled(&if_old->proto_ip, if_old->proto_ip.enabled);
+       }
+

        goto out;
 
 reload:
        goto out;
 
 reload: