File nm-fallback.patch of Package NetworkManager

Overview Repositories Revisions Requests Users Attributes Meta

File nm-fallback.patch of Package NetworkManager (Revision eec230b05db054facaef2a99bedd041d)

Currently displaying revision eec230b05db054facaef2a99bedd041d , Show latest

diff -urN NetworkManager-0.6.4/gnome/applet/applet.c NetworkManager-fallback/gnome/applet/applet.c
--- NetworkManager-0.6.4/gnome/applet/applet.c	2006-11-10 13:07:55.000000000 +0200
+++ NetworkManager-fallback/gnome/applet/applet.c	2006-11-10 13:08:08.000000000 +0200
@@ -1310,7 +1310,7 @@
 	if ((tag = g_object_get_data (G_OBJECT (item), "network")))
 		net = network_device_get_wireless_network_by_essid (dev, tag);
 
-	nma_dbus_set_device (applet->connection, dev, net ? wireless_network_get_essid (net) : NULL, NULL);
+	nma_dbus_set_device (applet->connection, dev, net ? wireless_network_get_essid (net) : NULL, FALSE, NULL);
 	network_device_unref (dev);
 
 	nmi_dbus_signal_user_interface_activated (applet->connection);
diff -urN NetworkManager-0.6.4/gnome/applet/applet-dbus-devices.c NetworkManager-fallback/gnome/applet/applet-dbus-devices.c
--- NetworkManager-0.6.4/gnome/applet/applet-dbus-devices.c	2006-11-10 13:07:55.000000000 +0200
+++ NetworkManager-fallback/gnome/applet/applet-dbus-devices.c	2006-11-10 13:08:21.000000000 +0200
@@ -1253,7 +1253,7 @@
  *
  */
 void nma_dbus_set_device (DBusConnection *connection, NetworkDevice *dev, const char *essid,
-						WirelessSecurityOption * opt)
+					 gboolean fallback, WirelessSecurityOption * opt)
 {
 	DBusMessage *	message;
 	gboolean		success = TRUE;
@@ -1272,6 +1272,7 @@
 			/* Build up the required args */
 			dbus_message_append_args (message, DBUS_TYPE_OBJECT_PATH, &dev_path,
 										DBUS_TYPE_STRING, &essid,
+										DBUS_TYPE_BOOLEAN, &fallback,
 										DBUS_TYPE_INVALID);
 
 			/* If we have specific wireless security options, add them */
diff -urN NetworkManager-0.6.4/gnome/applet/applet-dbus-devices.h NetworkManager-fallback/gnome/applet/applet-dbus-devices.h
--- NetworkManager-0.6.4/gnome/applet/applet-dbus-devices.h	2006-11-10 13:07:55.000000000 +0200
+++ NetworkManager-fallback/gnome/applet/applet-dbus-devices.h	2006-11-10 13:08:34.000000000 +0200
@@ -49,7 +49,7 @@
 void			nma_dbus_device_update_one_network		(NMApplet *applet, const char *dev_path, const char *net_path, const char *active_net_path);
 void			nma_dbus_device_remove_one_network		(NMApplet *applet, const char *dev_path, const char *net_path);
 void			nma_dbus_update_strength				(NMApplet *applet, const char *dev_path, const char *net_path, int strength);
-void			nma_dbus_set_device					(DBusConnection *connection, NetworkDevice *dev, const char *essid, WirelessSecurityOption *opt);
+void			nma_dbus_set_device					(DBusConnection *connection, NetworkDevice *dev, const char *essid, gboolean fallback, WirelessSecurityOption *opt);
 void			nma_dbus_create_network					(DBusConnection *connection, NetworkDevice *dev, const char *essid, WirelessSecurityOption *opt);
 
 void			nma_free_data_model					(NMApplet *applet);
diff -urN NetworkManager-0.6.4/gnome/applet/applet-dbus-info.c NetworkManager-fallback/gnome/applet/applet-dbus-info.c
--- NetworkManager-0.6.4/gnome/applet/applet-dbus-info.c	2006-11-10 13:07:55.000000000 +0200
+++ NetworkManager-fallback/gnome/applet/applet-dbus-info.c	2006-11-10 13:08:44.000000000 +0200
@@ -395,7 +395,7 @@
 	char *			escaped_network = NULL;
 	char *			essid = NULL;
 	gint				timestamp = -1;
-	gboolean			trusted = FALSE;
+	gboolean			fallback = FALSE;
 	DBusMessageIter 	iter, array_iter;
 	GConfClient *		client;
 	NMGConfWSO *		gconf_wso;
@@ -435,9 +435,9 @@
 	if (!nm_gconf_get_int_helper (client, GCONF_PATH_WIRELESS_NETWORKS, "timestamp", escaped_network, &timestamp) || (timestamp < 0))
 		timestamp = 0;
 
-	/* Trusted status */
-	if (!nm_gconf_get_bool_helper (client, GCONF_PATH_WIRELESS_NETWORKS, "trusted", escaped_network, &trusted))
-		trusted = FALSE;
+	/* Fallback status */
+	if (!nm_gconf_get_bool_helper (client, GCONF_PATH_WIRELESS_NETWORKS, "fallback", escaped_network, &fallback))
+		fallback = FALSE;
 
 	/* Grab the list of stored access point BSSIDs */
 	gconf_key = g_strdup_printf ("%s/%s/bssids", GCONF_PATH_WIRELESS_NETWORKS, escaped_network);
@@ -468,8 +468,8 @@
 	/* Second arg: Timestamp (INT32) */
 	dbus_message_iter_append_basic (&iter, DBUS_TYPE_INT32, &timestamp);
 
-	/* Third arg: Trusted (BOOLEAN) */
-	dbus_message_iter_append_basic (&iter, DBUS_TYPE_BOOLEAN, &trusted);
+	/* Third arg: Fallback? (BOOLEAN) */
+	dbus_message_iter_append_basic (&iter, DBUS_TYPE_BOOLEAN, &fallback);
 
 	/* Fourth arg: List of AP BSSIDs (ARRAY, STRING) */
 	dbus_message_iter_open_container (&iter, DBUS_TYPE_ARRAY, DBUS_TYPE_STRING_AS_STRING, &array_iter);
@@ -818,12 +818,14 @@
 nmi_save_network_info (NMApplet *applet,
                        const char *essid,
                        gboolean automatic,
+				   gboolean fallback,
                        const char *bssid,
                        NMGConfWSO * gconf_wso)
 {
-	char *					key;
-	GConfEntry *				gconf_entry;
-	char *					escaped_network;
+	char *		key;
+	GConfEntry *	gconf_entry;
+	char *		escaped_network;
+	GConfValue *	value;
 
 	g_return_if_fail (applet != NULL);
 	g_return_if_fail (essid != NULL);
@@ -854,9 +856,18 @@
 		g_free (key);
 	}
 
+	/*
+	 * XXX: We don't want to move a network from fallback to non-fallback because the user
+	 * connected via other means.  We need a better way to do this.
+	 */
+	key = g_strdup_printf ("%s/%s/fallback", GCONF_PATH_WIRELESS_NETWORKS, escaped_network);
+	value = gconf_client_get (applet->gconf_client, key, NULL);
+	if (!value || value->type != GCONF_VALUE_BOOL || (!gconf_value_get_bool (value) && fallback))
+		gconf_client_set_bool (applet->gconf_client, key, fallback, NULL);
+	g_free (key);
+
 	if (bssid && (strlen (bssid) >= 11))
 	{
-		GConfValue *	value;
 		GSList *		new_bssid_list = NULL;
 		gboolean		found = FALSE;
 
@@ -954,6 +965,7 @@
 	NMApplet *		applet = (NMApplet *) user_data;
 	char *			essid = NULL;
 	gboolean			automatic;
+	gboolean			fallback;
 	NMGConfWSO *		gconf_wso = NULL;
 	DBusMessageIter	iter;
 	char *			bssid;
@@ -984,7 +996,15 @@
 	}
 	dbus_message_iter_get_basic (&iter, &automatic);
 
-	/* Third argument: Access point's BSSID */
+	/* Third argument: Fallback? (BOOLEAN) */
+	if (!dbus_message_iter_next (&iter) || (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_BOOLEAN))
+	{
+		nm_warning ("%s:%d - message argument 'fallback' was invalid.", __FILE__, __LINE__);
+		goto out;
+	}
+	dbus_message_iter_get_basic (&iter, &fallback);
+
+	/* Fourth argument: Access point's BSSID */
 	if (!dbus_message_iter_next (&iter) || (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_STRING))
 	{
 		nm_warning ("%s:%d - message argument 'bssid' was invalid.", __FILE__, __LINE__);
@@ -1002,7 +1022,7 @@
 		goto out;
 	}
 
-	nmi_save_network_info (applet, essid, automatic, bssid, gconf_wso);
+	nmi_save_network_info (applet, essid, automatic, fallback, bssid, gconf_wso);
 	g_object_unref (G_OBJECT (gconf_wso));
 
 out:
diff -urN NetworkManager-0.6.4/gnome/applet/applet.glade NetworkManager-fallback/gnome/applet/applet.glade
--- NetworkManager-0.6.4/gnome/applet/applet.glade	2006-11-10 13:07:55.000000000 +0200
+++ NetworkManager-fallback/gnome/applet/applet.glade	2006-11-10 13:08:50.000000000 +0200
@@ -426,7 +426,7 @@
 	      <child>
 		<widget class="GtkTable" id="table1">
 		  <property name="visible">True</property>
-		  <property name="n_rows">4</property>
+		  <property name="n_rows">5</property>
 		  <property name="n_columns">2</property>
 		  <property name="homogeneous">False</property>
 		  <property name="row_spacing">6</property>
@@ -548,8 +548,8 @@
 		    <packing>
 		      <property name="left_attach">0</property>
 		      <property name="right_attach">1</property>
-		      <property name="top_attach">2</property>
-		      <property name="bottom_attach">3</property>
+		      <property name="top_attach">3</property>
+		      <property name="bottom_attach">4</property>
 		      <property name="x_options">fill</property>
 		      <property name="y_options"></property>
 		    </packing>
@@ -569,8 +569,8 @@
 		    <packing>
 		      <property name="left_attach">1</property>
 		      <property name="right_attach">2</property>
-		      <property name="top_attach">2</property>
-		      <property name="bottom_attach">3</property>
+		      <property name="top_attach">3</property>
+		      <property name="bottom_attach">4</property>
 		      <property name="x_options">fill</property>
 		      <property name="y_options">fill</property>
 		    </packing>
@@ -589,9 +589,31 @@
 		    <packing>
 		      <property name="left_attach">0</property>
 		      <property name="right_attach">2</property>
-		      <property name="top_attach">3</property>
-		      <property name="bottom_attach">4</property>
+		      <property name="top_attach">4</property>
+		      <property name="bottom_attach">5</property>
+		      <property name="x_options">fill</property>
+		    </packing>
+		  </child>
+
+		  <child>
+		    <widget class="GtkCheckButton" id="fallback_button">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="label" translatable="yes">_Fallback on this Network</property>
+		      <property name="use_underline">True</property>
+		      <property name="relief">GTK_RELIEF_NORMAL</property>
+		      <property name="focus_on_click">True</property>
+		      <property name="active">False</property>
+		      <property name="inconsistent">False</property>
+		      <property name="draw_indicator">True</property>
+		    </widget>
+		    <packing>
+		      <property name="left_attach">1</property>
+		      <property name="right_attach">2</property>
+		      <property name="top_attach">2</property>
+		      <property name="bottom_attach">3</property>
 		      <property name="x_options">fill</property>
+		      <property name="y_options"></property>
 		    </packing>
 		  </child>
 		</widget>
diff -urN NetworkManager-0.6.4/gnome/applet/nm-gconf-wso-wpa-eap.c NetworkManager-fallback/gnome/applet/nm-gconf-wso-wpa-eap.c
--- NetworkManager-0.6.4/gnome/applet/nm-gconf-wso-wpa-eap.c	2006-11-10 13:07:55.000000000 +0200
+++ NetworkManager-fallback/gnome/applet/nm-gconf-wso-wpa-eap.c	2006-11-10 13:08:56.000000000 +0200
@@ -332,3 +332,80 @@
 	}
 	return type;
 }
+
+typedef struct {
+	GtkComboBox *combo;
+	gint value;
+} ComboSelectInfo;
+
+static gboolean
+combo_select (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer user_data)
+{
+	ComboSelectInfo *info = user_data;
+	GValue val = { 0, };
+	gint i;
+
+	gtk_tree_model_get_value (model, iter, 1, &val);
+	i = g_value_get_int (&val);
+
+	if (i == info->value) {
+		gtk_combo_box_set_active_iter (info->combo, iter);
+		return TRUE;
+	}
+
+	return FALSE;
+}
+
+/* Ugh. Please avert your eyes. */
+void
+nm_gconf_wpa_eap_populate_dialog (NMGConfWSOWPA_EAP *wso, GladeXML *xml)
+{
+	GtkWidget *widget;
+	GtkTreeModel *model;
+	ComboSelectInfo info;
+
+	g_return_if_fail (wso != NULL);
+	g_return_if_fail (xml != NULL);
+
+	if (wso->priv->identity != NULL) {
+		widget = glade_xml_get_widget (xml, "wpa_eap_identity_entry");
+		gtk_entry_set_text (GTK_ENTRY (widget), wso->priv->identity);
+	}
+
+	if (wso->priv->passwd != NULL) {
+		widget = glade_xml_get_widget (xml, "wpa_eap_passwd_entry");
+		gtk_entry_set_text (GTK_ENTRY (widget), wso->priv->passwd);
+	}
+
+	if (wso->priv->anon_identity != NULL) {
+		widget = glade_xml_get_widget (xml, "wpa_eap_anon_identity_entry");
+		gtk_entry_set_text (GTK_ENTRY (widget), wso->priv->anon_identity);
+	}
+
+	widget = glade_xml_get_widget (xml, "wpa_eap_eap_method_combo");
+	info.combo = GTK_COMBO_BOX (widget);
+	info.value = wso->priv->eap_method;
+	gtk_tree_model_foreach (gtk_combo_box_get_model (info.combo),
+							combo_select, &info);
+
+	widget = glade_xml_get_widget (xml, "wpa_eap_key_type_combo");
+	info.combo = GTK_COMBO_BOX (widget);
+	info.value = wso->priv->key_type;
+	gtk_tree_model_foreach (gtk_combo_box_get_model (info.combo),
+							combo_select, &info);
+
+	if (wso->priv->client_cert_file != NULL && g_file_test (wso->priv->client_cert_file, G_FILE_TEST_EXISTS)) {
+		widget = glade_xml_get_widget (xml, "wpa_eap_client_cert_file_chooser_button");
+		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), wso->priv->client_cert_file);
+	}
+
+	if (wso->priv->ca_cert_file != NULL && g_file_test (wso->priv->ca_cert_file, G_FILE_TEST_EXISTS)) {
+		widget = glade_xml_get_widget (xml, "wpa_eap_ca_cert_file_chooser_button");
+		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), wso->priv->ca_cert_file);
+	}
+
+	if (wso->priv->private_key_file != NULL && g_file_test (wso->priv->private_key_file, G_FILE_TEST_EXISTS)) {
+		widget = glade_xml_get_widget (xml, "wpa_eap_private_key_file_chooser_button");
+		gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (widget), wso->priv->private_key_file);
+	}
+}
diff -urN NetworkManager-0.6.4/gnome/applet/nm-gconf-wso-wpa-eap.h NetworkManager-fallback/gnome/applet/nm-gconf-wso-wpa-eap.h
--- NetworkManager-0.6.4/gnome/applet/nm-gconf-wso-wpa-eap.h	2006-11-10 13:07:55.000000000 +0200
+++ NetworkManager-fallback/gnome/applet/nm-gconf-wso-wpa-eap.h	2006-11-10 13:09:01.000000000 +0200
@@ -59,4 +59,7 @@
 
 NMGConfWSOWPA_EAP * nm_gconf_wso_wpa_eap_new_deserialize_gconf (GConfClient *client, const char *network, int we_cipher);
 
