X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fnetifd.git;a=blobdiff_plain;f=config.c;h=8705c16accaa799dcd32e91bc3734838df89e2d5;hp=31ebb8dc117001a4f31ca48d46215964b88ca7ac;hb=98565127c60cba3d5b747bb9eb698e06d187f45b;hpb=df13b3ade3f366446033214b3a85228005c014ea

diff --git a/config.c b/config.c
index 31ebb8d..8705c16 100644
--- a/config.c
+++ b/config.c
@@ -2,17 +2,20 @@
 #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 uci_context *uci_ctx;
+static struct uci_package *uci_network;
 static struct blob_buf b;
 static unsigned int config_version = 1;
 
-
 static void uci_attr_to_blob(struct blob_buf *b, const char *str,
 			     const char *name, enum blobmsg_type type)
 {
@@ -140,7 +143,7 @@ config_parse_bridge_interface(struct uci_section *s)
 }
 
 void
-config_set_state(struct config_state *state, struct blob_attr *attr)
+config_set_state(struct config_state *state, const struct blob_attr *attr)
 {
 	state->data = malloc(blob_pad_len(attr));
 	if (!state->data)
@@ -177,7 +180,7 @@ config_parse_interface(struct uci_section *s)
 	iface->config.version = config_version;
 }
 
-void
+static void
 config_init_devices(void)
 {
 	struct uci_element *e;
@@ -212,7 +215,9 @@ config_init_interfaces(const char *name)
 	ctx = uci_alloc_context();
 	uci_ctx = ctx;
 
+#ifdef DUMMY_MODE
 	uci_set_confdir(ctx, "./config");
+#endif
 
 	if (uci_load(ctx, "network", &p)) {
 		fprintf(stderr, "Failed to load network config\n");