treewide: reflect managed mode is related to RA

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

diff --git a/src/dhcpv4.c b/src/dhcpv4.c
index 5ef99b1..e1f0df6 100644 (file)
--- a/src/dhcpv4.c
+++ b/src/dhcpv4.c
@@ -138,8 +138,6 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable)
                                        iface->dhcpv4_end.s_addr = end | htonl(12);
                                }
                        }
-
-
                }
 
                /* Parse static entries */
@@ -153,8 +151,7 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable)
                                return -1;
                        }
 
-                       if (lease->dhcpv4_leasetime >= 60)
-                               a->leasetime = lease->dhcpv4_leasetime;
+                       a->leasetime = lease->dhcpv4_leasetime;
 
                        a->addr = ntohl(lease->ipaddr.s_addr);
                        memcpy(a->hwaddr, lease->mac.ether_addr_octet, sizeof(a->hwaddr));
@@ -194,10 +191,6 @@ int setup_dhcpv4_interface(struct interface *iface, bool enable)
                                free_dhcpv4_assignment(a);
                }
 
-
-               if (iface->dhcpv4_leasetime < 60)
-                       iface->dhcpv4_leasetime = 43200;
-
                iface->dhcpv4_event.uloop.fd = sock;
                iface->dhcpv4_event.handle_dgram = handle_dhcpv4;
                odhcpd_register(&iface->dhcpv4_event);
@@ -383,7 +376,7 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
                 */
        }
 
-       syslog(LOG_WARNING, "received %s from %x:%x:%x:%x:%x:%x",
+       syslog(LOG_WARNING, "received %s from %02x:%02x:%02x:%02x:%02x:%02x",
                        dhcpv4_msg_to_string(reqmsg),
                        req->chaddr[0],req->chaddr[1],req->chaddr[2],
                        req->chaddr[3],req->chaddr[4],req->chaddr[5]);
@@ -507,7 +500,7 @@ static void handle_dhcpv4(void *addr, void *data, size_t len,
                 * 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",
+               syslog(LOG_WARNING, "sending %s to %02x:%02x:%02x:%02x:%02x:%02x - %s",
                                dhcpv4_msg_to_string(msg),
                                req->chaddr[0],req->chaddr[1],req->chaddr[2],
                                req->chaddr[3],req->chaddr[4],req->chaddr[5],
@@ -627,7 +620,7 @@ static struct dhcpv4_assignment* dhcpv4_lease(struct interface *iface,
                        assigned = dhcpv4_assign(iface, a, raddr);
                }
 
-               if (a->leasetime >= 60)
+               if (a->leasetime)
                        my_leasetime = a->leasetime;
                else
                        my_leasetime = iface->dhcpv4_leasetime;