[pkg-wpa-devel] r1080 - in /wpasupplicant/trunk/debian: changelog patches/84_ctrl_iface_scan_bss_count.patch patches/93_wpa_gui_qt4_scanres_really_remove_qtimer.patch patches/94_wpa_gui_qt4_scanres_bss_count.patch patches/series
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Fri Feb 1 05:21:25 UTC 2008
Author: kelmo-guest
Date: Fri Feb 1 05:21:24 2008
New Revision: 1080
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1080
Log:
- debian/patches/93_wpa_gui_qt4_scanres_really_remove_qtimer.patch
* Fix a bug introduced by new bss ctrl interface command and/or wpa_gui
processing of scan results where there would be no finite point of
iterations causing infinite loop.
- debian/patches/84_ctrl_iface_scan_bss_count.patch
- debian/patches/94_wpa_gui_qt4_scanres_bss_count.patch
Added:
wpasupplicant/trunk/debian/patches/84_ctrl_iface_scan_bss_count.patch
wpasupplicant/trunk/debian/patches/93_wpa_gui_qt4_scanres_really_remove_qtimer.patch
wpasupplicant/trunk/debian/patches/94_wpa_gui_qt4_scanres_bss_count.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=1080&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Fri Feb 1 05:21:24 2008
@@ -82,6 +82,7 @@
CTRL-EVENT-SCAN-RESULTS.
- debian/patches/90_wpa_gui_qt4_update_scan_results_on_event.patch
- debian/patches/91_wpa_gui_qt4_scanres_bss_iterative.patch
+ - debian/patches/93_wpa_gui_qt4_scanres_really_remove_qtimer.patch
* Start daemon in quiet mode by default, the scan event is being written to
logfile far too often. [debian/ifupdown/functions.sh]
* When starting daemon with debug option, include timestamps in logfile.
@@ -89,8 +90,13 @@
* Simplfy return check in init_wpa_supplicant(), init_wpa_cli()
kill_wpa_supplicant() and kill_wpa_cli() reduce one level of indentation
for each function. [debian/ifupdown/functions.sh]
-
- -- Kel Modderman <kel at otaku42.de> Thu, 31 Jan 2008 11:50:14 +1000
+ * Fix a bug introduced by new bss ctrl interface command and/or wpa_gui
+ processing of scan results where there would be no finite point of
+ iterations causing infinite loop.
+ - debian/patches/84_ctrl_iface_scan_bss_count.patch
+ - debian/patches/94_wpa_gui_qt4_scanres_bss_count.patch
+
+ -- Kel Modderman <kel at otaku42.de> Fri, 01 Feb 2008 15:20:28 +1000
wpasupplicant (0.6.2-1) experimental; urgency=low
Added: wpasupplicant/trunk/debian/patches/84_ctrl_iface_scan_bss_count.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/84_ctrl_iface_scan_bss_count.patch?rev=1080&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/84_ctrl_iface_scan_bss_count.patch (added)
+++ wpasupplicant/trunk/debian/patches/84_ctrl_iface_scan_bss_count.patch Fri Feb 1 05:21:24 2008
@@ -1,0 +1,38 @@
+--- a/wpa_supplicant/ctrl_iface.c
++++ b/wpa_supplicant/ctrl_iface.c
+@@ -1225,6 +1225,7 @@
+ u8 bssid[ETH_ALEN];
+ int next = 0;
+ int first = 0;
++ int count = 0;
+ size_t i;
+ struct wpa_scan_results *results;
+ struct wpa_scan_res *bss;
+@@ -1232,7 +1233,9 @@
+ char *pos, *end;
+ const u8 *ie, *ie2;
+
+- if (os_strcmp(cmd, "first") == 0) {
++ if (os_strcmp(cmd, "count") == 0) {
++ count = 1;
++ } else if (os_strcmp(cmd, "first") == 0) {
+ first = 1;
+ } else if (os_strncmp(cmd, "next ", 5) == 0) {
+ next = 1;
+@@ -1247,6 +1250,16 @@
+ if (results == NULL)
+ return 0;
+
++ if (count) {
++ pos = buf;
++ end = buf + buflen;
++ ret = snprintf(pos, end - pos, "%d\n", results->num);
++ if (ret < 0 || ret >= end - pos)
++ return pos - buf;
++ pos += ret;
++ return pos - buf;
++ }
++
+ for (i = 0; i < results->num; i++) {
+ if (first)
+ break;
Added: wpasupplicant/trunk/debian/patches/93_wpa_gui_qt4_scanres_really_remove_qtimer.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/93_wpa_gui_qt4_scanres_really_remove_qtimer.patch?rev=1080&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/93_wpa_gui_qt4_scanres_really_remove_qtimer.patch (added)
+++ wpasupplicant/trunk/debian/patches/93_wpa_gui_qt4_scanres_really_remove_qtimer.patch Fri Feb 1 05:21:24 2008
@@ -1,0 +1,11 @@
+--- a/wpa_supplicant/wpa_gui-qt4/scanresults.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/scanresults.cpp
+@@ -12,8 +12,6 @@
+ * See README and COPYING for more details.
+ */
+
+-#include <QTimer>
+-
+ #include "scanresults.h"
+ #include "wpagui.h"
+ #include "networkconfig.h"
Added: wpasupplicant/trunk/debian/patches/94_wpa_gui_qt4_scanres_bss_count.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/94_wpa_gui_qt4_scanres_bss_count.patch?rev=1080&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/94_wpa_gui_qt4_scanres_bss_count.patch (added)
+++ wpasupplicant/trunk/debian/patches/94_wpa_gui_qt4_scanres_bss_count.patch Fri Feb 1 05:21:24 2008
@@ -1,0 +1,40 @@
+--- a/wpa_supplicant/wpa_gui-qt4/scanresults.cpp
++++ b/wpa_supplicant/wpa_gui-qt4/scanresults.cpp
+@@ -56,9 +56,25 @@
+ {
+ char reply[2048];
+ size_t reply_len;
++ int bss_count = 0;
++ int bss_num = 0;
+
+ scanResultsWidget->clear();
+- QString cmd("BSS first");
++
++ QString cmd("BSS count");
++
++ reply_len = sizeof(reply) - 1;
++ if (wpagui->ctrlRequest(cmd.toAscii().constData(), reply, &reply_len)
++ >= 0) {
++ reply[reply_len] = '\0';
++ if (memcmp(reply, "FAIL", 4) != 0)
++ bss_count = atoi(reply);
++ }
++
++ if (bss_count < 1)
++ return;
++
++ cmd = "BSS first";
+
+ while (wpagui) {
+ reply_len = sizeof(reply) - 1;
+@@ -104,6 +120,10 @@
+ if (bssid.isEmpty())
+ break;
+
++ bss_num++;
++ if (bss_num == bss_count)
++ break;
++
+ cmd = "BSS next ";
+ cmd.append(bssid);
+ }
Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1080&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Fri Feb 1 05:21:24 2008
@@ -44,6 +44,9 @@
80_wpa_ctrl_scan_event.patch
81_ctrl_iface_scan_bss_command.patch
83_ctrl_iface_scan_bss_flags.patch
+84_ctrl_iface_scan_bss_count.patch
90_wpa_gui_qt4_update_scan_results_on_event.patch
91_wpa_gui_qt4_scanres_bss_iterative.patch
92_wpa_gui_qt4_scanres_bss_iterative_indexof_fixup.patch
+93_wpa_gui_qt4_scanres_really_remove_qtimer.patch
+94_wpa_gui_qt4_scanres_bss_count.patch
More information about the Pkg-wpa-devel
mailing list