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

2007-08-28 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/NetworkManagerAP.c
	  src/NetworkManagerAP.h
		- Remove 'fallback' tag, to be replaced by NMConnection/NMSettings
			'autoconnect' property instead

	* src/NetworkManager.c
	  src/NetworkManagerMain.h
	  src/NetworkManagerPolicy.c
	  src/NetworkManagerPolicy.h
		- Remove the 'allowed_ap_list', which should be replaced by 
			NMConnection/NMSettings instead, since _those_ are the allowed
			things that NM can connect to

	* src/nm-device-802-11-wireless.c
		- Remove both allowed_ap_list usage and 'fallback' checking



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2740 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2007-08-28 15:17:48 +00:00
parent 9194b61b8f
commit 3443abf3f9
8 changed files with 31 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/NetworkManager.c
View File

@@ -121,10 +121,8 @@ static NMData *nm_data_new (void)
data = g_slice_new0 (NMData);
/* Initialize the access point lists */
data->allowed_ap_list = nm_ap_list_new (NETWORK_TYPE_ALLOWED);
data->invalid_ap_list = nm_ap_list_new (NETWORK_TYPE_INVALID);
if (!data->allowed_ap_list || !data->invalid_ap_list)
{
if (!data->invalid_ap_list) {
nm_data_free (data);
nm_warning ("could not create access point lists.");
return NULL;
@@ -144,7 +142,6 @@ static void nm_data_free (NMData *data)
{
g_return_if_fail (data != NULL);
nm_ap_list_unref (data->allowed_ap_list);
nm_ap_list_unref (data->invalid_ap_list);
g_slice_free (NMData, data);
@@ -162,9 +159,10 @@ nm_name_owner_changed_handler (NMDBusManager *mgr,
gboolean new_owner_good = (new && (strlen (new) > 0));
if (strcmp (name, NMI_DBUS_SERVICE) == 0) {
if (!old_owner_good && new_owner_good)
if (!old_owner_good && new_owner_good) {
/* NMI appeared, update stuff */
nm_policy_schedule_allowed_ap_list_update (data);
// FIXME: grab NMConnections from the info-daemon
}
}
}
@@ -441,13 +439,11 @@ main (int argc, char *argv[])
goto done;
/* If NMI is running, grab allowed wireless network lists from it ASAP */
#if 0
// FIXME: grab NMConnections instead
if (nm_dbus_manager_name_has_owner (dbus_mgr, NMI_DBUS_SERVICE))
nm_policy_schedule_allowed_ap_list_update (nm_data);
/* We run dhclient when we need to, and we don't want any stray ones
* lying around upon launch.
*/
// nm_system_kill_all_dhcp_daemons ();
#endif
/* Bring up the loopback interface. */
nm_system_enable_loopback ();