X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=interface.c;h=ef176f64b99415f57ff80e8908b6f5c1a8b668b3;hp=d45f2d5120d0ed93b1e7d51b4a5e4a379e7c69c3;hb=6b7accf51072d883a7692d7a4bb1d7d1a2e7242b;hpb=5d1fff7af6f77c9bf0d46572c7af563cd9fc55b3

diff --git a/interface.c b/interface.c
index d45f2d5..ef176f6 100644
--- a/interface.c
+++ b/interface.c
@@ -3,44 +3,107 @@
 #include <stdio.h>
 
 #include "netifd.h"
+#include "device.h"
+#include "interface.h"
+#include "proto.h"
 #include "ubus.h"
 
-LIST_HEAD(interfaces);
+static LIST_HEAD(interfaces);
 
-static int interface_event(struct interface *iface, enum interface_event ev)
+static void
+clear_interface_errors(struct interface *iface)
 {
-	if (!iface->state || !iface->state->event)
-		return 0;
+	struct interface_error *error, *tmp;
+
+	list_for_each_entry_safe(error, tmp, &iface->errors, list) {
+		list_del(&error->list);
+		free(error);
+	}
+}
+
+void interface_add_error(struct interface *iface, const char *subsystem,
+			 const char *code, const char **data, int n_data)
+{
+	struct interface_error *error;
+	int i, len = 0;
+	int *datalen;
+	char *dest;
+
+	if (n_data) {
+		len = n_data * sizeof(char *);
+		datalen = alloca(len);
+		for (i = 0; i < n_data; i++) {
+			datalen[i] = strlen(data[i]) + 1;
+			len += datalen[i];
+		}
+	}
 
-	return iface->state->event(iface, iface->state, ev);
+	error = calloc(1, sizeof(*error) + sizeof(char *) + len);
+	if (!error)
+		return;
+
+	list_add_tail(&error->list, &iface->errors);
+	error->subsystem = subsystem;
+	error->code = code;
+
+	dest = (char *) &error->data[n_data + 1];
+	for (i = 0; i < n_data; i++) {
+		error->data[i] = dest;
+		memcpy(dest, data[i], datalen[i]);
+		dest += datalen[i];
+	}
+	error->data[n_data] = NULL;
+}
+
+static void
+interface_event(struct interface *iface, enum interface_event ev)
+{
+	/* TODO */
 }
 
 static void
+mark_interface_down(struct interface *iface)
+{
+	release_device(iface->main_dev.dev);
+	iface->state = IFS_DOWN;
+}
+
+static int
 __set_interface_up(struct interface *iface)
 {
-	if (iface->up)
-		return;
+	int ret;
 
-	if (claim_device(iface->main_dev.dev) < 0)
-		return;
+	if (iface->state != IFS_DOWN)
+		return 0;
 
-	if (interface_event(iface, IFEV_UP) < 0) {
-		release_device(iface->main_dev.dev);
-		return;
+	ret = claim_device(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)
+__set_interface_down(struct interface *iface, bool force)
 {
-	if (!iface->up)
+	clear_interface_errors(iface);
+
+	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_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
 }
 
 static void
@@ -67,14 +130,52 @@ interface_cb(struct device_user *dep, enum device_event ev)
 	iface->active = new_state;
 
 	if (new_state) {
-		if (iface->autostart)
-			__set_interface_up(iface);
+		if (iface->autostart && !config_init)
+			set_interface_up(iface);
 	} else
-		__set_interface_down(iface);
+		__set_interface_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 interface *iface;
 
@@ -87,6 +188,10 @@ alloc_interface(const char *name)
 	iface->l3_iface = &iface->main_dev;
 	strncpy(iface->name, name, sizeof(iface->name) - 1);
 	list_add(&iface->list, &interfaces);
+	INIT_LIST_HEAD(&iface->errors);
+
+	proto_attach_interface(iface, s);
+
 	netifd_ubus_add_interface(iface);
 
 	return iface;
@@ -97,8 +202,8 @@ free_interface(struct interface *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);
 }
 
@@ -115,12 +220,12 @@ 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;
 	}
 
@@ -128,17 +233,17 @@ interface_remove_link(struct interface *iface, struct device *llif)
 }
 
 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);
+	add_device_user(&iface->main_dev, dev);
 
 	return 0;
 }
@@ -148,22 +253,33 @@ set_interface_up(struct interface *iface)
 {
 	iface->autostart = true;
 
-	if (iface->up || !iface->active)
+	if (!iface->active) {
+		interface_add_error(iface, "interface", "NO_DEVICE", NULL, 0);
 		return -1;
+	}
 
-	__set_interface_up(iface);
-	return 0;
+	if (iface->state != IFS_DOWN)
+		return 0;
+
+	return __set_interface_up(iface);
 }
 
 int
 set_interface_down(struct interface *iface)
 {
 	iface->autostart = false;
+	__set_interface_down(iface, false);
 
-	if (!iface->up)
-		return -1;
+	return 0;
+}
 
-	__set_interface_down(iface);
+void
+start_pending_interfaces(void)
+{
+	struct interface *iface;
 
-	return 0;
+	list_for_each_entry(iface, &interfaces, list) {
+		if (iface->active && iface->autostart)
+			set_interface_up(iface);
+	}
 }