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

2005-07-07 Dan Williams <dcbw@redhat.com>

Browse Source 
Patch from Derek Atkins <warlord@MIT.EDU>
	* src/nm-dbus-net.c:
		- (nm_dbus_get_ap_from_object_path): differentiate similar ESSIDs


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@791 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2005-07-08 02:19:26 +00:00
parent fdf4947cdb
commit 07f489a125
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@@ -1,3 +1,9 @@
2005-07-07 Dan Williams <dcbw@redhat.com>
Patch from Derek Atkins <warlord@MIT.EDU>
* src/nm-dbus-net.c:
- (nm_dbus_get_ap_from_object_path): differentiate similar ESSIDs
2005-07-07 Dan Williams <dcbw@redhat.com> 2005-07-07 Dan Williams <dcbw@redhat.com>
Patch from Jos Dehaes <jos_dehaes@fastmail.fm> Patch from Jos Dehaes <jos_dehaes@fastmail.fm>

15
src/nm-dbus-net.c
View File

@@ -52,14 +52,21 @@ static NMAccessPoint *nm_dbus_get_ap_from_object_path (const char *path, NMDevic
while ((ap = nm_ap_list_iter_next (iter))) while ((ap = nm_ap_list_iter_next (iter)))
{ {
int len;
snprintf (compare_path, 100, "%s/%s/Networks/%s", NM_DBUS_PATH_DEVICES, snprintf (compare_path, 100, "%s/%s/Networks/%s", NM_DBUS_PATH_DEVICES,
nm_device_get_iface (dev), nm_ap_get_essid (ap)); nm_device_get_iface (dev), nm_ap_get_essid (ap));
escaped_compare_path = nm_dbus_escape_object_path (compare_path); escaped_compare_path = nm_dbus_escape_object_path (compare_path);
if (strncmp (path, escaped_compare_path,
strlen (escaped_compare_path)) == 0) len = strlen(escaped_compare_path);
if (strncmp (path, escaped_compare_path, len) == 0)
{ {
g_free (escaped_compare_path); /* Differentiate between 'foo' and 'foo-a' */
break; if (path[len] == '\0' || path[len] == '/')
{
g_free (escaped_compare_path);
break;
}
} }
g_free (escaped_compare_path); g_free (escaped_compare_path);
} }