[gentoo-commits] gentoo-x86 commit in net-wireless/wpa_supplicant/files: wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch wpa_cli.sh wpa_supplicant-0.7.2-no-crash.patch wpa_supplicant-0.7.2-dbus_path_fix.patch fix-ssid-combo.patch

[gentoo-commits] gentoo-x86 commit in net-wireless/wpa_supplicant/files: wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch wpa_cli.sh wpa_supplicant-0.7.2-no-crash.patch wpa_supplicant-0.7.2-dbus_path_fix.patch fix-ssid-combo.patch

[Bjarke Istrup Pedersen (gurligebis)]

gurligebis    11/07/07 07:54:55

  Modified:             wpa_cli.sh
  Added:                wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch
  Removed:              wpa_supplicant-0.7.2-no-crash.patch
                        wpa_supplicant-0.7.2-dbus_path_fix.patch
                        fix-ssid-combo.patch
  Log:
  Cleaning bug and fixing bugs #373921 and #374089
  
  (Portage version: 2.2.0_alpha43/cvs/Linux i686)

Revision  Changes    Path
1.2                  net-wireless/wpa_supplicant/files/wpa_cli.sh

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_cli.sh?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_cli.sh?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_cli.sh?r1=1.1&r2=1.2

Index: wpa_cli.sh
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_cli.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- wpa_cli.sh	11 Jul 2006 15:07:16 -0000	1.1
+++ wpa_cli.sh	7 Jul 2011 07:54:55 -0000	1.2
@@ -1,9 +1,9 @@
 #!/bin/sh
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Written by Roy Marples <uberlord@gentoo.org>
 # Distributed under the terms of the GNU General Public License v2
 # Alternatively, this file may be distributed under the terms of the BSD License
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_cli.sh,v 1.1 2006/07/11 15:07:16 uberlord Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_cli.sh,v 1.2 2011/07/07 07:54:55 gurligebis Exp $
 
 if [ -z "$1" -o -z "$2" ]; then
 	logger -t wpa_cli "Insufficient parameters"
@@ -41,5 +41,6 @@
 # stopping the interface and a background process - like wpa_cli - is.
 export IN_BACKGROUND=true
 
-logger -t wpa_cli "interface ${INTERFACE} ${ACTION}"
-${EXEC} || logger -t wpa_cli "executing '${EXEC}' failed"
+# Removed, since stopping /etc/init.d/net.wlanX stops the network completly.
+#logger -t wpa_cli "interface ${INTERFACE} ${ACTION}"
+#${EXEC} || logger -t wpa_cli "executing '${EXEC}' failed"



1.1                  net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/wpa_supplicant/files/wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch?rev=1.1&content-type=text/plain

Index: wpa_supplicant-0.7.3-dbus-WPAIE-fix.patch
===================================================================
diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.c.prop-failure wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.c
--- wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.c.prop-failure	2011-04-09 14:04:43.108343777 -0400
+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.c	2011-04-09 14:44:09.808372285 -0400
@@ -33,6 +33,14 @@
 #include "dbus_new_handlers.h"
 #include "dbus_dict_helpers.h"
 
+/* The getters in this file can also be invoked when building a signal
+ * message to send out spontaneously. In this case, no message is passed
+ * in and if we try to call dbus_message_new_error(), we'll get an
+ * assertion failure. So, #define dbus_message_new_error() to a more
+ * tolerant cut-and-paste version
+ */
+#define dbus_message_new_error wpa_dbus_message_new_error
+
 extern int wpa_debug_level;
 extern int wpa_debug_show_keys;
 extern int wpa_debug_timestamp;
diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.h.prop-failure wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_handlers.h
diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.c.prop-failure wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.c
--- wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.c.prop-failure	2011-04-09 14:04:18.293117234 -0400
+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.c	2011-04-09 14:51:48.464204876 -0400
@@ -22,6 +22,42 @@
 #include "dbus_new.h"
 #include "dbus_new_helpers.h"
 
