fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-06 09:20:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dhcp: rename get_lease_config -> get_lease_ip_configs

Browse source 
Since dhcpcd doesn't implement this function yet, just remove the
stub implementation.
This commit is contained in:
Dan Williams 2013-10-31 12:25:02 -05:00
parent 21b6f34f5e
commit e2fa51cd67
6 changed files with 25 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/dhcp-manager/nm-dhcp-dhclient.c
View file

@ -176,7 +176,9 @@ add_lease_option (GHashTable *hash, char *line)
}
GSList *
nm_dhcp_dhclient_get_lease_config (const char *iface, const char *uuid, gboolean ipv6)
nm_dhcp_dhclient_get_lease_ip_configs (const char *iface,
const char *uuid,
gboolean ipv6)
{
GSList *parsed = NULL, *iter, *leases = NULL;
char *contents = NULL;

4
src/dhcp-manager/nm-dhcp-dhclient.h
View file

@ -41,7 +41,9 @@ typedef struct {
GType nm_dhcp_dhclient_get_type (void);
GSList *nm_dhcp_dhclient_get_lease_config (const char *iface, const char *uuid, gboolean ipv6);
GSList *nm_dhcp_dhclient_get_lease_ip_configs (const char *iface,
const char *uuid,
gboolean ipv6);
const char *nm_dhcp_dhclient_get_path (const char *try_first);

6
src/dhcp-manager/nm-dhcp-dhcpcd.c
View file

@ -71,12 +71,6 @@ nm_dhcp_dhcpcd_get_path (const char *try_first)
return *path;
}
GSList *
nm_dhcp_dhcpcd_get_lease_config (const char *iface, const char *uuid, gboolean ipv6)
{
return NULL;
}
static void
dhcpcd_child_setup (gpointer user_data G_GNUC_UNUSED)
{

2
src/dhcp-manager/nm-dhcp-dhcpcd.h
View file

@ -41,8 +41,6 @@ typedef struct {
GType nm_dhcp_dhcpcd_get_type (void);
GSList *nm_dhcp_dhcpcd_get_lease_config (const char *iface, const char *uuid, gboolean ipv6);
const char *nm_dhcp_dhcpcd_get_path (const char *try_first);
#endif /* NM_DHCP_DHCPCD_H */

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

@ -71,7 +71,7 @@ typedef GSList * (*GetLeaseConfigFunc) (const char *iface, const char *uuid, gbo
typedef struct {
GType client_type;
GetLeaseConfigFunc get_lease_config_func;
GetLeaseConfigFunc get_lease_ip_configs_func;
NMDBusManager * dbus_mgr;
guint new_conn_id;
@ -313,7 +313,7 @@ get_client_type (const char *client, GError **error)
g_set_error_literal (error,
NM_DHCP_MANAGER_ERROR, NM_DHCP_MANAGER_ERROR_BAD_CLIENT,
_("no usable DHCP client could be found."));
return 0;
return G_TYPE_INVALID;
}
}
@ -322,7 +322,7 @@ get_client_type (const char *client, GError **error)
g_set_error_literal (error,
NM_DHCP_MANAGER_ERROR, NM_DHCP_MANAGER_ERROR_BAD_CLIENT,
_("'dhclient' could be found."));
return 0;
return G_TYPE_INVALID;
}
return NM_TYPE_DHCP_DHCLIENT;
}
@ -332,7 +332,7 @@ get_client_type (const char *client, GError **error)
g_set_error_literal (error,
NM_DHCP_MANAGER_ERROR, NM_DHCP_MANAGER_ERROR_BAD_CLIENT,
_("'dhcpcd' could be found."));
return 0;
return G_TYPE_INVALID;
}
return NM_TYPE_DHCP_DHCPCD;
}
@ -340,7 +340,7 @@ get_client_type (const char *client, GError **error)
g_set_error (error,
NM_DHCP_MANAGER_ERROR, NM_DHCP_MANAGER_ERROR_BAD_CLIENT,
_("unsupported DHCP client '%s'"), client);
return 0;
return G_TYPE_INVALID;
}
NMDHCPManager *
@ -362,15 +362,14 @@ nm_dhcp_manager_get (void)
/* Client-specific setup */
client = nm_config_get_dhcp_client (nm_config_get ());
priv->client_type = get_client_type (client, &error);
if (priv->client_type == NM_TYPE_DHCP_DHCLIENT)
priv->get_lease_config_func = nm_dhcp_dhclient_get_lease_config;
else if (priv->client_type == NM_TYPE_DHCP_DHCPCD)
priv->get_lease_config_func = nm_dhcp_dhcpcd_get_lease_config;
else {
priv->get_lease_ip_configs_func = nm_dhcp_dhclient_get_lease_ip_configs;
else if (priv->client_type == G_TYPE_INVALID) {
nm_log_warn (LOGD_DHCP, "No usable DHCP client found (%s)! DHCP configurations will fail.",
error->message);
g_error_free (error);
}
g_clear_error (&error);
priv->clients = g_hash_table_new_full (g_direct_hash, g_direct_equal,
NULL,
@ -610,10 +609,10 @@ nm_dhcp_manager_set_hostname_provider (NMDHCPManager *manager,
}
GSList *
nm_dhcp_manager_get_lease_config (NMDHCPManager *self,
const char *iface,
const char *uuid,
gboolean ipv6)
nm_dhcp_manager_get_lease_ip_configs (NMDHCPManager *self,
const char *iface,
const char *uuid,
gboolean ipv6)
{
NMDHCPManagerPrivate *priv;
@ -623,10 +622,8 @@ nm_dhcp_manager_get_lease_config (NMDHCPManager *self,
priv = NM_DHCP_MANAGER_GET_PRIVATE (self);
if (priv->get_lease_config_func)
return priv->get_lease_config_func (iface, uuid, ipv6);
nm_log_warn (LOGD_DHCP, "Cannot get a DHCP lease config (no usable DHCP client was found!)");
if (priv->get_lease_ip_configs_func)
return priv->get_lease_ip_configs_func (iface, uuid, ipv6);
return NULL;
}

8
src/dhcp-manager/nm-dhcp-manager.h
View file

@ -82,10 +82,10 @@ NMDHCPClient * nm_dhcp_manager_start_ip6 (NMDHCPManager *manager,
guint8 *dhcp_anycast_addr,
gboolean info_only);
GSList * nm_dhcp_manager_get_lease_config (NMDHCPManager *self,
const char *iface,
const char *uuid,
gboolean ipv6);
GSList * nm_dhcp_manager_get_lease_ip_configs (NMDHCPManager *self,
const char *iface,
const char *uuid,
gboolean ipv6);
/* For testing only */
NMIP4Config *nm_dhcp_manager_test_ip4_options_to_config (const char *dhcp_client,