Changeset b7155d7 in mainline

Timestamp:

2022-06-24T09:44:00Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

bb4ba92

Parents:

bbb7ffe

git-author:

Jiri Svoboda <jiri@…> (2022-07-23 19:43:22)

git-committer:

Jiri Svoboda <jiri@…> (2022-06-24 09:44:00)

Message:

DHCP should specify a parameter request list with the requested fields

Specifying that we need a DNS server makes DHCP work correctly in
VirtualBox. If not specified, VirtualBox provides an incorrect
DNS server address.

Location:

uspace/srv/net/dhcp

Files:

• dhcp.c (modified) (2 diffs)
• dhcp_std.h (modified) (1 diff)

uspace/srv/net/dhcp/dhcp.c

@@ -161 +161 @@
         uint32_t xid;
         errno_t rc;
+        size_t i;
 
         rc = rndgen_uint32(dlink->rndgen, &xid);
@@ -176 +177 @@
         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);
 }
 

uspace/srv/net/dhcp/dhcp_std.h

@@ -110 +110 @@
         /** Server identifier */
         opt_server_id = 54,
+        /** Parameter request list */
+        opt_param_req_list = 55,
         /** End */
         opt_end = 255