X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=60efc7e43950fc8f28bc97289cee59ea1a5089ca;hp=88cf6824fcc04c12da32b346a39e0b9fd5259e11;hb=6d99c7d319393a0a1bf1cc091ab60568f8f70a99;hpb=17aab88b83a0e50ab31f18beec78ab07ce864883 diff --git a/interface.c b/interface.c index 88cf682..60efc7e 100644 --- a/interface.c +++ b/interface.c @@ -5,11 +5,31 @@ #include "netifd.h" #include "device.h" #include "interface.h" +#include "interface-ip.h" #include "proto.h" #include "ubus.h" +#include "config.h" static LIST_HEAD(interfaces); +enum { + IFACE_ATTR_IFNAME, + IFACE_ATTR_PROTO, + IFACE_ATTR_AUTO, + IFACE_ATTR_MAX +}; + +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 }, +}; + +const struct config_param_list interface_attr_list = { + .n_params = IFACE_ATTR_MAX, + .params = iface_attrs, +}; + static void clear_interface_errors(struct interface *iface) { @@ -64,21 +84,26 @@ interface_event(struct interface *iface, enum interface_event ev) static void mark_interface_down(struct interface *iface) { - release_device(iface->main_dev.dev); + vlist_flush_all(&iface->proto_addr); + vlist_flush_all(&iface->proto_route); + if (iface->main_dev.dev) + device_release(&iface->main_dev); iface->state = IFS_DOWN; } static int -__set_interface_up(struct interface *iface) +__interface_set_up(struct interface *iface) { int ret; if (iface->state != IFS_DOWN) return 0; - ret = claim_device(iface->main_dev.dev); - if (ret) - return ret; + 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); @@ -92,7 +117,7 @@ __set_interface_up(struct interface *iface) } static void -__set_interface_down(struct interface *iface, bool force) +__interface_set_down(struct interface *iface, bool force) { clear_interface_errors(iface); @@ -102,7 +127,6 @@ __set_interface_down(struct interface *iface, bool force) iface->state = IFS_TEARDOWN; interface_event(iface, IFEV_DOWN); - interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force); } @@ -124,16 +148,22 @@ interface_cb(struct device_user *dep, enum device_event ev) return; } - if (iface->active == new_state) + interface_set_available(iface, new_state); +} + +void +interface_set_available(struct interface *iface, bool new_state) +{ + if (iface->available == new_state) return; - iface->active = new_state; + iface->available = new_state; if (new_state) { if (iface->autostart && !config_init) - set_interface_up(iface); + interface_set_up(iface); } else - __set_interface_down(iface, true); + __interface_set_down(iface, true); } static void @@ -155,6 +185,13 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve mark_interface_down(iface); break; + case IFPEV_LINK_LOST: + if (iface->state != IFS_UP) + return; + + iface->state = IFS_SETUP; + interface_event(iface, IFEV_DOWN); + break; } } @@ -175,32 +212,56 @@ void interface_set_proto_state(struct interface *iface, struct interface_proto_s } struct interface * -alloc_interface(const char *name, struct uci_section *s) +interface_alloc(const char *name, struct blob_attr *attr) { struct interface *iface; + struct blob_attr *tb[IFACE_ATTR_MAX]; + struct blob_attr *cur; + struct device *dev; + const char *proto_name = NULL; - iface = get_interface(name); + iface = interface_get(name); if (iface) return iface; iface = calloc(1, sizeof(*iface)); iface->main_dev.cb = interface_cb; - iface->l3_iface = &iface->main_dev; + iface->l3_dev = &iface->main_dev; strncpy(iface->name, name, sizeof(iface->name) - 1); - list_add(&iface->list, &interfaces); + list_add_tail(&iface->list, &interfaces); INIT_LIST_HEAD(&iface->errors); - INIT_LIST_HEAD(&iface->address); - INIT_LIST_HEAD(&iface->routes); - proto_attach_interface(iface, s); + interface_ip_init(iface); + + blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, + blob_data(attr), blob_len(attr)); + + if ((cur = tb[IFACE_ATTR_PROTO])) + proto_name = blobmsg_data(cur); + + proto_attach_interface(iface, proto_name); + + if (iface->proto_handler && + !(iface->proto_handler->flags & PROTO_FLAG_NODEV) && + (cur = tb[IFACE_ATTR_IFNAME])) { + dev = device_get(blobmsg_data(cur), true); + if (dev) + device_add_user(&iface->main_dev, dev); + } + + if ((cur = tb[IFACE_ATTR_AUTO])) + iface->autostart = blobmsg_get_bool(cur); + else + iface->autostart = true; netifd_ubus_add_interface(iface); + config_set_state(&iface->config, attr); return iface; } void -free_interface(struct interface *iface) +interface_free(struct interface *iface) { netifd_ubus_remove_interface(iface); list_del(&iface->list); @@ -210,7 +271,7 @@ free_interface(struct interface *iface) } struct interface * -get_interface(const char *name) +interface_get(const char *name) { struct interface *iface; @@ -231,7 +292,7 @@ interface_remove_link(struct interface *iface, struct device *dev) return; } - remove_device_user(&iface->main_dev); + device_remove_user(&iface->main_dev); } int @@ -245,17 +306,17 @@ interface_add_link(struct interface *iface, struct device *dev) if (iface->main_dev.dev) interface_remove_link(iface, NULL); - add_device_user(&iface->main_dev, dev); + device_add_user(&iface->main_dev, dev); return 0; } int -set_interface_up(struct interface *iface) +interface_set_up(struct interface *iface) { iface->autostart = true; - if (!iface->active) { + if (!iface->available) { interface_add_error(iface, "interface", "NO_DEVICE", NULL, 0); return -1; } @@ -263,25 +324,30 @@ set_interface_up(struct interface *iface) if (iface->state != IFS_DOWN) return 0; - return __set_interface_up(iface); + return __interface_set_up(iface); } int -set_interface_down(struct interface *iface) +interface_set_down(struct interface *iface) { - iface->autostart = false; - __set_interface_down(iface, false); + if (!iface) { + list_for_each_entry(iface, &interfaces, list) + __interface_set_down(iface, false); + } else { + iface->autostart = false; + __interface_set_down(iface, false); + } return 0; } void -start_pending_interfaces(void) +interface_start_pending(void) { struct interface *iface; list_for_each_entry(iface, &interfaces, list) { - if (iface->active && iface->autostart) - set_interface_up(iface); + if (iface->available && iface->autostart) + interface_set_up(iface); } }