X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=4b22807f4a4a1c0b6e568bfd00395292544b3b3f;hp=20956be26bd0da9d61471dc0befa8997c3695f81;hb=a323f3adf275954727f32895eea37bfcf0aa9fb7;hpb=07a47add60b567f65dd2051fe45ac49e1ae97524

diff --git a/interface.c b/interface.c
index 20956be..4b22807 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"
@@ -18,10 +19,6 @@ enum {
 	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_PROTO] = { .name = "proto", .type = BLOBMSG_TYPE_STRING },
 	[IFACE_ATTR_IFNAME] = { .name = "ifname", .type = BLOBMSG_TYPE_STRING },
@@ -31,7 +28,6 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 const struct config_param_list interface_attr_list = {
 	.n_params = IFACE_ATTR_MAX,
 	.params = iface_attrs,
-	.info = iface_attr_info,
 };
 
 static void
@@ -88,8 +84,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;
 }
 
@@ -101,7 +98,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;
 
@@ -127,8 +124,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);
 }
 
@@ -150,10 +145,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)
@@ -201,12 +196,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)
@@ -218,22 +214,31 @@ interface_alloc(const char *name, struct uci_section *s, struct blob_attr *attr)
 	strncpy(iface->name, name, sizeof(iface->name) - 1);
 	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_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);
 	}
 
+	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;
 }
 
@@ -293,7 +298,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;
 	}
@@ -307,8 +312,13 @@ interface_set_up(struct interface *iface)
 int
 interface_set_down(struct interface *iface)
 {
-	iface->autostart = false;
-	__interface_set_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;
 }
@@ -319,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);
 	}
 }