diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2014-05-10 15:31:49 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2014-05-10 15:31:49 +0000 |
| commit | 735a03be62e852705f73ebc16f25927d0d6a1f17 (patch) | |
| tree | f3cb1768cd28d4a4dc9cea3f2b0cc6fc09bc3995 | |
| parent | 0c06d76c79e6d24f6ea46952504b3938d6d298e6 (diff) | |
| download | upstream-735a03be62e852705f73ebc16f25927d0d6a1f17.tar.gz upstream-735a03be62e852705f73ebc16f25927d0d6a1f17.tar.bz2 upstream-735a03be62e852705f73ebc16f25927d0d6a1f17.zip | |
iwinfo: adjust for changed wpa_supplicant control socket path
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>
SVN-Revision: 40747
| -rw-r--r-- | package/network/utils/iwinfo/Makefile | 4 | ||||
| -rw-r--r-- | package/network/utils/iwinfo/src/iwinfo_nl80211.c | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/package/network/utils/iwinfo/Makefile b/package/network/utils/iwinfo/Makefile index 9bebb7a619..699682b95e 100644 --- a/package/network/utils/iwinfo/Makefile +++ b/package/network/utils/iwinfo/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2010-2013 Jo-Philipp Wich <xm@subsignal.org> +# Copyright (C) 2010-2014 Jo-Philipp Wich <xm@subsignal.org> # # This is free software, licensed under the GPL 2 license. # @@ -7,7 +7,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libiwinfo -PKG_RELEASE:=47 +PKG_RELEASE:=48 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_CONFIG_DEPENDS := \ diff --git a/package/network/utils/iwinfo/src/iwinfo_nl80211.c b/package/network/utils/iwinfo/src/iwinfo_nl80211.c index a258d2f2b2..854be6bbf8 100644 --- a/package/network/utils/iwinfo/src/iwinfo_nl80211.c +++ b/package/network/utils/iwinfo/src/iwinfo_nl80211.c @@ -526,7 +526,13 @@ static char * nl80211_wpactl_info(const char *ifname, const char *cmd, goto out; if (connect(sock, (struct sockaddr *) &remote, remote_length)) - goto out; + { + remote_length = sizeof(remote.sun_family) + sprintf(remote.sun_path, + "/var/run/wpa_supplicant/%s", ifname); + + if (connect(sock, (struct sockaddr *) &remote, remote_length)) + goto out; + } local.sun_family = AF_UNIX; local_length = sizeof(local.sun_family) + |