X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fconfig.c;h=195a9a420c20156c34070054a0b060faed72ec20;hp=65b35519ab2b09b76f2fe8e1aa0fdc45f91c1a8e;hb=025572363ee84e8477581dbca321efaee3ebdddb;hpb=3ebfad09209efc88d21bc4ede6d88516dc584ea3

diff --git a/src/config.c b/src/config.c
index 65b3551..195a9a4 100644
--- a/src/config.c
+++ b/src/config.c
@@ -108,7 +108,7 @@ const struct uci_blob_param_list lease_attr_list = {
 
 
 enum {
-	ODHCPD_ATTR_LEGACY,
+	ODHCPD_ATTR_MAINDHCP,
 	ODHCPD_ATTR_LEASEFILE,
 	ODHCPD_ATTR_LEASETRIGGER,
 	ODHCPD_ATTR_MAX
@@ -116,7 +116,7 @@ enum {
 
 
 static const struct blobmsg_policy odhcpd_attrs[LEASE_ATTR_MAX] = {
-	[ODHCPD_ATTR_LEGACY] = { .name = "legacy", .type = BLOBMSG_TYPE_BOOL },
+	[ODHCPD_ATTR_MAINDHCP] = { .name = "maindhcp", .type = BLOBMSG_TYPE_BOOL },
 	[ODHCPD_ATTR_LEASEFILE] = { .name = "leasefile", .type = BLOBMSG_TYPE_STRING },
 	[ODHCPD_ATTR_LEASETRIGGER] = { .name = "leasetrigger", .type = BLOBMSG_TYPE_STRING },
 };
@@ -188,7 +188,7 @@ static void set_config(struct uci_section *s)
 	uci_to_blob(&b, s, &odhcpd_attr_list);
 	blobmsg_parse(odhcpd_attrs, ODHCPD_ATTR_MAX, tb, blob_data(b.head), blob_len(b.head));
 
-	if ((c = tb[ODHCPD_ATTR_LEGACY]))
+	if ((c = tb[ODHCPD_ATTR_MAINDHCP]))
 		config.legacy = blobmsg_get_bool(c);
 
 	if ((c = tb[ODHCPD_ATTR_LEASEFILE])) {
@@ -302,6 +302,9 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 	if (ifname)
 		strncpy(iface->ifname, ifname, sizeof(iface->ifname) - 1);
 
+	if ((iface->ifindex = if_nametoindex(iface->ifname)) <= 0)
+		return -1;
+
 	iface->inuse = true;
 
 	if ((c = tb[IFACE_ATTR_DYNAMICDHCP]))
@@ -451,6 +454,8 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 
 	if ((c = tb[IFACE_ATTR_RA_MANAGEMENT]))
 		iface->managed = blobmsg_get_u32(c);
+	else
+		iface->managed = 1;
 
 	if ((c = tb[IFACE_ATTR_RA_OFFLINK]))
 		iface->ra_not_onlink = blobmsg_get_bool(c);
@@ -494,7 +499,6 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 		}
 	}
 
-	iface->ignore = (iface->ifindex = if_nametoindex(iface->ifname)) <= 0;
 	return 0;
 
 err:
@@ -558,7 +562,7 @@ void odhcpd_reload(void)
 
 		enum odhcpd_mode hybrid_mode = RELAYD_DISABLED;
 #ifdef WITH_UBUS
-		if (ubus_has_prefix(i->name, i->ifname))
+		if (!ubus_has_prefix(i->name, i->ifname))
 			hybrid_mode = RELAYD_RELAY;
 #endif