add some configuration code for interfaces, bind interfaces to regular devices

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index 7bf0ed4..06a36ed 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -3,9 +3,12 @@
 #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 void
 clear_interface_errors(struct interface *iface)
@@ -52,43 +55,55 @@ void interface_add_error(struct interface *iface, const char *subsystem,
        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
+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)
 {
        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_proto_event(iface->proto, PROTO_CMD_TEARDOWN, force);
 }
 
 static void
@@ -115,10 +130,48 @@ 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 *
@@ -131,6 +184,13 @@ alloc_interface(const char *name)
                return iface;
 
        iface = calloc(1, sizeof(*iface));
+
+       interface_set_proto_state(iface, get_default_proto());
+       if (!iface->proto) {
+               free(iface);
+               return NULL;
+       }
+
        iface->main_dev.cb = interface_cb;
        iface->l3_iface = &iface->main_dev;
        strncpy(iface->name, name, sizeof(iface->name) - 1);
@@ -147,8 +207,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);
 }
 
@@ -165,12 +225,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;
        }
 
@@ -178,17 +238,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;
 }
@@ -203,18 +263,28 @@ set_interface_up(struct interface *iface)
                return -1;
        }
 
-       if (iface->up)
-               return -1;
+       if (iface->state != IFS_DOWN)
+               return 0;
 
-       __set_interface_up(iface);
-       return 0;
+       return __set_interface_up(iface);
 }
 
 int
 set_interface_down(struct interface *iface)
 {
        iface->autostart = false;
-       __set_interface_down(iface);
+       __set_interface_down(iface, false);
 
        return 0;
 }
+
+void
+start_pending_interfaces(void)
+{
+       struct interface *iface;
+
+       list_for_each_entry(iface, &interfaces, list) {
+               if (iface->active && iface->autostart)
+                       set_interface_up(iface);
+       }
+}