}
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);
+}
+
+static void
+mark_interface_down(struct interface *iface)
+{
+ interface_flush_state(iface);
iface->state = IFS_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);
}
static void
{
struct interface_user *dep, *tmp;
- iface->hotplug_dev = false;
list_for_each_entry_safe(dep, tmp, &iface->users, list)
interface_remove_user(dep);
- interface_clear_dns(iface);
+ 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);
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();
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);
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;
__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);
+ }
+}
+
static void
interface_change_config(struct interface *if_old, struct interface *if_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);
}
}