X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=51e9e92ce34b756bd03c6aa3bbfe2ec3a47c1ee0;hp=5cefd4c231625c469d650c5e10354ba4e11dbdde;hb=8ddaf5d7688b14590f283b2ebb81f78326fb39fd;hpb=b567e47574a6f4179bdce88e65aaabb1a97cfb76

diff --git a/interface.c b/interface.c
index 5cefd4c..51e9e92 100644
--- a/interface.c
+++ b/interface.c
@@ -5,6 +5,7 @@
 #include "netifd.h"
 #include "device.h"
 #include "interface.h"
+#include "interface-ip.h"
 #include "proto.h"
 #include "ubus.h"
 #include "config.h"
@@ -12,7 +13,6 @@
 static LIST_HEAD(interfaces);
 
 enum {
-	IFACE_ATTR_TYPE,
 	IFACE_ATTR_IFNAME,
 	IFACE_ATTR_PROTO,
 	IFACE_ATTR_AUTO,
@@ -24,9 +24,8 @@ static const union config_param_info iface_attr_info[IFACE_ATTR_MAX] = {
 };
 
 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_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
 	[IFACE_ATTR_AUTO] = { .name = "auto", .type = BLOBMSG_TYPE_BOOL },
 };
 
@@ -90,8 +89,9 @@ interface_event(struct interface *iface, enum interface_event ev)
 static void
 mark_interface_down(struct interface *iface)
 {
-	interface_del_ctx_addr(iface, NULL);
-	device_release(iface->main_dev.dev);
+	vlist_flush_all(&iface->proto_addr);
+	vlist_flush_all(&iface->proto_route);
+	device_release(&iface->main_dev);
 	iface->state = IFS_DOWN;
 }
 
@@ -103,7 +103,7 @@ __interface_set_up(struct interface *iface)
 	if (iface->state != IFS_DOWN)
 		return 0;
 
-	ret = device_claim(iface->main_dev.dev);
+	ret = device_claim(&iface->main_dev);
 	if (ret)
 		return ret;
 
@@ -129,8 +129,6 @@ __interface_set_down(struct interface *iface, bool force)
 
 	iface->state = IFS_TEARDOWN;
 	interface_event(iface, IFEV_DOWN);
-
-	interface_del_all_routes(iface);
 	interface_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
 }
 
@@ -152,10 +150,10 @@ interface_cb(struct device_user *dep, enum device_event ev)
 		return;
 	}
 
-	if (iface->active == new_state)
+	if (iface->available == new_state)
 		return;
 
-	iface->active = new_state;
+	iface->available = new_state;
 
 	if (new_state) {
 		if (iface->autostart && !config_init)
@@ -203,14 +201,15 @@ void interface_set_proto_state(struct interface *iface, struct interface_proto_s
 }
 
 struct interface *
-alloc_interface(const char *name, struct uci_section *s, struct blob_attr *attr)
+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;
 
@@ -218,22 +217,18 @@ alloc_interface(const char *name, struct uci_section *s, struct blob_attr *attr)
 	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);
+	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);
 
-	netifd_ubus_add_interface(iface);
+	interface_ip_init(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_PROTO]))
+		proto_name = blobmsg_data(cur);
+
+	proto_attach_interface(iface, proto_name);
 
 	if ((cur = tb[IFACE_ATTR_IFNAME])) {
 		dev = device_get(blobmsg_data(cur), true);
@@ -241,11 +236,19 @@ alloc_interface(const char *name, struct uci_section *s, struct blob_attr *attr)
 			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);
@@ -255,7 +258,7 @@ free_interface(struct interface *iface)
 }
 
 struct interface *
-get_interface(const char *name)
+interface_get(const char *name)
 {
 	struct interface *iface;
 
@@ -300,7 +303,7 @@ 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;
 	}
@@ -326,7 +329,7 @@ interface_start_pending(void)
 	struct interface *iface;
 
 	list_for_each_entry(iface, &interfaces, list) {
-		if (iface->active && iface->autostart)
+		if (iface->available && iface->autostart)
 			interface_set_up(iface);
 	}
 }