X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fdhcpv4.c;h=79fabe2dc6f3bd561eb28a77342249afe706cd77;hp=b4b072041c93ec43ae763350e8a457a7da91d765;hb=1565d76bd6ff2d1064c3d30e947dc70613417853;hpb=7ccb1f94756db1c737d978f530276a3ac266f7e8

diff --git a/src/dhcpv4.c b/src/dhcpv4.c
index b4b0720..79fabe2 100644
--- a/src/dhcpv4.c
+++ b/src/dhcpv4.c
@@ -38,6 +38,8 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
 		enum dhcpv4_msg msg, const uint8_t *mac, struct in_addr reqaddr,
 		const char *hostname);
 
+// Magic option for hnet internal (4B enterprise ID, 1B data-len, 1B subopt-code, 1B subopt-len)
+static uint8_t hnet_internal_data[7] = {0x00, 0x00, 0x76, 0xfe, 2, 1, 0};
 
 // Create socket and register events
 int init_dhcpv4(void)
@@ -49,6 +51,7 @@ int init_dhcpv4(void)
 int setup_dhcpv4_interface(struct interface *iface, bool enable)
 {
 	if (iface->dhcpv4_event.uloop.fd > 0) {
+		uloop_fd_delete(&iface->dhcpv4_event.uloop);
 		close(iface->dhcpv4_event.uloop.fd);
 		iface->dhcpv4_event.uloop.fd = -1;
 	}
@@ -284,6 +287,10 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
 		} else if (opt->type == DHCPV4_OPT_SERVERID && opt->len == 4) {
 			if (memcmp(opt->data, &ifaddr.sin_addr, 4))
 				return;
+		} else if (opt->type == DHCPV4_OPT_VENDOR_SPECIFIC_INFORMATION &&
+				opt->len == sizeof(hnet_internal_data)) {
+			if (!memcmp(opt->data, hnet_internal_data, sizeof(hnet_internal_data)))
+				return; // Ignoring hnet internal routers
 		}
 	}