From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 7 Sep 2011 07:18:54 +0000 (+0200)
Subject: move more stuff out of netifd.h
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3fa53680c85a6e029a3e7b4d673bffee4795fa52;p=oweals%2Fnetifd.git

move more stuff out of netifd.h
---

diff --git a/config.c b/config.c
index 2a46532..81cbd28 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)
 {
diff --git a/config.h b/config.h
index 22a562f..5623a40 100644
--- 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 69aa5cd..dc69abc 100644
--- 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 2535972..69210ac 100644
--- 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