projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
extend vlist code to allow keeping the old data structure instead of the new one...
[project/netifd.git]
/
config.c
diff --git
a/config.c
b/config.c
index
2a46532
..
8705c16
100644
(file)
--- a/
config.c
+++ b/
config.c
@@
-2,17
+2,20
@@
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
+#include <uci.h>
+
#include "netifd.h"
#include "interface.h"
#include "proto.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;
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 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)
{
static void uci_attr_to_blob(struct blob_buf *b, const char *str,
const char *name, enum blobmsg_type type)
{
@@
-212,7
+215,9
@@
config_init_interfaces(const char *name)
ctx = uci_alloc_context();
uci_ctx = ctx;
ctx = uci_alloc_context();
uci_ctx = ctx;
+#ifdef DUMMY_MODE
uci_set_confdir(ctx, "./config");
uci_set_confdir(ctx, "./config");
+#endif
if (uci_load(ctx, "network", &p)) {
fprintf(stderr, "Failed to load network config\n");
if (uci_load(ctx, "network", &p)) {
fprintf(stderr, "Failed to load network config\n");