X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=a1e30046d203b25589966be32f62c95d31ce9bf6;hp=e12d3569dfe0b4ada12ec8cb4139d0a50eab8841;hb=d3f710f9c3b70b310fae6cdcceb201767b913d7d;hpb=8865846b6bb679ef917d3546113790978eb9f1a0 diff --git a/interface.c b/interface.c index e12d356..a1e3004 100644 --- a/interface.c +++ b/interface.c @@ -3,11 +3,39 @@ #include #include "netifd.h" +#include "device.h" +#include "interface.h" #include "proto.h" #include "ubus.h" +#include "config.h" static LIST_HEAD(interfaces); +enum { + IFACE_ATTR_TYPE, + IFACE_ATTR_IFNAME, + IFACE_ATTR_PROTO, + IFACE_ATTR_AUTO, + IFACE_ATTR_MAX +}; + +static const union config_param_info iface_attr_info[IFACE_ATTR_MAX] = { + [IFACE_ATTR_IFNAME].type = BLOBMSG_TYPE_STRING, +}; + +static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = { + [IFACE_ATTR_TYPE] = { .name = "type", .type = BLOBMSG_TYPE_STRING }, + [IFACE_ATTR_PROTO] = { .name = "proto", .type = BLOBMSG_TYPE_STRING }, + [IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_ARRAY }, + [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, + .info = iface_attr_info, +}; + static void clear_interface_errors(struct interface *iface) { @@ -24,7 +52,7 @@ void interface_add_error(struct interface *iface, const char *subsystem, { struct interface_error *error; int i, len = 0; - int *datalen; + int *datalen = NULL; char *dest; if (n_data) { @@ -62,7 +90,8 @@ interface_event(struct interface *iface, enum interface_event ev) static void mark_interface_down(struct interface *iface) { - release_device(iface->main_dev.dev); + interface_del_ctx_addr(iface, NULL); + device_release(iface->main_dev.dev); iface->state = IFS_DOWN; } @@ -74,12 +103,12 @@ __set_interface_up(struct interface *iface) if (iface->state != IFS_DOWN) return 0; - ret = claim_device(iface->main_dev.dev); + ret = device_claim(iface->main_dev.dev); if (ret) return ret; iface->state = IFS_SETUP; - ret = iface->proto->handler(iface->proto, PROTO_CMD_SETUP, false); + ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false); if (ret) { mark_interface_down(iface); return ret; @@ -101,8 +130,8 @@ __set_interface_down(struct interface *iface, bool force) iface->state = IFS_TEARDOWN; interface_event(iface, IFEV_DOWN); - iface->proto->handler(iface->proto, PROTO_CMD_TEARDOWN, force); - release_device(iface->main_dev.dev); + interface_del_all_routes(iface); + interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force); } static void @@ -129,7 +158,7 @@ interface_cb(struct device_user *dep, enum device_event ev) iface->active = new_state; if (new_state) { - if (iface->autostart) + if (iface->autostart && !config_init) set_interface_up(iface); } else __set_interface_down(iface, true); @@ -160,7 +189,7 @@ interface_proto_cb(struct interface_proto_state *state, enum interface_proto_eve void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state) { if (iface->proto) { - iface->proto->handler(iface->proto, PROTO_CMD_TEARDOWN, true); + interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, true); iface->proto->free(iface->proto); iface->proto = NULL; } @@ -174,30 +203,44 @@ void interface_set_proto_state(struct interface *iface, struct interface_proto_s } struct interface * -alloc_interface(const char *name) +alloc_interface(const char *name, struct uci_section *s, struct blob_attr *attr) { struct interface *iface; + struct blob_attr *tb[IFACE_ATTR_MAX]; + struct blob_attr *cur; + struct device *dev; iface = get_interface(name); if (iface) return iface; iface = calloc(1, sizeof(*iface)); - - interface_set_proto_state(iface, get_default_proto()); - if (!iface->proto) { - free(iface); - return NULL; - } - iface->main_dev.cb = interface_cb; iface->l3_iface = &iface->main_dev; strncpy(iface->name, name, sizeof(iface->name) - 1); list_add(&iface->list, &interfaces); INIT_LIST_HEAD(&iface->errors); + INIT_LIST_HEAD(&iface->address); + INIT_LIST_HEAD(&iface->routes); + + proto_attach_interface(iface, s); netifd_ubus_add_interface(iface); + blobmsg_parse(iface_attrs, IFACE_ATTR_MAX, tb, + blob_data(attr), blob_len(attr)); + + if ((cur = tb[IFACE_ATTR_TYPE])) { + if (!strcmp(blobmsg_data(cur), "bridge")) + interface_attach_bridge(iface, s); + } + + if ((cur = tb[IFACE_ATTR_IFNAME])) { + dev = device_get(blobmsg_data(cur), true); + if (dev) + device_add_user(&iface->main_dev, dev); + } + return iface; } @@ -224,30 +267,30 @@ get_interface(const char *name) } void -interface_remove_link(struct interface *iface, struct device *llif) +interface_remove_link(struct interface *iface, struct device *dev) { - struct device *dev = iface->main_dev.dev; + struct device *mdev = iface->main_dev.dev; - if (dev && dev->hotplug_ops) { - dev->hotplug_ops->del(dev, llif); + if (mdev && mdev->hotplug_ops) { + mdev->hotplug_ops->del(mdev, dev); return; } - remove_device_user(&iface->main_dev); + device_remove_user(&iface->main_dev); } int -interface_add_link(struct interface *iface, struct device *llif) +interface_add_link(struct interface *iface, struct device *dev) { - struct device *dev = iface->main_dev.dev; + struct device *mdev = iface->main_dev.dev; - if (dev && dev->hotplug_ops) - return dev->hotplug_ops->add(dev, llif); + if (mdev && mdev->hotplug_ops) + return mdev->hotplug_ops->add(mdev, dev); if (iface->main_dev.dev) interface_remove_link(iface, NULL); - add_device_user(&iface->main_dev, llif); + device_add_user(&iface->main_dev, dev); return 0; } @@ -276,3 +319,14 @@ set_interface_down(struct interface *iface) return 0; } + +void +start_pending_interfaces(void) +{ + struct interface *iface; + + list_for_each_entry(iface, &interfaces, list) { + if (iface->active && iface->autostart) + set_interface_up(iface); + } +}