X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=d7498968de6be4fcb4bbd08353f0df43ca640bcc;hp=4ad89f538a41328f006d49c49c3576f1348463da;hb=f196d048107c1c28bf6ddda31f0927a5893e5f3d;hpb=75baeca6f817b161f522a9961bfe5c3718397189 diff --git a/interface.c b/interface.c index 4ad89f5..d749896 100644 --- a/interface.c +++ b/interface.c @@ -18,6 +18,7 @@ enum { IFACE_ATTR_PROTO, IFACE_ATTR_AUTO, IFACE_ATTR_DEFAULTROUTE, + IFACE_ATTR_METRIC, IFACE_ATTR_MAX }; @@ -26,6 +27,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = { [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 }, + [IFACE_ATTR_METRIC] = { .name = "metric", .type = BLOBMSG_TYPE_INT32 }, }; const struct config_param_list interface_attr_list = { @@ -79,6 +81,42 @@ void interface_add_error(struct interface *iface, const char *subsystem, } static void +interface_data_del(struct interface *iface, struct interface_data *data) +{ + avl_delete(&iface->data, &data->node); + free(data); +} + +static void +interface_data_flush(struct interface *iface) +{ + struct interface_data *d, *tmp; + + avl_for_each_element_safe(&iface->data, d, node, tmp) + interface_data_del(iface, d); +} + +int +interface_add_data(struct interface *iface, const struct blob_attr *data) +{ + struct interface_data *n, *o; + + if (!blobmsg_check_attr(data, true)) + return UBUS_STATUS_INVALID_ARGUMENT; + + n = calloc(1, sizeof(*data) + blob_pad_len(data)); + memcpy(n->data, data, blob_pad_len(data)); + n->node.key = blobmsg_name(data); + + o = avl_find_element(&iface->data, n->node.key, o, node); + if (o) + interface_data_del(iface, o); + + avl_insert(&iface->data, &n->node); + return 0; +} + +static void interface_event(struct interface *iface, enum interface_event ev) { struct interface_user *dep, *tmp; @@ -92,11 +130,11 @@ interface_event(struct interface *iface, enum interface_event ev) static void interface_flush_state(struct interface *iface) { - interface_ip_flush(&iface->proto_ip); if (iface->main_dev.dev) device_release(&iface->main_dev); - if (iface->l3_dev != &iface->main_dev && iface->l3_dev->dev) - device_release(iface->l3_dev); + if (iface->l3_dev.dev) + device_release(&iface->l3_dev); + interface_data_flush(iface); } static void @@ -189,7 +227,7 @@ interface_claim_device(struct interface *iface) !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) { dev = device_get(iface->ifname, true); if (dev) - device_add_user(&iface->main_dev, dev); + interface_set_main_dev(iface, dev); } if (iface->proto_handler->flags & PROTO_FLAG_INIT_AVAILABLE) interface_set_available(iface, true); @@ -209,8 +247,7 @@ interface_cleanup(struct interface *iface, bool reload) interface_clear_errors(iface); if (iface->main_dev.dev && (!reload || !iface->main_dev.hotplug)) - device_remove_user(&iface->main_dev); - iface->l3_dev = &iface->main_dev; + interface_set_main_dev(iface, NULL); interface_set_proto_state(iface, NULL); } @@ -318,10 +355,10 @@ interface_init(struct interface *iface, const char *name, INIT_LIST_HEAD(&iface->hotplug_list); interface_ip_init(&iface->proto_ip, iface); interface_ip_init(&iface->config_ip, iface); + avl_init(&iface->data, avl_strcmp, false, NULL); iface->config_ip.enabled = false; iface->main_dev.cb = interface_cb; - iface->l3_dev = &iface->main_dev; blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blob_data(config), blob_len(config)); @@ -354,6 +391,46 @@ interface_add(struct interface *iface, struct blob_attr *config) vlist_add(&interfaces, &iface->node, iface->name); } +void +interface_set_l3_dev(struct interface *iface, struct device *dev) +{ + bool enabled = iface->config_ip.enabled; + bool claimed = iface->l3_dev.claimed; + + if (iface->l3_dev.dev == dev) + return; + + interface_ip_set_enabled(&iface->config_ip, false); + interface_ip_flush(&iface->proto_ip); + device_add_user(&iface->l3_dev, dev); + + if (dev) { + if (claimed) + device_claim(&iface->l3_dev); + interface_ip_set_enabled(&iface->config_ip, enabled); + } +} + +void +interface_set_main_dev(struct interface *iface, struct device *dev) +{ + bool set_l3 = (iface->main_dev.dev == iface->l3_dev.dev); + bool claimed = iface->l3_dev.claimed; + + if (iface->main_dev.dev == dev) + return; + + if (set_l3) + interface_set_l3_dev(iface, dev); + + device_add_user(&iface->main_dev, dev); + if (claimed) + device_claim(&iface->l3_dev); + + if (!iface->l3_dev.dev) + interface_set_l3_dev(iface, dev); +} + int interface_remove_link(struct interface *iface, struct device *dev) { @@ -390,7 +467,7 @@ interface_add_link(struct interface *iface, struct device *dev) return UBUS_STATUS_NOT_SUPPORTED; } - device_add_user(&iface->main_dev, dev); + interface_set_main_dev(iface, dev); iface->main_dev.hotplug = true; return 0; } @@ -475,8 +552,8 @@ interface_update_complete(struct interface *iface) interface_ip_update_complete(&iface->proto_ip); vlist_for_each_element(&iface->config_ip.route, route, node) { - if (iface->l3_dev->dev) { - system_add_route(iface->l3_dev->dev, route); + if (iface->l3_dev.dev) { + system_add_route(iface->l3_dev.dev, route); route->enabled = true; } } @@ -516,11 +593,21 @@ interface_change_config(struct interface *if_old, struct interface *if_new) 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); +#define UPDATE(field) ({ \ + bool __changed = (if_old->field != if_new->field); \ + if_old->field = if_new->field; \ + __changed; \ + }) + + if (UPDATE(metric) || UPDATE(proto_ip.no_defaultroute)) { + 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); } +#undef UPDATE + goto out; reload: