1 files changed, 115 insertions, 68 deletions

diff --git a/networking/udhcp/dhcpd.c b/networking/udhcp/dhcpd.c
index 0c55fa5e4..058f86bca 100644
--- a/networking/udhcp/dhcpd.c
+++ b/networking/udhcp/dhcpd.c
@@ -48,14 +48,25 @@
 #define g_leases ((struct dyn_lease*)ptr_to_globals)
 /* struct server_config_t server_config is in bb_common_bufsiz1 */
 
+struct static_lease {
+        struct static_lease *next;
+        uint32_t nip;
+        uint8_t mac[6];
+        uint8_t opt[1];
+};
+
 /* Takes the address of the pointer to the static_leases linked list,
  * address to a 6 byte mac address,
  * 4 byte IP address */
 static void add_static_lease(struct static_lease **st_lease_pp,
                 uint8_t *mac,
-                uint32_t nip)
+                uint32_t nip,
+                const char *opts)
 {
         struct static_lease *st_lease;
+        unsigned optlen;
+
+        optlen = (opts ? 1+1+strnlen(opts, 120) : 0);
 
         /* Find the tail of the list */
         while ((st_lease = *st_lease_pp) != NULL) {
@@ -63,15 +74,34 @@ static void add_static_lease(struct static_lease **st_lease_pp,
         }
 
         /* Add new node */
-        *st_lease_pp = st_lease = xzalloc(sizeof(*st_lease));
+        *st_lease_pp = st_lease = xzalloc(sizeof(*st_lease) + optlen);
         memcpy(st_lease->mac, mac, 6);
         st_lease->nip = nip;
         /*st_lease->next = NULL;*/
+        if (optlen) {
+                st_lease->opt[OPT_CODE] = DHCP_HOST_NAME;
+                optlen -= 2;
+                st_lease->opt[OPT_LEN] = optlen;
+                memcpy(&st_lease->opt[OPT_DATA], opts, optlen);
+        }
+
+#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2
+        /* Print out static leases just to check what's going on */
+        if (dhcp_verbose >= 2) {
+                bb_info_msg("static lease: mac:%02x:%02x:%02x:%02x:%02x:%02x nip:%x",
+                        st_lease->mac[0], st_lease->mac[1], st_lease->mac[2],
+                        st_lease->mac[3], st_lease->mac[4], st_lease->mac[5],
+                        st_lease->nip
+                );
+        }
+#endif
 }
 
 /* Find static lease IP by mac */
-static uint32_t get_static_nip_by_mac(struct static_lease *st_lease, void *mac)
+static uint32_t get_static_nip_by_mac(void *mac)
 {
+        struct static_lease *st_lease = server_config.static_leases;
+
         while (st_lease) {
                 if (memcmp(st_lease->mac, mac, 6) == 0)
                         return st_lease->nip;
@@ -81,8 +111,10 @@ static uint32_t get_static_nip_by_mac(struct static_lease *st_lease, void *mac)
         return 0;
 }
 
-static int is_nip_reserved(struct static_lease *st_lease, uint32_t nip)
+static int is_nip_reserved_as_static(uint32_t nip)
 {
+        struct static_lease *st_lease = server_config.static_leases;
+
         while (st_lease) {
                 if (st_lease->nip == nip)
                         return 1;
@@ -92,30 +124,6 @@ static int is_nip_reserved(struct static_lease *st_lease, uint32_t nip)
         return 0;
 }
 
-#if defined CONFIG_UDHCP_DEBUG && CONFIG_UDHCP_DEBUG >= 2
-/* Print out static leases just to check what's going on */
-/* Takes the address of the pointer to the static_leases linked list */
-static void log_static_leases(struct static_lease **st_lease_pp)
-{
-        struct static_lease *cur;
-
-        if (dhcp_verbose < 2)
-                return;
-
-        cur = *st_lease_pp;
-        while (cur) {
-                bb_error_msg("static lease: mac:%02x:%02x:%02x:%02x:%02x:%02x nip:%x",
-                        cur->mac[0], cur->mac[1], cur->mac[2],
-                        cur->mac[3], cur->mac[4], cur->mac[5],
-                        cur->nip
-                );
-                cur = cur->next;
-        }
-}
-#else
-# define log_static_leases(st_lease_pp) ((void)0)
-#endif
-
 /* Find the oldest expired lease, NULL if there are no expired leases */
 static struct dyn_lease *oldest_expired_lease(void)
 {
@@ -242,7 +250,7 @@ static int nobody_responds_to_arp(uint32_t nip, const uint8_t *safe_mac, unsigne
                 return r;
 
         temp.s_addr = nip;
-        bb_error_msg("%s belongs to someone, reserving it for %u seconds",
+        bb_info_msg("%s belongs to someone, reserving it for %u seconds",
                 inet_ntoa(temp), (unsigned)server_config.conflict_time);
         add_lease(NULL, nip, server_config.conflict_time, NULL, 0);
         return 0;
@@ -288,7 +296,7 @@ static uint32_t find_free_or_expired_nip(const uint8_t *safe_mac, unsigned arppi
                 if (nip == server_config.server_nip)
                         goto next_addr;
                 /* is this a static lease addr? */
-                if (is_nip_reserved(server_config.static_leases, nip))
+                if (is_nip_reserved_as_static(nip))
                         goto next_addr;
 
                 lease = find_lease_by_nip(nip);
@@ -340,6 +348,7 @@ static int FAST_FUNC read_staticlease(const char *const_line, void *arg)
         char *line;
         char *mac_string;
         char *ip_string;
+        char *opts;
         struct ether_addr mac_bytes; /* it's "struct { uint8_t mac[6]; }" */
         uint32_t nip;
 
@@ -354,14 +363,16 @@ static int FAST_FUNC read_staticlease(const char *const_line, void *arg)
         if (!ip_string || !udhcp_str2nip(ip_string, &nip))
                 return 0;
 
-        add_static_lease(arg, (uint8_t*) &mac_bytes, nip);
+        opts = strtok_r(NULL, " \t", &line);
+        /* opts might be NULL, that's not an error */
 
-        log_static_leases(arg);
+        add_static_lease(arg, (uint8_t*) &mac_bytes, nip, opts);
 
         return 1;
 }
 
-static int FAST_FUNC read_optset(const char *line, void *arg) {
+static int FAST_FUNC read_optset(const char *line, void *arg)
+{
         return udhcp_str2optset(line, arg,
                         dhcp_optflags, dhcp_option_strings,
                         /*dhcpv6:*/ 0
@@ -518,13 +529,13 @@ static NOINLINE void read_leases(const char *file)
                                 expires = 0;
 
                         /* Check if there is a different static lease for this IP or MAC */
-                        static_nip = get_static_nip_by_mac(server_config.static_leases, lease.lease_mac);
+                        static_nip = get_static_nip_by_mac(lease.lease_mac);
                         if (static_nip) {
                                 /* NB: we do not add lease even if static_nip == lease.lease_nip.
                                  */
                                 continue;
                         }
-                        if (is_nip_reserved(server_config.static_leases, lease.lease_nip))
+                        if (is_nip_reserved_as_static(lease.lease_nip))
                                 continue;
 
                         /* NB: add_lease takes "relative time", IOW,
@@ -602,6 +613,15 @@ static void send_packet(struct dhcp_packet *dhcp_pkt, int force_broadcast)
                 send_packet_to_client(dhcp_pkt, force_broadcast);
 }
 
+static void send_packet_verbose(struct dhcp_packet *dhcp_pkt, const char *fmt)
+{
+        struct in_addr addr;
+        addr.s_addr = dhcp_pkt->yiaddr;
+        bb_info_msg(fmt, inet_ntoa(addr));
+        /* send_packet emits error message itself if it detects failure */
+        send_packet(dhcp_pkt, /*force_bcast:*/ 0);
+}
+
 static void init_packet(struct dhcp_packet *packet, struct dhcp_packet *oldpacket, char type)
 {
         /* Sets op, htype, hlen, cookie fields
@@ -621,14 +641,49 @@ static void init_packet(struct dhcp_packet *packet, struct dhcp_packet *oldpacke
  */
 static void add_server_options(struct dhcp_packet *packet)
 {
-        struct option_set *curr = server_config.options;
+        struct option_set *config_opts;
+        uint8_t *client_hostname_opt;
+
+        client_hostname_opt = NULL;
+        if (packet->yiaddr) { /* if we aren't from send_inform()... */
+                struct static_lease *st_lease = server_config.static_leases;
+                while (st_lease) {
+                        if (st_lease->nip == packet->yiaddr) {
+                                if (st_lease->opt[0] != 0)
+                                        client_hostname_opt = st_lease->opt;
+                                break;
+                        }
+                        st_lease = st_lease->next;
+                }
+        }
 
-        while (curr) {
-                if (curr->data[OPT_CODE] != DHCP_LEASE_TIME)
-                        udhcp_add_binary_option(packet, curr->data);
-                curr = curr->next;
+        config_opts = server_config.options;
+        while (config_opts) {
+                if (config_opts->data[OPT_CODE] != DHCP_LEASE_TIME) {
+                        /* ^^^^
+                         * DHCP_LEASE_TIME is already filled, or in case of
+                         * send_inform(), should not be filled at all.
+                         */
+                        if (config_opts->data[OPT_CODE] != DHCP_HOST_NAME
+                         || !client_hostname_opt
+                        ) {
+                                /* Why "!client_hostname_opt":
+                                 * add hostname only if client has no hostname
+                                 * on its static lease line.
+                                 * (Not that "opt hostname HOST"
+                                 * makes much sense in udhcpd.conf,
+                                 * that'd give all clients the same hostname,
+                                 * but it's a valid configuration).
+                                 */
+                                udhcp_add_binary_option(packet, config_opts->data);
+                        }
+                }
+                config_opts = config_opts->next;
         }
 
+        if (client_hostname_opt)
+                udhcp_add_binary_option(packet, client_hostname_opt);
+
         packet->siaddr_nip = server_config.siaddr_nip;
 
         if (server_config.sname)
@@ -657,12 +712,11 @@ static uint32_t select_lease_time(struct dhcp_packet *packet)
 static NOINLINE void send_offer(struct dhcp_packet *oldpacket,
                 uint32_t static_lease_nip,
                 struct dyn_lease *lease,
-                uint8_t *requested_ip_opt,
+                uint32_t requested_nip,
                 unsigned arpping_ms)
 {
         struct dhcp_packet packet;
         uint32_t lease_time_sec;
-        struct in_addr addr;
 
         init_packet(&packet, oldpacket, DHCPOFFER);
 
@@ -671,7 +725,6 @@ static NOINLINE void send_offer(struct dhcp_packet *oldpacket,
         /* Else: */
         if (!static_lease_nip) {
                 /* We have no static lease for client's chaddr */
-                uint32_t req_nip;
                 const char *p_host_name;
 
                 if (lease) {
@@ -682,18 +735,16 @@ static NOINLINE void send_offer(struct dhcp_packet *oldpacket,
                         packet.yiaddr = lease->lease_nip;
                 }
                 /* Or: if client has requested an IP */
-                else if (requested_ip_opt != NULL
-                 /* (read IP) */
-                 && (move_from_unaligned32(req_nip, requested_ip_opt), 1)
+                else if (requested_nip != 0
                  /* and the IP is in the lease range */
-                 && ntohl(req_nip) >= server_config.start_ip
-                 && ntohl(req_nip) <= server_config.end_ip
+                 && ntohl(requested_nip) >= server_config.start_ip
+                 && ntohl(requested_nip) <= server_config.end_ip
                  /* and */
-                 && (  !(lease = find_lease_by_nip(req_nip)) /* is not already taken */
+                 && (  !(lease = find_lease_by_nip(requested_nip)) /* is not already taken */
                     || is_expired_lease(lease) /* or is taken, but expired */
                     )
                 ) {
-                        packet.yiaddr = req_nip;
+                        packet.yiaddr = requested_nip;
                 }
                 else {
                         /* Otherwise, find a free IP */
@@ -721,10 +772,8 @@ static NOINLINE void send_offer(struct dhcp_packet *oldpacket,
         udhcp_add_simple_option(&packet, DHCP_LEASE_TIME, htonl(lease_time_sec));
         add_server_options(&packet);
 
-        addr.s_addr = packet.yiaddr;
-        bb_error_msg("sending OFFER of %s", inet_ntoa(addr));
         /* send_packet emits error message itself if it detects failure */
-        send_packet(&packet, /*force_bcast:*/ 0);
+        send_packet_verbose(&packet, "sending OFFER to %s");
 }
 
 /* NOINLINE: limit stack usage in caller */
@@ -743,7 +792,6 @@ static NOINLINE void send_ACK(struct dhcp_packet *oldpacket, uint32_t yiaddr)
 {
         struct dhcp_packet packet;
         uint32_t lease_time_sec;
-        struct in_addr addr;
         const char *p_host_name;
 
         init_packet(&packet, oldpacket, DHCPACK);
@@ -751,12 +799,9 @@ static NOINLINE void send_ACK(struct dhcp_packet *oldpacket, uint32_t yiaddr)
 
         lease_time_sec = select_lease_time(oldpacket);
         udhcp_add_simple_option(&packet, DHCP_LEASE_TIME, htonl(lease_time_sec));
-
         add_server_options(&packet);
 
-        addr.s_addr = yiaddr;
-        bb_error_msg("sending ACK to %s", inet_ntoa(addr));
-        send_packet(&packet, /*force_bcast:*/ 0);
+        send_packet_verbose(&packet, "sending ACK to %s");
 
         p_host_name = (const char*) udhcp_get_option(oldpacket, DHCP_HOST_NAME);
         add_lease(packet.chaddr, packet.yiaddr,
@@ -796,6 +841,7 @@ static NOINLINE void send_inform(struct dhcp_packet *oldpacket)
         add_server_options(&packet);
 
         send_packet(&packet, /*force_bcast:*/ 0);
+        // or maybe? send_packet_verbose(&packet, "sending ACK to %s");
 }
 
 int udhcpd_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
@@ -865,7 +911,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
         write_pidfile(server_config.pidfile);
         /* if (!..) bb_perror_msg("can't create pidfile %s", pidfile); */
 
-        bb_error_msg("started, v"BB_VER);
+        bb_info_msg("started, v"BB_VER);
 
         option = udhcp_find_option(server_config.options, DHCP_LEASE_TIME);
         server_config.max_lease_sec = DEFAULT_LEASE_TIME;
@@ -908,7 +954,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                 int tv;
                 uint8_t *server_id_opt;
                 uint8_t *requested_ip_opt;
-                uint32_t requested_nip = requested_nip; /* for compiler */
+                uint32_t requested_nip;
                 uint32_t static_lease_nip;
                 struct dyn_lease *lease, fake_lease;
 
@@ -944,12 +990,12 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
 
                 if (pfds[0].revents) switch (udhcp_sp_read()) {
                 case SIGUSR1:
-                        bb_error_msg("received %s", "SIGUSR1");
+                        bb_info_msg("received %s", "SIGUSR1");
                         write_leases();
                         /* why not just reset the timeout, eh */
                         goto continue_with_autotime;
                 case SIGTERM:
-                        bb_error_msg("received %s", "SIGTERM");
+                        bb_info_msg("received %s", "SIGTERM");
                         write_leases();
                         goto ret0;
                 }
@@ -973,16 +1019,16 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                         continue;
                 }
                 if (packet.hlen != 6) {
-                        bb_error_msg("MAC length != 6, ignoring packet");
+                        bb_info_msg("MAC length != 6, ignoring packet");
                         continue;
                 }
                 if (packet.op != BOOTREQUEST) {
-                        bb_error_msg("not a REQUEST, ignoring packet");
+                        bb_info_msg("not a REQUEST, ignoring packet");
                         continue;
                 }
                 state = udhcp_get_option(&packet, DHCP_MESSAGE_TYPE);
                 if (state == NULL || state[0] < DHCP_MINTYPE || state[0] > DHCP_MAXTYPE) {
-                        bb_error_msg("no or bad message type option, ignoring packet");
+                        bb_info_msg("no or bad message type option, ignoring packet");
                         continue;
                 }
 
@@ -999,9 +1045,9 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                 }
 
                 /* Look for a static/dynamic lease */
-                static_lease_nip = get_static_nip_by_mac(server_config.static_leases, &packet.chaddr);
+                static_lease_nip = get_static_nip_by_mac(&packet.chaddr);
                 if (static_lease_nip) {
-                        bb_error_msg("found static lease: %x", static_lease_nip);
+                        bb_info_msg("found static lease: %x", static_lease_nip);
                         memcpy(&fake_lease.lease_mac, &packet.chaddr, 6);
                         fake_lease.lease_nip = static_lease_nip;
                         fake_lease.expires = 0;
@@ -1011,6 +1057,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                 }
 
                 /* Get REQUESTED_IP if present */
+                requested_nip = 0;
                 requested_ip_opt = udhcp_get_option32(&packet, DHCP_REQUESTED_IP);
                 if (requested_ip_opt) {
                         move_from_unaligned32(requested_nip, requested_ip_opt);
@@ -1021,7 +1068,7 @@ int udhcpd_main(int argc UNUSED_PARAM, char **argv)
                 case DHCPDISCOVER:
                         log1("received %s", "DISCOVER");
 
-                        send_offer(&packet, static_lease_nip, lease, requested_ip_opt, arpping_ms);
+                        send_offer(&packet, static_lease_nip, lease, requested_nip, arpping_ms);
                         break;
 
                 case DHCPREQUEST: