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

(force-commit to fix wrong comment and partial commit of r2685; this
	 commit actually applies to r2685)

	* src/NetworkManagerUtils.c
		- (nm_utils_same_ssid): add "ignore_trailing_null" parameter which
			ignores trailing nulls in the SSID to work around mismatches in
			expectations between WEXT and what the info-daemon passes back.  The
			info-daemon would pass back the correct length, but due to the
			ESSID length issues with WEXT 22 and greater and wpa_supplicant,
			the device would always have an SSID + 1 depending on what versions
			of wpa_supplicant, the kernel, and NM you have.  This was most often
			visible by just quitting the applet and relaunching, which caused
			NM to reassociated to the same network over again when reloading
			the save networks.

	* src/NetworkManagerPolicy.c
	  src/NetworkManagerUtils.h
	  src/nm-device-802-11-wireless.c
		- Update for new parameter to nm_utils_same_ssid()



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2686 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2007-08-15 01:59:19 +00:00
parent ccb13f0bdd
commit 0b9df92472
6 changed files with 27 additions and 0 deletions

View File

@@ -1,3 +1,25 @@
2007-08-14 Dan Williams <dcbw@redhat.com>
(force-commit to fix wrong comment and partial commit of r2685; this
commit actually applies to r2685)
* src/NetworkManagerUtils.c
- (nm_utils_same_ssid): add "ignore_trailing_null" parameter which
ignores trailing nulls in the SSID to work around mismatches in
expectations between WEXT and what the info-daemon passes back. The
info-daemon would pass back the correct length, but due to the
ESSID length issues with WEXT 22 and greater and wpa_supplicant,
the device would always have an SSID + 1 depending on what versions
of wpa_supplicant, the kernel, and NM you have. This was most often
visible by just quitting the applet and relaunching, which caused
NM to reassociated to the same network over again when reloading
the save networks.
* src/NetworkManagerPolicy.c
src/NetworkManagerUtils.h
src/nm-device-802-11-wireless.c
- Update for new parameter to nm_utils_same_ssid()
2007-08-14 Dan Williams <dcbw@redhat.com> 2007-08-14 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerAP.c * src/NetworkManagerAP.c

View File

@@ -560,3 +560,4 @@ void nm_ap_list_print_members (NMAccessPointList *list, const char *name)
nm_info ("AP_LIST_PRINT: done"); nm_info ("AP_LIST_PRINT: done");
nm_ap_list_iter_free (iter); nm_ap_list_iter_free (iter);
} }

View File

@@ -664,3 +664,4 @@ nm_policy_destroy (NMPolicy *policy)
global_policy = NULL; global_policy = NULL;
} }

View File

@@ -650,3 +650,4 @@ nm_utils_same_ssid (const GByteArray * ssid1,
return memcmp (ssid1->data, ssid2->data, ssid1_len) == 0 ? TRUE : FALSE; return memcmp (ssid1->data, ssid2->data, ssid1_len) == 0 ? TRUE : FALSE;
} }

View File

@@ -114,3 +114,4 @@ gboolean nm_utils_same_ssid (const GByteArray * ssid1,
gboolean ignore_trailing_null); gboolean ignore_trailing_null);
#endif #endif

View File

@@ -3218,3 +3218,4 @@ nm_device_802_11_wireless_get_activation_ap (NMDevice80211Wireless *self)
return NM_DEVICE_802_11_WIRELESS_GET_PRIVATE (self)->activation_ap; return NM_DEVICE_802_11_WIRELESS_GET_PRIVATE (self)->activation_ap;
} }