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

dhcp: don't fail assertions when a DHCP client is not available

Browse source 
If no configured client is available, gracefully fail the activation
without throwing runtime errors.
This commit is contained in:
Beniamino Galvani 2016-03-24 11:09:55 +01:00
parent fd971567b9
commit 76b79df155
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/dhcp-manager/nm-dhcp-manager.c
View file

@ -212,7 +212,8 @@ client_start (NMDhcpManager *self,
priv = NM_DHCP_MANAGER_GET_PRIVATE (self); priv = NM_DHCP_MANAGER_GET_PRIVATE (self);
/* Ensure we have a usable DHCP client */ /* Ensure we have a usable DHCP client */
g_return_val_if_fail (priv->client_type != 0, NULL); if (priv->client_type == G_TYPE_INVALID)
return NULL;
/* Kill any old client instance */ /* Kill any old client instance */
client = get_client_for_ifindex (self, ifindex, ipv6); client = get_client_for_ifindex (self, ifindex, ipv6);
@ -337,6 +338,7 @@ nm_dhcp_manager_get_lease_ip_configs (NMDhcpManager *self,
gboolean ipv6, gboolean ipv6,
guint32 default_route_metric) guint32 default_route_metric)
{ {
NMDhcpManagerPrivate *priv;
ClientDesc *desc; ClientDesc *desc;
g_return_val_if_fail (NM_IS_DHCP_MANAGER (self), NULL); g_return_val_if_fail (NM_IS_DHCP_MANAGER (self), NULL);
@ -344,7 +346,11 @@ nm_dhcp_manager_get_lease_ip_configs (NMDhcpManager *self,
g_return_val_if_fail (ifindex >= -1, NULL); g_return_val_if_fail (ifindex >= -1, NULL);
g_return_val_if_fail (uuid != NULL, NULL); g_return_val_if_fail (uuid != NULL, NULL);
desc = find_client_desc (NULL, NM_DHCP_MANAGER_GET_PRIVATE (self)->client_type); priv = NM_DHCP_MANAGER_GET_PRIVATE (self);
if (priv->client_type == G_TYPE_INVALID)
return NULL;
desc = find_client_desc (NULL, priv->client_type);
if (desc && desc->get_lease_configs_func) if (desc && desc->get_lease_configs_func)
return desc->get_lease_configs_func (iface, ifindex, uuid, ipv6, default_route_metric); return desc->get_lease_configs_func (iface, ifindex, uuid, ipv6, default_route_metric);
return NULL; return NULL;