[pkg-wpa-devel] r1442 - in /wpasupplicant/trunk/debian: changelog patches/15_wpa_gui_wpa_tab_annoyance.patch patches/16_wpa_msg_ctrl.patch patches/17_wpa_msg_ctrl_wps_ap_avail.patch patches/18_wpa_gui_wps_ap_avail_annoyance.patch patches/series
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Sun Nov 22 01:10:33 UTC 2009
Author: kelmo-guest
Date: Sun Nov 22 01:10:32 2009
New Revision: 1442
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1442
Log:
* Import debian/patches/15_wpa_gui_wpa_tab_annoyance.patch from
upstream to avoid annoyance of switching to WPS tab too frequently
while viewing status messages or managing networks with wpa_gui-qt4.
* Import debian/patches/16_wpa_msg_ctrl.patch from upstream to add
wpa_msg_ctrl helper which can send messages to the control interface
without logging when running in non-debug mode. Use it for CTRL-
EVENT-SCAN-RESULTS. (Closes: #539915)
* Add debian/patches/17_wpa_msg_ctrl_wps_ap_avail.patch to also use
wpa_msg_ctrl help for WPS_EVENT_AP_AVAIL_* events.
* Add debian/patches/18_wpa_gui_wps_ap_avail_annoyance.patch to stop
notifying about WPS_EVENT_AP_* events via wpa_gui tray status
bubbles - they are too frequent.
Added:
wpasupplicant/trunk/debian/patches/15_wpa_gui_wpa_tab_annoyance.patch
wpasupplicant/trunk/debian/patches/16_wpa_msg_ctrl.patch
wpasupplicant/trunk/debian/patches/17_wpa_msg_ctrl_wps_ap_avail.patch
wpasupplicant/trunk/debian/patches/18_wpa_gui_wps_ap_avail_annoyance.patch
Modified:
wpasupplicant/trunk/debian/changelog
wpasupplicant/trunk/debian/patches/series
Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1442&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sun Nov 22 01:10:32 2009
@@ -42,8 +42,20 @@
while providing an experimental feature only.
* Refresh patch series and fix rejects due to removal of
debian/patches/10_multi_driver.patch from series.
-
- -- Kel Modderman <kel at otaku42.de> Sun, 22 Nov 2009 09:00:38 +1000
+ * Import debian/patches/15_wpa_gui_wpa_tab_annoyance.patch from
+ upstream to avoid annoyance of switching to WPS tab too frequently
+ while viewing status messages or managing networks with wpa_gui-qt4.
+ * Import debian/patches/16_wpa_msg_ctrl.patch from upstream to add
+ wpa_msg_ctrl helper which can send messages to the control interface
+ without logging when running in non-debug mode. Use it for CTRL-
+ EVENT-SCAN-RESULTS. (Closes: #539915)
+ * Add debian/patches/17_wpa_msg_ctrl_wps_ap_avail.patch to also use
+ wpa_msg_ctrl help for WPS_EVENT_AP_AVAIL_* events.
+ * Add debian/patches/18_wpa_gui_wps_ap_avail_annoyance.patch to stop
+ notifying about WPS_EVENT_AP_* events via wpa_gui tray status
+ bubbles - they are too frequent.
+
+ -- Kel Modderman <kel at otaku42.de> Sun, 22 Nov 2009 11:09:33 +1000
wpasupplicant (0.6.9-3) unstable; urgency=low
Added: wpasupplicant/trunk/debian/patches/15_wpa_gui_wpa_tab_annoyance.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/15_wpa_gui_wpa_tab_annoyance.patch?rev=1442&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/15_wpa_gui_wpa_tab_annoyance.patch (added)
+++ wpasupplicant/trunk/debian/patches/15_wpa_gui_wpa_tab_annoyance.patch Sun Nov 22 01:10:32 2009
@@ -1,0 +1,45 @@
+From: Jouni Malinen <j at w1.fi>
+Date: Sat, 21 Nov 2009 18:52:55 +0000 (+0200)
+Subject: wpa_gui: Only move to WPS tab if inactive/disconnect and AP ready
+X-Git-Tag: hostap_0_7_0~5
+X-Git-Url: http://w1.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff_plain;h=19019a84a24fd3f1f49ca3296fa24626b403a607
+
+wpa_gui: Only move to WPS tab if inactive/disconnect and AP ready
+
+This removes many of the cases where moving to the WPS tab can be
+undesired. It is really only useful if we are not currently connected
+and there is an AP available that would likely be able to provide us
+network connectivity with use of WPS (active PBC more or selected
+registrar set).
+---
+
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -857,7 +857,9 @@ void WpaGui::processMsg(char *msg)
+ "Wi-Fi Protected Setup (WPS) AP\n"
+ "in active PBC mode found.");
+ wpsStatusText->setText("WPS AP in active PBC mode found");
+- wpaguiTab->setCurrentWidget(wpsTab);
++ if (textStatus->text() == "INACTIVE" ||
++ textStatus->text() == "DISCONNECTED")
++ wpaguiTab->setCurrentWidget(wpsTab);
+ wpsInstructions->setText("Press the PBC button on the screen "
+ "to start registration");
+ } else if (str_match(pos, WPS_EVENT_AP_AVAILABLE_PIN)) {
+@@ -866,13 +868,14 @@ void WpaGui::processMsg(char *msg)
+ " in active PIN mode found.");
+ wpsStatusText->setText("WPS AP with recently selected "
+ "registrar");
+- wpaguiTab->setCurrentWidget(wpsTab);
++ if (textStatus->text() == "INACTIVE" ||
++ textStatus->text() == "DISCONNECTED")
++ wpaguiTab->setCurrentWidget(wpsTab);
+ } else if (str_match(pos, WPS_EVENT_AP_AVAILABLE)) {
+ showTrayMessage(QSystemTrayIcon::Information, 3,
+ "Wi-Fi Protected Setup (WPS)\n"
+ "AP detected.");
+ wpsStatusText->setText("WPS AP detected");
+- wpaguiTab->setCurrentWidget(wpsTab);
+ } else if (str_match(pos, WPS_EVENT_OVERLAP)) {
+ showTrayMessage(QSystemTrayIcon::Information, 3,
+ "Wi-Fi Protected Setup (WPS)\n"
Added: wpasupplicant/trunk/debian/patches/16_wpa_msg_ctrl.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/16_wpa_msg_ctrl.patch?rev=1442&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/16_wpa_msg_ctrl.patch (added)
+++ wpasupplicant/trunk/debian/patches/16_wpa_msg_ctrl.patch Sun Nov 22 01:10:32 2009
@@ -1,0 +1,94 @@
+From: Jouni Malinen <jouni.malinen at atheros.com>
+Date: Tue, 10 Nov 2009 13:59:41 +0000 (+0200)
+Subject: Add wpa_msg_ctrl() for ctrl_interface-only messages
+X-Git-Tag: hostap_0_7_0~85
+X-Git-Url: http://w1.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff_plain;h=69856fadf77e680d01cac09da37e6bb3643ca427
+
+Add wpa_msg_ctrl() for ctrl_interface-only messages
+
+This is like wpa_msg(), but the output is directed only to
+ctrl_interface listeners. In other words, the output will not be
+shown on stdout or in syslog.
+
+Change scan result reporting to use wpa_msg_ctrl() for
+CTRL-EVENT-SCAN-RESULTS message at info level and wpa_printf() at
+debug level to avoid showing scan result events in syslog in the
+common configuration used with NetworkManager.
+---
+
+--- a/src/utils/wpa_debug.c
++++ b/src/utils/wpa_debug.c
+@@ -335,6 +335,30 @@ void wpa_msg(void *ctx, int level, char
+ wpa_msg_cb(ctx, level, buf, len);
+ os_free(buf);
+ }
++
++
++void wpa_msg_ctrl(void *ctx, int level, char *fmt, ...)
++{
++ va_list ap;
++ char *buf;
++ const int buflen = 2048;
++ int len;
++
++ if (!wpa_msg_cb)
++ return;
++
++ buf = os_malloc(buflen);
++ if (buf == NULL) {
++ wpa_printf(MSG_ERROR, "wpa_msg_ctrl: Failed to allocate "
++ "message buffer");
++ return;
++ }
++ va_start(ap, fmt);
++ len = vsnprintf(buf, buflen, fmt, ap);
++ va_end(ap);
++ wpa_msg_cb(ctx, level, buf, len);
++ os_free(buf);
++}
+ #endif /* CONFIG_NO_WPA_MSG */
+
+
+--- a/src/utils/wpa_debug.h
++++ b/src/utils/wpa_debug.h
+@@ -141,6 +141,7 @@ void wpa_hexdump_ascii_key(int level, co
+
+ #ifdef CONFIG_NO_WPA_MSG
+ #define wpa_msg(args...) do { } while (0)
++#define wpa_msg_ctrl(args...) do { } while (0)
+ #define wpa_msg_register_cb(f) do { } while (0)
+ #else /* CONFIG_NO_WPA_MSG */
+ /**
+@@ -159,6 +160,20 @@ void wpa_hexdump_ascii_key(int level, co
+ */
+ void wpa_msg(void *ctx, int level, char *fmt, ...) PRINTF_FORMAT(3, 4);
+
++/**
++ * wpa_msg_ctrl - Conditional printf for ctrl_iface monitors
++ * @ctx: Pointer to context data; this is the ctx variable registered
++ * with struct wpa_driver_ops::init()
++ * @level: priority level (MSG_*) of the message
++ * @fmt: printf format string, followed by optional arguments
++ *
++ * This function is used to print conditional debugging and error messages.
++ * This function is like wpa_msg(), but it sends the output only to the
++ * attached ctrl_iface monitors. In other words, it can be used for frequent
++ * events that do not need to be sent to syslog.
++ */
++void wpa_msg_ctrl(void *ctx, int level, char *fmt, ...) PRINTF_FORMAT(3, 4);
++
+ typedef void (*wpa_msg_cb_func)(void *ctx, int level, const char *txt,
+ size_t len);
+
+--- a/wpa_supplicant/events.c
++++ b/wpa_supplicant/events.c
+@@ -631,7 +631,8 @@ static void wpa_supplicant_event_scan_re
+ wpa_msg(wpa_s, MSG_DEBUG, "Cached scan results are "
+ "empty - not posting");
+ } else {
+- wpa_msg(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS);
++ wpa_printf(MSG_DEBUG, "New scan results available");
++ wpa_msg_ctrl(wpa_s, MSG_INFO, WPA_EVENT_SCAN_RESULTS);
+ wpa_supplicant_dbus_notify_scan_results(wpa_s);
+ wpas_wps_notify_scan_results(wpa_s);
+ }
Added: wpasupplicant/trunk/debian/patches/17_wpa_msg_ctrl_wps_ap_avail.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/17_wpa_msg_ctrl_wps_ap_avail.patch?rev=1442&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/17_wpa_msg_ctrl_wps_ap_avail.patch (added)
+++ wpasupplicant/trunk/debian/patches/17_wpa_msg_ctrl_wps_ap_avail.patch Sun Nov 22 01:10:32 2009
@@ -1,0 +1,31 @@
+From: Kel Modderman <kel at otaku42.de>
+References: none
+Description: Use wpa_msg_ctrl for WPA_EVEN_AP_AVAIL events to avoid spamming
+ log.
+
+---
+--- a/wpa_supplicant/wps_supplicant.c
++++ b/wpa_supplicant/wps_supplicant.c
+@@ -868,12 +868,16 @@ void wpas_wps_notify_scan_results(struct
+ ie = wpa_scan_get_vendor_ie_multi(bss, WPS_IE_VENDOR_TYPE);
+ if (!ie)
+ continue;
+- if (wps_is_selected_pbc_registrar(ie))
+- wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_AP_AVAILABLE_PBC);
+- else if (wps_is_selected_pin_registrar(ie))
+- wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_AP_AVAILABLE_PIN);
+- else
+- wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_AP_AVAILABLE);
++ if (wps_is_selected_pbc_registrar(ie)) {
++ wpa_printf(MSG_DEBUG, WPS_EVENT_AP_AVAILABLE_PBC);
++ wpa_msg_ctrl(wpa_s, MSG_INFO, WPS_EVENT_AP_AVAILABLE_PBC);
++ } else if (wps_is_selected_pin_registrar(ie)) {
++ wpa_printf(MSG_DEBUG, WPS_EVENT_AP_AVAILABLE_PIN);
++ wpa_msg_ctrl(wpa_s, MSG_INFO, WPS_EVENT_AP_AVAILABLE_PIN);
++ } else {
++ wpa_printf(MSG_DEBUG, WPS_EVENT_AP_AVAILABLE_PIN);
++ wpa_msg_ctrl(wpa_s, MSG_INFO, WPS_EVENT_AP_AVAILABLE);
++ }
+ wpabuf_free(ie);
+ break;
+ }
Added: wpasupplicant/trunk/debian/patches/18_wpa_gui_wps_ap_avail_annoyance.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/18_wpa_gui_wps_ap_avail_annoyance.patch?rev=1442&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/18_wpa_gui_wps_ap_avail_annoyance.patch (added)
+++ wpasupplicant/trunk/debian/patches/18_wpa_gui_wps_ap_avail_annoyance.patch Sun Nov 22 01:10:32 2009
@@ -1,0 +1,42 @@
+From: Kel Modderman <kel at otaku42.de>
+References: none
+Description: Do not show WPS events in a tray message, it is shown too
+ frequently and is not generally useful being shown there.
+
+---
+--- a/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
+@@ -853,9 +853,6 @@ void WpaGui::processMsg(char *msg)
+ QTimer::singleShot(5 * 1000, this, SLOT(showTrayStatus()));
+ stopWpsRun(true);
+ } else if (str_match(pos, WPS_EVENT_AP_AVAILABLE_PBC)) {
+- showTrayMessage(QSystemTrayIcon::Information, 3,
+- "Wi-Fi Protected Setup (WPS) AP\n"
+- "in active PBC mode found.");
+ wpsStatusText->setText("WPS AP in active PBC mode found");
+ if (textStatus->text() == "INACTIVE" ||
+ textStatus->text() == "DISCONNECTED")
+@@ -863,23 +860,14 @@ void WpaGui::processMsg(char *msg)
+ wpsInstructions->setText("Press the PBC button on the screen "
+ "to start registration");
+ } else if (str_match(pos, WPS_EVENT_AP_AVAILABLE_PIN)) {
+- showTrayMessage(QSystemTrayIcon::Information, 3,
+- "Wi-Fi Protected Setup (WPS) AP\n"
+- " in active PIN mode found.");
+ wpsStatusText->setText("WPS AP with recently selected "
+ "registrar");
+ if (textStatus->text() == "INACTIVE" ||
+ textStatus->text() == "DISCONNECTED")
+ wpaguiTab->setCurrentWidget(wpsTab);
+ } else if (str_match(pos, WPS_EVENT_AP_AVAILABLE)) {
+- showTrayMessage(QSystemTrayIcon::Information, 3,
+- "Wi-Fi Protected Setup (WPS)\n"
+- "AP detected.");
+ wpsStatusText->setText("WPS AP detected");
+ } else if (str_match(pos, WPS_EVENT_OVERLAP)) {
+- showTrayMessage(QSystemTrayIcon::Information, 3,
+- "Wi-Fi Protected Setup (WPS)\n"
+- "PBC mode overlap detected.");
+ wpsStatusText->setText("PBC mode overlap detected");
+ wpsInstructions->setText("More than one AP is currently in "
+ "active WPS PBC mode. Wait couple of "
Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1442&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Sun Nov 22 01:10:32 2009
@@ -7,3 +7,7 @@
12_wpa_supplicant_dont_force_disconnect_in_adhoc_mode.patch
13_deauthenticate_fixup.patch
14_start_and_finish_with_clean_slate.patch
+15_wpa_gui_wpa_tab_annoyance.patch
+16_wpa_msg_ctrl.patch
+17_wpa_msg_ctrl_wps_ap_avail.patch
+18_wpa_gui_wps_ap_avail_annoyance.patch
More information about the Pkg-wpa-devel
mailing list