[pkg-wpa-devel] r1029 - in /wpasupplicant/trunk/debian: changelog patches/34_ctrl_iface_enable_all.patch patches/35_ctrl_iface_disable_all.patch patches/series

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Sat Jan 12 15:34:49 2008
New Revision: 1029

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1029
Log:
* Add debian/patches/35_ctrl_iface_disable_all.patch to activate
  `disable_network all` ctrl_interface command.
* Add debian/patches/34_ctrl_iface_enable_all.patch to activate
  `enable_network all` ctrl_interface command.

Added:
    wpasupplicant/trunk/debian/patches/34_ctrl_iface_enable_all.patch
    wpasupplicant/trunk/debian/patches/35_ctrl_iface_disable_all.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=1029&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sat Jan 12 15:34:49 2008
@@ -15,8 +15,12 @@
     - wait_for_interface hack (-w command line option) now works as
       advertised. (Closes: #350963)
     - pending upstream inclusion. We won't ship it unless upstream accepts.
-
- -- Kel Modderman <kel at otaku42.de>  Fri, 11 Jan 2008 11:18:40 +1000
+  * Add debian/patches/35_ctrl_iface_disable_all.patch to activate
+    `disable_network all` ctrl_interface command.
+  * Add debian/patches/34_ctrl_iface_enable_all.patch to activate
+    `enable_network all` ctrl_interface command.
+
+ -- Kel Modderman <kel at otaku42.de>  Sun, 13 Jan 2008 01:32:45 +1000
 
 wpasupplicant (0.6.2-1) experimental; urgency=low
 

Added: wpasupplicant/trunk/debian/patches/34_ctrl_iface_enable_all.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/34_ctrl_iface_enable_all.patch?rev=1029&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/34_ctrl_iface_enable_all.patch (added)
+++ wpasupplicant/trunk/debian/patches/34_ctrl_iface_enable_all.patch Sat Jan 12 15:34:49 2008
@@ -1,0 +1,25 @@
+--- a/wpa_supplicant/ctrl_iface.c
++++ b/wpa_supplicant/ctrl_iface.c
+@@ -644,7 +644,21 @@
+ 	int id;
+ 	struct wpa_ssid *ssid;
+ 
+-	/* cmd: "<network id>" */
++	/* cmd: "<network id>" or "all" */
++	if (os_strcmp(cmd, "all") == 0) {
++		wpa_printf(MSG_DEBUG, "CTRL_IFACE: ENABLE_NETWORK all");
++		ssid = wpa_s->conf->ssid;
++		while (ssid) {
++			if (ssid == wpa_s->current_ssid && ssid->disabled)
++				wpa_s->reassociate = 1;
++			ssid->disabled = 0;
++			ssid = ssid->next;
++		}
++		if (wpa_s->reassociate)
++			wpa_supplicant_req_scan(wpa_s, 0, 0);
++		return 0;
++	}
++
+ 	id = atoi(cmd);
+ 	wpa_printf(MSG_DEBUG, "CTRL_IFACE: ENABLE_NETWORK id=%d", id);
+ 

Added: wpasupplicant/trunk/debian/patches/35_ctrl_iface_disable_all.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/35_ctrl_iface_disable_all.patch?rev=1029&op=file
==============================================================================
--- wpasupplicant/trunk/debian/patches/35_ctrl_iface_disable_all.patch (added)
+++ wpasupplicant/trunk/debian/patches/35_ctrl_iface_disable_all.patch Sat Jan 12 15:34:49 2008
@@ -1,0 +1,24 @@
+--- a/wpa_supplicant/ctrl_iface.c
++++ b/wpa_supplicant/ctrl_iface.c
+@@ -688,7 +688,20 @@
+ 	int id;
+ 	struct wpa_ssid *ssid;
+ 
+-	/* cmd: "<network id>" */
++	/* cmd: "<network id>" or "all" */
++	if (os_strcmp(cmd, "all") == 0) {
++		wpa_printf(MSG_DEBUG, "CTRL_IFACE: DISABLE_NETWORK all");
++		ssid = wpa_s->conf->ssid;
++		while (ssid) {
++			ssid->disabled = 1;
++			ssid = ssid->next;
++		}
++		if (wpa_s->current_ssid)
++			wpa_supplicant_disassociate(wpa_s,
++				                    WLAN_REASON_DEAUTH_LEAVING);
++		return 0;
++	}
++
+ 	id = atoi(cmd);
+ 	wpa_printf(MSG_DEBUG, "CTRL_IFACE: DISABLE_NETWORK id=%d", id);
+ 

Modified: wpasupplicant/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/patches/series?rev=1029&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/patches/series (original)
+++ wpasupplicant/trunk/debian/patches/series Sat Jan 12 15:34:49 2008
@@ -1,3 +1,5 @@
+34_ctrl_iface_enable_all.patch
+35_ctrl_iface_disable_all.patch
 00_defconfig.patch
 01_debian_wpa_roam_example.patch
 02_dbus_group_policy.patch