Changes in uspace/srv/net/dhcp/dhcp.c [8d58fca:1bbc6dc] in mainline

File:

• uspace/srv/net/dhcp/dhcp.c (modified) (11 diffs)

uspace/srv/net/dhcp/dhcp.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2013 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -42 +42 @@
 #include <fibril_synch.h>
 #include <inet/addr.h>
+#include <inet/eth_addr.h>
 #include <inet/dnsr.h>
 #include <inet/inetcfg.h>
 #include <io/log.h>
 #include <loc.h>
+#include <rndgen.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -68 +70 @@
 /** List of registered links (of dhcp_link_t) */
 static list_t dhcp_links;
+
+bool inetcfg_inited = false;
 
 static void dhcpsrv_discover_timeout(void *);
@@ -94 +98 @@
         /** DNS server */
         inet_addr_t dns_server;
+        /** Transaction ID */
+        uint32_t xid;
 } dhcp_offer_t;
 
@@ -113 +119 @@
         /** Last received offer */
         dhcp_offer_t offer;
+        /** Random number generator */
+        rndgen_t *rndgen;
 } dhcp_link_t;
 
@@ -153 +161 @@
         dhcp_hdr_t *hdr = (dhcp_hdr_t *)msgbuf;
         uint8_t *opt = msgbuf + sizeof(dhcp_hdr_t);
+        uint32_t xid;
+        errno_t rc;
+        size_t i;
+
+        rc = rndgen_uint32(dlink->rndgen, &xid);
+        if (rc != EOK)
+                return rc;
 
         memset(msgbuf, 0, MAX_MSG_SIZE);
         hdr->op = op_bootrequest;
         hdr->htype = 1; /* AHRD_ETHERNET */
-        hdr->hlen = sizeof(addr48_t);
-        hdr->xid = host2uint32_t_be(42);
-        hdr->flags = flag_broadcast;
-
-        addr48(dlink->link_info.mac_addr, hdr->chaddr);
+        hdr->hlen = ETH_ADDR_SIZE;
+        hdr->xid = host2uint32_t_be(xid);
+        hdr->flags = host2uint16_t_be(flag_broadcast);
+
+        eth_addr_encode(&dlink->link_info.mac_addr, hdr->chaddr);
         hdr->opt_magic = host2uint32_t_be(dhcp_opt_magic);
 
-        opt[0] = opt_msg_type;
-        opt[1] = 1;
-        opt[2] = msg_dhcpdiscover;
-        opt[3] = opt_end;
-
-        return dhcp_send(&dlink->dt, msgbuf, sizeof(dhcp_hdr_t) + 4);
+        i = 0;
+
+        opt[i++] = opt_msg_type;
+        opt[i++] = 1;
+        opt[i++] = msg_dhcpdiscover;
+
+        opt[i++] = opt_param_req_list;
+        opt[i++] = 3;
+        opt[i++] = 1; /* subnet mask */
+        opt[i++] = 6; /* DNS server */
+        opt[i++] = 3; /* router */
+
+        opt[i++] = opt_end;
+
+        return dhcp_send(&dlink->dt, msgbuf, sizeof(dhcp_hdr_t) + i);
 }
 
@@ -182 +206 @@
         hdr->htype = 1; /* AHRD_ETHERNET */
         hdr->hlen = 6;
-        hdr->xid = host2uint32_t_be(42);
-        hdr->flags = flag_broadcast;
-        hdr->ciaddr = host2uint32_t_be(offer->oaddr.addr);
-        addr48(dlink->link_info.mac_addr, hdr->chaddr);
+        hdr->xid = host2uint32_t_be(offer->xid);
+        hdr->flags = host2uint16_t_be(flag_broadcast);
+        eth_addr_encode(&dlink->link_info.mac_addr, hdr->chaddr);
         hdr->opt_magic = host2uint32_t_be(dhcp_opt_magic);
 
@@ -257 +280 @@
 
         inet_naddr_set(yiaddr.addr, 0, &offer->oaddr);
+        offer->xid = uint32_t_be2host(hdr->xid);
 
         msgb = (uint8_t *)msg;
@@ -446 +470 @@
         log_msg(LOG_DEFAULT, LVL_DEBUG, "dhcpsrv_link_add(%zu)", link_id);
 
+        if (!inetcfg_inited) {
+                rc = inetcfg_init();
+                if (rc != EOK) {
+                        log_msg(LOG_DEFAULT, LVL_ERROR, "Error contacting "
+                            "inet configuration service.\n");
+                        return EIO;
+                }
+
+                inetcfg_inited = true;
+        }
+
         if (dhcpsrv_link_find(link_id) != NULL) {
                 log_msg(LOG_DEFAULT, LVL_NOTE, "Link %zu already added",
@@ -455 +490 @@
         if (dlink == NULL)
                 return ENOMEM;
+
+        rc = rndgen_create(&dlink->rndgen);
+        if (rc != EOK)
+                goto error;
 
         dlink->link_id = link_id;
@@ -493 +532 @@
         return EOK;
 error:
+        if (dlink != NULL && dlink->rndgen != NULL)
+                rndgen_destroy(dlink->rndgen);
         if (dlink != NULL && dlink->timeout != NULL)
                 fibril_timer_destroy(dlink->timeout);