X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=ca641aeb1bec9c5602211d25780a739bd55ae209;hp=9d6a7c1836c4b6838b35efffee871267ac9e5f98;hb=43c2934a4d3f9a3e9d7fc2a4e9a32a2bef7174ba;hpb=0ee52049c03987bc0fb068495d153ecf08f81dbb diff --git a/interface.c b/interface.c index 9d6a7c1..ca641ae 100644 --- a/interface.c +++ b/interface.c @@ -79,17 +79,28 @@ void interface_add_error(struct interface *iface, const char *subsystem, static void 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); + interface_queue_event(iface, ev); } static void -mark_interface_down(struct interface *iface) +interface_flush_state(struct interface *iface) { - interface_clear_dns(iface); - vlist_flush_all(&iface->proto_addr); - vlist_flush_all(&iface->proto_route); + 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); +} + +static void +mark_interface_down(struct interface *iface) +{ + interface_flush_state(iface); iface->state = IFS_DOWN; } @@ -117,7 +128,7 @@ __interface_set_up(struct interface *iface) return 0; } -static void +void __interface_set_down(struct interface *iface, bool force) { interface_clear_errors(iface); @@ -129,6 +140,8 @@ __interface_set_down(struct interface *iface, bool force) iface->state = IFS_TEARDOWN; interface_event(iface, IFEV_DOWN); interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force); + if (force) + interface_flush_state(iface); } static void @@ -168,12 +181,28 @@ interface_set_available(struct interface *iface, bool new_state) __interface_set_down(iface, true); } +void +interface_add_user(struct interface_user *dep, struct interface *iface) +{ + dep->iface = iface; + list_add(&dep->list, &iface->users); + if (iface->state == IFS_UP) + dep->cb(dep, IFEV_UP); +} + +void +interface_remove_user(struct interface_user *dep) +{ + list_del_init(&dep->list); + dep->iface = NULL; +} + static void interface_claim_device(struct interface *iface) { struct device *dev; - if (iface->proto_handler && + if (iface->ifname && iface->proto_handler && !(iface->proto_handler->flags & PROTO_FLAG_NODEV)) { dev = device_get(iface->ifname, true); if (dev) @@ -185,10 +214,17 @@ interface_claim_device(struct interface *iface) static void interface_cleanup(struct interface *iface) { - interface_clear_dns(iface); + struct interface_user *dep, *tmp; + + 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; interface_set_proto_state(iface, NULL); } @@ -209,9 +245,6 @@ interface_do_reload(struct interface *iface) interface_claim_device(iface); proto_init_interface(iface, iface->config); - - if (iface->autostart && !config_init) - interface_set_up(iface); } static void @@ -225,8 +258,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 @@ -239,26 +274,29 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve if (iface->state != IFS_SETUP) return; + interface_ip_set_enabled(&iface->config_ip, true); system_flush_routes(); 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: if (iface->state == IFS_DOWN) 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); interface_handle_config_change(iface); - if (iface->autostart) - __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); iface->state = IFS_SETUP; interface_event(iface, IFEV_DOWN); break; @@ -290,9 +328,11 @@ interface_init(struct interface *iface, const char *name, strncpy(iface->name, name, sizeof(iface->name) - 1); INIT_LIST_HEAD(&iface->errors); + INIT_LIST_HEAD(&iface->users); INIT_LIST_HEAD(&iface->hotplug_list); - INIT_LIST_HEAD(&iface->proto_dns_search); - INIT_LIST_HEAD(&iface->proto_dns_servers); + interface_ip_init(&iface->proto_ip, iface); + interface_ip_init(&iface->config_ip, iface); + iface->config_ip.enabled = false; iface->main_dev.cb = interface_cb; iface->l3_dev = &iface->main_dev; @@ -409,6 +449,26 @@ set_config_state(struct interface *iface, enum interface_config_state s) __interface_set_down(iface, false); } +void +interface_update_start(struct interface *iface) +{ + interface_ip_update_start(&iface->proto_ip); +} + +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_change_config(struct interface *if_old, struct interface *if_new) { @@ -468,7 +528,6 @@ interface_update(struct vlist_tree *tree, struct vlist_node *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_ip_init(if_new); netifd_ubus_add_interface(if_new); } }