X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fconfig.c;h=d6b4e81ab027e8cdbfa1d0784837f4f71afbcb88;hp=943f2430326cb40e251f1dc67e7b0caca2dc333a;hb=9dd5316deae6402de68ddc8a08d1a6b496101828;hpb=eea7d037b93020dd5d5d2e5a698e88650a0f0912

diff --git a/src/config.c b/src/config.c
index 943f243..d6b4e81 100644
--- a/src/config.c
+++ b/src/config.c
@@ -17,8 +17,9 @@ static struct blob_buf b;
 static int reload_pipe[2];
 struct list_head leases = LIST_HEAD_INIT(leases);
 struct list_head interfaces = LIST_HEAD_INIT(interfaces);
-struct config config = {.legacy = false, .dhcp_cb = NULL,
-			.dhcp_statefile = NULL, .log_level = LOG_INFO};
+struct config config = {.legacy = false, .main_dhcpv4 = false,
+			.dhcp_cb = NULL, .dhcp_statefile = NULL,
+			.log_level = LOG_INFO};
 
 enum {
 	IFACE_ATTR_INTERFACE,
@@ -49,6 +50,7 @@ enum {
 	IFACE_ATTR_RA_MAXINTERVAL,
 	IFACE_ATTR_RA_LIFETIME,
 	IFACE_ATTR_RA_USELEASETIME,
+	IFACE_ATTR_RA_MTU,
 	IFACE_ATTR_PD_MANAGER,
 	IFACE_ATTR_PD_CER,
 	IFACE_ATTR_NDPROXY_ROUTING,
@@ -87,6 +89,7 @@ static const struct blobmsg_policy iface_attrs[IFACE_ATTR_MAX] = {
 	[IFACE_ATTR_RA_MAXINTERVAL] = { .name = "ra_maxinterval", .type = BLOBMSG_TYPE_INT32 },
 	[IFACE_ATTR_RA_LIFETIME] = { .name = "ra_lifetime", .type = BLOBMSG_TYPE_INT32 },
 	[IFACE_ATTR_RA_USELEASETIME] = { .name = "ra_useleasetime", .type = BLOBMSG_TYPE_BOOL },
+	[IFACE_ATTR_RA_MTU] = { .name = "ra_mtu", .type = BLOBMSG_TYPE_INT32 },
 	[IFACE_ATTR_NDPROXY_ROUTING] = { .name = "ndproxy_routing", .type = BLOBMSG_TYPE_BOOL },
 	[IFACE_ATTR_NDPROXY_SLAVE] = { .name = "ndproxy_slave", .type = BLOBMSG_TYPE_BOOL },
 };
@@ -128,6 +131,7 @@ const struct uci_blob_param_list lease_attr_list = {
 };
 
 enum {
+	ODHCPD_ATTR_LEGACY,
 	ODHCPD_ATTR_MAINDHCP,
 	ODHCPD_ATTR_LEASEFILE,
 	ODHCPD_ATTR_LEASETRIGGER,
@@ -136,6 +140,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 },
@@ -249,9 +254,12 @@ 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_MAINDHCP]))
+	if ((c = tb[ODHCPD_ATTR_LEGACY]))
 		config.legacy = blobmsg_get_bool(c);
 
+	if ((c = tb[ODHCPD_ATTR_MAINDHCP]))
+		config.main_dhcpv4 = blobmsg_get_bool(c);
+
 	if ((c = tb[ODHCPD_ATTR_LEASEFILE])) {
 		free(config.dhcp_statefile);
 		config.dhcp_statefile = strdup(blobmsg_get_string(c));
@@ -433,7 +441,7 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 	if ((c = tb[IFACE_ATTR_START])) {
 		iface->dhcpv4_start.s_addr = htonl(blobmsg_get_u32(c));
 
-		if (config.legacy)
+		if (config.main_dhcpv4 && config.legacy)
 			iface->dhcpv4 = RELAYD_SERVER;
 	}
 
@@ -471,8 +479,10 @@ int config_parse_interface(void *data, size_t len, const char *name, bool overwr
 	}
 
 	if ((c = tb[IFACE_ATTR_DHCPV4])) {
-		if ((mode = parse_mode(blobmsg_get_string(c))) >= 0)
-			iface->dhcpv4 = mode;
+		if ((mode = parse_mode(blobmsg_get_string(c))) >= 0) {
+			if (config.main_dhcpv4)
+				iface->dhcpv4 = mode;
+		}
 		else
 			goto err;
 	}
@@ -586,6 +596,12 @@ 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);
 
+	if ((c = tb[IFACE_ATTR_RA_MTU])) {
+		iface->ra_mtu = blobmsg_get_u32(c);
+		if (iface->ra_mtu < 1280)
+			goto err;
+	}
+
 	if ((c = tb[IFACE_ATTR_RA_OFFLINK]))
 		iface->ra_not_onlink = blobmsg_get_bool(c);