Merge pull request #30 from dedeckeh/bugfixes
[project/odhcpd.git] / src / dhcpv4.c
index 5883847..1807c68 100644 (file)
@@ -137,8 +137,8 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable)
 
                        if (start && end && start < end &&
                                        start > ntohl(addr.s_addr & ~mask.s_addr) &&
-                                       (start & ntohl(mask.s_addr)) == start &&
-                                       (end & ntohl(mask.s_addr)) == end) {
+                                       (start & ntohl(~mask.s_addr)) == start &&
+                                       (end & ntohl(~mask.s_addr)) == end) {
                                iface->dhcpv4_start.s_addr = htonl(start) |
                                                (addr.s_addr & mask.s_addr);
                                iface->dhcpv4_end.s_addr = htonl(end) |
@@ -458,6 +458,13 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
                 */
                dest.sin_addr.s_addr = INADDR_BROADCAST;
                dest.sin_port = htons(DHCPV4_CLIENT_PORT);
+       } else if (!req->ciaddr.s_addr && msg == DHCPV4_MSG_NAK) {
+               /*
+                * client has no previous configuration -> no IP, so we need to reply
+                * with a broadcast packet
+                */
+               dest.sin_addr.s_addr = INADDR_BROADCAST;
+               dest.sin_port = htons(DHCPV4_CLIENT_PORT);
        } else {
                /*
                 * send reply to the newly (in this proccess) allocated IP
@@ -472,10 +479,24 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
                ioctl(sock, SIOCSARP, &arp);
        }
 
-       syslog(LOG_WARNING, "sending %s to %x:%x:%x:%x:%x:%x",
-                       dhcpv4_msg_to_string(msg),
-                       req->chaddr[0],req->chaddr[1],req->chaddr[2],
-                       req->chaddr[3],req->chaddr[4],req->chaddr[5]);
+       if (dest.sin_addr.s_addr == INADDR_BROADCAST) {
+               /*
+                * reply goes to IP broadcast -> MAC broadcast
+                */
+               syslog(LOG_WARNING, "sending %s to ff:ff:ff:ff:ff:ff - %s",
+                               dhcpv4_msg_to_string(msg),
+                               inet_ntoa(dest.sin_addr));
+       } else {
+               /*
+                * reply is send directly to IP,
+                * MAC is assumed to be the same as the request
+                */
+               syslog(LOG_WARNING, "sending %s to %x:%x:%x:%x:%x:%x - %s",
+                               dhcpv4_msg_to_string(msg),
+                               req->chaddr[0],req->chaddr[1],req->chaddr[2],
+                               req->chaddr[3],req->chaddr[4],req->chaddr[5],
+                               inet_ntoa(dest.sin_addr));
+       }
 
        sendto(sock, &reply, sizeof(reply), MSG_DONTWAIT,
                        (struct sockaddr*)&dest, sizeof(dest));
@@ -485,12 +506,12 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
 static bool dhcpv4_assign(struct interface *iface,
                struct dhcpv4_assignment *assign, uint32_t raddr)
 {
-       const unsigned tries = 10;
+       const unsigned tries = 100;
        uint32_t start = ntohl(iface->dhcpv4_start.s_addr);
        uint32_t end = ntohl(iface->dhcpv4_end.s_addr);
        uint32_t count = end - start + 1;
 
-       // Seed RNG with checksum of DUID
+       // Seed RNG with checksum of hwaddress
        uint32_t seed = 0;
        for (size_t i = 0; i < sizeof(assign->hwaddr); ++i)
                seed += assign->hwaddr[i];
@@ -590,10 +611,9 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
                if (assigned && a)
                        lease = a;
        } else if (msg == DHCPV4_MSG_RELEASE) {
-               if (a) {
+               if (a && a->valid_until != LONG_MAX)
                        a->valid_until = 0;
-               }
-       } else if (msg == DHCPV4_MSG_DECLINE) {
+       } else if (msg == DHCPV4_MSG_DECLINE && a->valid_until != LONG_MAX) {
                memset(a->hwaddr, 0, sizeof(a->hwaddr));
                a->valid_until = now + 3600; // Block address for 1h
        }