From 777d07673c885723402fc18ce63e2a4d4b404f20 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Mon, 8 Oct 2007 15:27:56 +0000 Subject: [PATCH] 2007-10-08 Dan Williams * src/NetworkManagerAP.h src/NetworkManagerAP.c - (nm_ap_has_manufacturer_default_ssid): remove, unused. User clients should handle default SSIDs and whether or not to autoconnect to them git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2955 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 8 ++++++++ src/NetworkManagerAP.c | 31 ------------------------------- src/NetworkManagerAP.h | 7 ------- 3 files changed, 8 insertions(+), 38 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9a78c7c10d..6f5c9283f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2007-10-08 Dan Williams + + * src/NetworkManagerAP.h + src/NetworkManagerAP.c + - (nm_ap_has_manufacturer_default_ssid): remove, unused. User clients + should handle default SSIDs and whether or not to autoconnect + to them + 2007-10-08 Dan Williams * src/NetworkManagerPolicy.c diff --git a/src/NetworkManagerAP.c b/src/NetworkManagerAP.c index 8c2eb6c727..1e6fd9e3f8 100644 --- a/src/NetworkManagerAP.c +++ b/src/NetworkManagerAP.c @@ -28,18 +28,6 @@ #include "nm-access-point-glue.h" -/* This is a controlled list. Want to add to it? Stop. Ask first. */ -static const char * default_ssid_list[] = -{ - "linksys", - "linksys-a", - "linksys-g", - "default", - "belkin54g", - "NETGEAR", - NULL -}; - /* * Encapsulates Access Point information */ @@ -1022,25 +1010,6 @@ void nm_ap_set_user_addresses (NMAccessPoint *ap, GSList *list) } -gboolean nm_ap_has_manufacturer_default_ssid (NMAccessPoint *ap) -{ - const char **default_ssid = default_ssid_list; - const GByteArray * this_ssid; - - g_return_val_if_fail (NM_IS_AP (ap), FALSE); - this_ssid = NM_AP_GET_PRIVATE (ap)->ssid; - - while (*default_ssid) { - if (this_ssid->len == strlen (*default_ssid)) { - if (!memcmp (*default_ssid, this_ssid->data, this_ssid->len)) - return TRUE; - } - default_ssid++; - } - - return FALSE; -} - guint32 nm_ap_add_security_from_ie (guint32 flags, const guint8 *wpa_ie, diff --git a/src/NetworkManagerAP.h b/src/NetworkManagerAP.h index 68e784aabe..e9289efc9f 100644 --- a/src/NetworkManagerAP.h +++ b/src/NetworkManagerAP.h @@ -122,13 +122,6 @@ gboolean nm_ap_check_compatible (NMAccessPoint *self, void nm_ap_print_self (NMAccessPoint *ap, const char * prefix); -/* - * NOTE: - * This is not intended to return true for all APs with manufacturer defaults. It is intended to return true for - * only the MOST COMMON manufacturing defaults. - */ -gboolean nm_ap_has_manufacturer_default_ssid (NMAccessPoint *ap); - guint32 freq_to_channel (guint32 freq); guint32 channel_to_freq (guint32 channel);