nl80211: remove ancient wpa_supplicant ctrl socket path
authorAndre Heider <a.heider@gmail.com>
Sun, 20 Nov 2022 16:45:11 +0000 (17:45 +0100)
committerJo-Philipp Wich <jo@mein.io>
Thu, 15 Dec 2022 19:12:41 +0000 (20:12 +0100)
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>
iwinfo_nl80211.c

index aceef18230ffd9e419dd1ddaf4ff758004eb9390..c1e53d7a3514914824e2e2d8a805bd7521270abe 100644 (file)
@@ -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;