+/* Ugh. Please avert your eyes. */
+void nm_gconf_wpa_eap_populate_dialog (NMGConfWSOWPA_EAP *wso, GladeXML *xml);
+
 #endif	/* NM_GCONF_WSO_WPA_EAP_H */
diff -urN NetworkManager-0.6.4/gnome/applet/other-network-dialog.c NetworkManager-fallback/gnome/applet/other-network-dialog.c
--- NetworkManager-0.6.4/gnome/applet/other-network-dialog.c	2006-11-10 13:07:55.000000000 +0200
+++ NetworkManager-fallback/gnome/applet/other-network-dialog.c	2006-11-10 13:09:05.000000000 +0200
@@ -410,19 +410,24 @@
 			WirelessSecurityOption *	opt;
 			GtkComboBox *			security_combo;
 			GtkTreeIter			iter;
+			GtkWidget *			fallback_button;
 			char *				str;
 			NetworkDevice *		dev;
+			gboolean				fallback;
 
 			gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo), &iter);
 			gtk_tree_model_get (model, &iter, NAME_COLUMN, &str, DEV_COLUMN, &dev, -1);
 
+			fallback_button = glade_xml_get_widget (xml, "fallback_button");
+			fallback = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (fallback_button));
+
 			security_combo = GTK_COMBO_BOX (glade_xml_get_widget (xml, "security_combo"));
 			opt = wsm_get_option_for_active (wsm, security_combo);
 
 			if (create_network)
 				nma_dbus_create_network (applet->connection, dev, essid, opt);
 			else
