projects
/
project
/
netifd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
interface: do not clear errors after an interface is marked as down, the user might...
[project/netifd.git]
/
config.c
diff --git
a/config.c
b/config.c
index
5687b4c
..
98c46b3
100644
(file)
--- a/
config.c
+++ b/
config.c
@@
-29,7
+29,7
@@
static struct uci_context *uci_ctx;
static struct uci_package *uci_network;
static struct blob_buf b;
static struct uci_package *uci_network;
static struct blob_buf b;
-static
void
uci_attr_to_blob(struct blob_buf *b, const char *str,
+static
bool
uci_attr_to_blob(struct blob_buf *b, const char *str,
const char *name, enum blobmsg_type type)
{
char *err;
const char *name, enum blobmsg_type type)
{
char *err;
@@
-45,20
+45,21
@@
static void uci_attr_to_blob(struct blob_buf *b, const char *str,
else if (!strcmp(str, "false") || !strcmp(str, "0"))
intval = 0;
else
else if (!strcmp(str, "false") || !strcmp(str, "0"))
intval = 0;
else
- return;
+ return
false
;
blobmsg_add_u8(b, name, intval);
break;
case BLOBMSG_TYPE_INT32:
intval = strtol(str, &err, 0);
if (*err)
blobmsg_add_u8(b, name, intval);
break;
case BLOBMSG_TYPE_INT32:
intval = strtol(str, &err, 0);
if (*err)
- return;
+ return
false
;
blobmsg_add_u32(b, name, intval);
break;
default:
blobmsg_add_u32(b, name, intval);
break;
default:
-
break
;
+
return false
;
}
}
+ return true;
}
static void uci_array_to_blob(struct blob_buf *b, struct uci_option *o,
}
static void uci_array_to_blob(struct blob_buf *b, struct uci_option *o,
@@
-87,14
+88,14
@@
static void uci_array_to_blob(struct blob_buf *b, struct uci_option *o,
free(str);
}
free(str);
}
-static
void
__uci_to_blob(struct blob_buf *b, struct uci_section *s,
-
const struct config_param_list *p)
+static
int
__uci_to_blob(struct blob_buf *b, struct uci_section *s,
+ const struct config_param_list *p)
{
const struct blobmsg_policy *attr = NULL;
struct uci_element *e;
struct uci_option *o;
void *array;
{
const struct blobmsg_policy *attr = NULL;
struct uci_element *e;
struct uci_option *o;
void *array;
- int i;
+ int i
, ret = 0
;
uci_foreach_element(&s->options, e) {
for (i = 0; i < p->n_params; i++) {
uci_foreach_element(&s->options, e) {
for (i = 0; i < p->n_params; i++) {
@@
-115,24
+116,30
@@
static void __uci_to_blob(struct blob_buf *b, struct uci_section *s,
array = blobmsg_open_array(b, attr->name);
uci_array_to_blob(b, o, p->info[i].type);
blobmsg_close_array(b, array);
array = blobmsg_open_array(b, attr->name);
uci_array_to_blob(b, o, p->info[i].type);
blobmsg_close_array(b, array);
+ ret++;
continue;
}
if (o->type == UCI_TYPE_LIST)
continue;
continue;
}
if (o->type == UCI_TYPE_LIST)
continue;
- uci_attr_to_blob(b, o->v.string, attr->name, attr->type);
+
ret +=
uci_attr_to_blob(b, o->v.string, attr->name, attr->type);
}
}
+
+ return ret;
}
}
-static
void
uci_to_blob(struct blob_buf *b, struct uci_section *s,
-
const struct config_param_list *p)
+static
int
uci_to_blob(struct blob_buf *b, struct uci_section *s,
+ const struct config_param_list *p)
{
{
+ int ret = 0;
int i;
int i;
- __uci_to_blob(b, s, p);
+
ret +=
__uci_to_blob(b, s, p);
for (i = 0; i < p->n_next; i++)
for (i = 0; i < p->n_next; i++)
- uci_to_blob(b, s, p->next[i]);
+ ret += uci_to_blob(b, s, p->next[i]);
+
+ return ret;
}
static int
}
static int
@@
-156,20
+163,25
@@
config_parse_bridge_interface(struct uci_section *s)
}
static void
}
static void
-config_parse_interface(struct uci_section *s)
+config_parse_interface(struct uci_section *s
, bool alias
)
{
struct interface *iface;
{
struct interface *iface;
- const char *type;
+ const char *type
= NULL
;
struct blob_attr *config;
struct device *dev;
struct blob_attr *config;
struct device *dev;
+ bool bridge = false;
blob_buf_init(&b, 0);
blob_buf_init(&b, 0);
- type = uci_lookup_option_string(uci_ctx, s, "type");
- if (type && !strcmp(type, "bridge"))
+ if (!alias)
+ type = uci_lookup_option_string(uci_ctx, s, "type");
+ if (type && !strcmp(type, "bridge")) {
if (config_parse_bridge_interface(s))
return;
if (config_parse_bridge_interface(s))
return;
+ bridge = true;
+ }
+
uci_to_blob(&b, s, &interface_attr_list);
iface = calloc(1, sizeof(*iface));
if (!iface)
uci_to_blob(&b, s, &interface_attr_list);
iface = calloc(1, sizeof(*iface));
if (!iface)
@@
-180,14
+192,21
@@
config_parse_interface(struct uci_section *s)
if (iface->proto_handler && iface->proto_handler->config_params)
uci_to_blob(&b, s, iface->proto_handler->config_params);
if (iface->proto_handler && iface->proto_handler->config_params)
uci_to_blob(&b, s, iface->proto_handler->config_params);
+ if (!bridge && uci_to_blob(&b, s, simple_device_type.config_params))
+ iface->device_config = true;
+
config = malloc(blob_pad_len(b.head));
config = malloc(blob_pad_len(b.head));
- if (!config) {
- free(iface);
- return;
- }
+ if (!config)
+ goto error;
memcpy(config, b.head, blob_pad_len(b.head));
memcpy(config, b.head, blob_pad_len(b.head));
- interface_add(iface, config);
+
+ if (alias) {
+ if (!interface_add_alias(iface, config))
+ goto error_free_config;
+ } else {
+ interface_add(iface, config);
+ }
/*
* need to look up the interface name again, in case of config update,
/*
* need to look up the interface name again, in case of config update,
@@
-207,6
+226,11
@@
config_parse_interface(struct uci_section *s)
return;
device_set_config(dev, dev->type, b.head);
return;
device_set_config(dev, dev->type, b.head);
+ return;
+error_free_config:
+ free(config);
+error:
+ free(iface);
}
static void
}
static void
@@
-378,7
+402,14
@@
config_init_interfaces(void)
struct uci_section *s = uci_to_section(e);
if (!strcmp(s->type, "interface"))
struct uci_section *s = uci_to_section(e);
if (!strcmp(s->type, "interface"))
- config_parse_interface(s);
+ config_parse_interface(s, false);
+ }
+
+ uci_foreach_element(&uci_network->sections, e) {
+ struct uci_section *s = uci_to_section(e);
+
+ if (!strcmp(s->type, "alias"))
+ config_parse_interface(s, true);
}
}
}
}
@@
-427,7
+458,7
@@
config_init_all(void)
device_reset_old();
device_init_pending();
device_reset_old();
device_init_pending();
- device_free_unused(NULL);
vlist_flush(&interfaces);
vlist_flush(&interfaces);
+ device_free_unused(NULL);
interface_start_pending();
}
interface_start_pending();
}