[pkg-wpa-devel] r1394 - in /hostapd/trunk/debian: changelog control patches/ patches/hostap_reject_conf_without_channel_nl80211.patch patches/hostap_reuse_existing_ctrl_iface_socket.patch patches/series rules
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Sun May 17 19:40:53 UTC 2009
Author: kelmo-guest
Date: Sun May 17 19:40:53 2009
New Revision: 1394
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1394
Log:
* Change Maintainer to pkg-wpa-devel team and add Reinhard and myself
to Uploaders to better reflect the organisation which makes the package
available.
* Import upstream patches:
- hostap_reuse_existing_ctrl_iface_socket.patch allows to reuse ctrl
interface sockets left over as result of unclean shutdown
- hostap_reject_conf_without_channel_nl80211.patch adds code to reject
configurations which use nl80211 driver without setting a channel
because this will always fail for the time being
* Build-Depend on quilt >= 0.46-7 for dh integration.
Added:
hostapd/trunk/debian/patches/
hostapd/trunk/debian/patches/hostap_reject_conf_without_channel_nl80211.patch
hostapd/trunk/debian/patches/hostap_reuse_existing_ctrl_iface_socket.patch
hostapd/trunk/debian/patches/series
Modified:
hostapd/trunk/debian/changelog
hostapd/trunk/debian/control
hostapd/trunk/debian/rules
Modified: hostapd/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/changelog?rev=1394&op=diff
==============================================================================
--- hostapd/trunk/debian/changelog (original)
+++ hostapd/trunk/debian/changelog Sun May 17 19:40:53 2009
@@ -1,11 +1,21 @@
hostapd (1:0.6.9-3) unstable; urgency=low
+ * Change Maintainer to pkg-wpa-devel team and add Reinhard and myself
+ to Uploaders to better reflect the organisation which makes the package
+ available.
+ * Import upstream patches:
+ - hostap_reuse_existing_ctrl_iface_socket.patch allows to reuse ctrl
+ interface sockets left over as result of unclean shutdown
+ - hostap_reject_conf_without_channel_nl80211.patch adds code to reject
+ configurations which use nl80211 driver without setting a channel
+ because this will always fail for the time being
+ * Build-Depend on quilt >= 0.46-7 for dh integration.
* Update debian/control long description to mention mac80211 based
drivers. Thanks to Jan Braunisch for noticing.
* Also remove reference to the Prism54 driver in package long
description, we do not support it.
- -- Kel Modderman <kel at otaku42.de> Sun, 26 Apr 2009 02:43:44 +1000
+ -- Kel Modderman <kel at otaku42.de> Sun, 17 May 2009 04:35:12 +1000
hostapd (1:0.6.9-2) unstable; urgency=low
Modified: hostapd/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/control?rev=1394&op=diff
==============================================================================
--- hostapd/trunk/debian/control (original)
+++ hostapd/trunk/debian/control Sun May 17 19:40:53 2009
@@ -1,9 +1,9 @@
Source: hostapd
Section: net
Priority: optional
-Maintainer: Kel Modderman <kel at otaku42.de>
-Uploaders: Faidon Liambotis <paravoid at debian.org>
-Build-Depends: debhelper (>= 7.0.50), libssl-dev, libnl-dev (>= 1.1)
+Maintainer: Debian/Ubuntu wpasupplicant Maintainers <pkg-wpa-devel at lists.alioth.debian.org>
+Uploaders: Faidon Liambotis <paravoid at debian.org>, Reinhard Tartler <siretart at tauware.de>, Kel Modderman <kel at otaku42.de>
+Build-Depends: debhelper (>= 7.0.50), quilt (>= 0.46-7), libssl-dev, libnl-dev (>= 1.1)
Standards-Version: 3.8.1
Homepage: http://w1.fi/
Vcs-Svn: svn://svn.debian.org/pkg-wpa/hostapd/trunk
Added: hostapd/trunk/debian/patches/hostap_reject_conf_without_channel_nl80211.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/patches/hostap_reject_conf_without_channel_nl80211.patch?rev=1394&op=file
==============================================================================
--- hostapd/trunk/debian/patches/hostap_reject_conf_without_channel_nl80211.patch (added)
+++ hostapd/trunk/debian/patches/hostap_reject_conf_without_channel_nl80211.patch Sun May 17 19:40:53 2009
@@ -1,0 +1,28 @@
+From: Jouni Malinen <jouni.malinen at atheros.com>
+Date: Wed, 6 May 2009 13:07:43 +0000 (+0300)
+Subject: Reject hostapd configuration without channel for nl80211 drivers
+X-Git-Url: http://w1.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff_plain;h=24c9fcebfb7c354d8cf91f93002921314322a720
+
+Reject hostapd configuration without channel for nl80211 drivers
+
+We could use auto-channel selection here eventually, but for now,
+reject the configuration since it is not going to work correctly
+(Beacon and Probe Response frames use incorrect value in DS Params).
+---
+
+--- a/hostapd/hw_features.c
++++ b/hostapd/hw_features.c
+@@ -382,6 +382,13 @@ int hostapd_select_hw_mode(struct hostap
+ break;
+ }
+ }
++ if (iface->conf->channel == 0) {
++ /* TODO: could request a scan of neighboring BSSes and select
++ * the channel automatically */
++ wpa_printf(MSG_ERROR, "Channel not configured "
++ "(hw_mode/channel in hostapd.conf)");
++ return -1;
++ }
+ if (ok == 0 && iface->conf->channel != 0) {
+ hostapd_logger(iface->bss[0], NULL,
+ HOSTAPD_MODULE_IEEE80211,
Added: hostapd/trunk/debian/patches/hostap_reuse_existing_ctrl_iface_socket.patch
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/patches/hostap_reuse_existing_ctrl_iface_socket.patch?rev=1394&op=file
==============================================================================
--- hostapd/trunk/debian/patches/hostap_reuse_existing_ctrl_iface_socket.patch (added)
+++ hostapd/trunk/debian/patches/hostap_reuse_existing_ctrl_iface_socket.patch Sun May 17 19:40:53 2009
@@ -1,0 +1,52 @@
+From: Jouni Malinen <jouni.malinen at atheros.com>
+Date: Wed, 6 May 2009 08:31:45 +0000 (+0300)
+Subject: Add code to re-use an existing ctrl_iface socket file
+X-Git-Url: http://w1.fi/gitweb/gitweb.cgi?p=hostap.git;a=commitdiff_plain;h=617d1555479aecf3bf13e35202a46c63e8d19052
+
+Add code to re-use an existing ctrl_iface socket file
+
+Port the code from wpa_supplicant to re-use an existing ctrl_iface
+socket file if the file does not seem to be in use. This allows
+hostapd to recover from unclean shutdown of the control interface.
+---
+
+--- a/hostapd/ctrl_iface.c
++++ b/hostapd/ctrl_iface.c
+@@ -450,8 +450,35 @@ int hostapd_ctrl_iface_init(struct hosta
+ goto fail;
+ os_strlcpy(addr.sun_path, fname, sizeof(addr.sun_path));
+ if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+- perror("bind(PF_UNIX)");
+- goto fail;
++ wpa_printf(MSG_DEBUG, "ctrl_iface bind(PF_UNIX) failed: %s",
++ strerror(errno));
++ if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
++ wpa_printf(MSG_DEBUG, "ctrl_iface exists, but does not"
++ " allow connections - assuming it was left"
++ "over from forced program termination");
++ if (unlink(fname) < 0) {
++ perror("unlink[ctrl_iface]");
++ wpa_printf(MSG_ERROR, "Could not unlink "
++ "existing ctrl_iface socket '%s'",
++ fname);
++ goto fail;
++ }
++ if (bind(s, (struct sockaddr *) &addr, sizeof(addr)) <
++ 0) {
++ perror("bind(PF_UNIX)");
++ goto fail;
++ }
++ wpa_printf(MSG_DEBUG, "Successfully replaced leftover "
++ "ctrl_iface socket '%s'", fname);
++ } else {
++ wpa_printf(MSG_INFO, "ctrl_iface exists and seems to "
++ "be in use - cannot override it");
++ wpa_printf(MSG_INFO, "Delete '%s' manually if it is "
++ "not used anymore", fname);
++ os_free(fname);
++ fname = NULL;
++ goto fail;
++ }
+ }
+
+ if (hapd->conf->ctrl_interface_gid_set &&
Added: hostapd/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/patches/series?rev=1394&op=file
==============================================================================
--- hostapd/trunk/debian/patches/series (added)
+++ hostapd/trunk/debian/patches/series Sun May 17 19:40:53 2009
@@ -1,0 +1,2 @@
+hostap_reuse_existing_ctrl_iface_socket.patch
+hostap_reject_conf_without_channel_nl80211.patch
Modified: hostapd/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-wpa/hostapd/trunk/debian/rules?rev=1394&op=diff
==============================================================================
--- hostapd/trunk/debian/rules (original)
+++ hostapd/trunk/debian/rules Sun May 17 19:40:53 2009
@@ -17,7 +17,7 @@
endif
%:
- dh $@
+ dh --with quilt $@
override_dh_auto_build:
cp -v $(CONFIG) hostapd/.config
More information about the Pkg-wpa-devel
mailing list