projects
/
project
/
odhcpd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
config: Prioritize ifname resolving via ubus over ifname/networkid attributes
[project/odhcpd.git]
/
src
/
config.c
diff --git
a/src/config.c
b/src/config.c
index
4fc8bc7
..
74ab3dd
100644
(file)
--- a/
src/config.c
+++ b/
src/config.c
@@
-300,11
+300,6
@@
int config_parse_interface(void *data, size_t len, const char *name, bool overwr
}
const char *ifname = NULL;
}
const char *ifname = NULL;
-#ifdef WITH_UBUS
- if (overwrite || !iface->ifname[0])
- ifname = ubus_get_ifname(name);
-#endif
-
if (overwrite) {
if ((c = tb[IFACE_ATTR_IFNAME]))
ifname = blobmsg_get_string(c);
if (overwrite) {
if ((c = tb[IFACE_ATTR_IFNAME]))
ifname = blobmsg_get_string(c);
@@
-312,6
+307,11
@@
int config_parse_interface(void *data, size_t len, const char *name, bool overwr
ifname = blobmsg_get_string(c);
}
ifname = blobmsg_get_string(c);
}
+#ifdef WITH_UBUS
+ if (overwrite || !iface->ifname[0])
+ ifname = ubus_get_ifname(name);
+#endif
+
if (!iface->ifname[0] && !ifname)
goto err;
if (!iface->ifname[0] && !ifname)
goto err;