[pkg-wpa-devel] r1536 - in /wpasupplicant/trunk/wpa_supplicant: Makefile dbus/dbus-wpa_supplicant.conf dbus/fi.epitest.hostap.WPASupplicant.service dbus/fi.w1.wpa_supplicant1.service wpa_gui-qt4/wpa_gui.desktop wpa_gui-qt4/wpagui.cpp wpa_supplicant.c
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Sun May 2 01:27:03 UTC 2010
Author: kelmo-guest
Date: Sun May 2 01:26:56 2010
New Revision: 1536
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1536
Log:
Unapply accidental commit of quilt patch series ...
Modified:
wpasupplicant/trunk/wpa_supplicant/Makefile
wpasupplicant/trunk/wpa_supplicant/dbus/dbus-wpa_supplicant.conf
wpasupplicant/trunk/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
wpasupplicant/trunk/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop
wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
wpasupplicant/trunk/wpa_supplicant/wpa_supplicant.c
Modified: wpasupplicant/trunk/wpa_supplicant/Makefile
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/Makefile?rev=1536&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/Makefile (original)
+++ wpasupplicant/trunk/wpa_supplicant/Makefile Sun May 2 01:26:56 2010
@@ -687,7 +687,7 @@
#dynamic symbol loading that is now used in pcsc_funcs.c
#LIBS += -lwinscard
else
-LIBS += $(shell pkg-config --libs libpcsclite)
+LIBS += -lpcsclite -lpthread
endif
endif
Modified: wpasupplicant/trunk/wpa_supplicant/dbus/dbus-wpa_supplicant.conf
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/dbus/dbus-wpa_supplicant.conf?rev=1536&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/dbus/dbus-wpa_supplicant.conf (original)
+++ wpasupplicant/trunk/wpa_supplicant/dbus/dbus-wpa_supplicant.conf Sun May 2 01:26:56 2010
@@ -14,14 +14,6 @@
<allow send_interface="fi.w1.wpa_supplicant1"/>
<allow receive_sender="fi.w1.wpa_supplicant1" receive_type="signal"/>
</policy>
- <policy group="netdev">
- <allow send_destination="fi.epitest.hostap.WPASupplicant"/>
- <allow send_interface="fi.epitest.hostap.WPASupplicant"/>
-
- <allow send_destination="fi.w1.wpa_supplicant1"/>
- <allow send_interface="fi.w1.wpa_supplicant1"/>
- <allow receive_sender="fi.w1.wpa_supplicant1" receive_type="signal"/>
- </policy>
<policy context="default">
<deny own="fi.epitest.hostap.WPASupplicant"/>
<deny send_destination="fi.epitest.hostap.WPASupplicant"/>
Modified: wpasupplicant/trunk/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service?rev=1536&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service (original)
+++ wpasupplicant/trunk/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service Sun May 2 01:26:56 2010
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=fi.epitest.hostap.WPASupplicant
-Exec=/sbin/wpa_supplicant -u -s
+Exec=/sbin/wpa_supplicant -u
User=root
Modified: wpasupplicant/trunk/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service?rev=1536&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service (original)
+++ wpasupplicant/trunk/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service Sun May 2 01:26:56 2010
@@ -1,4 +1,4 @@
[D-BUS Service]
Name=fi.w1.wpa_supplicant1
-Exec=/sbin/wpa_supplicant -u -s
+Exec=/sbin/wpa_supplicant -u
User=root
Modified: wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop?rev=1536&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop (original)
+++ wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpa_gui.desktop Sun May 2 01:26:56 2010
@@ -2,7 +2,7 @@
Version=1.0
Name=wpa_gui
Comment=Graphical user interface for wpa_supplicant
-Exec=/usr/share/wpagui/netdev_wrapper
+Exec=wpa_gui
Icon=wpa_gui
GenericName=wpa_supplicant user interface
Terminal=false
Modified: wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpagui.cpp
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpagui.cpp?rev=1536&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpagui.cpp (original)
+++ wpasupplicant/trunk/wpa_supplicant/wpa_gui-qt4/wpagui.cpp Sun May 2 01:26:56 2010
@@ -971,10 +971,17 @@
char reply[10];
size_t reply_len = sizeof(reply);
- if (cmd.contains(QRegExp("^\\d+:")))
- cmd.truncate(cmd.indexOf(':'));
- else
+ if (cmd.compare(tr("Select any network"))) {
cmd = "any";
+ } else {
+ int pos = cmd.indexOf(':');
+ if (pos < 0) {
+ printf("Invalid selectNetwork '%s'\n",
+ cmd.toAscii().constData());
+ return;
+ }
+ cmd.truncate(pos);
+ }
cmd.prepend("SELECT_NETWORK ");
ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
triggerUpdate();
@@ -988,12 +995,14 @@
char reply[10];
size_t reply_len = sizeof(reply);
- if (cmd.contains(QRegExp("^\\d+:")))
- cmd.truncate(cmd.indexOf(':'));
- else if (!cmd.startsWith("all")) {
- printf("Invalid editNetwork '%s'\n",
- cmd.toAscii().constData());
- return;
+ if (!cmd.startsWith("all")) {
+ int pos = cmd.indexOf(':');
+ if (pos < 0) {
+ printf("Invalid enableNetwork '%s'\n",
+ cmd.toAscii().constData());
+ return;
+ }
+ cmd.truncate(pos);
}
cmd.prepend("ENABLE_NETWORK ");
ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
@@ -1007,12 +1016,14 @@
char reply[10];
size_t reply_len = sizeof(reply);
- if (cmd.contains(QRegExp("^\\d+:")))
- cmd.truncate(cmd.indexOf(':'));
- else if (!cmd.startsWith("all")) {
- printf("Invalid editNetwork '%s'\n",
- cmd.toAscii().constData());
- return;
+ if (!cmd.startsWith("all")) {
+ int pos = cmd.indexOf(':');
+ if (pos < 0) {
+ printf("Invalid disableNetwork '%s'\n",
+ cmd.toAscii().constData());
+ return;
+ }
+ cmd.truncate(pos);
}
cmd.prepend("DISABLE_NETWORK ");
ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
@@ -1025,8 +1036,14 @@
QString cmd(sel);
int id = -1;
- if (cmd.contains(QRegExp("^\\d+:"))) {
- cmd.truncate(cmd.indexOf(':'));
+ if (!cmd.compare(tr("Select any network"))) {
+ int pos = sel.indexOf(':');
+ if (pos < 0) {
+ printf("Invalid editNetwork '%s'\n",
+ cmd.toAscii().constData());
+ return;
+ }
+ cmd.truncate(pos);
id = cmd.toInt();
}
@@ -1097,12 +1114,17 @@
char reply[10];
size_t reply_len = sizeof(reply);
- if (cmd.contains(QRegExp("^\\d+:")))
- cmd.truncate(cmd.indexOf(':'));
- else if (!cmd.startsWith("all")) {
- printf("Invalid editNetwork '%s'\n",
- cmd.toAscii().constData());
- return;
+ if (cmd.compare(tr("Select any network")))
+ return;
+
+ if (!cmd.startsWith("all")) {
+ int pos = cmd.indexOf(':');
+ if (pos < 0) {
+ printf("Invalid removeNetwork '%s'\n",
+ cmd.toAscii().constData());
+ return;
+ }
+ cmd.truncate(pos);
}
cmd.prepend("REMOVE_NETWORK ");
ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);
Modified: wpasupplicant/trunk/wpa_supplicant/wpa_supplicant.c
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/wpa_supplicant/wpa_supplicant.c?rev=1536&op=diff
==============================================================================
--- wpasupplicant/trunk/wpa_supplicant/wpa_supplicant.c (original)
+++ wpasupplicant/trunk/wpa_supplicant/wpa_supplicant.c Sun May 2 01:26:56 2010
@@ -1392,15 +1392,13 @@
}
if (wpa_s->reassociate)
wpa_supplicant_req_scan(wpa_s, 0, 0);
- } else if (ssid->disabled) {
- if (wpa_s->current_ssid == NULL) {
- /*
- * Try to reassociate since there is no current configuration
- * and a new network was made available.
- */
- wpa_s->reassociate = 1;
- wpa_supplicant_req_scan(wpa_s, 0, 0);
- }
+ } else if (wpa_s->current_ssid == NULL && ssid->disabled) {
+ /*
+ * Try to reassociate since there is no current configuration
+ * and a new network was made available.
+ */
+ wpa_s->reassociate = 1;
+ wpa_supplicant_req_scan(wpa_s, 0, 0);
was_disabled = ssid->disabled;
More information about the Pkg-wpa-devel
mailing list