diff options
| author | David Wood <david.wood@cambridgeconsultants.com> | 2020-02-28 18:28:49 +0000 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2020-03-19 09:08:40 +0100 |
| commit | 7354900dddb869b4eda9ab2b511763dbb30f94bc (patch) | |
| tree | 88542f1d9520a2163d555443e640bd132486f75c /src/libsystemd-network/dhcp-server-internal.h | |
| parent | d69b62de4439a103fe3c8fbb9dbd25e1758d48b3 (diff) | |
| download | systemd-7354900dddb869b4eda9ab2b511763dbb30f94bc.tar.gz | |
network: Fix split in `SendOption=` on client and server
When specifying `DHCPv4.SendOption=`, it is used by systemd-networkd to
set the value of that option within the DHCP request that is sent out.
This differs to setting `DHCPServer.SendOption=`, which will place all
the options together as suboptions into the vendor-specific information
(code 43) option.
This commit adds two new config options, `DHCPv4.SendVendorOption=` and
`DHCPServer.SendVendorOption=`. These both have the behaviour of the old
`DHCPServer.SendOption=` flag, and set the value of the suboption in the
vendor-specific information option.
The behaviour of `DHCPServer.SendOption=` is then changed to reflect
that of `DHCPv4.SendOption=`. It will set the value of the corresponding
option in the DHCP request.
Diffstat (limited to 'src/libsystemd-network/dhcp-server-internal.h')
| -rw-r--r-- | src/libsystemd-network/dhcp-server-internal.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libsystemd-network/dhcp-server-internal.h b/src/libsystemd-network/dhcp-server-internal.h index 42c3ceb8b1..41901894f5 100644 --- a/src/libsystemd-network/dhcp-server-internal.h +++ b/src/libsystemd-network/dhcp-server-internal.h @@ -58,7 +58,8 @@ struct sd_dhcp_server { struct in_addr *ntp, *dns, *sip; unsigned n_ntp, n_dns, n_sip; - OrderedHashmap *raw_option; + OrderedHashmap *extra_options; + OrderedHashmap *vendor_options; bool emit_router; |