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

2006-1-3 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/NetworkManager.c
		- Move link-checking/probing into the device subclasses
			themselves

	* src/nm-device.[ch]
	  src/nm-device-802-11-wireless.c
	  src/nm-device-802-3-ethernet.c
		- Do periodic link checking in device subclasses rather
			than being triggered from NetworkManager.c
		- discover_wireless_capabilities -> get_wireless_capabilities
		- discover_generic_capabilities -> get_generic_capabilities
		- Device subclass activation routines now return a value of type
			NMActStageReturn to indicate what step to perform next
		- Devices now override stage4_get_ip4_config if they choose


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1249 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2006-01-03 17:07:07 +00:00
parent d724f08c8a
commit d639dbeac0
7 changed files with 367 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
src/NetworkManager.c
View File

@@ -165,8 +165,7 @@ void nm_remove_device (NMData *data, NMDevice *dev)
g_return_if_fail (dev != NULL);
nm_device_set_removed (dev, TRUE);
nm_device_deactivate (dev);
nm_device_worker_thread_stop (dev);
nm_device_stop (dev);
nm_dbus_schedule_device_status_change_signal (data, dev, NULL, DEVICE_REMOVED);
g_object_unref (G_OBJECT (dev));
@@ -531,77 +530,15 @@ static void nm_print_usage (void)
"\n");
}
/*
* nm_poll_and_update_wireless_link_state
*
* Called every 2s to poll wireless cards and determine if they have a link
* or not.
*
*/
static gboolean nm_poll_and_update_wireless_link_state (NMData *data)
{
GSList * elt;
GSList * copy = NULL;
NMDevice * dev;
g_return_val_if_fail (data != NULL, TRUE);
if ((data->wireless_enabled == FALSE) || (data->asleep == TRUE))
return (TRUE);
/* Copy device list and ref devices to keep them around */
if (nm_try_acquire_mutex (data->dev_list_mutex, __FUNCTION__))
{
for (elt = data->dev_list; elt; elt = g_slist_next (elt))
{
if ((dev = (NMDevice *)(elt->data)))
{
g_object_ref (G_OBJECT (dev));
copy = g_slist_append (copy, dev);
}
}
nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__);
}
for (elt = copy; elt; elt = g_slist_next (elt))
{
if ((dev = (NMDevice *)(elt->data)))
{
if (nm_device_is_802_11_wireless (dev) && !nm_device_is_activating (dev))
{
NMDevice80211Wireless *wdev = NM_DEVICE_802_11_WIRELESS (dev);
nm_device_set_active_link (dev, nm_device_probe_link_state (dev));
nm_device_802_11_wireless_update_signal_strength (wdev);
}
g_object_unref (G_OBJECT (dev));
}
}
g_slist_free (copy);
return TRUE;
}
static void nm_monitor_wireless_link_state (NMData *data)
{
GSource *link_source;
link_source = g_timeout_source_new (NM_WIRELESS_LINK_STATE_POLL_INTERVAL);
g_source_set_callback (link_source,
(GSourceFunc) nm_poll_and_update_wireless_link_state,
data, NULL);
g_source_attach (link_source, nm_data->main_context);
g_source_unref (link_source);
}
static void nm_device_link_activated (NmNetlinkMonitor *monitor, const gchar *interface_name, NMData *data)
{
NMDevice *dev = NULL;
if (nm_try_acquire_mutex (data->dev_list_mutex, __FUNCTION__))
if (nm_try_acquire_mutex (data->dev_list_mutex, __func__))
{
if ((dev = nm_get_device_by_iface (data, interface_name)))
g_object_ref (G_OBJECT (dev));
nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__);
nm_unlock_mutex (data->dev_list_mutex, __func__);
}
/* Don't do anything if we already have a link */
@@ -620,11 +557,11 @@ static void nm_device_link_deactivated (NmNetlinkMonitor *monitor, const gchar *
{
NMDevice *dev = NULL;
if (nm_try_acquire_mutex (data->dev_list_mutex, __FUNCTION__))
if (nm_try_acquire_mutex (data->dev_list_mutex, __func__))
{
if ((dev = nm_get_device_by_iface (data, interface_name)))
g_object_ref (G_OBJECT (dev));
nm_unlock_mutex (data->dev_list_mutex, __FUNCTION__);
nm_unlock_mutex (data->dev_list_mutex, __func__);
}
if (dev)
@@ -940,7 +877,6 @@ int main( int argc, char *argv[] )
nm_system_enable_loopback ();
/* Create watch functions that monitor cards for link status. */
nm_monitor_wireless_link_state (nm_data);
nm_monitor_wired_link_state (nm_data);
/* Get modems, ISDN, and so on's configuration from the system */