X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=01dabad8047edd7ef8a6a0c9b63ae7c0d9084d35;hp=4605a66737a438798db84b2f9173aea1bc7cc76c;hb=3bd580e340d2075194cb353da32e10393b006c55;hpb=10c15e535b04041795e3a85b2fb496bd6d856417 diff --git a/interface.c b/interface.c index 4605a66..01dabad 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,13 +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 }; @@ -27,12 +45,21 @@ 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_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 @@ -104,7 +131,7 @@ interface_add_data(struct interface *iface, const struct blob_attr *data) if (!blobmsg_check_attr(data, true)) return UBUS_STATUS_INVALID_ARGUMENT; - n = calloc(1, sizeof(*data) + blob_pad_len(data)); + n = calloc(1, sizeof(*n) + blob_pad_len(data)); memcpy(n->data, data, blob_pad_len(data)); n->node.key = blobmsg_name(data); @@ -122,9 +149,10 @@ interface_event(struct interface *iface, enum interface_event ev) struct interface_user *dep, *tmp; list_for_each_entry_safe(dep, tmp, &iface->users, list) - dep->cb(dep, IFEV_UP); + dep->cb(dep, iface, ev); - interface_queue_event(iface, ev); + list_for_each_entry_safe(dep, tmp, &iface_all_users, list) + dep->cb(dep, iface, ev); } static void @@ -140,12 +168,15 @@ interface_flush_state(struct interface *iface) static void mark_interface_down(struct interface *iface) { - if (iface->state == IFS_UP) + enum interface_state state = iface->state; + + iface->state = IFS_DOWN; + if (state == IFS_UP) interface_event(iface, IFEV_DOWN); - interface_ip_flush(&iface->config_ip); + interface_ip_set_enabled(&iface->config_ip, false); interface_ip_flush(&iface->proto_ip); interface_flush_state(iface); - iface->state = IFS_DOWN; + system_flush_routes(); } void @@ -184,6 +215,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 @@ -205,10 +238,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 @@ -219,16 +257,52 @@ 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->ifname && + if (iface->parent_iface.iface) + interface_remove_user(&iface->parent_iface); + + 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) - interface_set_main_dev(iface, dev); } + + if (dev) + interface_set_main_dev(iface, dev); + if (iface->proto_handler->flags & PROTO_FLAG_INIT_AVAILABLE) interface_set_available(iface, true); } @@ -239,15 +313,17 @@ 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_dequeue_event(iface); interface_ip_flush(&iface->config_ip); interface_flush_state(iface); interface_clear_errors(iface); - if (iface->main_dev.dev && - (!reload || !iface->main_dev.hotplug)) + + if (iface->main_dev.dev && !reload) interface_set_main_dev(iface, NULL); interface_set_proto_state(iface, NULL); } @@ -255,6 +331,7 @@ interface_cleanup(struct interface *iface, bool reload) static void interface_do_free(struct interface *iface) { + interface_event(iface, IFEV_FREE); interface_cleanup(iface, false); free(iface->config); netifd_ubus_remove_interface(iface); @@ -265,6 +342,7 @@ interface_do_free(struct interface *iface) static void interface_do_reload(struct interface *iface) { + interface_event(iface, IFEV_RELOAD); interface_cleanup(iface, true); proto_init_interface(iface, iface->config); interface_claim_device(iface); @@ -273,7 +351,10 @@ interface_do_reload(struct interface *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: @@ -310,9 +391,7 @@ 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); mark_interface_down(iface); - system_flush_routes(); interface_handle_config_change(iface); break; case IFPEV_LINK_LOST: @@ -320,10 +399,7 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve return; netifd_log_message(L_NOTICE, "Interface '%s' has lost the connection\n", iface->name); - if (iface->state == IFS_UP) - interface_event(iface, IFEV_DOWN); mark_interface_down(iface); - system_flush_routes(); iface->state = IFS_SETUP; break; } @@ -356,8 +432,7 @@ 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; @@ -374,12 +449,22 @@ interface_init(struct interface *iface, const char *name, 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; @@ -387,11 +472,36 @@ 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, iface->name); + return true; +} + +void +interface_add(struct interface *iface, struct blob_attr *config) +{ + __interface_add(iface, config, false); +} + +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 @@ -551,15 +661,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 @@ -567,6 +676,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); @@ -576,11 +686,21 @@ interface_change_config(struct interface *if_old, struct interface *if_new) 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 ((!!old_ifname != !!if_new->ifname) || - (old_ifname && 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; @@ -609,6 +729,10 @@ interface_change_config(struct interface *if_old, struct interface *if_new) 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; @@ -616,6 +740,8 @@ interface_change_config(struct interface *if_old, struct interface *if_new) reload: set_config_state(if_old, IFC_RELOAD); out: + if_new->config = NULL; + interface_cleanup(if_new, false); free(old_config); free(if_new); }