X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=df04ce317ab946b0953884a101fccde3ac1f0fc9;hp=65bc37d07154d64fbf010c7150d213fd0e65845f;hb=9f9f387e14300de1ad517bf57273722c54ba5d7f;hpb=c9dadceeba2faa311e4a086f1c6a5eb0d5577c9f diff --git a/interface.c b/interface.c index 65bc37d..df04ce3 100644 --- a/interface.c +++ b/interface.c @@ -308,6 +308,13 @@ interface_set_link_state(struct interface *iface, bool new_state) } static void +interface_ext_cb(struct device_user *dep, enum device_event ev) +{ + if (ev == DEV_EVENT_REMOVE) + device_remove_user(dep); +} + +static void interface_cb(struct device_user *dep, enum device_event ev) { struct interface *iface; @@ -319,7 +326,7 @@ interface_cb(struct device_user *dep, enum device_event ev) new_state = true; case DEV_EVENT_REMOVE: interface_set_available(iface, new_state); - if (!new_state && dep->dev->external) + if (!new_state && dep->dev && dep->dev->external) interface_set_main_dev(iface, NULL); break; case DEV_EVENT_UP: @@ -329,7 +336,7 @@ interface_cb(struct device_user *dep, enum device_event ev) break; case DEV_EVENT_LINK_UP: new_state = true; - case DEV_EVENT_LINK_DOWN: + case DEV_EVENT_LINK_DOWN: interface_set_link_state(iface, new_state); break; case DEV_EVENT_TOPO_CHANGE: @@ -491,6 +498,8 @@ interface_claim_device(struct interface *iface) } else if (iface->ifname && !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) { dev = device_get(iface->ifname, true); + } else { + dev = iface->ext_dev.dev; } if (dev) @@ -509,8 +518,8 @@ interface_cleanup_state(struct interface *iface) interface_clear_errors(iface); interface_set_proto_state(iface, NULL); - if (iface->main_dev.dev) - interface_set_main_dev(iface, NULL); + interface_set_main_dev(iface, NULL); + interface_set_l3_dev(iface, NULL); } static void @@ -518,6 +527,9 @@ interface_cleanup(struct interface *iface) { struct interface_user *dep, *tmp; + uloop_timeout_cancel(&iface->remove_timer); + device_remove_user(&iface->ext_dev); + if (iface->parent_iface.iface) interface_remove_user(&iface->parent_iface); @@ -641,6 +653,7 @@ interface_alloc(const char *name, struct blob_attr *config) struct blob_attr *cur; const char *proto_name = NULL; char *iface_name; + bool force_link = false; iface = calloc_a(sizeof(*iface), &iface_name, strlen(name) + 1); iface->name = strcpy(iface_name, name); @@ -653,6 +666,7 @@ interface_alloc(const char *name, struct blob_attr *config) iface->config_ip.enabled = false; iface->main_dev.cb = interface_cb; + iface->ext_dev.cb = interface_ext_cb; blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blob_data(config), blob_len(config)); @@ -661,9 +675,11 @@ interface_alloc(const char *name, struct blob_attr *config) proto_name = blobmsg_data(cur); proto_attach_interface(iface, proto_name); + if (iface->proto_handler->flags & PROTO_FLAG_FORCE_LINK_DEFAULT) + force_link = true; iface->autostart = blobmsg_get_bool_default(tb[IFACE_ATTR_AUTO], true); - iface->force_link = blobmsg_get_bool_default(tb[IFACE_ATTR_FORCE_LINK], false); + iface->force_link = blobmsg_get_bool_default(tb[IFACE_ATTR_FORCE_LINK], force_link); iface->proto_ip.no_defaultroute = !blobmsg_get_bool_default(tb[IFACE_ATTR_DEFAULTROUTE], true); iface->proto_ip.no_dns = @@ -709,6 +725,7 @@ interface_alloc(const char *name, struct blob_attr *config) void interface_set_dynamic(struct interface *iface) { iface->dynamic = true; + iface->autostart = true; iface->node.version = -1; // Don't delete on reload } @@ -766,8 +783,10 @@ interface_set_l3_dev(struct interface *iface, struct device *dev) device_add_user(&iface->l3_dev, dev); if (dev) { - if (claimed) - device_claim(&iface->l3_dev); + if (claimed) { + if (device_claim(&iface->l3_dev) < 0) + return; + } interface_ip_set_enabled(&iface->config_ip, enabled); } } @@ -780,14 +799,17 @@ interface_set_main_dev(struct interface *iface, struct device *dev) if (iface->main_dev.dev == dev) return; + interface_set_available(iface, false); device_add_user(&iface->main_dev, dev); if (!dev) { interface_set_link_state(iface, false); return; } - if (claimed) - device_claim(&iface->l3_dev); + if (claimed) { + if (device_claim(&iface->l3_dev) < 0) + return; + } if (!iface->l3_dev.dev) interface_set_l3_dev(iface, dev); @@ -801,6 +823,9 @@ interface_remove_link(struct interface *iface, struct device *dev) if (mdev && mdev->hotplug_ops) return mdev->hotplug_ops->del(mdev, dev); + if (dev == iface->ext_dev.dev) + device_remove_user(&iface->ext_dev); + if (!iface->main_dev.hotplug) return UBUS_STATUS_INVALID_ARGUMENT; @@ -811,8 +836,8 @@ interface_remove_link(struct interface *iface, struct device *dev) return 0; } -int -interface_add_link(struct interface *iface, struct device *dev) +static int +interface_add_link(struct interface *iface, struct device *dev, bool link_ext) { struct device *mdev = iface->main_dev.dev; @@ -829,20 +854,23 @@ interface_add_link(struct interface *iface, struct device *dev) return UBUS_STATUS_NOT_SUPPORTED; } + if (link_ext) + device_add_user(&iface->ext_dev, dev); + interface_set_main_dev(iface, dev); iface->main_dev.hotplug = true; return 0; } int -interface_handle_link(struct interface *iface, const char *name, bool add) +interface_handle_link(struct interface *iface, const char *name, bool add, bool link_ext) { struct device *dev; int ret; device_lock(); - dev = device_get(name, add ? 2 : 0); + dev = device_get(name, add ? (link_ext ? 2 : 1) : 0); if (!dev) { ret = UBUS_STATUS_NOT_FOUND; goto out; @@ -854,7 +882,7 @@ interface_handle_link(struct interface *iface, const char *name, bool add) device_set_config(dev, &simple_device_type, iface->config); system_if_apply_settings(dev, &dev->settings, dev->settings.flags); - ret = interface_add_link(iface, dev); + ret = interface_add_link(iface, dev, link_ext); } else { ret = interface_remove_link(iface, dev); } @@ -1019,7 +1047,8 @@ interface_change_config(struct interface *if_old, struct interface *if_new) } interface_write_resolv_conf(); - interface_check_state(if_old); + if (if_old->main_dev.dev) + interface_check_state(if_old); out: if_new->config = NULL;