#include <stdio.h>
#include "netifd.h"
+#include "device.h"
+#include "interface.h"
+#include "proto.h"
#include "ubus.h"
-
-LIST_HEAD(interfaces);
+#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)
{
struct interface_error *error;
int i, len = 0;
- int *datalen;
+ int *datalen = NULL;
char *dest;
if (n_data) {
error->data[n_data] = NULL;
}
-static int
+static void
interface_event(struct interface *iface, enum interface_event ev)
{
- if (!iface->state || !iface->state->event)
- return 0;
-
- return iface->state->event(iface, iface->state, ev);
+ /* TODO */
}
static void
-__set_interface_up(struct interface *iface)
+mark_interface_down(struct interface *iface)
{
- if (iface->up)
- return;
+ interface_del_ctx_addr(iface, NULL);
+ device_release(iface->main_dev.dev);
+ iface->state = IFS_DOWN;
+}
- if (claim_device(iface->main_dev.dev) < 0)
- return;
+static int
+__interface_set_up(struct interface *iface)
+{
+ int ret;
- if (interface_event(iface, IFEV_UP) < 0) {
- release_device(iface->main_dev.dev);
- return;
+ if (iface->state != IFS_DOWN)
+ return 0;
+
+ ret = device_claim(iface->main_dev.dev);
+ if (ret)
+ return ret;
+
+ iface->state = IFS_SETUP;
+ ret = interface_proto_event(iface->proto, PROTO_CMD_SETUP, false);
+ if (ret) {
+ mark_interface_down(iface);
+ return ret;
}
- iface->up = true;
+ return 0;
+
}
static void
-__set_interface_down(struct interface *iface)
+__interface_set_down(struct interface *iface, bool force)
{
clear_interface_errors(iface);
- if (!iface->up)
+ if (iface->state == IFS_DOWN ||
+ iface->state == IFS_TEARDOWN)
return;
- iface->up = false;
+ iface->state = IFS_TEARDOWN;
interface_event(iface, IFEV_DOWN);
- release_device(iface->main_dev.dev);
+
+ interface_del_all_routes(iface);
+ interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
}
static void
iface->active = new_state;
if (new_state) {
- if (iface->autostart)
- __set_interface_up(iface);
+ if (iface->autostart && !config_init)
+ interface_set_up(iface);
} else
- __set_interface_down(iface);
+ __interface_set_down(iface, true);
+}
+
+static void
+interface_proto_cb(struct interface_proto_state *state, enum interface_proto_event ev)
+{
+ struct interface *iface = state->iface;
+
+ switch (ev) {
+ case IFPEV_UP:
+ if (iface->state != IFS_SETUP)
+ return;
+
+ iface->state = IFS_UP;
+ interface_event(iface, IFEV_UP);
+ break;
+ case IFPEV_DOWN:
+ if (iface->state == IFS_DOWN)
+ return;
+
+ mark_interface_down(iface);
+ break;
+ }
+}
+
+void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state)
+{
+ if (iface->proto) {
+ interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, true);
+ iface->proto->free(iface->proto);
+ iface->proto = NULL;
+ }
+ iface->state = IFS_DOWN;
+ iface->proto = state;
+ if (!state)
+ return;
+
+ state->proto_event = interface_proto_cb;
+ state->iface = iface;
}
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);
+ iface = interface_get(name);
if (iface)
return iface;
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;
}
{
netifd_ubus_remove_interface(iface);
list_del(&iface->list);
- if (iface->state && iface->state->free)
- iface->state->free(iface, iface->state);
+ if (iface->proto->free)
+ iface->proto->free(iface->proto);
free(iface);
}
struct interface *
-get_interface(const char *name)
+interface_get(const char *name)
{
struct interface *iface;
}
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;
}
int
-set_interface_up(struct interface *iface)
+interface_set_up(struct interface *iface)
{
iface->autostart = true;
return -1;
}
- if (iface->up || !iface->active)
- return -1;
+ if (iface->state != IFS_DOWN)
+ return 0;
- __set_interface_up(iface);
- return 0;
+ 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);
+ __interface_set_down(iface, false);
return 0;
}
+
+void
+interface_start_pending(void)
+{
+ struct interface *iface;
+
+ list_for_each_entry(iface, &interfaces, list) {
+ if (iface->active && iface->autostart)
+ interface_set_up(iface);
+ }
+}
projects / project / netifd.git / blobdiff