-				nma_dbus_set_device (applet->connection, dev, essid, opt);
+				nma_dbus_set_device (applet->connection, dev, essid, fallback, opt);
 		}
 	}
 
diff -urN NetworkManager-0.6.4/gnome/applet/passphrase-dialog.c NetworkManager-fallback/gnome/applet/passphrase-dialog.c
--- NetworkManager-0.6.4/gnome/applet/passphrase-dialog.c	2006-11-10 13:07:55.000000000 +0200
+++ NetworkManager-fallback/gnome/applet/passphrase-dialog.c	2006-11-10 13:09:10.000000000 +0200
@@ -37,6 +37,9 @@
 #include "NetworkManager.h"
 #include "wireless-security-manager.h"
 
+#include "nm-gconf-wso-wpa-eap.h"
+#include "wso-private.h"
+
 static GladeXML *get_dialog_xml (GtkWidget *dialog)
 {
 	g_return_val_if_fail (dialog != NULL, NULL);
@@ -269,6 +272,24 @@
 
 	g_signal_connect (G_OBJECT (dialog), "response", GTK_SIGNAL_FUNC (nmi_passphrase_dialog_response_received), dialog);
 
+	/* Ugh. Avert your eyes, please. */
+	{
+		/* Pre-populate the dialog if we have information about this network. */
+		NMGConfWSO *wso;
+		const char *essid;
+		char *escaped_network;
+
+		essid = wireless_network_get_essid (net);
+		escaped_network = gconf_escape_key (essid, strlen (essid));
+		wso = nm_gconf_wso_new_deserialize_gconf (applet->gconf_client, escaped_network);
+		g_free (escaped_network);
+
+		if (wso != NULL && NM_IS_GCONF_WSO_WPA_EAP (wso)) {
+			WirelessSecurityOption *wso_widget = wsm_get_option_for_active (wsm, GTK_COMBO_BOX (security_combo));
+			nm_gconf_wpa_eap_populate_dialog (NM_GCONF_WSO_WPA_EAP (wso), wso_widget->uixml);
+		}
+	}
+
 	/* Bash focus-stealing prevention in the face */
 	gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_CENTER_ALWAYS);
 	gtk_widget_realize (dialog);
diff -urN NetworkManager-0.6.4/src/backends/NetworkManagerSuSE.c NetworkManager-fallback/src/backends/NetworkManagerSuSE.c
--- NetworkManager-0.6.4/src/backends/NetworkManagerSuSE.c	2006-11-10 13:07:55.000000000 +0200
+++ NetworkManager-fallback/src/backends/NetworkManagerSuSE.c	2006-11-10 13:11:52.000000000 +0200
@@ -535,11 +535,10 @@
 		NMAccessPoint *	list_ap;
 		char *			key;
 		char *			mode;
+		gboolean		success = FALSE;
 
 		ap = nm_ap_new ();
 		nm_ap_set_essid (ap, buf);
-		nm_ap_set_timestamp (ap, time (NULL), 0);
-		nm_ap_set_trusted (ap, TRUE);
 
 		if ((mode = svGetValue (file, "WIRELESS_AUTH_MODE")) && !strcmp (mode, "psk"))
 		{
@@ -557,11 +556,16 @@
 				{
 					nm_ap_security_set_key (NM_AP_SECURITY (security), hash, strlen (hash));
 					nm_ap_set_security (ap, NM_AP_SECURITY (security));
+					success = TRUE;
 				}
+				else
+					nm_warning ("Ignoring ESSID '%s' (invalid PSK key).", nm_ap_get_orig_essid (ap));
 
 				ieee_802_11_cipher_unref (cipher);
 				g_object_unref (G_OBJECT (security));
 			}
+			else
+				nm_warning ("Ignoring ESSID '%s' (PSK mode but no key provided).", nm_ap_get_orig_essid (ap));
 		}
 		else if ((key = svGetValue (file, "WIRELESS_KEY_0")) && strlen (key) > 3)
 		{
@@ -620,7 +624,10 @@
 			{
 				nm_ap_security_set_key (NM_AP_SECURITY (security), hash, strlen (hash));
 				nm_ap_set_security (ap, NM_AP_SECURITY (security));
+				success = TRUE;
 			}
+			else
+				nm_warning ("Ignoring ESSID '%s' (invalid WEP key).", nm_ap_get_orig_essid (ap));
 
 			ieee_802_11_cipher_unref (cipher);
 			g_object_unref (G_OBJECT (security));
@@ -634,26 +641,34 @@
 			security = nm_ap_security_new (IW_AUTH_CIPHER_NONE);
 			nm_ap_set_security (ap, security);
 			g_object_unref (G_OBJECT (security));
+			success = TRUE;
 		}
 
-		if ((list_ap = nm_ap_list_get_ap_by_essid (app_data->allowed_ap_list, buf)))
-		{
-			nm_ap_set_essid (list_ap, nm_ap_get_essid (ap));
-			nm_ap_set_timestamp_via_timestamp (list_ap, nm_ap_get_timestamp (ap));
-			nm_ap_set_trusted (list_ap, nm_ap_get_trusted (ap));
-			nm_ap_set_security (list_ap, nm_ap_get_security (ap));
-		}
-		else
+		if (success)
 		{
-			/* New AP, just add it to the list */
-			nm_ap_list_append_ap (app_data->allowed_ap_list, ap);
-		}
-		nm_ap_unref (ap);
+			if ((list_ap = nm_ap_list_get_ap_by_essid (app_data->allowed_ap_list, buf)))
+			{
+				nm_ap_set_essid (list_ap, nm_ap_get_essid (ap));
+				nm_ap_set_timestamp_via_timestamp (list_ap, nm_ap_get_timestamp (ap));
+				nm_ap_set_fallback (list_ap, TRUE);
+				nm_ap_set_security (list_ap, nm_ap_get_security (ap));
+			}
+			else
+			{
+				nm_ap_set_timestamp (ap, time (NULL), 0);
+				nm_ap_set_fallback (ap, TRUE);
+			
+				/* New AP, just add it to the list */
+				nm_ap_list_append_ap (app_data->allowed_ap_list, ap);
+			}
+
+			nm_debug ("Adding '%s' to the list of trusted networks", buf);
 
