X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=d8f7de3c3f4910ddfe5a62a9680e0fd284dd01d7;hp=2b66fb9267c86a0a200c450a2b124d3cb3b5708e;hb=e15ef7a8d23fbc6c931d7221ac792fce67729218;hpb=4ed89555c4b5e748ed407f7694b5c9b32eea2e54

diff --git a/interface.c b/interface.c
index 2b66fb9..d8f7de3 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"
@@ -24,7 +25,7 @@ static const union config_param_info iface_attr_info[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_ARRAY },
+	[IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
 	[IFACE_ATTR_AUTO] = { .name = "auto", .type = BLOBMSG_TYPE_BOOL },
 };
 
@@ -88,8 +89,9 @@ interface_event(struct interface *iface, enum interface_event ev)
 static void
 mark_interface_down(struct interface *iface)
 {
+	interface_del_all_routes(iface);
 	interface_del_ctx_addr(iface, NULL);
-	device_release(iface->main_dev.dev);
+	device_release(&iface->main_dev);
 	iface->state = IFS_DOWN;
 }
 
@@ -101,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;
 
@@ -201,12 +203,13 @@ void interface_set_proto_state(struct interface *iface, struct interface_proto_s
 }
 
 struct interface *
-interface_alloc(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 = interface_get(name);
 	if (iface)
@@ -216,24 +219,28 @@ interface_alloc(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);
-
 	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 ((cur = tb[IFACE_ATTR_IFNAME])) {
 		dev = device_get(blobmsg_data(cur), true);
 		if (dev)
 			device_add_user(&iface->main_dev, dev);
 	}
 
+	netifd_ubus_add_interface(iface);
+	config_set_state(&iface->config, attr);
+
 	return iface;
 }