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.
This commit is contained in:
David Wood
2020-03-19 09:08:40 +01:00
committed by Zbigniew Jędrzejewski-Szmek
parent d69b62de44
commit 7354900ddd
12 changed files with 131 additions and 15 deletions
@@ -100,6 +100,7 @@ SendRelease=
MaxAttempts=
IPServiceType=
SendOption=
SendVendorOption=
SendDecline=
RouteMTUBytes=
[DHCPv6]
@@ -273,6 +274,7 @@ DefaultLeaseTimeSec=
EmitTimezone=
DNS=
SendOption=
SendVendorOption=
[NextHop]
Id=
Gateway=