X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fodhcpd.c;h=71b803d01534935037d89c9f6da9dc91f58732d1;hp=97a6de92f34620fa79f2d8516d354e957a4b3f08;hb=7aa2594c5a127d92fa8f04328ac7b43e595bcaa7;hpb=c516801e3dbb992ce1ea5274439b9b30888d9fb1;ds=sidebyside

diff --git a/src/odhcpd.c b/src/odhcpd.c
index 97a6de9..71b803d 100644
--- a/src/odhcpd.c
+++ b/src/odhcpd.c
@@ -187,8 +187,8 @@ ssize_t odhcpd_send(int socket, struct sockaddr_in6 *dest,
 
 	ssize_t sent = sendmsg(socket, &msg, MSG_DONTWAIT);
 	if (sent < 0)
-		syslog(LOG_NOTICE, "Failed to send to %s%%%s (%s)",
-				ipbuf, iface->ifname, strerror(errno));
+		syslog(LOG_NOTICE, "Failed to send to %s%%%s (%m)",
+				ipbuf, iface->ifname);
 	else
 		syslog(LOG_DEBUG, "Sent %li bytes to %s%%%s",
 				(long)sent, ipbuf, iface->ifname);
@@ -371,12 +371,6 @@ static void odhcpd_receive_packets(struct uloop_fd *u, _unused unsigned int even
 		if (addr.ll.sll_family == AF_PACKET)
 			destiface = addr.ll.sll_ifindex;
 
-		struct interface *iface =
-				odhcpd_get_interface_by_index(destiface);
-
-		if (!iface && addr.nl.nl_family != AF_NETLINK)
-			continue;
-
 		char ipbuf[INET6_ADDRSTRLEN] = "kernel";
 		if (addr.ll.sll_family == AF_PACKET &&
 				len >= (ssize_t)sizeof(struct ip6_hdr))
@@ -386,10 +380,26 @@ static void odhcpd_receive_packets(struct uloop_fd *u, _unused unsigned int even
 		else if (addr.in.sin_family == AF_INET)
 			inet_ntop(AF_INET, &addr.in.sin_addr, ipbuf, sizeof(ipbuf));
 
-		syslog(LOG_DEBUG, "Received %li Bytes from %s%%%s", (long)len,
-				ipbuf, (iface) ? iface->ifname : "netlink");
+		// From netlink
+		if (addr.nl.nl_family == AF_NETLINK) {
+			syslog(LOG_DEBUG, "Received %li Bytes from %s%%%s", (long)len,
+					ipbuf, "netlink");
+			e->handle_dgram(&addr, data_buf, len, NULL, dest);
+			return;
+		} else if (destiface != 0) {
+			struct interface *iface;
+			list_for_each_entry(iface, &interfaces, head) {
+				if (iface->ifindex != destiface)
+					continue;
+
+				syslog(LOG_DEBUG, "Received %li Bytes from %s%%%s", (long)len,
+						ipbuf, iface->ifname);
+
+				e->handle_dgram(&addr, data_buf, len, iface, dest);
+			}
+		}
+
 
-		e->handle_dgram(&addr, data_buf, len, iface, dest);
 	}
 }