Merge pull request #21 from mehlis/fix-nak-by-doing-valid-reply

[project/odhcpd.git] / src / odhcpd.c

diff --git a/src/odhcpd.c b/src/odhcpd.c
index f40cea0..b8651dd 100644 (file)
--- a/src/odhcpd.c
+++ b/src/odhcpd.c
@@ -172,7 +172,7 @@ ssize_t odhcpd_send(int socket, struct sockaddr_in6 *dest,
 
        ssize_t sent = sendmsg(socket, &msg, MSG_DONTWAIT);
        if (sent < 0)
-               syslog(LOG_WARNING, "Failed to send to %s%%%s (%s)",
+               syslog(LOG_NOTICE, "Failed to send to %s%%%s (%s)",
                                ipbuf, iface->ifname, strerror(errno));
        else
                syslog(LOG_DEBUG, "Sent %li bytes to %s%%%s",
@@ -217,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];
@@ -319,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)) {
@@ -326,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);
@@ -363,7 +366,7 @@ static void odhcpd_receive_packets(struct uloop_fd *u, _unused unsigned int even
                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);
        }
 }
 
@@ -427,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]);
+       }
+}