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

2005-03-11 Ray Strode <rstrode@redhat.com>

Browse Source 
Third (unfinished, partially working) cut at porting to
	dbus 0.30 api and new hal.

	* info-daemon/NetworkManagerInfoDbus.c:
		don't free null arrays.

	* panel-applet/NMWirelessAppletDbus.c:
	* src/nm-dbus-device.c:
	* src/nm-dbus-net.c:
	* src/NetworkManagerDbus.c: more
 	STRING -> OBJECT_PATH fun
	* src/NetworkManagerDevice.c:
	* src/NetworkManagerDevice.h:
	(rename nm_device_get_link_active): rename to
	nm_device_has_active_link
	(nm_device_wireless_link_active): rename to
	nm_device_probe_wireless_link_state
	(nm_device_wired_link_active): rename to
	nm_device_probe_wired_link_state.  Rewrite to
	use carrier file since hal doesn't maintain
	link state anymore.
	(nm_device_update_link_active): rename to
	nm_device_update_link_state
	* src/NetworkManagerPolicy.c
	  (nm_policy_activation_finish): check for NULL
	  MAC address.

	* src/Makefile.am:
	* src/NetworkManagerMain.h:
	* src/NetworkManager.c:
	* src/nm-netlink-monitor.c:
	* src/nm-netlink-monitor.h: New class to support
	monitoring wired ethernet link status, since HAL
	doesn't export that information anymore.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@495 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Ray Strode
2005-03-11 20:12:57 +00:00
parent 587a50e6e8
commit 0790d2fc3e
15 changed files with 1041 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/NetworkManagerPolicy.c
View File

@@ -65,7 +65,7 @@ static NMDevice * nm_policy_auto_get_best_device (NMData *data)
continue;
dev_type = nm_device_get_type (dev);
link_active = nm_device_get_link_active (dev);
link_active = nm_device_has_active_link (dev);
if (dev_type == DEVICE_TYPE_WIRED_ETHERNET)
{
@@ -181,7 +181,7 @@ static NMDevice * nm_policy_get_best_device (NMDevice *switch_to_dev, NMData *da
{
/* Wired devices get unlocked only if they have lost their link */
case (DEVICE_TYPE_WIRED_ETHERNET):
if (nm_device_get_link_active (data->active_device))
if (nm_device_has_active_link (data->active_device))
best_dev = data->active_device;
break;
@@ -251,7 +251,7 @@ gboolean nm_policy_activation_finish (gpointer user_data)
struct ether_addr addr;
nm_device_get_ap_address (dev, &addr);
if (!nm_ethernet_address_is_valid (nm_ap_get_address (ap)))
if (!nm_ap_get_address (ap) || !nm_ethernet_address_is_valid (nm_ap_get_address (ap)))
nm_ap_set_address (ap, &addr);
/* Don't store MAC addresses for non-infrastructure networks */