From 66a2ca5845e4245c7a6d7e162bf7b115eb1e9bb0 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 26 Aug 2004 03:05:32 +0000 Subject: [PATCH] 2004-08-25 Dan Williams * src/NetworkManagerDevice.c - (nm_device_set_enc_key): always set device to "open" mode instead of turning encryption off, because the Cisco driver doesn't associate with WEP-enabled access points unless we are in "open" git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@78 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 7 +++++++ src/NetworkManagerDevice.c | 9 ++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e5f38fb350..2639e2cd7f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-08-25 Dan Williams + + * src/NetworkManagerDevice.c + - (nm_device_set_enc_key): always set device to "open" mode instead of + turning encryption off, because the Cisco driver doesn't associate + with WEP-enabled access points unless we are in "open" + 2004-08-25 Dan Williams * src/NetworkManagerWireless.c diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c index 056d661f59..aabe5038a5 100644 --- a/src/NetworkManagerDevice.c +++ b/src/NetworkManagerDevice.c @@ -629,7 +629,7 @@ void nm_device_set_enc_key (NMDevice *dev, const char *key) if (strlen (safe_key) == 0) { - wreq.u.data.flags = IW_ENCODE_DISABLED | IW_ENCODE_NOKEY; /* Disable WEP */ + wreq.u.data.flags = IW_ENCODE_OPEN | IW_ENCODE_NOKEY; /* Disable WEP */ set_key = TRUE; } else @@ -933,6 +933,8 @@ static gpointer nm_device_activation_worker (gpointer user_data) if ((best_ap = nm_device_get_best_ap (dev))) { /* WEP key we have is wrong, ask user for one */ +fprintf( stderr, "(!switch (%d) || !enc_source (%d)) && is_enc (%d)\n", +!nm_device_need_ap_switch (dev), !nm_ap_get_enc_key_source (best_ap), nm_ap_get_encrypted (best_ap)); if ( (!nm_device_need_ap_switch (dev) || !nm_ap_get_enc_key_source (best_ap)) && nm_ap_get_encrypted (best_ap)) { @@ -943,6 +945,7 @@ static gpointer nm_device_activation_worker (gpointer user_data) */ if (nm_ap_get_enc_key_source (best_ap) && !nm_ap_get_enc_method_good (best_ap)) { +fprintf (stderr, "trying encryption method\n"); /* Try another method, since the one set before obviously didn't work */ switch (nm_ap_get_enc_method (best_ap)) { @@ -965,6 +968,7 @@ static gpointer nm_device_activation_worker (gpointer user_data) if (ask_for_key) { +fprintf( stderr, "asking for key\n"); dev->options.wireless.user_key_received = FALSE; nm_dbus_get_user_key_for_network (dev->app_data->dbus_connection, dev, best_ap); @@ -989,7 +993,10 @@ static gpointer nm_device_activation_worker (gpointer user_data) nm_device_activate_wireless (dev); } else +{ +fprintf (stderr, "sleeping due to no access point\n"); g_usleep (G_USEC_PER_SEC * 2); +} /* If we were told to quit activation, stop the thread and return */ if (dev->quit_activation)