]> git.ipfire.org Git - thirdparty/systemd.git/commit - src/network/networkd-network.c
network: Fix split in `SendOption=` on client and server
authorDavid Wood <david.wood@cambridgeconsultants.com>
Fri, 28 Feb 2020 18:28:49 +0000 (18:28 +0000)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 19 Mar 2020 08:08:40 +0000 (09:08 +0100)
commit7354900dddb869b4eda9ab2b511763dbb30f94bc
tree88542f1d9520a2163d555443e640bd132486f75c
parentd69b62de4439a103fe3c8fbb9dbd25e1758d48b3
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.
12 files changed:
man/systemd.network.xml
src/libsystemd-network/dhcp-server-internal.h
src/libsystemd-network/sd-dhcp-client.c
src/libsystemd-network/sd-dhcp-server.c
src/network/networkd-dhcp-server.c
src/network/networkd-dhcp4.c
src/network/networkd-network-gperf.gperf
src/network/networkd-network.c
src/network/networkd-network.h
src/systemd/sd-dhcp-client.h
src/systemd/sd-dhcp-server.h
test/fuzz/fuzz-network-parser/directives.network