diff options
| author | Janusz Dziedzic <janusz.dziedzic@gmail.com> | 2020-01-12 22:02:20 (GMT) |
|---|---|---|
| committer | Jouni Malinen <j@w1.fi> | 2020-02-23 13:40:58 (GMT) |
| commit | 12fb9698ab7c640fce3f73ab2c5bf5ad5f886ddf (patch) | |
| tree | 9790b11ba7c9163fafb0cdb7c29a514d3b477e8c | |
| parent | 7a934fe72a61163448022026feb058484d5f290c (diff) | |
| download | hostap-12fb9698ab7c640fce3f73ab2c5bf5ad5f886ddf.zip hostap-12fb9698ab7c640fce3f73ab2c5bf5ad5f886ddf.tar.gz hostap-12fb9698ab7c640fce3f73ab2c5bf5ad5f886ddf.tar.bz2 | |
Use IFNAME= prefix for global UDP control interface events
There does not seem to be a good reason for using the different IFACE=
prefix on the UDP control interface. This got added when the UDP
interface in wpa_supplicant was extended in commit f0e5d3b5c6c7
("wpa_supplicant: Share attach/detach/send UDP ctrl_iface functions")
and that was then extended to hostapd in commit e9208056856c ("hostapd:
Extend global control interface notifications").
Replace the IFACE= prefix in UDP case with IFNAME= to be consistent with
the UNIX domain socket based control interface.
This fixes a problem when at least one test case fail (hapd_ctrl_sta)
when remote/udp used. This also fixes test_connectivity().
Signed-off-by: Janusz Dziedzic <janusz.dziedzic@gmail.com>
| -rw-r--r-- | hostapd/ctrl_iface.c | 5 | ||||
| -rw-r--r-- | wpa_supplicant/ctrl_iface_udp.c | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/hostapd/ctrl_iface.c b/hostapd/ctrl_iface.c index a1e4abd..18cbc76 100644 --- a/hostapd/ctrl_iface.c +++ b/hostapd/ctrl_iface.c @@ -4689,13 +4689,8 @@ static void hostapd_ctrl_iface_send_internal(int sock, struct dl_list *ctrl_dst, return; idx = 0; if (ifname) { -#ifdef CONFIG_CTRL_IFACE_UDP - io[idx].iov_base = "IFACE="; - io[idx].iov_len = 6; -#else /* CONFIG_CTRL_IFACE_UDP */ io[idx].iov_base = "IFNAME="; io[idx].iov_len = 7; -#endif /* CONFIG_CTRL_IFACE_UDP */ idx++; io[idx].iov_base = (char *) ifname; io[idx].iov_len = os_strlen(ifname); diff --git a/wpa_supplicant/ctrl_iface_udp.c b/wpa_supplicant/ctrl_iface_udp.c index 8a6057a..1e92b97 100644 --- a/wpa_supplicant/ctrl_iface_udp.c +++ b/wpa_supplicant/ctrl_iface_udp.c @@ -516,7 +516,7 @@ static void wpa_supplicant_ctrl_iface_send(struct wpa_supplicant *wpa_s, return; if (ifname) - os_snprintf(levelstr, sizeof(levelstr), "IFACE=%s <%d>", + os_snprintf(levelstr, sizeof(levelstr), "IFNAME=%s <%d>", ifname, level); else os_snprintf(levelstr, sizeof(levelstr), "<%d>", level); |