diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2017-05-09 15:32:09 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2017-05-09 15:48:10 +0200 |
| commit | b784360eff27aa71e1cd1180d9699cd295788a3d (patch) | |
| tree | 5bd442f6ce838333b0675b5a4063d1ddc5e3da72 /src/dhcp/nm-dhcp-manager.c | |
| parent | c8dbe90f428fbc58b22f1d86b29d63e565d2ed91 (diff) | |
| download | NetworkManager-bg/dhcp-server-route-rh1448987.tar.gz | |
Diffstat (limited to 'src/dhcp/nm-dhcp-manager.c')
| -rw-r--r-- | src/dhcp/nm-dhcp-manager.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/dhcp/nm-dhcp-manager.c b/src/dhcp/nm-dhcp-manager.c index fff9f9ec30..7efd793059 100644 --- a/src/dhcp/nm-dhcp-manager.c +++ b/src/dhcp/nm-dhcp-manager.c @@ -167,7 +167,8 @@ client_start (NMDhcpManager *self, gboolean info_only, NMSettingIP6ConfigPrivacy privacy, const char *last_ip4_address, - guint needed_prefixes) + guint needed_prefixes, + gboolean never_default) { NMDhcpManagerPrivate *priv; NMDhcpClient *client; @@ -202,6 +203,7 @@ client_start (NMDhcpManager *self, NM_DHCP_CLIENT_UUID, uuid, NM_DHCP_CLIENT_PRIORITY, priority, NM_DHCP_CLIENT_TIMEOUT, timeout ? timeout : DHCP_TIMEOUT, + NM_DHCP_CLIENT_NEVER_DEFAULT, never_default, NULL); g_hash_table_insert (NM_DHCP_MANAGER_GET_PRIVATE (self)->clients, client, g_object_ref (client)); g_signal_connect (client, NM_DHCP_CLIENT_SIGNAL_STATE_CHANGED, G_CALLBACK (client_state_changed), self); @@ -233,7 +235,8 @@ nm_dhcp_manager_start_ip4 (NMDhcpManager *self, const char *dhcp_client_id, guint32 timeout, const char *dhcp_anycast_addr, - const char *last_ip_address) + const char *last_ip_address, + gboolean never_default) { NMDhcpManagerPrivate *priv; const char *hostname = NULL; @@ -269,7 +272,7 @@ nm_dhcp_manager_start_ip4 (NMDhcpManager *self, return client_start (self, iface, ifindex, hwaddr, uuid, priority, FALSE, NULL, dhcp_client_id, timeout, dhcp_anycast_addr, hostname, - use_fqdn, FALSE, 0, last_ip_address, 0); + use_fqdn, FALSE, 0, last_ip_address, 0, never_default); } /* Caller owns a reference to the NMDhcpClient on return */ @@ -301,7 +304,7 @@ nm_dhcp_manager_start_ip6 (NMDhcpManager *self, } return client_start (self, iface, ifindex, hwaddr, uuid, priority, TRUE, ll_addr, NULL, timeout, dhcp_anycast_addr, hostname, TRUE, info_only, - privacy, NULL, needed_prefixes); + privacy, NULL, needed_prefixes, FALSE); } void |