[pkg-wpa-devel] r1081 - /wpasupplicant/trunk/debian/patches/94_wpa_gui_qt4_scanres_bss_count.patch
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Fri Feb 1 09:54:56 UTC 2008
Author: kelmo-guest
Date: Fri Feb 1 09:54:56 2008
New Revision: 1081
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1081
Log:
cleanup debian/patches/94_wpa_gui_qt4_scanres_bss_count.patch for re-submission
Modified:
wpasupplicant/trunk/debian/patches/94_wpa_gui_qt4_scanres_bss_count.patch
Modified: 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=1081&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/94_wpa_gui_qt4_scanres_bss_count.patch (original)
+++ wpasupplicant/trunk/debian/patches/94_wpa_gui_qt4_scanres_bss_count.patch Fri Feb 1 09:54:56 2008
@@ -1,15 +1,17 @@
--- a/wpa_supplicant/wpa_gui-qt4/scanresults.cpp
+++ b/wpa_supplicant/wpa_gui-qt4/scanresults.cpp
-@@ -56,9 +56,25 @@
+@@ -56,11 +56,30 @@
{
char reply[2048];
size_t reply_len;
+-
+ int bss_count = 0;
-+ int bss_num = 0;
-
++ int i;
++
scanResultsWidget->clear();
- QString cmd("BSS first");
-+
+
+- while (wpagui) {
+ QString cmd("BSS count");
+
+ reply_len = sizeof(reply) - 1;
@@ -24,17 +26,31 @@
+ 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)
++
++ for (i = 0; i < bss_count; i++) {
++ if (wpagui == NULL)
+ break;
+
+ reply_len = sizeof(reply) - 1;
+ if (wpagui->ctrlRequest(cmd.toAscii().constData(), reply,
+ &reply_len) < 0)
+@@ -92,6 +111,9 @@
+ ssid = (*it).mid(pos);
+ }
+
++ if (bssid.isEmpty())
++ break;
++
+ QTreeWidgetItem *item = new QTreeWidgetItem(scanResultsWidget);
+ if (item) {
+ item->setText(0, ssid);
+@@ -101,9 +123,6 @@
+ item->setText(4, flags);
+ }
+
+- if (bssid.isEmpty())
+- break;
+-
cmd = "BSS next ";
cmd.append(bssid);
}
More information about the Pkg-wpa-devel
mailing list