From 0b9df9247243e52e726292a56b720f70a6283608 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 15 Aug 2007 01:59:19 +0000 Subject: [PATCH] 2007-08-14 Dan Williams (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 --- ChangeLog | 22 ++++++++++++++++++++++ src/NetworkManagerAPList.c | 1 + src/NetworkManagerPolicy.c | 1 + src/NetworkManagerUtils.c | 1 + src/NetworkManagerUtils.h | 1 + src/nm-device-802-11-wireless.c | 1 + 6 files changed, 27 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6f295b426..d1710253c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,25 @@ +2007-08-14 Dan Williams + + (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 * src/NetworkManagerAP.c diff --git a/src/NetworkManagerAPList.c b/src/NetworkManagerAPList.c index db6c1eb5d..ccd83f62d 100644 --- a/src/NetworkManagerAPList.c +++ b/src/NetworkManagerAPList.c @@ -560,3 +560,4 @@ void nm_ap_list_print_members (NMAccessPointList *list, const char *name) nm_info ("AP_LIST_PRINT: done"); nm_ap_list_iter_free (iter); } + diff --git a/src/NetworkManagerPolicy.c b/src/NetworkManagerPolicy.c index 15b980e91..59bec75b3 100644 --- a/src/NetworkManagerPolicy.c +++ b/src/NetworkManagerPolicy.c @@ -664,3 +664,4 @@ nm_policy_destroy (NMPolicy *policy) global_policy = NULL; } + diff --git a/src/NetworkManagerUtils.c b/src/NetworkManagerUtils.c index 6aee689ff..8ae4ecf96 100644 --- a/src/NetworkManagerUtils.c +++ b/src/NetworkManagerUtils.c @@ -650,3 +650,4 @@ nm_utils_same_ssid (const GByteArray * ssid1, return memcmp (ssid1->data, ssid2->data, ssid1_len) == 0 ? TRUE : FALSE; } + diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h index e2f7c83dc..754c7c5f8 100644 --- a/src/NetworkManagerUtils.h +++ b/src/NetworkManagerUtils.h @@ -114,3 +114,4 @@ gboolean nm_utils_same_ssid (const GByteArray * ssid1, gboolean ignore_trailing_null); #endif + diff --git a/src/nm-device-802-11-wireless.c b/src/nm-device-802-11-wireless.c index 8e71cfbb8..8a158e293 100644 --- a/src/nm-device-802-11-wireless.c +++ b/src/nm-device-802-11-wireless.c @@ -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; } +