move more stuff out of netifd.h

diff --git a/config.c b/config.c
index 2a4653259b9ff3fbafa73c49295724afe45d2275..81cbd28180f42c817c139c2044d5425612ec7dcc 100644 (file)
--- 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)
 {

diff --git a/config.h b/config.h
index 22a562f0d4637a829e44d3e3402a9f031cc1ffde..5623a40fcd0022ec74d2ee2f6e44b845e1291941 100644 (file)
--- a/config.h
+++ b/config.h
@@ -3,6 +3,8 @@
 
 #include <libubox/blobmsg.h>
 
+extern bool config_init;
+
 enum config_param_type {
        CONFIG_PARAM_TYPE_SIMPLE,
        CONFIG_PARAM_TYPE_LIST,
@@ -28,7 +30,7 @@ struct config_state {
        unsigned int version;
 };
 
+void config_init_interfaces(const char *name);
 void config_set_state(struct config_state *state, const struct blob_attr *attr);
 
-
 #endif

diff --git a/main.c b/main.c
index 69aa5cd5339afd68c3ad7f337eabbf3a6415065b..dc69abc15c08a6a2bb7b61fc4d70afe46b69fcf6 100644 (file)
--- a/main.c
+++ b/main.c
@@ -5,6 +5,7 @@
 
 #include "netifd.h"
 #include "ubus.h"
+#include "config.h"
 
 static int usage(const char *progname)
 {

diff --git a/netifd.h b/netifd.h
index 2535972bfbea7b100e818a65217aef782506a34a..69210acc80ef52b9310087003f0e7920029624f2 100644 (file)
--- a/netifd.h
+++ b/netifd.h
@@ -10,16 +10,10 @@
 #include <libubox/uloop.h>
 
 #include <libubus.h>
-#include <uci.h>
 
 #include "utils.h"
 
 struct device;
 struct interface;
 
-extern struct uci_context *uci_ctx;
-extern bool config_init;
-
-void config_init_interfaces(const char *name);
-
 #endif