-		nm_debug ("Adding '%s' to the list of trusted networks", buf);
+			/* Ensure all devices get new information copied into their device lists */
+			nm_policy_schedule_device_ap_lists_update_from_allowed (app_data);
+		}
 
-		/* Ensure all devices get new information copied into their device lists */
-		nm_policy_schedule_device_ap_lists_update_from_allowed (app_data);
+		nm_ap_unref (ap);
 
 		free (key);
 		free (mode);
diff -urN NetworkManager-0.6.4/src/NetworkManagerAP.c NetworkManager-fallback/src/NetworkManagerAP.c
--- NetworkManager-0.6.4/src/NetworkManagerAP.c	2006-11-10 13:07:55.000000000 +0200
+++ NetworkManager-fallback/src/NetworkManagerAP.c	2006-11-10 13:09:20.000000000 +0200
@@ -56,7 +56,7 @@
 	GTimeVal			last_seen;	/* Last time the AP was seen in a scan */
 
 	/* Things from user prefs/NetworkManagerInfo */
-	gboolean			trusted;
+	gboolean			fallback;
 	NMAPSecurity *		security;
 	GTimeVal			timestamp;
 	GSList *			user_addresses;
@@ -403,21 +403,21 @@
 
 /*
  * Get/Set functions to indicate that an access point is
- * 'trusted'
+ * 'fallback'
  *
  */
-gboolean nm_ap_get_trusted (const NMAccessPoint *ap)
+gboolean nm_ap_get_fallback (const NMAccessPoint *ap)
 {
 	g_return_val_if_fail (ap != NULL, FALSE);
 
-	return (ap->trusted);
+	return (ap->fallback);
 }
 
-void nm_ap_set_trusted (NMAccessPoint *ap, gboolean trusted)
+void nm_ap_set_fallback (NMAccessPoint *ap, gboolean fallback)
 {
 	g_return_if_fail (ap != NULL);
 
-	ap->trusted = trusted;
+	ap->fallback = fallback;
 }
 
 
diff -urN NetworkManager-0.6.4/src/NetworkManagerAP.h NetworkManager-fallback/src/NetworkManagerAP.h
--- NetworkManager-0.6.4/src/NetworkManagerAP.h	2006-11-10 13:07:55.000000000 +0200
+++ NetworkManager-fallback/src/NetworkManagerAP.h	2006-11-10 13:09:25.000000000 +0200
@@ -72,8 +72,8 @@
 gboolean			nm_ap_get_invalid		(const NMAccessPoint *ap);
 void				nm_ap_set_invalid		(NMAccessPoint *ap, gboolean invalid);
 
-gboolean			nm_ap_get_trusted		(const NMAccessPoint *ap);
-void				nm_ap_set_trusted		(NMAccessPoint *ap, gboolean trusted);
+gboolean			nm_ap_get_fallback		(const NMAccessPoint *ap);
+void				nm_ap_set_fallback		(NMAccessPoint *ap, gboolean fallback);
 
 gboolean			nm_ap_get_artificial	(const NMAccessPoint *ap);
 void				nm_ap_set_artificial	(NMAccessPoint *ap, gboolean artificial);
diff -urN NetworkManager-0.6.4/src/NetworkManagerAPList.c NetworkManager-fallback/src/NetworkManagerAPList.c
--- NetworkManager-0.6.4/src/NetworkManagerAPList.c	2006-11-10 13:07:55.000000000 +0200
+++ NetworkManager-fallback/src/NetworkManagerAPList.c	2006-11-10 13:09:30.000000000 +0200
@@ -422,6 +422,63 @@
 	return (found_ap);
 }
 
