colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dhcp/nettools: add siaddr to lease options

Browse Source 
This is so that we end up with a next-server option analogous to what
dhclient helper sends us. Dracut uses this for networked boots.
This commit is contained in:
Lubomir Rintel
2019-11-07 13:26:38 +01:00
parent edda3d3606
commit c1104a5cc2
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/dhcp/nm-dhcp-nettools.c
View File

@@ -352,6 +352,7 @@ lease_parse_address (NDhcp4ClientLease *lease,
const gint64 ts_clock_boottime = nm_utils_monotonic_timestamp_as_boottime (ts, 1); const gint64 ts_clock_boottime = nm_utils_monotonic_timestamp_as_boottime (ts, 1);
struct in_addr a_address; struct in_addr a_address;
struct in_addr a_netmask; struct in_addr a_netmask;
struct in_addr a_next_server;
guint32 a_plen; guint32 a_plen;
guint64 nettools_lifetime; guint64 nettools_lifetime;
gint64 a_lifetime; gint64 a_lifetime;
@@ -415,6 +416,16 @@ lease_parse_address (NDhcp4ClientLease *lease,
NM_DHCP_OPTION_DHCP4_NM_EXPIRY, NM_DHCP_OPTION_DHCP4_NM_EXPIRY,
(guint64) a_expiry); (guint64) a_expiry);
n_dhcp4_client_lease_get_siaddr (lease, &a_next_server);
if (a_next_server.s_addr != INADDR_ANY) {
nm_utils_inet4_ntop (a_next_server.s_addr, addr_str);
nm_dhcp_option_add_option (options,
_nm_dhcp_option_dhcp4_options,
NM_DHCP_OPTION_DHCP4_NM_NEXT_SERVER,
addr_str);
}
nm_ip4_config_add_address (ip4_config, nm_ip4_config_add_address (ip4_config,
&((const NMPlatformIP4Address) { &((const NMPlatformIP4Address) {
.address = a_address.s_addr, .address = a_address.s_addr,