X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=9c208a283e40a2da7716651922aaa0b0a4e44b58;hp=30e48cf526b778c9bb27a4a2b0d47370a03b0452;hb=134775b1f41fa19a816768268b9d0f8dad86bd90;hpb=dfb67585561ccd9bf735cfc5d5fba8401ca270c5 diff --git a/interface.c b/interface.c index 30e48cf..9c208a2 100644 --- 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,14 +62,15 @@ 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 union config_param_info iface_attr_info[IFACE_ATTR_MAX] = { +static const struct uci_blob_param_info iface_attr_info[IFACE_ATTR_MAX] = { [IFACE_ATTR_DNS] = { .type = BLOBMSG_TYPE_STRING }, [IFACE_ATTR_IP6CLASS] = { .type = BLOBMSG_TYPE_STRING }, }; -const struct config_param_list interface_attr_list = { +const struct uci_blob_param_list interface_attr_list = { .n_params = IFACE_ATTR_MAX, .params = iface_attrs, .info = iface_attr_info, @@ -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) @@ -220,6 +222,9 @@ __interface_set_down(struct interface *iface, bool force) interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force); if (force) interface_flush_state(iface); + + if (iface->dynamic) + vlist_delete(&interfaces, &iface->node); } static void @@ -375,6 +380,7 @@ interface_alias_cb(struct interface_user *dep, struct interface *iface, enum int interface_remove_user(dep); break; case IFEV_RELOAD: + case IFEV_UPDATE: break; } } @@ -480,8 +486,10 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve switch (ev) { case IFPEV_UP: - if (iface->state != IFS_SETUP) + if (iface->state != IFS_SETUP) { + interface_event(iface, IFEV_UPDATE); return; + } interface_ip_set_enabled(&iface->config_ip, true); system_flush_routes(); @@ -528,15 +536,17 @@ void interface_set_proto_state(struct interface *iface, struct interface_proto_s state->iface = iface; } -void -interface_init(struct interface *iface, const char *name, - struct blob_attr *config) +struct interface * +interface_alloc(const char *name, struct blob_attr *config) { + struct interface *iface; struct blob_attr *tb[IFACE_ATTR_MAX]; struct blob_attr *cur; const char *proto_name = NULL; + char *iface_name; - strncpy(iface->name, name, sizeof(iface->name) - 1); + iface = calloc_a(sizeof(*iface), &iface_name, strlen(name) + 1); + iface->name = strcpy(iface_name, name); INIT_LIST_HEAD(&iface->errors); INIT_LIST_HEAD(&iface->users); INIT_LIST_HEAD(&iface->hotplug_list); @@ -599,7 +609,16 @@ 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; + return iface; +} + +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) @@ -675,6 +694,9 @@ interface_set_main_dev(struct interface *iface, struct device *dev) interface_set_l3_dev(iface, dev); device_add_user(&iface->main_dev, dev); + if (!dev) + return; + if (claimed) device_claim(&iface->l3_dev); @@ -724,6 +746,37 @@ interface_add_link(struct interface *iface, struct device *dev) } int +interface_handle_link(struct interface *iface, const char *name, bool add) +{ + struct device *dev; + int ret; + + device_lock(); + + dev = device_get(name, add ? 2 : 0); + if (!dev) { + ret = UBUS_STATUS_NOT_FOUND; + goto out; + } + + if (add) { + device_set_present(dev, true); + if (iface->device_config) + device_set_config(dev, &simple_device_type, iface->config); + + system_if_apply_settings(dev, &dev->settings); + ret = interface_add_link(iface, dev); + } else { + ret = interface_remove_link(iface, dev); + } + +out: + device_unlock(); + + return ret; +} + +int interface_set_up(struct interface *iface) { int ret; @@ -833,8 +886,8 @@ interface_change_config(struct interface *if_old, struct interface *if_new) if (!if_old->proto_handler->config_params) D(INTERFACE, "No config parameters for interface '%s'\n", if_old->name); - else if (!config_check_equal(if_old->config, if_new->config, - if_old->proto_handler->config_params)) + else if (!uci_blob_check_equal(if_old->config, if_new->config, + if_old->proto_handler->config_params)) reload = true; #define UPDATE(field, __var) ({ \ @@ -865,7 +918,7 @@ interface_change_config(struct interface *if_old, struct interface *if_new) #undef UPDATE if (reload) { - D(INTERFACE, "Reload interface '%s because of config changes\n", + D(INTERFACE, "Reload interface '%s' because of config changes\n", if_old->name); interface_clear_errors(if_old); set_config_state(if_old, IFC_RELOAD); @@ -874,9 +927,9 @@ interface_change_config(struct interface *if_old, struct interface *if_new) if (reload_ip) { interface_ip_set_enabled(&if_old->config_ip, false); - interface_ip_set_enabled(&if_old->config_ip, if_new->config_ip.enabled); interface_ip_set_enabled(&if_old->proto_ip, false); interface_ip_set_enabled(&if_old->proto_ip, if_new->proto_ip.enabled); + interface_ip_set_enabled(&if_old->config_ip, if_new->config_ip.enabled); } interface_write_resolv_conf();