+/*
+ * nm_ap_list_merge_fallback
+ *
+ * Merges the user's fallback networks, if any, into the scan list.  We "fall back"
+ * on these networks and attempt a brute-force connection, given no better options.
+ */
+void nm_ap_list_merge_fallback (NMDevice80211Wireless *dev)
+{
+	NMAccessPointList *	allowed_list;
+	NMAccessPointList *	scan_list;
+	NMAPListIter *		iter;
+	NMData *			app_data;
+
+	app_data = nm_device_get_app_data (NM_DEVICE (dev));
+	allowed_list = app_data->allowed_ap_list;
+	scan_list = nm_device_802_11_wireless_ap_list_get (dev);
+
+	iter = nm_ap_list_iter_new (allowed_list);
+	if (iter)
+	{
+		NMAccessPoint *	allowed_ap;
+
+		while ((allowed_ap = nm_ap_list_iter_next (iter)))
+		{
+			if (nm_ap_get_fallback (allowed_ap))
+			{
+				NMAccessPoint *	ap;
+				GTimeVal			cur_time;
+				NMAPSecurity *		allowed_security;
+
+				ap = nm_ap_new ();
+				nm_ap_set_essid (ap, nm_ap_get_essid (allowed_ap));
+				nm_ap_set_timestamp_via_timestamp (ap, nm_ap_get_timestamp (allowed_ap));
+				nm_ap_set_fallback (ap, TRUE);
+
+				allowed_security = nm_ap_get_security (allowed_ap);
+				nm_ap_set_security (ap, allowed_security);
+				nm_ap_set_capabilities (ap, nm_ap_security_get_default_capabilities (allowed_security));
+				nm_ap_add_capabilities_from_security (ap, allowed_security);
+
+				/*
+				 * Fake it as if we see the AP right now.  We process the scan results _after_ this, thus
+				 * if the AP is seen in a scan we will favor that AP when we merge.
+				 * XXX: Temporarily doing this _after_ the scan results.
+				 */
+				g_get_current_time (&cur_time);
+				nm_ap_set_last_seen (ap, &cur_time);
+				nm_ap_set_artificial (ap, TRUE);
+				nm_ap_set_broadcast (ap, FALSE);
+
+				nm_ap_list_merge_scanned_ap (dev, scan_list, ap);
+				nm_ap_unref (ap);
+			}
+		}
+		nm_ap_list_iter_free (iter);
+	}
+}
 
 /*
  * nm_ap_list_merge_scanned_ap
diff -urN NetworkManager-0.6.4/src/NetworkManagerAPList.h NetworkManager-fallback/src/NetworkManagerAPList.h
--- NetworkManager-0.6.4/src/NetworkManagerAPList.h	2006-11-10 13:07:55.000000000 +0200
+++ NetworkManager-fallback/src/NetworkManagerAPList.h	2006-11-10 13:09:35.000000000 +0200
@@ -51,6 +51,8 @@
 void				nm_ap_list_copy_essids_by_address	(NMData *app_data, NMDevice80211Wireless *dev, NMAccessPointList *dest, NMAccessPointList *source);
 void				nm_ap_list_copy_one_essid_by_address	(NMData *app_data, NMDevice80211Wireless *dev, NMAccessPoint *ap, NMAccessPointList *search_list);
 
+void				nm_ap_list_merge_fallback			(NMDevice80211Wireless *dev);
+
 gboolean			nm_ap_list_merge_scanned_ap		(NMDevice80211Wireless *dev, NMAccessPointList *list, NMAccessPoint *merge_ap);
 
 NMNetworkType		nm_ap_list_get_type				(NMAccessPointList *list);
diff -urN NetworkManager-0.6.4/src/nm-dbus-nm.c NetworkManager-fallback/src/nm-dbus-nm.c
--- NetworkManager-0.6.4/src/nm-dbus-nm.c	2006-11-10 13:07:55.000000000 +0200
+++ NetworkManager-fallback/src/nm-dbus-nm.c	2006-11-10 13:09:46.000000000 +0200
@@ -262,6 +262,7 @@
 	{
 		NMAPSecurity * 	security = NULL;
 		char *			essid = NULL;
+		gboolean			fallback = FALSE;
 
 		if (!dbus_message_iter_next (&iter) || (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_STRING))
 		{
@@ -277,6 +278,15 @@
 			goto out;
 		}
 
+		if (!dbus_message_iter_next (&iter) || (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_BOOLEAN))
+		{
+			nm_warning ("Invalid argument type (fallback");
+			goto out;
+		}
+
+		/* grab the fallback bit */
+		dbus_message_iter_get_basic (&iter, &fallback);
+
 		/* If there's security information, we use that.  If not, we
 		 * make some up from the scan list.
 		 */
@@ -293,6 +303,7 @@
 
 		/* Set up the wireless-specific activation request properties */
 		ap = nm_device_802_11_wireless_get_activation_ap (NM_DEVICE_802_11_WIRELESS (dev), essid, security);
+		nm_ap_set_fallback (ap, fallback);
 		if (security)
 	 		g_object_unref (G_OBJECT (security));
 
