DGNum/iwinfo
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nl80211: remove ancient wpa_supplicant ctrl socket path

Browse source 
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>
This commit is contained in:
Andre Heider 2022-11-20 17:45:11 +01:00 committed by Jo-Philipp Wich
parent dd4e1ffeac
commit a5a75fd661
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
iwinfo_nl80211.c
View file

@ -935,8 +935,7 @@ static int nl80211_wpactl_connect(const char *ifname, struct sockaddr_un *local)
remote.sun_family = AF_UNIX; remote.sun_family = AF_UNIX;
remote_length = sizeof(remote.sun_family) + remote_length = sizeof(remote.sun_family) +
sprintf(remote.sun_path, "/var/run/wpa_supplicant-%s/%s", sprintf(remote.sun_path, "/var/run/wpa_supplicant/%s", ifname);
ifname, ifname);
/* Set client socket file permissions so that bind() creates the client /* Set client socket file permissions so that bind() creates the client
* socket with these permissions and there is no need to try to change * socket with these permissions and there is no need to try to change
@ -956,17 +955,11 @@ static int nl80211_wpactl_connect(const char *ifname, struct sockaddr_un *local)
return -1; return -1;
} }
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))
{ {
close(sock); close(sock);
return -1; return -1;
} }
}
local->sun_family = AF_UNIX; local->sun_family = AF_UNIX;
local_length = sizeof(local->sun_family) + local_length = sizeof(local->sun_family) +