projects
/
project
/
odhcpd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0fa1231
)
improve matching api
author
Steven Barth
<steven@midlink.org>
Tue, 15 Oct 2013 18:56:26 +0000
(20:56 +0200)
committer
Steven Barth
<steven@midlink.org>
Tue, 15 Oct 2013 18:56:26 +0000
(20:56 +0200)
src/ubus.c
patch
|
blob
|
history
diff --git
a/src/ubus.c
b/src/ubus.c
index
9116dd8
..
bf1d072
100644
(file)
--- a/
src/ubus.c
+++ b/
src/ubus.c
@@
-238,18
+238,25
@@
void ubus_apply_network(void)
const char *ifname = (tb[IFACE_ATTR_IFNAME]) ?
blobmsg_get_string(tb[IFACE_ATTR_IFNAME]) : "";
const char *ifname = (tb[IFACE_ATTR_IFNAME]) ?
blobmsg_get_string(tb[IFACE_ATTR_IFNAME]) : "";
+ bool matched = false;
struct interface *c;
list_for_each_entry(c, &interfaces, head) {
char *f = memmem(c->upstream, c->upstream_len,
interface, strlen(interface) + 1);
struct interface *c;
list_for_each_entry(c, &interfaces, head) {
char *f = memmem(c->upstream, c->upstream_len,
interface, strlen(interface) + 1);
- if (strcmp(interface, c->name) && strcmp(ifname, c->ifname) &&
- (!f || (f != c->upstream && f[-1] != 0)))
+ bool cmatched = !strcmp(interface, c->name) || !strcmp(ifname, c->ifname);
+ matched |= cmatched;
+
+ if (!cmatched && (!f || (f != c->upstream && f[-1] != 0)))
continue;
continue;
- if (!c
|| !c
->ignore)
+ if (!c->ignore)
config_parse_interface(blobmsg_data(tb[IFACE_ATTR_DATA]),
config_parse_interface(blobmsg_data(tb[IFACE_ATTR_DATA]),
- blobmsg_data_len(tb[IFACE_ATTR_DATA]),
interfac
e, false);
+ blobmsg_data_len(tb[IFACE_ATTR_DATA]),
c->nam
e, false);
}
}
+
+ if (!matched)
+ config_parse_interface(blobmsg_data(tb[IFACE_ATTR_DATA]),
+ blobmsg_data_len(tb[IFACE_ATTR_DATA]), interface, false);
}
}
}
}