diff -urN NetworkManager-0.6.4/src/nm-dbus-nmi.c NetworkManager-fallback/src/nm-dbus-nmi.c
--- NetworkManager-0.6.4/src/nm-dbus-nmi.c	2006-11-10 13:07:55.000000000 +0200
+++ NetworkManager-fallback/src/nm-dbus-nmi.c	2006-11-10 13:10:37.000000000 +0200
@@ -223,6 +223,7 @@
 {
 	DBusMessage *		message;
 	gboolean			success = FALSE;
+	gboolean			fallback;
 	const char *		essid;
 	gchar *			char_bssid;
 	NMAPSecurity *		security;
@@ -245,10 +246,14 @@
 	/* First argument: ESSID (STRING) */
 	dbus_message_iter_append_basic (&iter, DBUS_TYPE_STRING, &essid);
 
-	/* Second argument: Automatic (BOOLEAN) */
+	/* Second argument: Automatic or user-driven connection? (BOOLEAN) */
 	dbus_message_iter_append_basic (&iter, DBUS_TYPE_BOOLEAN, &automatic);
 
-	/* Third argument: Access point's BSSID */
+	/* Third argument: Fallback? (BOOLEAN) */
+	fallback = nm_ap_get_fallback (ap);
+	dbus_message_iter_append_basic (&iter, DBUS_TYPE_BOOLEAN, &fallback);
+
+	/* Fourth argument: Access point's BSSID */
 	addr = nm_ap_get_address (ap);
 	if ((nm_ap_get_mode (ap) == IW_MODE_INFRA) && nm_ethernet_address_is_valid (addr))
 	{
@@ -339,7 +344,7 @@
 	DBusMessageIter		subiter;
 	const char *			essid = NULL;
 	gint					timestamp_secs = -1;
-	gboolean				trusted = FALSE;
+	gboolean				fallback = FALSE;
 	GSList *				addr_list = NULL;
 	NMAPSecurity *			security;
 	NMAccessPoint *		ap;
@@ -390,14 +395,14 @@
 	}
 	dbus_message_iter_get_basic (&iter, &timestamp_secs);
 
-	/* Third arg: Trusted (BOOLEAN) */
+	/* Third arg: Fallback? (BOOLEAN) */
 	if (!dbus_message_iter_next (&iter)
 			|| (dbus_message_iter_get_arg_type (&iter) != DBUS_TYPE_BOOLEAN))
 	{
-		nm_warning ("a message argument (trusted) was invalid.");
+		nm_warning ("a message argument (fallback) was invalid.");
 		goto out;
 	}
-	dbus_message_iter_get_basic (&iter, &trusted);
+	dbus_message_iter_get_basic (&iter, &fallback);
 
 	/* Fourth arg: BSSID addresses (ARRAY, STRING) */
 	if (!dbus_message_iter_next (&iter)
@@ -436,11 +441,12 @@
 	ap = nm_ap_new ();
 	nm_ap_set_essid (ap, essid);
 	nm_ap_set_security (ap, security);
+	nm_ap_add_capabilities_from_security (ap, security);
 	g_object_unref (G_OBJECT (security));	/* set_security copies the object */
 
 	nm_ap_set_timestamp (ap, timestamp_secs, 0);
 
-	nm_ap_set_trusted (ap, trusted);
+	nm_ap_set_fallback (ap, fallback);
 	nm_ap_set_user_addresses (ap, addr_list);
 
 	if ((list_ap = nm_ap_list_get_ap_by_essid (cb_data->list, essid)))
@@ -449,8 +455,9 @@
 
 		nm_ap_set_essid (list_ap, nm_ap_get_essid (ap));
 		nm_ap_set_timestamp_via_timestamp (list_ap, nm_ap_get_timestamp (ap));
-		nm_ap_set_trusted (list_ap, nm_ap_get_trusted (ap));
+		nm_ap_set_fallback (list_ap, nm_ap_get_fallback (ap));
 		nm_ap_set_security (list_ap, nm_ap_get_security (ap));
+		nm_ap_add_capabilities_from_security (list_ap, nm_ap_get_security (ap));
 
 		user_addresses = nm_ap_get_user_addresses (ap);
 		nm_ap_set_user_addresses (list_ap, user_addresses);
diff -urN NetworkManager-0.6.4/src/nm-device-802-11-wireless.c NetworkManager-fallback/src/nm-device-802-11-wireless.c
--- NetworkManager-0.6.4/src/nm-device-802-11-wireless.c	2006-11-10 13:07:55.000000000 +0200
+++ NetworkManager-fallback/src/nm-device-802-11-wireless.c	2006-11-10 13:11:40.000000000 +0200
@@ -244,12 +244,13 @@
 		return;
 
 	/* Get the current BSSID.  If it is valid but does not match the stored value,
-	 * and the ESSID is the same as what we think its suposed to be, update it. */
+	 * and the ESSID is the same as what we think its supposed to be, update it. */
 	nm_device_802_11_wireless_get_bssid (self, &new_bssid);
 	old_bssid = nm_ap_get_address (ap);
 	new_essid = nm_device_802_11_wireless_get_essid(self);
 	old_essid = nm_ap_get_essid(ap);
 	if (     nm_ethernet_address_is_valid (&new_bssid)
+		&&  nm_ethernet_address_is_valid (old_bssid)
 		&& !nm_ethernet_addresses_are_equal (&new_bssid, old_bssid)
 		&& !nm_null_safe_strcmp (old_essid, new_essid))
 	{
@@ -792,12 +793,11 @@
 	NMAPListIter *		iter;
 	NMAccessPoint *	scan_ap = NULL;
 	NMAccessPoint *	best_ap = NULL;
+	NMAccessPoint *	fallback_ap = NULL;
 	NMAccessPoint *	cur_ap = NULL;
 	NMActRequest *		req = NULL;
-	NMAccessPoint *	trusted_best_ap = NULL;
-	NMAccessPoint *	untrusted_best_ap = NULL;
-	GTimeVal			trusted_latest_timestamp = {0, 0};
-	GTimeVal		 	untrusted_latest_timestamp = {0, 0};
+	GTimeVal		 	best_timestamp = {0, 0};
+	GTimeVal			fallback_timestamp = {0, 0};
 	NMData *			app_data;
 
 	g_return_val_if_fail (self != NULL, NULL);
@@ -883,27 +883,50 @@
 					}
 				}
 
-				g_slist_foreach (user_addrs, (GFunc)g_free, NULL);
+				g_slist_foreach (user_addrs, (GFunc) g_free, NULL);
 				g_slist_free (user_addrs);
 			}
 
-			if (!blacklisted && nm_ap_get_trusted (tmp_ap) && (curtime->tv_sec > trusted_latest_timestamp.tv_sec))
+			if (!blacklisted)
 			{
-				trusted_latest_timestamp = *nm_ap_get_timestamp (tmp_ap);
-				trusted_best_ap = scan_ap;
-				nm_ap_set_security (trusted_best_ap, nm_ap_get_security (tmp_ap));
-			}
-			else if (!blacklisted && !nm_ap_get_trusted (tmp_ap) && (curtime->tv_sec > untrusted_latest_timestamp.tv_sec))
-			{
-				untrusted_latest_timestamp = *nm_ap_get_timestamp (tmp_ap);
-				untrusted_best_ap = scan_ap;
-				nm_ap_set_security (untrusted_best_ap, nm_ap_get_security (tmp_ap));
+				if (!nm_ap_get_artificial (scan_ap))
+				{
+					/*
+					 * Allowed, non-blacklist, non-invalid, really-seen-in-scan network.  We
+					 * prefer these, and we will return the most-recently-used.
+					 */
+					if (curtime->tv_sec > best_timestamp.tv_sec)
+					{
+						best_timestamp = *nm_ap_get_timestamp (tmp_ap);
+						best_ap = scan_ap;
+						nm_ap_set_security (best_ap, nm_ap_get_security (tmp_ap));
+					}
+				}
+				else
+				{
+					/*
+					 * Allowed, non-blacklist, non-invalid, fallback, but not-seen-in-scan network.
+					 * If we don't find any of the above networks, we will brute-force one of these
+					 */
+					if (nm_ap_get_fallback (tmp_ap) && (curtime->tv_sec > fallback_timestamp.tv_sec))
+					{
+						fallback_timestamp = *nm_ap_get_timestamp (tmp_ap);
+						fallback_ap = scan_ap;
+						nm_ap_set_security (fallback_ap, nm_ap_get_security (tmp_ap));
+					}
+				}
 			}
 		}
 	}
