summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Heider <a.heider@gmail.com>2022-11-20 17:45:11 +0100
committerJo-Philipp Wich <jo@mein.io>2022-12-15 20:12:41 +0100
commita5a75fd661da3cb029bf71fab5e27eebc14cdd1b (patch)
tree90c6488095da3f4608bcc430a9a5936158d1e1cb
parentdd4e1ffeacfde2499da67d523f548dead52e04c7 (diff)
downloadiwinfo-a5a75fd661da3cb029bf71fab5e27eebc14cdd1b.tar.gz
nl80211: remove ancient wpa_supplicant ctrl socket path
This isn't required nor used anymore, and it's been +8 years. See "735a03be: iwinfo: adjust for changed wpa_supplicant control socket path" on the main repository. Signed-off-by: Andre Heider <a.heider@gmail.com>
-rw-r--r--iwinfo_nl80211.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/iwinfo_nl80211.c b/iwinfo_nl80211.c
index aceef18..c1e53d7 100644
--- a/iwinfo_nl80211.c
+++ b/iwinfo_nl80211.c
@@ -935,8 +935,7 @@ static int nl80211_wpactl_connect(const char *ifname, struct sockaddr_un *local)
remote.sun_family = AF_UNIX;
remote_length = sizeof(remote.sun_family) +
- sprintf(remote.sun_path, "/var/run/wpa_supplicant-%s/%s",
- ifname, ifname);
+ sprintf(remote.sun_path, "/var/run/wpa_supplicant/%s", ifname);
/* Set client socket file permissions so that bind() creates the client
* socket with these permissions and there is no need to try to change
@@ -958,14 +957,8 @@ static int nl80211_wpactl_connect(const char *ifname, struct sockaddr_un *local)
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))
- {
- close(sock);
- return -1;
- }
+ close(sock);
+ return -1;
}
local->sun_family = AF_UNIX;