From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sat, 10 May 2014 15:31:49 +0000 (+0000)
Subject: iwinfo: adjust for changed wpa_supplicant control socket path
X-Git-Tag: reboot~7276
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=735a03be62e852705f73ebc16f25927d0d6a1f17;p=oweals%2Fopenwrt.git

iwinfo: adjust for changed wpa_supplicant control socket path

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 40747
---

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) +