X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=77654fe1d6edab28908ab076e8578fca81b7ba99;hp=0f54d51c13a143d8d771c4ea4ecd4743f3a860e1;hb=28735bd31f043d39f024d53e48ce767b95e5d70e;hpb=ea6dec1329b08109387f091b60a13d1b40839317 diff --git a/interface.c b/interface.c index 0f54d51..77654fe 100644 --- a/interface.c +++ b/interface.c @@ -1,3 +1,16 @@ +/* + * netifd - network interface daemon + * Copyright (C) 2012 Felix Fietkau + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ #include #include #include @@ -12,11 +25,18 @@ #include "system.h" struct vlist_tree interfaces; +static LIST_HEAD(iface_all_users); enum { IFACE_ATTR_IFNAME, IFACE_ATTR_PROTO, IFACE_ATTR_AUTO, + IFACE_ATTR_DEFAULTROUTE, + IFACE_ATTR_PEERDNS, + IFACE_ATTR_DNS, + IFACE_ATTR_DNS_SEARCH, + IFACE_ATTR_METRIC, + IFACE_ATTR_INTERFACE, IFACE_ATTR_MAX }; @@ -24,11 +44,22 @@ 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_DEFAULTROUTE] = { .name = "defaultroute", .type = BLOBMSG_TYPE_BOOL }, + [IFACE_ATTR_PEERDNS] = { .name = "peerdns", .type = BLOBMSG_TYPE_BOOL }, + [IFACE_ATTR_METRIC] = { .name = "metric", .type = BLOBMSG_TYPE_INT32 }, + [IFACE_ATTR_DNS] = { .name = "dns", .type = BLOBMSG_TYPE_ARRAY }, + [IFACE_ATTR_DNS_SEARCH] = { .name = "dns_search", .type = BLOBMSG_TYPE_ARRAY }, + [IFACE_ATTR_INTERFACE] = { .name = "interface", .type = BLOBMSG_TYPE_STRING }, +}; + +static const union config_param_info iface_attr_info[IFACE_ATTR_MAX] = { + [IFACE_ATTR_DNS] = { .type = BLOBMSG_TYPE_STRING }, }; const struct config_param_list interface_attr_list = { .n_params = IFACE_ATTR_MAX, .params = iface_attrs, + .info = iface_attr_info, }; static void @@ -49,6 +80,7 @@ void interface_add_error(struct interface *iface, const char *subsystem, int i, len = 0; int *datalen = NULL; char *dest; + int subsystem_len = 0, code_len = 0; if (n_data) { len = n_data * sizeof(char *); @@ -59,13 +91,21 @@ void interface_add_error(struct interface *iface, const char *subsystem, } } + if (subsystem) { + subsystem_len = strlen(subsystem) + 1; + len += subsystem_len; + } + + if (code) { + code_len = strlen(code) + 1; + len += code_len; + } + error = calloc(1, sizeof(*error) + sizeof(char *) + len); if (!error) return; list_add_tail(&error->list, &iface->errors); - error->subsystem = subsystem; - error->code = code; dest = (char *) &error->data[n_data + 1]; for (i = 0; i < n_data; i++) { @@ -73,70 +113,114 @@ void interface_add_error(struct interface *iface, const char *subsystem, memcpy(dest, data[i], datalen[i]); dest += datalen[i]; } - error->data[n_data] = NULL; + error->data[n_data++] = NULL; + + dest = (char *) &error->data[n_data]; + if (subsystem) { + error->subsystem = dest; + strcpy(dest, subsystem); + dest += subsystem_len; + } + + if (code) { + error->code = dest; + strcpy(dest, code); + dest += code_len; + } +} + +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(*n) + 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; + struct device *adev = NULL; list_for_each_entry_safe(dep, tmp, &iface->users, list) - dep->cb(dep, IFEV_UP); + dep->cb(dep, iface, ev); + + list_for_each_entry_safe(dep, tmp, &iface_all_users, list) + dep->cb(dep, iface, ev); - interface_queue_event(iface, ev); + switch (ev) { + case IFEV_UP: + adev = iface->main_dev.dev; + /* fall through */ + case IFEV_DOWN: + alias_notify_device(iface->name, adev); + break; + default: + break; + } } 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.dev) + device_release(&iface->l3_dev); + interface_data_flush(iface); } static void mark_interface_down(struct interface *iface) { - interface_flush_state(iface); - iface->state = IFS_DOWN; -} - -static int -__interface_set_up(struct interface *iface) -{ - int ret; - - if (iface->state != IFS_DOWN) - return 0; - - if (iface->main_dev.dev) { - ret = device_claim(&iface->main_dev); - if (ret) - return ret; - } - - iface->state = IFS_SETUP; - ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false); - if (ret) { - mark_interface_down(iface); - return ret; - } + enum interface_state state = iface->state; - return 0; + iface->state = IFS_DOWN; + if (state == IFS_UP) + interface_event(iface, IFEV_DOWN); + interface_ip_set_enabled(&iface->config_ip, false); + interface_ip_flush(&iface->proto_ip); + interface_flush_state(iface); + system_flush_routes(); } void __interface_set_down(struct interface *iface, bool force) { - interface_clear_errors(iface); - if (iface->state == IFS_DOWN || iface->state == IFS_TEARDOWN) return; + if (iface->state == IFS_UP) + interface_event(iface, IFEV_DOWN); iface->state = IFS_TEARDOWN; - interface_event(iface, IFEV_DOWN); interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force); if (force) interface_flush_state(iface); @@ -161,6 +245,8 @@ interface_cb(struct device_user *dep, enum device_event ev) } interface_set_available(iface, new_state); + if (!new_state && dep->dev->external) + interface_set_main_dev(iface, NULL); } void @@ -182,10 +268,15 @@ interface_set_available(struct interface *iface, bool new_state) void interface_add_user(struct interface_user *dep, struct interface *iface) { + if (!iface) { + list_add(&dep->list, &iface_all_users); + return; + } + dep->iface = iface; list_add(&dep->list, &iface->users); if (iface->state == IFS_UP) - dep->cb(dep, IFEV_UP); + dep->cb(dep, iface, IFEV_UP); } void @@ -196,40 +287,82 @@ interface_remove_user(struct interface_user *dep) } static void +interface_alias_cb(struct interface_user *dep, struct interface *iface, enum interface_event ev) +{ + struct interface *alias = container_of(dep, struct interface, parent_iface); + struct device *dev = iface->l3_dev.dev; + + switch (ev) { + case IFEV_UP: + if (!dev) + return; + + interface_set_main_dev(alias, dev); + interface_set_available(alias, true); + break; + case IFEV_DOWN: + interface_set_available(alias, false); + interface_set_main_dev(alias, NULL); + break; + case IFEV_FREE: + interface_remove_user(dep); + break; + case IFEV_RELOAD: + break; + } +} + +static void interface_claim_device(struct interface *iface) { - struct device *dev; + struct interface *parent; + struct device *dev = NULL; + + if (iface->parent_iface.iface) + interface_remove_user(&iface->parent_iface); - if (iface->ifname && iface->proto_handler && + if (iface->parent_ifname) { + parent = vlist_find(&interfaces, iface->parent_ifname, parent, node); + iface->parent_iface.cb = interface_alias_cb; + interface_add_user(&iface->parent_iface, parent); + } else if (iface->ifname && !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) { dev = device_get(iface->ifname, true); - if (dev) - device_add_user(&iface->main_dev, dev); } + + if (dev) + interface_set_main_dev(iface, dev); + + if (iface->proto_handler->flags & PROTO_FLAG_INIT_AVAILABLE) + interface_set_available(iface, true); } static void -interface_cleanup(struct interface *iface) +interface_cleanup(struct interface *iface, bool reload) { struct interface_user *dep, *tmp; + if (iface->parent_iface.iface) + interface_remove_user(&iface->parent_iface); + list_for_each_entry_safe(dep, tmp, &iface->users, list) interface_remove_user(dep); interface_ip_flush(&iface->config_ip); interface_flush_state(iface); interface_clear_errors(iface); - if (iface->main_dev.dev) - device_remove_user(&iface->main_dev); - iface->l3_dev = &iface->main_dev; + + if (iface->main_dev.dev && !reload) + interface_set_main_dev(iface, NULL); interface_set_proto_state(iface, NULL); } static void interface_do_free(struct interface *iface) { - interface_cleanup(iface); + interface_event(iface, IFEV_FREE); + interface_cleanup(iface, false); free(iface->config); netifd_ubus_remove_interface(iface); avl_delete(&interfaces.avl, &iface->node.avl); @@ -239,19 +372,19 @@ interface_do_free(struct interface *iface) static void interface_do_reload(struct interface *iface) { - interface_cleanup(iface); - - interface_claim_device(iface); + interface_event(iface, IFEV_RELOAD); + interface_cleanup(iface, true); proto_init_interface(iface, iface->config); - - if (iface->autostart && !config_init) - interface_set_up(iface); + interface_claim_device(iface); } static void interface_handle_config_change(struct interface *iface) { - switch(iface->config_state) { + enum interface_config_state state = iface->config_state; + + iface->config_state = IFC_NORMAL; + switch(state) { case IFC_NORMAL: break; case IFC_RELOAD: @@ -259,8 +392,10 @@ interface_handle_config_change(struct interface *iface) break; case IFC_REMOVE: interface_do_free(iface); - break; + return; } + if (iface->autostart && iface->available) + interface_set_up(iface); } static void @@ -278,7 +413,6 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve iface->state = IFS_UP; iface->start_time = system_get_rtime(); interface_event(iface, IFEV_UP); - interface_write_resolv_conf(); netifd_log_message(L_NOTICE, "Interface '%s' is now up\n", iface->name); break; case IFPEV_DOWN: @@ -286,24 +420,22 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve return; netifd_log_message(L_NOTICE, "Interface '%s' is now down\n", iface->name); - interface_ip_set_enabled(&iface->config_ip, false); - system_flush_routes(); mark_interface_down(iface); + if (iface->main_dev.dev) + device_release(&iface->main_dev); interface_handle_config_change(iface); - if (iface->l3_dev->dev) - device_release(iface->l3_dev); - if (iface->autostart && iface->available) - __interface_set_up(iface); break; case IFPEV_LINK_LOST: if (iface->state != IFS_UP) return; netifd_log_message(L_NOTICE, "Interface '%s' has lost the connection\n", iface->name); + mark_interface_down(iface); iface->state = IFS_SETUP; - interface_event(iface, IFEV_DOWN); break; } + + interface_write_resolv_conf(); } void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state) @@ -333,12 +465,11 @@ interface_init(struct interface *iface, const char *name, INIT_LIST_HEAD(&iface->errors); INIT_LIST_HEAD(&iface->users); INIT_LIST_HEAD(&iface->hotplug_list); - interface_ip_init(&iface->proto_ip, iface); - interface_ip_init(&iface->config_ip, iface); + interface_ip_init(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)); @@ -348,15 +479,25 @@ interface_init(struct interface *iface, const char *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->proto_ip.no_dns = + !blobmsg_get_bool_default(tb[IFACE_ATTR_PEERDNS], true); + + if ((cur = tb[IFACE_ATTR_DNS])) + interface_add_dns_server_list(&iface->config_ip, cur); + + if ((cur = tb[IFACE_ATTR_DNS_SEARCH])) + interface_add_dns_search_list(&iface->config_ip, cur); + + if ((cur = tb[IFACE_ATTR_METRIC])) + iface->metric = blobmsg_get_u32(cur); + iface->config_autostart = iface->autostart; } -void -interface_add(struct interface *iface, struct blob_attr *config) +static bool __interface_add(struct interface *iface, struct blob_attr *config, bool alias) { struct blob_attr *tb[IFACE_ATTR_MAX]; struct blob_attr *cur; @@ -364,24 +505,94 @@ interface_add(struct interface *iface, struct blob_attr *config) blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, blob_data(config), blob_len(config)); - if ((cur = tb[IFACE_ATTR_IFNAME])) - iface->ifname = blobmsg_data(cur); + if (alias) { + if ((cur = tb[IFACE_ATTR_INTERFACE])) + iface->parent_ifname = blobmsg_data(cur); + + if (!iface->parent_ifname) + return false; + } else { + if ((cur = tb[IFACE_ATTR_IFNAME])) + iface->ifname = blobmsg_data(cur); + } + iface->config = config; - vlist_add(&interfaces, &iface->node); + vlist_add(&interfaces, &iface->node, iface->name); + return true; } void -interface_remove_link(struct interface *iface, struct device *dev) +interface_add(struct interface *iface, struct blob_attr *config) { - struct device *mdev = iface->main_dev.dev; + __interface_add(iface, config, false); +} - if (mdev && mdev->hotplug_ops) { - mdev->hotplug_ops->del(mdev, dev); +bool +interface_add_alias(struct interface *iface, struct blob_attr *config) +{ + if (iface->proto_handler->flags & PROTO_FLAG_NODEV) + return false; + + return __interface_add(iface, config, true); +} + +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) +{ + struct device *mdev = iface->main_dev.dev; + + 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); + return 0; } int @@ -389,20 +600,29 @@ interface_add_link(struct interface *iface, struct device *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; + } + interface_set_main_dev(iface, dev); + iface->main_dev.hotplug = true; return 0; } int interface_set_up(struct interface *iface) { + int ret; + iface->autostart = true; if (iface->state != IFS_DOWN) @@ -414,7 +634,20 @@ interface_set_up(struct interface *iface) return -1; } - return __interface_set_up(iface); + if (iface->main_dev.dev) { + ret = device_claim(&iface->main_dev); + if (ret) + return ret; + } + + iface->state = IFS_SETUP; + ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false); + if (ret) { + mark_interface_down(iface); + return ret; + } + + return 0; } int @@ -461,15 +694,14 @@ interface_update_start(struct interface *iface) void interface_update_complete(struct interface *iface) { - struct device_route *route; - 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); - route->enabled = true; - } - } +} + +static void +interface_replace_dns(struct interface_ip_settings *new, struct interface_ip_settings *old) +{ + vlist_simple_replace(&new->dns_servers, &old->dns_servers); + vlist_simple_replace(&new->dns_search, &old->dns_search); } static void @@ -477,6 +709,7 @@ interface_change_config(struct interface *if_old, struct interface *if_new) { struct blob_attr *old_config = if_old->config; const char *old_ifname = if_old->ifname; + const char *old_parent_ifname = if_old->parent_ifname; const struct proto_handler *proto = if_old->proto_handler; interface_clear_errors(if_old); @@ -484,12 +717,24 @@ interface_change_config(struct interface *if_old, struct interface *if_new) if (!if_old->config_autostart && if_new->config_autostart) if_old->autostart = true; + if_old->device_config = if_new->device_config; if_old->config_autostart = if_new->config_autostart; if_old->ifname = if_new->ifname; + if_old->parent_ifname = if_new->parent_ifname; if_old->proto_handler = if_new->proto_handler; - if (strcmp(old_ifname, if_new->ifname) != 0 || - proto != if_new->proto_handler) { +#define FIELD_CHANGED_STR(field) \ + ((!!if_old->field != !!old_ ## field) || \ + (old_ ## field && \ + strcmp(old_ ## field, if_old->field) != 0)) + + if (FIELD_CHANGED_STR(parent_ifname)) { + if (if_old->parent_iface.iface) + interface_remove_user(&if_old->parent_iface); + goto reload; + } + + if (FIELD_CHANGED_STR(ifname) || proto != if_new->proto_handler) { D(INTERFACE, "Reload interface '%s' because of ifname/proto change\n", if_old->name); goto reload; @@ -505,11 +750,32 @@ interface_change_config(struct interface *if_old, struct interface *if_new) goto reload; } +#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); + } + + UPDATE(proto_ip.no_dns); + interface_replace_dns(&if_old->config_ip, &if_new->config_ip); + interface_write_resolv_conf(); + +#undef UPDATE + goto out; reload: set_config_state(if_old, IFC_RELOAD); out: + if_new->config = NULL; + interface_cleanup(if_new, false); free(old_config); free(if_new); } @@ -529,8 +795,8 @@ interface_update(struct vlist_tree *tree, struct vlist_node *node_new, set_config_state(if_old, IFC_REMOVE); } else if (node_new) { D(INTERFACE, "Create interface '%s'\n", if_new->name); - interface_claim_device(if_new); proto_init_interface(if_new, if_new->config); + interface_claim_device(if_new); netifd_ubus_add_interface(if_new); } } @@ -539,8 +805,7 @@ interface_update(struct vlist_tree *tree, struct vlist_node *node_new, static void __init interface_init_list(void) { - vlist_init(&interfaces, avl_strcmp, interface_update, - struct interface, node, name); + vlist_init(&interfaces, avl_strcmp, interface_update); interfaces.keep_old = true; interfaces.no_delete = true; }