add rudimentary protocol handling

[project/netifd.git] / interface.c

diff --git a/interface.c b/interface.c
index d45f2d5..78cfe12 100644 (file)
--- a/interface.c
+++ b/interface.c
@@ -3,43 +3,101 @@
 #include <stdio.h>
 
 #include "netifd.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;
 
-       return iface->state->event(iface, iface->state, ev);
+       list_for_each_entry_safe(error, tmp, &iface->errors, list) {
+               list_del(&error->list);
+               free(error);
+       }
 }
 
-static void
-__set_interface_up(struct interface *iface)
+void interface_add_error(struct interface *iface, const char *subsystem,
+                        const char *code, const char **data, int n_data)
 {
-       if (iface->up)
-               return;
+       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];
+               }
+       }
 
-       if (claim_device(iface->main_dev.dev) < 0)
+       error = calloc(1, sizeof(*error) + sizeof(char *) + len);
+       if (!error)
                return;
 
-       if (interface_event(iface, IFEV_UP) < 0) {
-               release_device(iface->main_dev.dev);
-               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;
+}
 
-       iface->up = true;
+static void
+interface_event(struct interface *iface, enum interface_event ev)
+{
+       /* TODO */
+}
+
+static int
+__set_interface_up(struct interface *iface)
+{
+       int ret;
+
+       if (iface->state != IFS_DOWN)
+               return 0;
+
+       ret = claim_device(iface->main_dev.dev);
+       if (ret)
+               goto out;
+
+       iface->state = IFS_SETUP;
+       ret = iface->proto->handler(iface->proto, PROTO_CMD_SETUP, false);
+       if (ret)
+               goto release;
+
+       return 0;
+
+release:
+       release_device(iface->main_dev.dev);
+out:
+       iface->state = IFS_DOWN;
+       return ret;
 }
 
 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);
+
+       iface->proto->handler(iface->proto, PROTO_CMD_TEARDOWN, force);
        release_device(iface->main_dev.dev);
 }
 
@@ -68,9 +126,44 @@ interface_cb(struct device_user *dep, enum device_event ev)
 
        if (new_state) {
                if (iface->autostart)
-                       __set_interface_up(iface);
+                       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:
+               iface->state = IFS_DOWN;
+               break;
+       }
+}
+
+void interface_set_proto_state(struct interface *iface, struct interface_proto_state *state)
+{
+       if (iface->proto) {
+               iface->proto->handler(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 *
@@ -83,10 +176,19 @@ 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);
        list_add(&iface->list, &interfaces);
+       INIT_LIST_HEAD(&iface->errors);
+
        netifd_ubus_add_interface(iface);
 
        return iface;
@@ -97,8 +199,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);
 }
 
@@ -148,22 +250,22 @@ 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;
-
-       if (!iface->up)
-               return -1;
-
-       __set_interface_down(iface);
+       __set_interface_down(iface, false);
 
        return 0;
 }