X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fodhcpd.c;h=794bbfc00648b6b08ad0bffe1944e03fd862ad38;hp=cb8451308a7f4cbe14ac49868775a727b690cffa;hb=98b41e5b07b28b438fb0be45ba294a932f4c849b;hpb=5df476f99b3254bfc26721452b17a5fc23e7142c

diff --git a/src/odhcpd.c b/src/odhcpd.c
index cb84513..794bbfc 100644
--- a/src/odhcpd.c
+++ b/src/odhcpd.c
@@ -52,6 +52,7 @@ static int urandom_fd = -1;
 int main()
 {
 	openlog("odhcpd", LOG_PERROR | LOG_PID, LOG_DAEMON);
+	setlogmask(LOG_UPTO(LOG_WARNING));
 	uloop_init();
 
 	if (getuid() != 0) {
@@ -174,7 +175,7 @@ ssize_t odhcpd_send(int socket, struct sockaddr_in6 *dest,
 		syslog(LOG_WARNING, "Failed to send to %s%%%s (%s)",
 				ipbuf, iface->ifname, strerror(errno));
 	else
-		syslog(LOG_NOTICE, "Sent %li bytes to %s%%%s",
+		syslog(LOG_DEBUG, "Sent %li bytes to %s%%%s",
 				(long)sent, ipbuf, iface->ifname);
 	return sent;
 }
@@ -216,7 +217,7 @@ ssize_t odhcpd_get_interface_addresses(int ifindex,
 
 		struct ifaddrmsg *ifa = NLMSG_DATA(nhm);
 		if (ifa->ifa_scope != RT_SCOPE_UNIVERSE ||
-				ifa->ifa_index != (unsigned)ifindex)
+				(ifindex && ifa->ifa_index != (unsigned)ifindex))
 			continue;
 
 		struct rtattr *rta = (struct rtattr*)&ifa[1];
@@ -318,6 +319,7 @@ static void odhcpd_receive_packets(struct uloop_fd *u, _unused unsigned int even
 		// Extract destination interface
 		int destiface = 0;
 		int *hlim = NULL;
+		void *dest = NULL;
 		struct in6_pktinfo *pktinfo;
 		struct in_pktinfo *pkt4info;
 		for (struct cmsghdr *ch = CMSG_FIRSTHDR(&msg); ch != NULL; ch = CMSG_NXTHDR(&msg, ch)) {
@@ -325,10 +327,12 @@ static void odhcpd_receive_packets(struct uloop_fd *u, _unused unsigned int even
 					ch->cmsg_type == IPV6_PKTINFO) {
 				pktinfo = (struct in6_pktinfo*)CMSG_DATA(ch);
 				destiface = pktinfo->ipi6_ifindex;
+				dest = &pktinfo->ipi6_addr;
 			} else if (ch->cmsg_level == IPPROTO_IP &&
 					ch->cmsg_type == IP_PKTINFO) {
 				pkt4info = (struct in_pktinfo*)CMSG_DATA(ch);
 				destiface = pkt4info->ipi_ifindex;
+				dest = &pkt4info->ipi_addr;
 			} else if (ch->cmsg_level == IPPROTO_IPV6 &&
 					ch->cmsg_type == IPV6_HOPLIMIT) {
 				hlim = (int*)CMSG_DATA(ch);
@@ -358,11 +362,11 @@ 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_NOTICE, "--");
-		syslog(LOG_NOTICE, "Received %li Bytes from %s%%%s", (long)len,
+		syslog(LOG_DEBUG, "--");
+		syslog(LOG_DEBUG, "Received %li Bytes from %s%%%s", (long)len,
 				ipbuf, (iface) ? iface->ifname : "netlink");
 
-		e->handle_dgram(&addr, data_buf, len, iface);
+		e->handle_dgram(&addr, data_buf, len, iface, dest);
 	}
 }
 
@@ -426,3 +430,33 @@ void odhcpd_hexlify(char *dst, const uint8_t *src, size_t len)
 	}
 	*dst = 0;
 }
+
+
+int odhcpd_bmemcmp(const void *av, const void *bv, size_t bits)
+{
+	const uint8_t *a = av, *b = bv;
+	size_t bytes = bits / 8;
+	bits %= 8;
+
+	int res = memcmp(a, b, bytes);
+	if (res == 0 && bits > 0)
+		res = (a[bytes] >> (8 - bits)) - (b[bytes] >> (8 - bits));
+
+	return res;
+}
+
+
+void odhcpd_bmemcpy(void *av, const void *bv, size_t bits)
+{
+	uint8_t *a = av;
+	const uint8_t *b = bv;
+
+	size_t bytes = bits / 8;
+	bits %= 8;
+	memcpy(a, b, bytes);
+
+	if (bits > 0) {
+		uint8_t mask = (1 << (8 - bits)) - 1;
+		a[bytes] = (a[bytes] & mask) | ((~mask) & b[bytes]);
+	}
+}