KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

iwinfo: adjust for changed wpa_supplicant control socket path

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

SVN-Revision: 40747
This commit is contained in:
Jo-Philipp Wich 2014-05-10 15:31:49 +00:00
parent 0c06d76c79
commit 735a03be62
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package/network/utils/iwinfo/Makefile
View file

@ -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. # This is free software, licensed under the GPL 2 license.
# #
@ -7,7 +7,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=libiwinfo PKG_NAME:=libiwinfo
PKG_RELEASE:=47 PKG_RELEASE:=48
PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
PKG_CONFIG_DEPENDS := \ PKG_CONFIG_DEPENDS := \

6
package/network/utils/iwinfo/src/iwinfo_nl80211.c
View file

@ -525,8 +525,14 @@ static char * nl80211_wpactl_info(const char *ifname, const char *cmd,
if (fcntl(sock, F_SETFD, fcntl(sock, F_GETFD) | FD_CLOEXEC) < 0) if (fcntl(sock, F_SETFD, fcntl(sock, F_GETFD) | FD_CLOEXEC) < 0)
goto out; goto out;
if (connect(sock, (struct sockaddr *) &remote, remote_length))
{
remote_length = sizeof(remote.sun_family) + sprintf(remote.sun_path,
"/var/run/wpa_supplicant/%s", ifname);
if (connect(sock, (struct sockaddr *) &remote, remote_length)) if (connect(sock, (struct sockaddr *) &remote, remote_length))
goto out; goto out;
}
local.sun_family = AF_UNIX; local.sun_family = AF_UNIX;
local_length = sizeof(local.sun_family) + local_length = sizeof(local.sun_family) +