fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 08:58:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp: fix setting "-S" flag for dhclient info-only requests

Browse source 
Fixes: 58287cbcc0 ('core: rework IP configuration in NetworkManager using layer 3 configuration')
(cherry picked from commit 41df480fdd)
This commit is contained in:
Thomas Haller 2022-05-11 10:54:35 +02:00
parent 6ad3694fc5
commit 29e90e4722
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/core/dhcp/nm-dhcp-dhclient.c
View file

@ -330,7 +330,7 @@ create_dhclient_config(NMDhcpDhclient *self,
static gboolean static gboolean
dhclient_start(NMDhcpClient *client, dhclient_start(NMDhcpClient *client,
const char *mode_opt, gboolean set_mode,
gboolean release, gboolean release,
pid_t *out_pid, pid_t *out_pid,
GError **error) GError **error)
@ -439,14 +439,19 @@ dhclient_start(NMDhcpClient *client,
} }
if (addr_family == AF_INET6) { if (addr_family == AF_INET6) {
guint prefixes = client_config->v6.needed_prefixes; guint prefixes = client_config->v6.needed_prefixes;
const char *mode_opt;
g_ptr_array_add(argv, (gpointer) "-6"); g_ptr_array_add(argv, (gpointer) "-6");
if (prefixes > 0 && nm_streq0(mode_opt, "-S")) { if (!set_mode)
/* -S is incompatible with -P, only use the latter */ mode_opt = NULL;
else if (!client_config->v6.info_only)
mode_opt = "-N";
else if (prefixes == 0)
mode_opt = "-S";
else
mode_opt = NULL; mode_opt = NULL;
}
if (mode_opt) if (mode_opt)
g_ptr_array_add(argv, (gpointer) mode_opt); g_ptr_array_add(argv, (gpointer) mode_opt);
@ -546,7 +551,7 @@ ip4_start(NMDhcpClient *client, GError **error)
nm_assert(!client_config->client_id); nm_assert(!client_config->client_id);
nm_dhcp_client_set_effective_client_id(client, new_client_id); nm_dhcp_client_set_effective_client_id(client, new_client_id);
} }
return dhclient_start(client, NULL, FALSE, NULL, error); return dhclient_start(client, FALSE, FALSE, NULL, error);
} }
static gboolean static gboolean
@ -581,7 +586,7 @@ ip6_start(NMDhcpClient *client, const struct in6_addr *ll_addr, GError **error)
return FALSE; return FALSE;
} }
return dhclient_start(client, config->v6.needed_prefixes ? "-S" : "-N", FALSE, NULL, error); return dhclient_start(client, TRUE, FALSE, NULL, error);
} }
static void static void
@ -615,7 +620,7 @@ stop(NMDhcpClient *client, gboolean release)
if (release) { if (release) {
pid_t rpid = -1; pid_t rpid = -1;
if (dhclient_start(client, NULL, TRUE, &rpid, NULL)) { if (dhclient_start(client, FALSE, TRUE, &rpid, NULL)) {
/* Wait a few seconds for the release to happen */ /* Wait a few seconds for the release to happen */
nm_dhcp_client_stop_pid(rpid, nm_dhcp_client_get_iface(client)); nm_dhcp_client_stop_pid(rpid, nm_dhcp_client_get_iface(client));
} }