X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fodhcpd.git;a=blobdiff_plain;f=src%2Fodhcpd.c;h=bf9f16d8932845b454569572be627df78ccac6d7;hp=5a800b702127ab7e6a5da5eea00e1f9b4bdaa5cd;hb=d8d6d784258b64d23e7f1cc0a2ee02e88377707d;hpb=d02dc222e61e2464bf850a629030c8a8b9b57ee8

diff --git a/src/odhcpd.c b/src/odhcpd.c
index 5a800b7..bf9f16d 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];
@@ -244,10 +245,9 @@ ssize_t odhcpd_get_interface_addresses(int ifindex,
 		addrs[ret].class = 0;
 #ifdef WITH_UBUS
 		struct interface *iface = odhcpd_get_interface_by_index(ifindex);
-		if (iface) {
-			addrs[ret].has_class = true;
-			addrs[ret].class = ubus_get_class(iface->ifname, &addrs[ret].addr);
-		}
+		if (iface)
+			addrs[ret].has_class = ubus_get_class(iface->ifname,
+					&addrs[ret].addr, &addrs[ret].class);
 #endif
 		++ret;
 	}
@@ -321,8 +321,7 @@ static void odhcpd_receive_packets(struct uloop_fd *u, _unused unsigned int even
 		int *hlim = NULL;
 		struct in6_pktinfo *pktinfo;
 		struct in_pktinfo *pkt4info;
-		for (struct cmsghdr *ch = CMSG_FIRSTHDR(&msg); ch != NULL &&
-				destiface == 0; ch = CMSG_NXTHDR(&msg, ch)) {
+		for (struct cmsghdr *ch = CMSG_FIRSTHDR(&msg); ch != NULL; ch = CMSG_NXTHDR(&msg, ch)) {
 			if (ch->cmsg_level == IPPROTO_IPV6 &&
 					ch->cmsg_type == IPV6_PKTINFO) {
 				pktinfo = (struct in6_pktinfo*)CMSG_DATA(ch);
@@ -360,8 +359,8 @@ 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);
@@ -428,3 +427,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]);
+	}
+}