Limit lifetime of non-static leases in case of release and decline

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

diff --git a/src/dhcpv4.c b/src/dhcpv4.c
index 618475f..509b092 100644 (file)
--- a/src/dhcpv4.c
+++ b/src/dhcpv4.c
@@ -37,7 +37,7 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
                struct interface *iface, void *dest_addr);
 static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
                enum dhcpv4_msg msg, const uint8_t *mac, struct in_addr reqaddr,
                struct interface *iface, void *dest_addr);
 static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
                enum dhcpv4_msg msg, const uint8_t *mac, struct in_addr reqaddr,

-               const char *hostname);
+               uint32_t *leasetime, const char *hostname);

 
 // Create socket and register events
 int init_dhcpv4(void)
 
 // Create socket and register events
 int init_dhcpv4(void)


@@ -181,6 +181,8 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable)
                        a->addr = ntohl(lease->ipaddr.s_addr);
                        memcpy(a->hwaddr, lease->mac.ether_addr_octet, sizeof(a->hwaddr));
                        memcpy(a->hostname, lease->hostname, hostlen);
                        a->addr = ntohl(lease->ipaddr.s_addr);
                        memcpy(a->hwaddr, lease->mac.ether_addr_octet, sizeof(a->hwaddr));
                        memcpy(a->hostname, lease->hostname, hostlen);

+                       /* Static assignment */
+                       a->flags |= OAF_STATIC;

                        /* Infinite valid */
                        a->valid_until = 0;
 
                        /* Infinite valid */
                        a->valid_until = 0;
 


@@ -312,6 +314,7 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
        uint8_t msg = DHCPV4_MSG_ACK;
 
        struct in_addr reqaddr = {INADDR_ANY};
        uint8_t msg = DHCPV4_MSG_ACK;
 
        struct in_addr reqaddr = {INADDR_ANY};

+       uint32_t leasetime = 0;

        char hostname[256];
        hostname[0] = 0;
 
        char hostname[256];
        hostname[0] = 0;
 


@@ -336,7 +339,8 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
                                if (*c == elen && !memcmp(&c[1], iface->filter_class, elen))
                                        return; // Ignore from homenet
                        }
                                if (*c == elen && !memcmp(&c[1], iface->filter_class, elen))
                                        return; // Ignore from homenet
                        }

