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
1649cee
..
8705c16
100644
(file)
--- a/
config.c
+++ b/
config.c
@@
-2,15
+2,19
@@
#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 blob_buf b;
+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)
static void uci_attr_to_blob(struct blob_buf *b, const char *str,
const char *name, enum blobmsg_type type)
@@
-138,6
+142,16
@@
config_parse_bridge_interface(struct uci_section *s)
return 0;
}
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)
{
static void
config_parse_interface(struct uci_section *s)
{
@@
-163,9
+177,10
@@
config_parse_interface(struct uci_section *s)
uci_to_blob(&b, s, iface->proto_handler->config_params);
proto_init_interface(iface, b.head);
uci_to_blob(&b, s, iface->proto_handler->config_params);
proto_init_interface(iface, b.head);
+ iface->config.version = config_version;
}
}
-void
+
static
void
config_init_devices(void)
{
struct uci_element *e;
config_init_devices(void)
{
struct uci_element *e;
@@
-200,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");
@@
-221,7
+238,7
@@
config_init_interfaces(const char *name)
if (!strcmp(s->type, "interface"))
config_parse_interface(s);
}
if (!strcmp(s->type, "interface"))
config_parse_interface(s);
}
- device_free_
all(
);
+ device_free_
unused(NULL
);
config_init = false;
interface_start_pending();
config_init = false;
interface_start_pending();