2004-08-24 00:31:47 +00:00
|
|
|
/* NetworkManager -- Network link manager
|
|
|
|
|
*
|
|
|
|
|
* Dan Williams <dcbw@redhat.com>
|
2004-08-25 20:52:19 +00:00
|
|
|
* Dan Willemsen <dan@willemsen.us>
|
2004-10-13 20:57:23 +00:00
|
|
|
* Robert Paskowitz
|
2004-08-24 00:31:47 +00:00
|
|
|
*
|
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
|
* (at your option) any later version.
|
|
|
|
|
*
|
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
|
*
|
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
|
* along with this program; if not, write to the Free Software
|
|
|
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
|
|
|
*
|
|
|
|
|
* (C) Copyright 2004 Red Hat, Inc.
|
2004-08-25 20:52:19 +00:00
|
|
|
* (C) Copyright 2004 Dan Willemsen
|
2004-10-13 20:57:23 +00:00
|
|
|
* (C) Copyright 2004 Robert Paskowitz
|
2004-08-24 00:31:47 +00:00
|
|
|
*/
|
|
|
|
|
|
2006-07-13 16:40:34 +00:00
|
|
|
#ifdef HAVE_CONFIG_H
|
|
|
|
|
#include <config.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
2004-08-25 20:52:19 +00:00
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <sys/types.h>
|
|
|
|
|
#include <signal.h>
|
2004-12-16 04:24:20 +00:00
|
|
|
|
2005-07-26 22:19:09 +00:00
|
|
|
#include <arpa/inet.h>
|
2006-07-24 05:49:14 +00:00
|
|
|
#include "NetworkManagerGeneric.h"
|
2004-08-24 00:31:47 +00:00
|
|
|
#include "NetworkManagerSystem.h"
|
2004-08-25 20:52:19 +00:00
|
|
|
#include "NetworkManagerUtils.h"
|
2005-12-31 08:21:24 +00:00
|
|
|
#include "nm-device.h"
|
|
|
|
|
#include "nm-device-802-3-ethernet.h"
|
|
|
|
|
#include "nm-device-802-11-wireless.h"
|
2005-07-26 22:19:09 +00:00
|
|
|
#include "nm-utils.h"
|
|
|
|
|
#include "shvar.h"
|
2004-08-25 20:52:19 +00:00
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* nm_system_init
|
|
|
|
|
*
|
|
|
|
|
* Initializes the distribution-specific system backend
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
void nm_system_init (void)
|
|
|
|
|
{
|
2006-07-24 05:49:14 +00:00
|
|
|
nm_generic_init ();
|
2004-08-25 20:52:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* nm_system_device_flush_routes
|
|
|
|
|
*
|
|
|
|
|
* Flush all routes associated with a network device
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
void nm_system_device_flush_routes (NMDevice *dev)
|
|
|
|
|
{
|
2006-07-24 05:49:14 +00:00
|
|
|
nm_generic_device_flush_routes (dev);
|
2005-07-08 02:08:55 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* nm_system_device_flush_routes_with_iface
|
|
|
|
|
*
|
|
|
|
|
* Flush all routes associated with a network device
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
void nm_system_device_flush_routes_with_iface (const char *iface)
|
|
|
|
|
{
|
2006-07-24 05:49:14 +00:00
|
|
|
nm_generic_device_flush_routes_with_iface (iface);
|
2004-08-25 20:52:19 +00:00
|
|
|
}
|
|
|
|
|
|
2005-07-26 22:19:09 +00:00
|
|
|
/*
|
|
|
|
|
* nm_system_device_has_active_routes
|
|
|
|
|
*
|
|
|
|
|
* Find out whether the specified device has any routes in the routing
|
|
|
|
|
* table.
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
gboolean nm_system_device_has_active_routes (NMDevice *dev)
|
|
|
|
|
{
|
2006-04-18 17:06:03 +00:00
|
|
|
/* TODO */
|
2005-07-26 22:19:09 +00:00
|
|
|
return (FALSE);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-08-25 20:52:19 +00:00
|
|
|
/*
|
|
|
|
|
* nm_system_device_flush_addresses
|
|
|
|
|
*
|
|
|
|
|
* Flush all network addresses associated with a network device
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
void nm_system_device_flush_addresses (NMDevice *dev)
|
|
|
|
|
{
|
2006-07-24 05:49:14 +00:00
|
|
|
nm_generic_device_flush_addresses (dev);
|
2004-08-25 20:52:19 +00:00
|
|
|
}
|
|
|
|
|
|
2004-10-12 11:15:47 +00:00
|
|
|
/*
|
2005-07-08 02:08:55 +00:00
|
|
|
* nm_system_device_flush_addresses_with_iface
|
|
|
|
|
*
|
|
|
|
|
* Flush all network addresses associated with a network device
|
2004-10-12 11:15:47 +00:00
|
|
|
*
|
2005-07-08 02:08:55 +00:00
|
|
|
*/
|
|
|
|
|
void nm_system_device_flush_addresses_with_iface (const char *iface)
|
|
|
|
|
{
|
2006-07-24 05:49:14 +00:00
|
|
|
nm_generic_device_flush_addresses_with_iface (iface);
|
2005-07-08 02:08:55 +00:00
|
|
|
}
|
|
|
|
|
|
2005-07-26 22:19:09 +00:00
|
|
|
#if 0
|
|
|
|
|
/* Alert other computers of our new address */
|
|
|
|
|
temp_addr.s_addr = addr;
|
|
|
|
|
buf = g_strdup_printf ("/sbin/arping -q -A -c 1 -I %s %s", iface, inet_ntoa (temp_addr));
|
|
|
|
|
nm_spawn_process (buf);
|
|
|
|
|
g_free (buf);
|
|
|
|
|
g_usleep (G_USEC_PER_SEC * 2);
|
|
|
|
|
buf = g_strdup_printf ("/sbin/arping -q -U -c 1 -I %s %s", iface, inet_ntoa (temp_addr));
|
|
|
|
|
nm_spawn_process (buf);
|
|
|
|
|
g_free (buf);
|
|
|
|
|
#endif
|
|
|
|
|
|
2005-07-08 02:08:55 +00:00
|
|
|
/*
|
|
|
|
|
* nm_system_device_add_route_via_device_with_iface
|
2004-10-12 11:15:47 +00:00
|
|
|
*
|
2005-07-08 02:08:55 +00:00
|
|
|
* Add route to the given device
|
2004-10-12 11:15:47 +00:00
|
|
|
*
|
|
|
|
|
*/
|
2005-07-08 02:08:55 +00:00
|
|
|
void nm_system_device_add_route_via_device_with_iface (const char *iface, const char *route)
|
2004-10-12 11:15:47 +00:00
|
|
|
{
|
2006-07-24 05:49:14 +00:00
|
|
|
nm_generic_device_add_route_via_device_with_iface (iface, route);
|
2004-10-12 11:15:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2004-08-25 20:52:19 +00:00
|
|
|
/*
|
|
|
|
|
* nm_system_enable_loopback
|
|
|
|
|
*
|
|
|
|
|
* Bring up the loopback interface
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
void nm_system_enable_loopback (void)
|
|
|
|
|
{
|
2006-04-18 17:06:03 +00:00
|
|
|
/* No need to run net.lo if it is already running */
|
|
|
|
|
if (nm_spawn_process ("/etc/init.d/net.lo status") != 0)
|
|
|
|
|
nm_spawn_process("/etc/init.d/net.lo start");
|
2005-07-26 22:19:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* nm_system_flush_loopback_routes
|
|
|
|
|
*
|
|
|
|
|
* Flush all routes associated with the loopback device, because it
|
|
|
|
|
* sometimes gets the first route for ZeroConf/Link-Local traffic.
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
void nm_system_flush_loopback_routes (void)
|
|
|
|
|
{
|
2006-07-24 05:49:14 +00:00
|
|
|
nm_generic_flush_loopback_routes ();
|
2004-08-25 20:52:19 +00:00
|
|
|
}
|
|
|
|
|
|
2005-07-26 22:19:09 +00:00
|
|
|
/*
|
|
|
|
|
* nm_system_flush_arp_cache
|
|
|
|
|
*
|
|
|
|
|
* Flush all entries in the arp cache.
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
void nm_system_flush_arp_cache (void)
|
|
|
|
|
{
|
2006-07-24 05:49:14 +00:00
|
|
|
nm_generic_flush_arp_cache ();
|
2005-07-26 22:19:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-08-25 20:52:19 +00:00
|
|
|
/*
|
|
|
|
|
* nm_system_kill_all_dhcp_daemons
|
|
|
|
|
*
|
|
|
|
|
* Kill all DHCP daemons currently running, done at startup
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
void nm_system_kill_all_dhcp_daemons (void)
|
|
|
|
|
{
|
2006-04-18 17:06:03 +00:00
|
|
|
/* TODO */
|
|
|
|
|
/* Tell dhcdbd to kill its dhclient instance */
|
2004-08-25 20:52:19 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* nm_system_update_dns
|
|
|
|
|
*
|
|
|
|
|
* Make glibc/nscd aware of any changes to the resolv.conf file by
|
|
|
|
|
* restarting nscd. Only restart if already running.
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
void nm_system_update_dns (void)
|
|
|
|
|
{
|
2005-07-26 22:19:09 +00:00
|
|
|
#ifdef NM_NO_NAMED
|
2005-08-08 15:11:08 +00:00
|
|
|
if (nm_spawn_process ("/etc/init.d/nscd status") == 0)
|
2004-08-25 20:52:19 +00:00
|
|
|
nm_spawn_process ("/etc/init.d/nscd restart");
|
2005-07-26 22:19:09 +00:00
|
|
|
#else
|
2005-10-21 21:50:49 +00:00
|
|
|
nm_spawn_process("/usr/bin/killall -q nscd");
|
2006-04-18 17:06:03 +00:00
|
|
|
#endif
|
2004-08-25 20:52:19 +00:00
|
|
|
}
|
|
|
|
|
|
2004-12-16 04:24:20 +00:00
|
|
|
/*
|
|
|
|
|
* nm_system_restart_mdns_responder
|
|
|
|
|
*
|
|
|
|
|
* Restart the multicast DNS responder so that it knows about new
|
|
|
|
|
* network interfaces and IP addresses.
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
void nm_system_restart_mdns_responder (void)
|
|
|
|
|
{
|
2007-11-12 02:54:18 +00:00
|
|
|
#if defined(MDNS_PROVIDER_AVAHI)
|
2007-11-01 02:15:16 +00:00
|
|
|
nm_info ("Restarting avahi-daemon");
|
|
|
|
|
if (g_file_test ("/var/run/avahi-daemon/pid", G_FILE_TEST_EXISTS))
|
|
|
|
|
{
|
|
|
|
|
nm_spawn_process ("/etc/init.d/avahi-daemon restart");
|
|
|
|
|
}
|
2007-11-12 02:54:18 +00:00
|
|
|
#elif defined(MDNS_PROVIDER_BONJOUR)
|
2007-11-01 02:15:16 +00:00
|
|
|
if (g_file_test ("/var/run/mDNSResponderPosix.pid", G_FILE_TEST_EXISTS))
|
|
|
|
|
{
|
|
|
|
|
nm_info ("Restarting mDNSResponderPosix");
|
|
|
|
|
nm_spawn_process ("/etc/init.d/mDNSResponderPosix restart");
|
|
|
|
|
}
|
|
|
|
|
#else
|
|
|
|
|
g_printerr("No mDNSResponder support enabled");
|
|
|
|
|
g_assert_not_reached();
|
|
|
|
|
#endif
|
2004-12-16 04:24:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2005-02-10 21:16:03 +00:00
|
|
|
/*
|
|
|
|
|
* nm_system_device_add_ip6_link_address
|
|
|
|
|
*
|
|
|
|
|
* Add a default link-local IPv6 address to a device.
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
void nm_system_device_add_ip6_link_address (NMDevice *dev)
|
|
|
|
|
{
|
2006-07-24 05:49:14 +00:00
|
|
|
nm_generic_device_add_ip6_link_address (dev);
|
2005-02-10 21:16:03 +00:00
|
|
|
}
|
|
|
|
|
|
2005-07-08 02:08:55 +00:00
|
|
|
typedef struct GentooSystemConfigData
|
|
|
|
|
{
|
|
|
|
|
NMIP4Config * config;
|
|
|
|
|
gboolean use_dhcp;
|
|
|
|
|
} GentooSystemConfigData;
|
|
|
|
|
|
2005-02-10 21:16:03 +00:00
|
|
|
|
2004-09-08 18:14:42 +00:00
|
|
|
/*
|
2005-07-08 02:08:55 +00:00
|
|
|
* nm_system_device_get_system_config
|
2004-09-08 18:14:42 +00:00
|
|
|
*
|
|
|
|
|
* Retrieve any relevant configuration info for a particular device
|
|
|
|
|
* from the system network configuration information. Clear out existing
|
|
|
|
|
* info before setting stuff too.
|
|
|
|
|
*
|
|
|
|
|
*/
|
2007-08-28 15:54:55 +00:00
|
|
|
void *nm_system_device_get_system_config (NMDevice *dev)
|
2004-09-08 18:14:42 +00:00
|
|
|
{
|
2004-11-06 03:40:17 +00:00
|
|
|
char *cfg_file_path = NULL;
|
|
|
|
|
FILE *file = NULL;
|
|
|
|
|
char buffer[100];
|
|
|
|
|
char confline[100], dhcpline[100], ipline[100];
|
|
|
|
|
int ipa, ipb, ipc, ipd;
|
|
|
|
|
int nNext = 0, bNext = 0, count = 0;
|
|
|
|
|
char *confToken;
|
|
|
|
|
gboolean data_good = FALSE;
|
|
|
|
|
gboolean use_dhcp = TRUE;
|
2005-07-08 02:08:55 +00:00
|
|
|
GentooSystemConfigData *sys_data = NULL;
|
2004-11-06 03:40:17 +00:00
|
|
|
guint32 ip4_address = 0;
|
|
|
|
|
guint32 ip4_netmask = 0;
|
|
|
|
|
guint32 ip4_gateway = 0;
|
2004-12-05 21:28:42 +00:00
|
|
|
guint32 ip4_broadcast = 0;
|
2004-11-06 03:40:17 +00:00
|
|
|
|
2005-07-08 02:08:55 +00:00
|
|
|
g_return_val_if_fail (dev != NULL, NULL);
|
2004-11-06 03:40:17 +00:00
|
|
|
|
2005-07-08 02:08:55 +00:00
|
|
|
sys_data = g_malloc0 (sizeof (GentooSystemConfigData));
|
2006-04-18 17:06:03 +00:00
|
|
|
sys_data->config = nm_device_get_ip4_config(dev);
|
2004-11-06 03:40:17 +00:00
|
|
|
/* We use DHCP on an interface unless told not to */
|
2005-07-08 02:08:55 +00:00
|
|
|
sys_data->use_dhcp = TRUE;
|
|
|
|
|
nm_device_set_use_dhcp (dev, TRUE);
|
|
|
|
|
// nm_ip4_config_set_address (sys_data->config, 0);
|
|
|
|
|
// nm_ip4_config_set_gateway (sys_data->config, 0);
|
|
|
|
|
// nm_ip4_config_set_netmask (sys_data->config, 0);
|
2004-11-06 03:40:17 +00:00
|
|
|
|
|
|
|
|
/* Gentoo systems store this information in
|
|
|
|
|
* /etc/conf.d/net, this is for all interfaces.
|
|
|
|
|
*/
|
|
|
|
|
|
2006-04-18 17:06:03 +00:00
|
|
|
cfg_file_path = g_strdup ("/etc/conf.d/net");
|
|
|
|
|
if (!cfg_file_path) {
|
|
|
|
|
g_free (sys_data);
|
2005-07-08 02:08:55 +00:00
|
|
|
return NULL;
|
2006-04-18 17:06:03 +00:00
|
|
|
}
|
2004-11-06 03:40:17 +00:00
|
|
|
|
|
|
|
|
if (!(file = fopen (cfg_file_path, "r")))
|
|
|
|
|
{
|
|
|
|
|
g_free (cfg_file_path);
|
2006-04-18 17:06:03 +00:00
|
|
|
g_free (sys_data);
|
2005-07-08 02:08:55 +00:00
|
|
|
return NULL;
|
2004-11-06 03:40:17 +00:00
|
|
|
}
|
2006-04-18 17:06:03 +00:00
|
|
|
snprintf(confline, 100, "iface_%s", nm_device_get_iface (dev));
|
|
|
|
|
snprintf(dhcpline, 100, "iface_%s=\"dhcp\"", nm_device_get_iface (dev));
|
|
|
|
|
/* buffer is char[100], guess this fgets call was fairly wrong then? */
|
|
|
|
|
while (fgets (buffer, 100, file) && !feof (file))
|
2004-11-06 03:40:17 +00:00
|
|
|
{
|
|
|
|
|
/* Kock off newline if any */
|
|
|
|
|
g_strstrip (buffer);
|
|
|
|
|
|
|
|
|
|
if (strncmp (buffer, confline, strlen(confline)) == 0)
|
|
|
|
|
{
|
|
|
|
|
/* Make sure this config file is for this device */
|
|
|
|
|
if (strncmp (&buffer[strlen(confline) - strlen(nm_device_get_iface (dev))],
|
|
|
|
|
nm_device_get_iface (dev), strlen(nm_device_get_iface (dev))) != 0)
|
|
|
|
|
{
|
2005-03-14 Ray Strode <rstrode@redhat.com>
Fourth (probably working) cut at porting to
dbus 0.30 api and new hal. This cut adds
some new logging macros to make debugging
easier.
* dispatcher-daemon/NetworkManagerDispatcher.c:
* info-daemon/NetworkmanagerInfo.c:
* info-daemon/NetworkManagerInfoPassphraseDialog.c:
* info-daemon/NetworkManagerInfoVPN.c:
* src/NetworkManager.c:
* src/NetworkManagerAP.c:
* src/NetworkManagerAPList.c:
* src/NetworkManagerDHCP.c:
* src/NetworkManagerDbus.c:
* src/NetworkManagerDevice.c:
* src/NetworkManagerPolicy.c:
* src/NetworkManagerSystem.c:
* src/NetworkManagerUtils.c:
* src/NetworkManagerWireless.c:
* src/autoip.c:
* src/nm-dbus-nm.c:
* src/backends/NetworkManagerDebian.c:
* src/backends/NetworkManagerGentoo.c:
* src/backends/NetworkManagerRedHat.c:
* src/backends/NetworkManagerSlackware.c:
use new logging macros.
* dispatcher-daemon/NetworkManagerDispatcher.c:
(nmd_dbus_filter): s/dbus_free/g_free/
* info-daemon/Makefile.am: link in utils library.
* info-daemon/NetworkmanagerInfo.c: use new logging
macros.
(nmi_dbus_get_network): don't assume enumerations
are 32-bit.
(nmi_dbus_nmi_message_handler): don't free what
doesn't belong to us.
* libnm_glib/libnm_glib.c:
(libnm_glib_get_nm_status):
(libnm_glib_init): don't free what doesn't
belong to us.
(libnm_glib_dbus): strdup result, so it doesn't get
lost when message is unref'd.
* panel-applet/NMWirelessAppletDbus.c:
(nmwa_dbus_update_devices): s/dbus_free/g_free/
* src/NetworkManager.c:
(nm_monitor_wired_link_state): request initial status
dump of all cards when we start up, instead of relying
on /sys/.../carrier.
(nm_info_handler), (nm_set_up_log_handlers):
log handlers to specify what syslog priorites
the logging macros default to.
* src/NetworkManagerAPList.c:
(nm_ap_list_populate_from_nmi):
s/dbus_free_string_array/g_strfreev/
* src/NetworkManagerDbus.c:
(nm_dbus_get_network_object):
validate d-bus message argument types.
Advance message iterator after reading argument,
prepend instead of append to GSList.
* src/NetworkManagerDevice.c:
(nm_device_probe_wired_link_status):
remove redundant /sys in /sys path. remove wrong
contents == NULL means has carrier assumption.
* src/nm-netlink-monitor.c
(nm_netlink_monitor_request_status): implement
function to ask kernel to dump interface link
status over netlink socket.
* test/*.c: s/dbus_free/g_free/
* utils/nm-utils.h:
(nm_print_backtrace): new macro to print backtrace.
(nm_get_timestamp): new macro to get sub-second precise
unix timestamp.
(nm_info), (nm_debug), (nm_warning), (nm_error):
new logging functions. nm_info just prints,
nm_debug includes timestamp and function,
nm_warning includes function, nm_error includes
backtrace and sigtrap.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@497 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2005-03-15 05:30:15 +00:00
|
|
|
nm_warning ("System config file '%s' does not define device '%s'\n",
|
2004-11-06 03:40:17 +00:00
|
|
|
cfg_file_path, nm_device_get_iface (dev));
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
data_good = TRUE;
|
|
|
|
|
|
2004-10-13 20:57:23 +00:00
|
|
|
if (strncmp (buffer, dhcpline, strlen(dhcpline)) == 0)
|
|
|
|
|
{
|
|
|
|
|
use_dhcp = TRUE;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
use_dhcp = FALSE;
|
|
|
|
|
confToken = strtok(&buffer[strlen(confline) + 2], " ");
|
|
|
|
|
while (count < 3)
|
2004-11-06 03:40:17 +00:00
|
|
|
{
|
2004-10-13 20:57:23 +00:00
|
|
|
if (nNext == 1 && bNext == 1)
|
|
|
|
|
{
|
|
|
|
|
ip4_address = inet_addr (confToken);
|
|
|
|
|
count++;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (strcmp(confToken, "netmask") == 0)
|
|
|
|
|
{
|
|
|
|
|
confToken = strtok(NULL, " ");
|
|
|
|
|
ip4_netmask = inet_addr (confToken);
|
|
|
|
|
count++;
|
|
|
|
|
nNext = 1;
|
|
|
|
|
}
|
|
|
|
|
else if (strcmp(confToken, "broadcast") == 0)
|
|
|
|
|
{
|
|
|
|
|
confToken = strtok(NULL, " ");
|
|
|
|
|
count++;
|
|
|
|
|
bNext = 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
ip4_address = inet_addr (confToken);
|
|
|
|
|
count++;
|
|
|
|
|
}
|
2004-11-06 03:40:17 +00:00
|
|
|
confToken = strtok(NULL, " ");
|
|
|
|
|
}
|
2004-10-13 20:57:23 +00:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
/* If we aren't using dhcp, then try to get the gateway */
|
|
|
|
|
if (!use_dhcp)
|
2004-11-06 03:40:17 +00:00
|
|
|
{
|
2006-04-18 17:06:03 +00:00
|
|
|
snprintf(ipline, 100, "gateway=\"%s/", nm_device_get_iface (dev));
|
2004-10-13 20:57:23 +00:00
|
|
|
if (strncmp(buffer, ipline, strlen(ipline) - 1) == 0)
|
|
|
|
|
{
|
2006-04-18 17:06:03 +00:00
|
|
|
snprintf(ipline, 100, "gateway=\"%s/%%d.%%d.%%d.%%d\"", nm_device_get_iface (dev) );
|
2004-10-13 20:57:23 +00:00
|
|
|
sscanf(buffer, ipline, &ipa, &ipb, &ipc, &ipd);
|
2006-04-18 17:06:03 +00:00
|
|
|
snprintf(ipline, 100, "%d.%d.%d.%d", ipa, ipb, ipc, ipd);
|
2004-10-13 20:57:23 +00:00
|
|
|
ip4_gateway = inet_addr (ipline);
|
|
|
|
|
}
|
|
|
|
|
}
|
2004-11-06 03:40:17 +00:00
|
|
|
}
|
|
|
|
|
fclose (file);
|
|
|
|
|
g_free (cfg_file_path);
|
|
|
|
|
|
|
|
|
|
/* If successful, set values on the device */
|
|
|
|
|
if (data_good)
|
|
|
|
|
{
|
2006-04-18 17:06:03 +00:00
|
|
|
nm_warning("data good :-)");
|
2005-07-08 02:08:55 +00:00
|
|
|
nm_device_set_use_dhcp (dev, use_dhcp);
|
2004-11-06 03:40:17 +00:00
|
|
|
if (ip4_address)
|
2006-04-18 17:06:03 +00:00
|
|
|
nm_ip4_config_set_address (sys_data->config, ip4_address);
|
2004-11-06 03:40:17 +00:00
|
|
|
if (ip4_gateway)
|
2006-04-18 17:06:03 +00:00
|
|
|
nm_ip4_config_set_gateway (sys_data->config, ip4_gateway);
|
2004-11-06 03:40:17 +00:00
|
|
|
if (ip4_netmask)
|
2005-07-08 02:08:55 +00:00
|
|
|
nm_ip4_config_set_netmask (sys_data->config, ip4_netmask);
|
2004-11-06 03:40:17 +00:00
|
|
|
if (ip4_broadcast)
|
2005-07-08 02:08:55 +00:00
|
|
|
nm_ip4_config_set_broadcast (sys_data->config, ip4_broadcast);
|
2004-11-06 03:40:17 +00:00
|
|
|
}
|
2005-07-08 02:08:55 +00:00
|
|
|
return (void *)sys_data;
|
2004-09-08 18:14:42 +00:00
|
|
|
}
|
2004-12-17 17:16:22 +00:00
|
|
|
|
|
|
|
|
/*
|
2008-03-07 Dan Williams <dcbw@redhat.com>
First pass of multiple active device support. Expect bugs.
* src/nm-ip4-config.c
src/nm-ip4-config.h
- (nm_ip4_config_get_secondary, nm_ip4_config_set_secondary): remove;
there are better ways to do this in the named manager
* src/nm-device.c
src/nm-device.h
- (nm_device_can_activate): return whether the device can activate a
connection right now; taking into account things like carrier state
and rfkill state
- (nm_device_get_best_auto_connection): renamed from
nm_device_get_best_connection
- (real_act_stage4_get_ip4_config): MTU stuff is now handled in the
device subclasses themselves, so that each device can override the
MTU from it's NMSetting subclass if needed
- (nm_device_set_ip4_config): set MTU when setting up routes and stuff
in NetworkManagerSystem.c, not here
* src/named-manager/nm-named-manager.c
src/named-manager/nm-named-manager.h
- (nm_named_manager_name_owner_changed,
nm_named_manager_dbus_connection_changed): fix for changes to
rewrite_resolv_conf()
- (compute_nameservers): don't need the NMNamedManager at all, remove
from parameter list
- (merge_one_ip4_config): new function; merge ip4 configs together
- (rewrite_resolv_conf): write out resolv.conf from all the stored
ip4 configs; the VPN config takes precedence, then the best
device config, then the rest of the configs
- (get_domain_for_config): take the NMNamedManager as an argument
to check whether the config is the VPN config
- (add_ip4_config_to_named): fixups for removal of the 'secondary'
attribute from ip4 configs
- (add_all_ip4_configs_to_named): add all the configs in priority order
- (remove_ip4_config_from_named): fix for changes to
get_domain_for_config()
- (nm_named_manager_add_ip4_config): assign the config to the right slot
based on its type; callers must pass in the type now
- (get_last_default_domain): remove, unused
- (nm_named_manager_remove_ip4_config): handle config slots correctly
* src/nm-device-802-11-wireless.c
- (real_can_activate): new function
- (real_get_best_auto_connection): renamed from real_get_best_connection
- (real_act_stage4_get_ip4_config): handle MTU override
* src/nm-device-802-3-ethernet.c
- (real_can_activate): new function
- (real_get_best_auto_connection): renamed from real_get_best_connection
- (real_act_stage4_get_ip4_config): new function; handle MTU override
* src/vpn-manager/nm-vpn-connection.c
- (nm_vpn_connection_ip4_config_get): don't need to set the 'secondary'
attribute on the ip4 config
* src/NetworkManagerPolicy.c
- (nm_policy_auto_get_best_device): remove
- (nm_policy_device_change_check): remove
- (update_default_route): new function; set the default route via
the specified device
- (get_device_priority): new function; return the priority number of
a device type WRT which one should have the default route. Order is
(highest to lowest) wired, wireless, GSM, CDMA.
- (update_routing_and_dns): new function; determine which device should
have the default route, then update the routing table and DNS
- (maybe_auto_activate_device): new function; if a device is now
available for activation, find out what connection it would like to
activate and do it
- (schedule_activate_check): new function; if a device can be activated
now, schedule the activation. Each device may have only one
pending activation at a given time.
- (device_state_changed): if activation was canceled, try again,
possibly with another connection; if the device was activated,
update routing and DNS; if the device was deactivated, try again
with another connection
- (device_carrier_changed): if there is no carrier, deactivate the
device; otherwise schedule an activation check for the device
- (wireless_networks_changed): schedule an activation check for the
device
- (device_added): keep track of the signal handler IDs so they can
be removed when the device goes away
- (device_removed): remove any signal handlers that might be attached
to the device; update routing and DNS
- (schedule_activate_all): new function
- (connections_added, connection_added, connection_updated): when
connections change, schedule all devices for an activation check
- (connection_removed): when a device is deactivated because its
connection was removed, schedule another activation check for it
- (nm_policy_destroy): destroy pending activations and disconnect
all device signal handlers
* src/nm-manager.c
- (nm_manager_activate_device): if the device was already actived,
deactivate it
- (deactivate_old_device): remove
- (connection_added_default_handler, impl_manager_activate_device):
don't deactivate other devices when activating this one
* src/backends/NetworkManagerGentoo.c
src/backends/NetworkManagerFrugalware.c
src/backends/NetworkManagerPaldo.c
src/backends/NetworkManagerRedHat.c
src/backends/NetworkManagerSlackware.c
src/backends/NetworkManagerArch.c
src/backends/NetworkManagerSuSE.c
src/backends/NetworkManagerDebian.c
- (nm_system_get_mtu): remove; MTU should be provided through the
distro's system settings service plugin instead
- (nm_system_device_add_default_route_via_device): remove
- (nm_system_device_add_default_route_via_device_with_iface): remove
- (nm_system_device_replace_default_route): new function; call
generic implementation
* src/backends/NetworkManagerGeneric.c
src/backends/NetworkManagerGeneric.h
- (nm_generic_device_add_default_route_via_device,
nm_generic_device_add_default_route_via_device_with_iface): remove
- (nm_generic_device_replace_default_route): replace the default route
with the given route via some gateway
* src/NetworkManagerSystem.c
src/NetworkManagerSystem.h
- (nm_system_device_set_from_ip4_config): let the policy handle updates
to routing and DNS; but set the MTU here
- (nm_system_vpn_device_set_from_ip4_config): set the route with the
ip_iface of the active device; use the standard MTU setting function
- (nm_system_set_mtu): remove
- (nm_system_device_set_mtu): consolidate MTU setting code in one place
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3391 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-03-07 19:41:32 +00:00
|
|
|
* nm_system_device_replace_default_route
|
2005-07-08 02:08:55 +00:00
|
|
|
*
|
|
|
|
|
* Add default route to the given device
|
|
|
|
|
*
|
|
|
|
|
*/
|
2008-03-07 Dan Williams <dcbw@redhat.com>
First pass of multiple active device support. Expect bugs.
* src/nm-ip4-config.c
src/nm-ip4-config.h
- (nm_ip4_config_get_secondary, nm_ip4_config_set_secondary): remove;
there are better ways to do this in the named manager
* src/nm-device.c
src/nm-device.h
- (nm_device_can_activate): return whether the device can activate a
connection right now; taking into account things like carrier state
and rfkill state
- (nm_device_get_best_auto_connection): renamed from
nm_device_get_best_connection
- (real_act_stage4_get_ip4_config): MTU stuff is now handled in the
device subclasses themselves, so that each device can override the
MTU from it's NMSetting subclass if needed
- (nm_device_set_ip4_config): set MTU when setting up routes and stuff
in NetworkManagerSystem.c, not here
* src/named-manager/nm-named-manager.c
src/named-manager/nm-named-manager.h
- (nm_named_manager_name_owner_changed,
nm_named_manager_dbus_connection_changed): fix for changes to
rewrite_resolv_conf()
- (compute_nameservers): don't need the NMNamedManager at all, remove
from parameter list
- (merge_one_ip4_config): new function; merge ip4 configs together
- (rewrite_resolv_conf): write out resolv.conf from all the stored
ip4 configs; the VPN config takes precedence, then the best
device config, then the rest of the configs
- (get_domain_for_config): take the NMNamedManager as an argument
to check whether the config is the VPN config
- (add_ip4_config_to_named): fixups for removal of the 'secondary'
attribute from ip4 configs
- (add_all_ip4_configs_to_named): add all the configs in priority order
- (remove_ip4_config_from_named): fix for changes to
get_domain_for_config()
- (nm_named_manager_add_ip4_config): assign the config to the right slot
based on its type; callers must pass in the type now
- (get_last_default_domain): remove, unused
- (nm_named_manager_remove_ip4_config): handle config slots correctly
* src/nm-device-802-11-wireless.c
- (real_can_activate): new function
- (real_get_best_auto_connection): renamed from real_get_best_connection
- (real_act_stage4_get_ip4_config): handle MTU override
* src/nm-device-802-3-ethernet.c
- (real_can_activate): new function
- (real_get_best_auto_connection): renamed from real_get_best_connection
- (real_act_stage4_get_ip4_config): new function; handle MTU override
* src/vpn-manager/nm-vpn-connection.c
- (nm_vpn_connection_ip4_config_get): don't need to set the 'secondary'
attribute on the ip4 config
* src/NetworkManagerPolicy.c
- (nm_policy_auto_get_best_device): remove
- (nm_policy_device_change_check): remove
- (update_default_route): new function; set the default route via
the specified device
- (get_device_priority): new function; return the priority number of
a device type WRT which one should have the default route. Order is
(highest to lowest) wired, wireless, GSM, CDMA.
- (update_routing_and_dns): new function; determine which device should
have the default route, then update the routing table and DNS
- (maybe_auto_activate_device): new function; if a device is now
available for activation, find out what connection it would like to
activate and do it
- (schedule_activate_check): new function; if a device can be activated
now, schedule the activation. Each device may have only one
pending activation at a given time.
- (device_state_changed): if activation was canceled, try again,
possibly with another connection; if the device was activated,
update routing and DNS; if the device was deactivated, try again
with another connection
- (device_carrier_changed): if there is no carrier, deactivate the
device; otherwise schedule an activation check for the device
- (wireless_networks_changed): schedule an activation check for the
device
- (device_added): keep track of the signal handler IDs so they can
be removed when the device goes away
- (device_removed): remove any signal handlers that might be attached
to the device; update routing and DNS
- (schedule_activate_all): new function
- (connections_added, connection_added, connection_updated): when
connections change, schedule all devices for an activation check
- (connection_removed): when a device is deactivated because its
connection was removed, schedule another activation check for it
- (nm_policy_destroy): destroy pending activations and disconnect
all device signal handlers
* src/nm-manager.c
- (nm_manager_activate_device): if the device was already actived,
deactivate it
- (deactivate_old_device): remove
- (connection_added_default_handler, impl_manager_activate_device):
don't deactivate other devices when activating this one
* src/backends/NetworkManagerGentoo.c
src/backends/NetworkManagerFrugalware.c
src/backends/NetworkManagerPaldo.c
src/backends/NetworkManagerRedHat.c
src/backends/NetworkManagerSlackware.c
src/backends/NetworkManagerArch.c
src/backends/NetworkManagerSuSE.c
src/backends/NetworkManagerDebian.c
- (nm_system_get_mtu): remove; MTU should be provided through the
distro's system settings service plugin instead
- (nm_system_device_add_default_route_via_device): remove
- (nm_system_device_add_default_route_via_device_with_iface): remove
- (nm_system_device_replace_default_route): new function; call
generic implementation
* src/backends/NetworkManagerGeneric.c
src/backends/NetworkManagerGeneric.h
- (nm_generic_device_add_default_route_via_device,
nm_generic_device_add_default_route_via_device_with_iface): remove
- (nm_generic_device_replace_default_route): replace the default route
with the given route via some gateway
* src/NetworkManagerSystem.c
src/NetworkManagerSystem.h
- (nm_system_device_set_from_ip4_config): let the policy handle updates
to routing and DNS; but set the MTU here
- (nm_system_vpn_device_set_from_ip4_config): set the route with the
ip_iface of the active device; use the standard MTU setting function
- (nm_system_set_mtu): remove
- (nm_system_device_set_mtu): consolidate MTU setting code in one place
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3391 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-03-07 19:41:32 +00:00
|
|
|
void
|
|
|
|
|
nm_system_device_replace_default_route (const char *iface,
|
|
|
|
|
guint32 gw,
|
|
|
|
|
guint32 mss)
|
2005-07-08 02:08:55 +00:00
|
|
|
{
|
2008-03-07 Dan Williams <dcbw@redhat.com>
First pass of multiple active device support. Expect bugs.
* src/nm-ip4-config.c
src/nm-ip4-config.h
- (nm_ip4_config_get_secondary, nm_ip4_config_set_secondary): remove;
there are better ways to do this in the named manager
* src/nm-device.c
src/nm-device.h
- (nm_device_can_activate): return whether the device can activate a
connection right now; taking into account things like carrier state
and rfkill state
- (nm_device_get_best_auto_connection): renamed from
nm_device_get_best_connection
- (real_act_stage4_get_ip4_config): MTU stuff is now handled in the
device subclasses themselves, so that each device can override the
MTU from it's NMSetting subclass if needed
- (nm_device_set_ip4_config): set MTU when setting up routes and stuff
in NetworkManagerSystem.c, not here
* src/named-manager/nm-named-manager.c
src/named-manager/nm-named-manager.h
- (nm_named_manager_name_owner_changed,
nm_named_manager_dbus_connection_changed): fix for changes to
rewrite_resolv_conf()
- (compute_nameservers): don't need the NMNamedManager at all, remove
from parameter list
- (merge_one_ip4_config): new function; merge ip4 configs together
- (rewrite_resolv_conf): write out resolv.conf from all the stored
ip4 configs; the VPN config takes precedence, then the best
device config, then the rest of the configs
- (get_domain_for_config): take the NMNamedManager as an argument
to check whether the config is the VPN config
- (add_ip4_config_to_named): fixups for removal of the 'secondary'
attribute from ip4 configs
- (add_all_ip4_configs_to_named): add all the configs in priority order
- (remove_ip4_config_from_named): fix for changes to
get_domain_for_config()
- (nm_named_manager_add_ip4_config): assign the config to the right slot
based on its type; callers must pass in the type now
- (get_last_default_domain): remove, unused
- (nm_named_manager_remove_ip4_config): handle config slots correctly
* src/nm-device-802-11-wireless.c
- (real_can_activate): new function
- (real_get_best_auto_connection): renamed from real_get_best_connection
- (real_act_stage4_get_ip4_config): handle MTU override
* src/nm-device-802-3-ethernet.c
- (real_can_activate): new function
- (real_get_best_auto_connection): renamed from real_get_best_connection
- (real_act_stage4_get_ip4_config): new function; handle MTU override
* src/vpn-manager/nm-vpn-connection.c
- (nm_vpn_connection_ip4_config_get): don't need to set the 'secondary'
attribute on the ip4 config
* src/NetworkManagerPolicy.c
- (nm_policy_auto_get_best_device): remove
- (nm_policy_device_change_check): remove
- (update_default_route): new function; set the default route via
the specified device
- (get_device_priority): new function; return the priority number of
a device type WRT which one should have the default route. Order is
(highest to lowest) wired, wireless, GSM, CDMA.
- (update_routing_and_dns): new function; determine which device should
have the default route, then update the routing table and DNS
- (maybe_auto_activate_device): new function; if a device is now
available for activation, find out what connection it would like to
activate and do it
- (schedule_activate_check): new function; if a device can be activated
now, schedule the activation. Each device may have only one
pending activation at a given time.
- (device_state_changed): if activation was canceled, try again,
possibly with another connection; if the device was activated,
update routing and DNS; if the device was deactivated, try again
with another connection
- (device_carrier_changed): if there is no carrier, deactivate the
device; otherwise schedule an activation check for the device
- (wireless_networks_changed): schedule an activation check for the
device
- (device_added): keep track of the signal handler IDs so they can
be removed when the device goes away
- (device_removed): remove any signal handlers that might be attached
to the device; update routing and DNS
- (schedule_activate_all): new function
- (connections_added, connection_added, connection_updated): when
connections change, schedule all devices for an activation check
- (connection_removed): when a device is deactivated because its
connection was removed, schedule another activation check for it
- (nm_policy_destroy): destroy pending activations and disconnect
all device signal handlers
* src/nm-manager.c
- (nm_manager_activate_device): if the device was already actived,
deactivate it
- (deactivate_old_device): remove
- (connection_added_default_handler, impl_manager_activate_device):
don't deactivate other devices when activating this one
* src/backends/NetworkManagerGentoo.c
src/backends/NetworkManagerFrugalware.c
src/backends/NetworkManagerPaldo.c
src/backends/NetworkManagerRedHat.c
src/backends/NetworkManagerSlackware.c
src/backends/NetworkManagerArch.c
src/backends/NetworkManagerSuSE.c
src/backends/NetworkManagerDebian.c
- (nm_system_get_mtu): remove; MTU should be provided through the
distro's system settings service plugin instead
- (nm_system_device_add_default_route_via_device): remove
- (nm_system_device_add_default_route_via_device_with_iface): remove
- (nm_system_device_replace_default_route): new function; call
generic implementation
* src/backends/NetworkManagerGeneric.c
src/backends/NetworkManagerGeneric.h
- (nm_generic_device_add_default_route_via_device,
nm_generic_device_add_default_route_via_device_with_iface): remove
- (nm_generic_device_replace_default_route): replace the default route
with the given route via some gateway
* src/NetworkManagerSystem.c
src/NetworkManagerSystem.h
- (nm_system_device_set_from_ip4_config): let the policy handle updates
to routing and DNS; but set the MTU here
- (nm_system_vpn_device_set_from_ip4_config): set the route with the
ip_iface of the active device; use the standard MTU setting function
- (nm_system_set_mtu): remove
- (nm_system_device_set_mtu): consolidate MTU setting code in one place
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3391 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-03-07 19:41:32 +00:00
|
|
|
nm_generic_device_replace_default_route (iface, gw, mss);
|
2005-07-08 02:08:55 +00:00
|
|
|
}
|
2004-12-17 17:16:22 +00:00
|
|
|
|
2005-07-08 02:08:55 +00:00
|
|
|
void nm_system_device_free_system_config (NMDevice *dev, void *system_config_data)
|
|
|
|
|
{
|
|
|
|
|
GentooSystemConfigData *sys_data = (GentooSystemConfigData *)system_config_data;
|
|
|
|
|
|
|
|
|
|
g_return_if_fail (dev != NULL);
|
|
|
|
|
|
2006-04-18 17:06:03 +00:00
|
|
|
g_return_if_fail(sys_data != NULL);
|
2005-07-08 02:08:55 +00:00
|
|
|
|
|
|
|
|
if (sys_data->config)
|
2007-02-16 11:23:49 +00:00
|
|
|
g_object_unref (sys_data->config);
|
2005-07-08 02:08:55 +00:00
|
|
|
|
2006-04-18 17:06:03 +00:00
|
|
|
g_free (sys_data);
|
2004-12-17 17:16:22 +00:00
|
|
|
}
|
|
|
|
|
|
2006-01-27 05:43:16 +00:00
|
|
|
/*
|
|
|
|
|
* nm_system_device_get_disabled
|
|
|
|
|
*
|
|
|
|
|
* Return whether the distro-specific system config tells us to use
|
|
|
|
|
* dhcp for this device.
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
gboolean nm_system_device_get_disabled (NMDevice *dev)
|
|
|
|
|
{
|
|
|
|
|
return FALSE;
|
|
|
|
|
}
|
|
|
|
|
|
2005-12-14 16:00:17 +00:00
|
|
|
/*
|
|
|
|
|
* nm_system_activate_nis
|
|
|
|
|
*
|
|
|
|
|
* set up the nis domain and write a yp.conf
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
void nm_system_activate_nis (NMIP4Config *config)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* nm_system_shutdown_nis
|
|
|
|
|
*
|
|
|
|
|
* shutdown ypbind
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
void nm_system_shutdown_nis (void)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2006-01-23 21:02:39 +00:00
|
|
|
/*
|
|
|
|
|
* nm_system_set_hostname
|
|
|
|
|
*
|
|
|
|
|
* set the hostname
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
void nm_system_set_hostname (NMIP4Config *config)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2006-02-28 21:41:16 +00:00
|
|
|
/*
|
|
|
|
|
* nm_system_should_modify_resolv_conf
|
|
|
|
|
*
|
|
|
|
|
* Can NM update resolv.conf, or is it locked down?
|
|
|
|
|
*/
|
|
|
|
|
gboolean nm_system_should_modify_resolv_conf (void)
|
|
|
|
|
{
|
|
|
|
|
return TRUE;
|
|
|
|
|
}
|
2006-03-21 17:57:01 +00:00
|
|
|
|
2008-03-07 Dan Williams <dcbw@redhat.com>
First pass of multiple active device support. Expect bugs.
* src/nm-ip4-config.c
src/nm-ip4-config.h
- (nm_ip4_config_get_secondary, nm_ip4_config_set_secondary): remove;
there are better ways to do this in the named manager
* src/nm-device.c
src/nm-device.h
- (nm_device_can_activate): return whether the device can activate a
connection right now; taking into account things like carrier state
and rfkill state
- (nm_device_get_best_auto_connection): renamed from
nm_device_get_best_connection
- (real_act_stage4_get_ip4_config): MTU stuff is now handled in the
device subclasses themselves, so that each device can override the
MTU from it's NMSetting subclass if needed
- (nm_device_set_ip4_config): set MTU when setting up routes and stuff
in NetworkManagerSystem.c, not here
* src/named-manager/nm-named-manager.c
src/named-manager/nm-named-manager.h
- (nm_named_manager_name_owner_changed,
nm_named_manager_dbus_connection_changed): fix for changes to
rewrite_resolv_conf()
- (compute_nameservers): don't need the NMNamedManager at all, remove
from parameter list
- (merge_one_ip4_config): new function; merge ip4 configs together
- (rewrite_resolv_conf): write out resolv.conf from all the stored
ip4 configs; the VPN config takes precedence, then the best
device config, then the rest of the configs
- (get_domain_for_config): take the NMNamedManager as an argument
to check whether the config is the VPN config
- (add_ip4_config_to_named): fixups for removal of the 'secondary'
attribute from ip4 configs
- (add_all_ip4_configs_to_named): add all the configs in priority order
- (remove_ip4_config_from_named): fix for changes to
get_domain_for_config()
- (nm_named_manager_add_ip4_config): assign the config to the right slot
based on its type; callers must pass in the type now
- (get_last_default_domain): remove, unused
- (nm_named_manager_remove_ip4_config): handle config slots correctly
* src/nm-device-802-11-wireless.c
- (real_can_activate): new function
- (real_get_best_auto_connection): renamed from real_get_best_connection
- (real_act_stage4_get_ip4_config): handle MTU override
* src/nm-device-802-3-ethernet.c
- (real_can_activate): new function
- (real_get_best_auto_connection): renamed from real_get_best_connection
- (real_act_stage4_get_ip4_config): new function; handle MTU override
* src/vpn-manager/nm-vpn-connection.c
- (nm_vpn_connection_ip4_config_get): don't need to set the 'secondary'
attribute on the ip4 config
* src/NetworkManagerPolicy.c
- (nm_policy_auto_get_best_device): remove
- (nm_policy_device_change_check): remove
- (update_default_route): new function; set the default route via
the specified device
- (get_device_priority): new function; return the priority number of
a device type WRT which one should have the default route. Order is
(highest to lowest) wired, wireless, GSM, CDMA.
- (update_routing_and_dns): new function; determine which device should
have the default route, then update the routing table and DNS
- (maybe_auto_activate_device): new function; if a device is now
available for activation, find out what connection it would like to
activate and do it
- (schedule_activate_check): new function; if a device can be activated
now, schedule the activation. Each device may have only one
pending activation at a given time.
- (device_state_changed): if activation was canceled, try again,
possibly with another connection; if the device was activated,
update routing and DNS; if the device was deactivated, try again
with another connection
- (device_carrier_changed): if there is no carrier, deactivate the
device; otherwise schedule an activation check for the device
- (wireless_networks_changed): schedule an activation check for the
device
- (device_added): keep track of the signal handler IDs so they can
be removed when the device goes away
- (device_removed): remove any signal handlers that might be attached
to the device; update routing and DNS
- (schedule_activate_all): new function
- (connections_added, connection_added, connection_updated): when
connections change, schedule all devices for an activation check
- (connection_removed): when a device is deactivated because its
connection was removed, schedule another activation check for it
- (nm_policy_destroy): destroy pending activations and disconnect
all device signal handlers
* src/nm-manager.c
- (nm_manager_activate_device): if the device was already actived,
deactivate it
- (deactivate_old_device): remove
- (connection_added_default_handler, impl_manager_activate_device):
don't deactivate other devices when activating this one
* src/backends/NetworkManagerGentoo.c
src/backends/NetworkManagerFrugalware.c
src/backends/NetworkManagerPaldo.c
src/backends/NetworkManagerRedHat.c
src/backends/NetworkManagerSlackware.c
src/backends/NetworkManagerArch.c
src/backends/NetworkManagerSuSE.c
src/backends/NetworkManagerDebian.c
- (nm_system_get_mtu): remove; MTU should be provided through the
distro's system settings service plugin instead
- (nm_system_device_add_default_route_via_device): remove
- (nm_system_device_add_default_route_via_device_with_iface): remove
- (nm_system_device_replace_default_route): new function; call
generic implementation
* src/backends/NetworkManagerGeneric.c
src/backends/NetworkManagerGeneric.h
- (nm_generic_device_add_default_route_via_device,
nm_generic_device_add_default_route_via_device_with_iface): remove
- (nm_generic_device_replace_default_route): replace the default route
with the given route via some gateway
* src/NetworkManagerSystem.c
src/NetworkManagerSystem.h
- (nm_system_device_set_from_ip4_config): let the policy handle updates
to routing and DNS; but set the MTU here
- (nm_system_vpn_device_set_from_ip4_config): set the route with the
ip_iface of the active device; use the standard MTU setting function
- (nm_system_set_mtu): remove
- (nm_system_device_set_mtu): consolidate MTU setting code in one place
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3391 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
2008-03-07 19:41:32 +00:00
|
|
|
|