+/* This is exactly like dbus_message_new_error, but returns a
+ * (partially filled in) error message in the case reply_to is
+ * NULL rather than failing with an assertion message. This is
+ * useful for getters that we recycle when sending out signals.
+ *
+ * Contains code cut-and-pasted from dbus_message_new_error()
+ * Copyright (C) 2002, 2003, 2004, 2005  Red Hat Inc.
+ * Copyright (C) 2002, 2003  CodeFactory AB
+ */
+DBusMessage*
+wpa_dbus_message_new_error (DBusMessage *reply_to,
+			    const char  *error_name,
+			    const char  *error_message)
+{
+	if (reply_to) {
+		return dbus_message_new_error(reply_to, error_name, error_message);
+	} else {
+		DBusMessage *message = dbus_message_new(DBUS_MESSAGE_TYPE_ERROR);
+		DBusMessageIter iter;
+
+		dbus_message_set_error_name(message, error_name);
+		dbus_message_set_no_reply(message, TRUE);
+
+		if (error_message != NULL) {
+			dbus_message_iter_init_append(message, &iter);
+			if (!dbus_message_iter_append_basic(&iter,
+							    DBUS_TYPE_STRING,
+							    &error_message)) {
+				dbus_message_unref(message);
+				return NULL;
+			}
+		}
+
+		return message;
+	}
+}
 
 /**
  * recursive_iter_copy - Reads arguments from one iterator and
@@ -86,6 +122,7 @@ static void recursive_iter_copy(DBusMess
 
 
 static unsigned int fill_dict_with_properties(
+	DBusMessage *message,
 	DBusMessageIter *dict_iter, const struct wpa_dbus_property_desc *props,
 	const char *interface, const void *user_data)
 {
@@ -98,7 +135,7 @@ static unsigned int fill_dict_with_prope
 		if (!os_strncmp(dsc->dbus_interface, interface,
 				WPAS_DBUS_INTERFACE_MAX) &&
 		    dsc->access != W && dsc->getter) {
-			reply = dsc->getter(NULL, user_data);
+			reply = dsc->getter(message, user_data);
 			if (!reply)
 				continue;
 
@@ -160,7 +197,8 @@ static DBusMessage * get_all_properties(
 					 DBUS_DICT_ENTRY_END_CHAR_AS_STRING,
 					 &dict_iter);
 
-	props_num = fill_dict_with_properties(&dict_iter, obj_dsc->properties,
+	props_num = fill_dict_with_properties(message,
+					      &dict_iter, obj_dsc->properties,
 					      interface, obj_dsc->user_data);
 
 	dbus_message_iter_close_container(&iter, &dict_iter);
@@ -870,6 +908,7 @@ void wpa_dbus_get_object_properties(stru
 		return;
 	}
 
-	fill_dict_with_properties(dict_iter, obj_desc->properties,
+	fill_dict_with_properties(NULL,
+				  dict_iter, obj_desc->properties,
 				  interface, obj_desc->user_data);
 }
diff -up wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.h.prop-failure wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.h
--- wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.h.prop-failure	2011-04-09 14:04:25.130180461 -0400
+++ wpa_supplicant-0.7.3/wpa_supplicant/dbus/dbus_new_helpers.h	2011-04-09 14:38:53.092075181 -0400
@@ -112,6 +112,10 @@ struct wpa_dbus_property_desc {
 #define WPA_DBUS_PROPERTIES_SET "Set"
 #define WPA_DBUS_PROPERTIES_GETALL "GetAll"
 
+DBusMessage* wpa_dbus_message_new_error (DBusMessage *reply_to,
+					 const char  *error_name,
+					 const char  *error_message);
+
 void free_dbus_object_desc(struct wpa_dbus_object_desc *obj_dsc);
 
 int wpa_dbus_ctrl_iface_init(struct wpas_dbus_priv *iface, char *dbus_path,