SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dhcp: fix user class and vendor specific option assignment

Browse Source 
The commit 6d7cb9a6b8 fixes the assignment
of the these options when specified through SendOption=. However, it
breaks when specified through UserClass= or SendVendorOption=.

When UserClass= or SendVendorOption= is specified, the option length is
calculated from the sd_dhcp_client.user_class or .vendor_options. Hence,
we can use 0 for the length in that case.

Follow-up for 6d7cb9a6b8.
This commit is contained in:
Yu Watanabe
2026-03-22 19:40:54 +01:00
committed by Daan De Meyer
parent 924f5a3461
commit 55f2fdd508
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd-network/sd-dhcp-client.c
+2 -3
View File
@@ -1020,8 +1020,7 @@ static int client_append_common_discover_request_options(sd_dhcp_client *client,
if (client->user_class) {
r = dhcp_option_append(&packet->dhcp, optlen, optoffset, 0,
SD_DHCP_OPTION_USER_CLASS,
strv_length(client->user_class),
client->user_class);
/* optlen= */ 0, client->user_class);
if (r < 0)
return r;
}
@@ -1037,7 +1036,7 @@ static int client_append_common_discover_request_options(sd_dhcp_client *client,
r = dhcp_option_append(
&packet->dhcp, optlen, optoffset, 0,
SD_DHCP_OPTION_VENDOR_SPECIFIC,
ordered_hashmap_size(client->vendor_options), client->vendor_options);
/* optlen= */ 0, client->vendor_options);
if (r < 0)
return r;
}
src/libsystemd-network/sd-dhcp-server.c
+1 -1
View File
@@ -719,7 +719,7 @@ static int server_send_offer_or_ack(
r = dhcp_option_append(
&packet->dhcp, req->max_optlen, &offset, 0,
SD_DHCP_OPTION_VENDOR_SPECIFIC,
ordered_set_size(server->vendor_options), server->vendor_options);
/* optlen= */ 0, server->vendor_options);
if (r < 0)
return r;
}