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

2008-02-28 Tambet Ingo <tambet@gmail.com>

Browse Source 
Get rid of a bunch of unused distro specific functions.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3360 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Tambet Ingo
2008-02-28 22:31:55 +00:00
parent 66c0c51e33
commit 42d71a5372
13 changed files with 4 additions and 1017 deletions
Download Patch File Download Diff File Expand all files Collapse all files

246
src/backends/NetworkManagerSuSE.c
View File

@@ -40,7 +40,6 @@
#include "NetworkManagerPolicy.h"
#include "nm-device-802-3-ethernet.h"
#include "nm-device-802-11-wireless.h"
#include "NetworkManagerDialup.h"
#include "nm-utils.h"
#include "shvar.h"
@@ -527,26 +526,6 @@ void nm_system_device_free_system_config (NMDevice *dev, void *system_config_dat
}
/*
* nm_system_device_get_use_dhcp
*
* Return whether the distro-specific system config tells us to use
* dhcp for this device.
*
*/
gboolean nm_system_device_get_use_dhcp (NMDevice *dev)
{
SuSEDeviceConfigData *sys_data;
g_return_val_if_fail (dev != NULL, FALSE);
if ((sys_data = nm_device_get_system_config_data (dev)))
return sys_data->use_dhcp;
return FALSE;
}
/*
* nm_system_device_get_disabled
*
@@ -566,231 +545,6 @@ gboolean nm_system_device_get_disabled (NMDevice *dev)
}
NMIP4Config *nm_system_device_new_ip4_system_config (NMDevice *dev)
{
SuSEDeviceConfigData *sys_data;
NMIP4Config *new_config = NULL;
g_return_val_if_fail (dev != NULL, NULL);
if ((sys_data = nm_device_get_system_config_data (dev)))
new_config = nm_ip4_config_copy (sys_data->config);
return new_config;
}
void nm_system_deactivate_all_dialup (GSList *list)
{
GSList *elt;
for (elt = list; elt; elt = g_slist_next (elt))
{
NMDialUpConfig *config = (NMDialUpConfig *) elt->data;
char *cmd;
if (config->type == NM_DIALUP_TYPE_ISDN)
{
cmd = g_strdup_printf ("/sbin/isdnctrl hangup %s", (char *) config->data);
nm_spawn_process (cmd);
g_free (cmd);
}
cmd = g_strdup_printf ("/sbin/ifdown %s", (char *) config->data);
nm_spawn_process (cmd);
g_free (cmd);
}
}
gboolean nm_system_deactivate_dialup (GSList *list, const char *dialup)
{
GSList *elt;
gboolean ret = FALSE;
for (elt = list; elt; elt = g_slist_next (elt))
{
NMDialUpConfig *config = (NMDialUpConfig *) elt->data;
if (strcmp (dialup, config->name) == 0)
{
char *cmd;
nm_info ("Deactivating dialup device %s (%s) ...", dialup, (char *) config->data);
cmd = g_strdup_printf ("/sbin/ifdown %s", (char *) config->data);
nm_spawn_process (cmd);
g_free (cmd);
if (config->type == NM_DIALUP_TYPE_ISDN)
{
cmd = g_strdup_printf ("/sbin/isdnctrl hangup %s", (char *) config->data);
nm_spawn_process (cmd);
g_free (cmd);
}
ret = TRUE;
break;
}
}
return ret;
}
gboolean nm_system_activate_dialup (GSList *list, const char *dialup)
{
GSList *elt;
gboolean ret = FALSE;
for (elt = list; elt; elt = g_slist_next (elt))
{
NMDialUpConfig *config = (NMDialUpConfig *) elt->data;
if (strcmp (dialup, config->name) == 0)
{
char *cmd;
nm_info ("Activating dialup device %s (%s) ...", dialup, (char *) config->data);
cmd = g_strdup_printf ("/sbin/ifup %s", (char *) config->data);
nm_spawn_process (cmd);
g_free (cmd);
if (config->type == NM_DIALUP_TYPE_ISDN)
{
cmd = g_strdup_printf ("/sbin/isdnctrl dial %s", (char *) config->data);
nm_spawn_process (cmd);
g_free (cmd);
}
ret = TRUE;
break;
}
}
return ret;
}
/*
* verify_and_return_provider - given a provider identifier, verify that it is able to dial without
* prompting and return the provider name. On failure, return NULL. Caller is responsible for
* free'ing the return.
*/
static char * verify_and_return_provider (const char *provider)
{
shvarFile *file;
char *name, *buf = NULL;
int ret;
name = g_strdup_printf (SYSCONFDIR"/sysconfig/network/providers/%s", provider);
file = svNewFile (name);
if (!file)
goto out_gfree;
buf = svGetValue (file, "ASKPASSWORD");
if (!buf)
goto out_close;
ret = strcmp (buf, "no");
free (buf);
if (ret)
{
buf = NULL;
goto out_close;
}
buf = svGetValue (file, "PROVIDER");
out_close:
svCloseFile (file);
out_gfree:
g_free (name);
return buf;
}
/*
* nm_system_get_dialup_config
*
* Enumerate dial up options on this system, allocate NMDialUpConfig's,
* fill them out, and return.
*
*/
GSList * nm_system_get_dialup_config (void)
{
GSList *list = NULL;
const char *dentry;
GError *err = NULL;
GDir *dir;
dir = g_dir_open (SYSCONFDIR "/sysconfig/network", 0, &err);
if (!dir)
{
nm_warning ("Could not open directory " SYSCONFDIR "/sysconfig/network: %s", err->message);
return NULL;
}
while ((dentry = g_dir_read_name (dir)))
{
NMDialUpConfig *config;
shvarFile *modem_file;
char *name, *buf, *provider_name;
int modem;
/* we only want modems and isdn */
if (g_str_has_prefix (dentry, "ifcfg-modem"))
modem = 1;
else if (g_str_has_prefix (dentry, "ifcfg-ippp"))
modem = 0;
else
continue;
/* open the configuration file */
name = g_strdup_printf (SYSCONFDIR"/sysconfig/network/%s", dentry);
modem_file = svNewFile (name);
if (!modem_file)
goto out_gfree;
/* get the name of the provider used for this entry */
buf = svGetValue (modem_file, "PROVIDER");
if (!buf)
goto out_close;
provider_name = verify_and_return_provider (buf);
if (!provider_name)
goto out_free;
config = g_malloc (sizeof (NMDialUpConfig));
config->data = g_strdup (dentry + 6); /* skip the "ifcfg-" prefix */
if (modem)
{
config->name = g_strdup_printf ("%s via modem (%s)", provider_name, (char *) config->data);
config->type = NM_DIALUP_TYPE_MODEM;
} else
{
config->name = g_strdup_printf ("%s via ISDN (%s)", provider_name, (char *) config->data);
config->type = NM_DIALUP_TYPE_ISDN;
}
list = g_slist_append (list, config);
nm_info ("Found dial up configuration for %s: %s", config->name, (char *) config->data);
free (provider_name);
out_free:
free (buf);
out_close:
svCloseFile (modem_file);
out_gfree:
g_free (name);
}
g_dir_close (dir);
return list;
}
/*
* nm_system_activate_nis
*