add code for cleaning up unused devices mentioned in the config

[project/netifd.git] / config.c

diff --git a/config.c b/config.c
index a106db2..1711121 100644 (file)
--- a/config.c
+++ b/config.c
@@ -2,28 +2,155 @@
 #include <stdlib.h>
 #include <stdio.h>
 
 #include <stdlib.h>
 #include <stdio.h>
 

+#include <sys/types.h>
+#include <sys/socket.h>
+#include <net/ethernet.h>
+

 #include "netifd.h"
 #include "netifd.h"

+#include "interface.h"

 
 struct uci_context *uci_ctx;
 
 struct uci_context *uci_ctx;

+struct uci_package *uci_network;
+bool config_init = false;
+
+enum {
+       SIF_TYPE,
+       SIF_IFNAME,
+       __SIF_MAX,
+};
+
+static const struct uci_parse_option if_opts[__SIF_MAX] = {
+       [SIF_TYPE] = { "type", UCI_TYPE_STRING },
+       [SIF_IFNAME] = { "ifname", UCI_TYPE_STRING },
+};

 
 

-static void config_parse_interface(struct uci_section *s)
+static void
+config_parse_interface(struct uci_section *s)

 {
 {

+       struct uci_option *opts[__SIF_MAX];

        struct interface *iface;
        struct interface *iface;

+       struct device *dev;

        const char *type;
 
        DPRINTF("Create interface '%s'\n", s->e.name);
 
        iface = alloc_interface(s->e.name);
        const char *type;
 
        DPRINTF("Create interface '%s'\n", s->e.name);
 
        iface = alloc_interface(s->e.name);

-       type = uci_lookup_option_string(uci_ctx, s, "type");
+       if (!iface)
+               return;
+
+       uci_parse_section(s, if_opts, __SIF_MAX, opts);
+
+       if (opts[SIF_TYPE]) {
+               type = opts[SIF_TYPE]->v.string;
+
+               if (!strcmp(type, "bridge")) {
+                       interface_attach_bridge(iface, s);
+                       return;
+               }
+       }
+
+       if (opts[SIF_IFNAME]) {
+               dev = get_device(opts[SIF_IFNAME]->v.string, true);
+               if (!dev)
+                       return;
+
+               add_device_user(&iface->main_dev, dev);
+       }
+}
+
+enum {
+       SDEV_NAME,
+       SDEV_TYPE,
+       SDEV_MTU,
+       SDEV_MACADDR,
+       SDEV_TXQUEUELEN,
+       __SDEV_MAX,
+};
+
+static const struct uci_parse_option dev_opts[__SDEV_MAX] = {
+       [SDEV_NAME] = { "name", UCI_TYPE_STRING },
+       [SDEV_TYPE] = { "type", UCI_TYPE_STRING },
+       [SDEV_MTU] = { "mtu", UCI_TYPE_STRING },
+       [SDEV_MACADDR] = { "macaddr", UCI_TYPE_STRING },
+       [SDEV_TXQUEUELEN] = { "txqueuelen", UCI_TYPE_STRING },
+};
+
+static bool
+add_int_option(struct uci_option *o, unsigned int *dest)
+{
+       char *error = NULL;
+       int val;
+
+       if (!o)
+               return false;
+
+       val = strtoul(o->v.string, &error, 0);
+       if (error && *error)
+               return false;
+
+       *dest = val;
+       return true;
+}
+
+static void
+config_init_device_settings(struct device *dev, struct uci_option **opts)
+{
+       struct ether_addr *ea;

 
 

-       if (!type)
-               type = "";
+       dev->flags = 0;

 
 

-       if (!strcmp(type, "bridge"))
-               interface_attach_bridge(iface, s);
+       if (add_int_option(opts[SDEV_MTU], &dev->mtu))
+               dev->flags |= DEV_OPT_MTU;
+
+       if (add_int_option(opts[SDEV_TXQUEUELEN], &dev->txqueuelen))
+               dev->flags |= DEV_OPT_TXQUEUELEN;
+
+       if (opts[SDEV_MACADDR]) {
+               ea = ether_aton(opts[SDEV_MACADDR]->v.string);
+               if (ea) {
+                       memcpy(dev->macaddr, ea, sizeof(dev->macaddr));
+                       dev->flags |= DEV_OPT_MACADDR;
+               }
+       }
+}
+
+void
+config_init_devices(void)
+{
+       struct uci_element *e;
+       struct device *dev;
+       struct uci_option *opts[__SDEV_MAX];
+
+       uci_foreach_element(&uci_network->sections, e) {
+               struct uci_section *s = uci_to_section(e);
+
+               if (strcmp(s->type, "device") != 0)
+                       continue;
+
+               uci_parse_section(s, dev_opts, __SDEV_MAX, opts);
+               if (!opts[SDEV_NAME])
+                       continue;
+
+               dev = NULL;
+               if (opts[SDEV_TYPE]) {
+                       const char *type = opts[SDEV_TYPE]->v.string;
+
+                       if (!strcmp(type, "bridge"))
+                               dev = bridge_create(opts[SDEV_NAME]->v.string, s);
+               } else {
+                       dev = get_device(opts[SDEV_NAME]->v.string, true);
+               }
+
+               if (!dev)
+                       continue;
+
+               config_init_device_settings(dev, opts);
+               dev->config_hash = uci_hash_options(opts, __SDEV_MAX);
+       }

 }
 
 }
 

-void config_init_interfaces(const char *name)
+void
+config_init_interfaces(const char *name)

 {
        struct uci_context *ctx;
        struct uci_package *p = NULL;
 {
        struct uci_context *ctx;
        struct uci_package *p = NULL;


@@ -39,6 +166,11 @@ void config_init_interfaces(const char *name)
                return;
        }
 
                return;
        }
 

+       uci_network = p;
+       config_init = true;
+
+       config_init_devices();
+

        uci_foreach_element(&p->sections, e) {
                struct uci_section *s = uci_to_section(e);
 
        uci_foreach_element(&p->sections, e) {
                struct uci_section *s = uci_to_section(e);
 


@@ -48,4 +180,8 @@ void config_init_interfaces(const char *name)
                if (!strcmp(s->type, "interface"))
                        config_parse_interface(s);
        }
                if (!strcmp(s->type, "interface"))
                        config_parse_interface(s);
        }

+       cleanup_devices();
+       config_init = false;
+
+       start_pending_interfaces();

 }
 }