-               }
+               } else if (opt->type == DHCPV4_OPT_LEASETIME && opt->len == 4)
+                       memcpy(&leasetime, opt->data, 4);

        }
 
        if (reqmsg != DHCPV4_MSG_DISCOVER && reqmsg != DHCPV4_MSG_REQUEST &&
        }
 
        if (reqmsg != DHCPV4_MSG_DISCOVER && reqmsg != DHCPV4_MSG_REQUEST &&


@@ -346,7 +350,7 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
 
        struct dhcpv4_assignment *lease = NULL;
        if (reqmsg != DHCPV4_MSG_INFORM)
 
        struct dhcpv4_assignment *lease = NULL;
        if (reqmsg != DHCPV4_MSG_INFORM)

-               lease = dhcpv4_lease(iface, reqmsg, req->chaddr, reqaddr, hostname);
+               lease = dhcpv4_lease(iface, reqmsg, req->chaddr, reqaddr, &leasetime, hostname);

 
        if (!lease) {
                if (reqmsg == DHCPV4_MSG_REQUEST)
 
        if (!lease) {
                if (reqmsg == DHCPV4_MSG_REQUEST)


@@ -382,16 +386,9 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
        dhcpv4_put(&reply, &cookie, DHCPV4_OPT_SERVERID, 4, &ifaddr.sin_addr);
 
        if (lease) {
        dhcpv4_put(&reply, &cookie, DHCPV4_OPT_SERVERID, 4, &ifaddr.sin_addr);
 
        if (lease) {

-               reply.yiaddr.s_addr = htonl(lease->addr);
-

                uint32_t val;
                uint32_t val;

-               uint32_t leasetime;

 
 

-               if (lease->leasetime >= 60) {
-                       leasetime = lease->leasetime;
-               } else {
-                       leasetime = iface->dhcpv4_leasetime;
-               }
+               reply.yiaddr.s_addr = htonl(lease->addr);

 
                val = htonl(leasetime);
                dhcpv4_put(&reply, &cookie, DHCPV4_OPT_LEASETIME, 4, &val);
 
                val = htonl(leasetime);
                dhcpv4_put(&reply, &cookie, DHCPV4_OPT_LEASETIME, 4, &val);


@@ -588,7 +585,7 @@ static bool dhcpv4_assign(struct interface *iface,
 
 static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
                enum dhcpv4_msg msg, const uint8_t *mac, struct in_addr reqaddr,
 
 static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
                enum dhcpv4_msg msg, const uint8_t *mac, struct in_addr reqaddr,

-               const char *hostname)
+               uint32_t *leasetime, const char *hostname)

 {
        struct dhcpv4_assignment *lease = NULL;
        uint32_t raddr = ntohl(reqaddr.s_addr);
 {
        struct dhcpv4_assignment *lease = NULL;
        uint32_t raddr = ntohl(reqaddr.s_addr);


@@ -609,6 +606,7 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
        if (msg == DHCPV4_MSG_DISCOVER || msg == DHCPV4_MSG_REQUEST) {
                bool assigned = !!a;
                size_t hostlen = strlen(hostname) + 1;
        if (msg == DHCPV4_MSG_DISCOVER || msg == DHCPV4_MSG_REQUEST) {
                bool assigned = !!a;
                size_t hostlen = strlen(hostname) + 1;

+               uint32_t my_leasetime;

 
                if (!a && !iface->no_dynamic_dhcp) { // Create new binding
                        a = calloc(1, sizeof(*a) + hostlen);
 
                if (!a && !iface->no_dynamic_dhcp) { // Create new binding
                        a = calloc(1, sizeof(*a) + hostlen);


@@ -637,18 +635,27 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
                        a->head.prev->next = &a->head;
                }
 
                        a->head.prev->next = &a->head;
                }
 

-               uint32_t leasetime;
-               if (a->leasetime) {
-                       leasetime = a->leasetime;
+               if (a->leasetime >= 60) {
+                       my_leasetime = a->leasetime;

                } else {
                } else {

-                       leasetime = iface->dhcpv4_leasetime;
+                       my_leasetime = iface->dhcpv4_leasetime;

                }
 
                }
 

+               if ((*leasetime == 0) || (my_leasetime < *leasetime))
+                       *leasetime = my_leasetime;
+

                if (assigned) {
                if (assigned) {

-                       if (!INFINITE_VALID(a->valid_until))
-                               // Was only a discover; mark binding for removal
-                               a->valid_until = ((msg == DHCPV4_MSG_DISCOVER) ? now : ((leasetime == UINT32_MAX) ?
-                                                       0 : (time_t)(now + leasetime)));
+                       if (msg == DHCPV4_MSG_DISCOVER) {
+                               a->flags &= ~OAF_BOUND;
+
+                               if (!(a->flags & OAF_STATIC))
+                                       a->valid_until = now;
+                       } else {
+                               a->flags |= OAF_BOUND;
+
+                               if (!(a->flags & OAF_STATIC))
+                                       a->valid_until = ((*leasetime == UINT32_MAX) ? 0 : (time_t)(now + *leasetime));
+                       }

                } else if (!assigned && a) { // Cleanup failed assignment
                        free(a);
                        a = NULL;
                } else if (!assigned && a) { // Cleanup failed assignment
                        free(a);
                        a = NULL;


@@ -656,12 +663,19 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
 
                if (assigned && a)
                        lease = a;
 
                if (assigned && a)
                        lease = a;

-       } else if (msg == DHCPV4_MSG_RELEASE) {
-               if (a && !INFINITE_VALID(a->valid_until))
+       } else if (msg == DHCPV4_MSG_RELEASE && a) {
+               a->flags &= ~OAF_BOUND;
+
+               if (!(a->flags & OAF_STATIC))

                        a->valid_until = now - 1;
                        a->valid_until = now - 1;

-       } else if (msg == DHCPV4_MSG_DECLINE && a && !INFINITE_VALID(a->valid_until)) {
-               memset(a->hwaddr, 0, sizeof(a->hwaddr));
-               a->valid_until = now + 3600; // Block address for 1h
+
+       } else if (msg == DHCPV4_MSG_DECLINE && a) {
+               a->flags &= ~OAF_BOUND;
+
+               if (!(a->flags & OAF_STATIC)) {
+                       memset(a->hwaddr, 0, sizeof(a->hwaddr));
+                       a->valid_until = now + 3600; // Block address for 1h
+               }

        }
 
        dhcpv6_write_statefile();
        }
 
        dhcpv6_write_statefile();