#include <stdlib.h>
#include <stdio.h>
+#include <uci.h>
+
#include "netifd.h"
#include "interface.h"
#include "proto.h"
+#include "config.h"
-struct uci_context *uci_ctx;
-static struct uci_package *uci_network;
bool config_init = false;
-static struct blob_buf b;
-static unsigned int config_version = 1;
+static struct uci_context *uci_ctx;
+static struct uci_package *uci_network;
+static struct blob_buf b;
static void uci_attr_to_blob(struct blob_buf *b, const char *str,
const char *name, enum blobmsg_type type)
blobmsg_add_string(&b, "name", name);
uci_to_blob(&b, s, bridge_device_type.config_params);
- if (!bridge_device_type.create(b.head)) {
+ if (!device_create(name, &bridge_device_type, b.head)) {
DPRINTF("Failed to create bridge for interface '%s'\n", s->e.name);
return -EINVAL;
}
return 0;
}
-void
-config_set_state(struct config_state *state, const struct blob_attr *attr)
-{
- state->data = malloc(blob_pad_len(attr));
- if (!state->data)
- return;
-
- memcpy(state->data, attr, blob_pad_len(attr));
-}
-
static void
config_parse_interface(struct uci_section *s)
{
struct interface *iface;
const char *type;
+ struct blob_attr *config;
DPRINTF("Create interface '%s'\n", s->e.name);
return;
uci_to_blob(&b, s, &interface_attr_list);
- iface = interface_alloc(s->e.name, b.head);
+ iface = calloc(1, sizeof(*iface));
if (!iface)
return;
- blob_buf_init(&b, 0);
+ interface_init(iface, s->e.name, b.head);
+
if (iface->proto_handler && iface->proto_handler->config_params)
uci_to_blob(&b, s, iface->proto_handler->config_params);
- proto_init_interface(iface, b.head);
- iface->config.version = config_version;
+ config = malloc(blob_pad_len(b.head));
+ if (!config) {
+ free(iface);
+ return;
+ }
+
+ memcpy(config, b.head, blob_pad_len(b.head));
+ interface_add(iface, config);
}
static void
uci_foreach_element(&uci_network->sections, e) {
struct uci_section *s = uci_to_section(e);
const struct device_type *devtype;
- const char *type;
+ const char *type, *name;
if (strcmp(s->type, "device") != 0)
continue;
- blob_buf_init(&b, 0);
+ name = uci_lookup_option_string(uci_ctx, s, "name");
+ if (!name)
+ continue;
+
type = uci_lookup_option_string(uci_ctx, s, "type");
if (type && !strcmp(type, "bridge"))
devtype = &bridge_device_type;
else
devtype = &simple_device_type;
+ blob_buf_init(&b, 0);
uci_to_blob(&b, s, devtype->config_params);
- devtype->create(b.head);
+ device_create(name, devtype, b.head);
}
}
ctx = uci_alloc_context();
uci_ctx = ctx;
+#ifdef DUMMY_MODE
uci_set_confdir(ctx, "./config");
+ uci_set_savedir(ctx, "./tmp");
+#endif
if (uci_load(ctx, "network", &p)) {
fprintf(stderr, "Failed to load network config\n");