-	best_ap = trusted_best_ap ? trusted_best_ap : untrusted_best_ap;
 	nm_ap_list_iter_free (iter);
 
+	if (!best_ap && fallback_ap)
+	{
+		nm_ap_set_broadcast (fallback_ap, FALSE);
+		nm_info ("Attempting to fallback to wireless network '%s'", nm_ap_get_essid (fallback_ap));
+		best_ap = fallback_ap;
+	}
+
 	if (best_ap)
 		nm_ap_ref (best_ap);
 
@@ -1837,7 +1860,6 @@
 	NMDevice80211Wireless *	self;
 	GTimeVal				cur_time;
 	NMAPListIter *			iter = NULL;
-	const char *			iface;
 	NMData *				app_data;
 	NMAccessPointList *		ap_list;
 
@@ -1847,17 +1869,22 @@
 	if (!self || !cb_data->results)
 		return FALSE;
 
-	iface = nm_device_get_iface (NM_DEVICE (self));
 	app_data = nm_device_get_app_data (NM_DEVICE (self));
 	if (cb_data->results_len > 0)
 	{
 		if (!process_scan_results (self, cb_data->results, cb_data->results_len))
+		{
+			const char *	iface;
+			iface = nm_device_get_iface (NM_DEVICE (self));
 			nm_warning ("process_scan_results() on device %s returned an error.", iface);
+		}
 
 		/* Once we have the list, copy in any relevant information from our Allowed list. */
 		nm_ap_list_copy_properties (nm_device_802_11_wireless_ap_list_get (self), app_data->allowed_ap_list);
 	}
 
+	nm_ap_list_merge_fallback (self);
+
 	/* Walk the access point list and remove any access points older than thrice the inactive scan interval */
 	g_get_current_time (&cur_time);
 	ap_list = nm_device_802_11_wireless_ap_list_get (self);
@@ -3053,9 +3080,10 @@
 		goto out;
 
 	/* For non-broadcast networks, we need to set "scan_ssid 1" to scan with probe request frames.
+	 * FIXME: Unfortunately, we sometimes think a hidden network is broadcast, so we always do this.
 	 * However, don't try to probe Ad-Hoc networks.
 	 */
-	if (!nm_ap_get_broadcast (ap) && !is_adhoc)
+	if (!is_adhoc)
 	{
 		if (!nm_utils_supplicant_request_with_check (ctrl, "OK", __func__, NULL,
 				"SET_NETWORK %i scan_ssid 1", nwid))
@@ -3363,24 +3391,27 @@
 
 	if ((ap = nm_act_request_get_ap (req)))
 	{
-		if (nm_ap_get_artificial (ap))
+		if (!nm_ap_get_fallback (ap))
 		{
-			NMAccessPointList *	dev_list;
-		
-			/* Artificial APs are ones that don't show up in scans,
-			 * but which the user explicitly attempted to connect to.
-			 * However, if we fail on one of these, remove it from the
-			 * list because we don't have any scan or capability info
-			 * for it, and they are pretty much useless.
-			 */
-			dev_list = nm_device_802_11_wireless_ap_list_get (self);
-			nm_ap_list_remove_ap (dev_list, ap);
-		}
-		else
-		{
-			/* Add the AP to the invalid list */
-			nm_ap_set_invalid (ap, TRUE);
-			nm_ap_list_append_ap (app_data->invalid_ap_list, ap);
+			if (nm_ap_get_artificial (ap))
+			{
+				NMAccessPointList *	dev_list;
+
+				/* Artificial APs are ones that don't show up in scans,
+				 * but which the user explicitly attempted to connect to.
+				 * However, if we fail on one of these, remove it from the
+				 * list because we don't have any scan or capability info
+				 * for it, and they are pretty much useless.
+				 */
+				dev_list = nm_device_802_11_wireless_ap_list_get (self);
+				nm_ap_list_remove_ap (dev_list, ap);
+			}
+			else
+			{
+				/* Add the AP to the invalid list */
+				nm_ap_set_invalid (ap, TRUE);
+				nm_ap_list_append_ap (app_data->invalid_ap_list, ap);
+			}
 		}
 	}
 
diff -urN NetworkManager-0.6.4/test/nm-set-fallback NetworkManager-fallback/test/nm-set-fallback
--- NetworkManager-0.6.4/test/nm-set-fallback	1970-01-01 03:00:00.000000000 +0300
+++ NetworkManager-fallback/test/nm-set-fallback	2006-11-03 11:20:25.000000000 +0200
@@ -0,0 +1,27 @@
+#! /bin/sh
+#
+# nm-set-fallback - mark a network as fallback
+#
+# Robert Love
+
+BIN=`which gconftool-2`
+
+if [ "x$1" == "x" ]; then
+	echo "usage: $0 <network> <true|false>"
+	exit 1
+fi
+
+if [ "x$2" != "xtrue" -a "x$2" != "xfalse" ]; then
+	echo "usage: $0 <network> <true|false>"
+	exit 2
+fi
+
+KEY="/system/networking/wireless/networks/${1}/fallback"
+CURRENT=`$BIN --get $KEY 2>/dev/null`
+
+if [ "x$CURRENT" != "xtrue" -a "x$CURRENT" != "xfalse" ]; then
+	echo "Network '$1' is not valid"
+	exit 3
+fi
+
+$BIN --set --type=bool $KEY ${2}

Places

File nm-fallback.patch of Package NetworkManager (Revision eec230b05db054facaef2a99bedd041d)

Places