jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wpa_supplicant: Share attach/detach/send UDP ctrl_iface functions

Browse source 
Extend the previously per-interface UDP ctrl_iface functions
(attach/detach/send) to support operations on the global interface as
well.

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@tieto.com>
This commit is contained in:
Janusz Dziedzic 2016-03-04 10:20:18 +01:00 committed by Jouni Malinen
parent db7fb435f3
commit f0e5d3b5c6
1 changed files with 29 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
wpa_supplicant/ctrl_iface_udp.c
View file

@ -49,12 +49,14 @@ struct ctrl_iface_priv {
}; };
static void wpa_supplicant_ctrl_iface_send(struct ctrl_iface_priv *priv, static void wpa_supplicant_ctrl_iface_send(struct wpa_supplicant *wpa_s,
const char *ifname, int sock,
struct wpa_ctrl_dst **head,
int level, const char *buf, int level, const char *buf,
size_t len); size_t len);
static int wpa_supplicant_ctrl_iface_attach(struct ctrl_iface_priv *priv, static int wpa_supplicant_ctrl_iface_attach(struct wpa_ctrl_dst **head,
#ifdef CONFIG_CTRL_IFACE_UDP_IPV6 #ifdef CONFIG_CTRL_IFACE_UDP_IPV6
struct sockaddr_in6 *from, struct sockaddr_in6 *from,
#else /* CONFIG_CTRL_IFACE_UDP_IPV6 */ #else /* CONFIG_CTRL_IFACE_UDP_IPV6 */
@ -73,8 +75,8 @@ static int wpa_supplicant_ctrl_iface_attach(struct ctrl_iface_priv *priv,
os_memcpy(&dst->addr, from, sizeof(*from)); os_memcpy(&dst->addr, from, sizeof(*from));
dst->addrlen = fromlen; dst->addrlen = fromlen;
dst->debug_level = MSG_INFO; dst->debug_level = MSG_INFO;
dst->next = priv->ctrl_dst; dst->next = *head;
priv->ctrl_dst = dst; *head = dst;
#ifdef CONFIG_CTRL_IFACE_UDP_IPV6 #ifdef CONFIG_CTRL_IFACE_UDP_IPV6
wpa_printf(MSG_DEBUG, "CTRL_IFACE monitor attached %s:%d", wpa_printf(MSG_DEBUG, "CTRL_IFACE monitor attached %s:%d",
inet_ntop(AF_INET6, &from->sin6_addr, addr, sizeof(*from)), inet_ntop(AF_INET6, &from->sin6_addr, addr, sizeof(*from)),
@ -87,7 +89,7 @@ static int wpa_supplicant_ctrl_iface_attach(struct ctrl_iface_priv *priv,
} }
static int wpa_supplicant_ctrl_iface_detach(struct ctrl_iface_priv *priv, static int wpa_supplicant_ctrl_iface_detach(struct wpa_ctrl_dst **head,
#ifdef CONFIG_CTRL_IFACE_UDP_IPV6 #ifdef CONFIG_CTRL_IFACE_UDP_IPV6
struct sockaddr_in6 *from, struct sockaddr_in6 *from,
#else /* CONFIG_CTRL_IFACE_UDP_IPV6 */ #else /* CONFIG_CTRL_IFACE_UDP_IPV6 */
@ -100,7 +102,7 @@ static int wpa_supplicant_ctrl_iface_detach(struct ctrl_iface_priv *priv,
char addr[INET6_ADDRSTRLEN]; char addr[INET6_ADDRSTRLEN];
#endif /* CONFIG_CTRL_IFACE_UDP_IPV6 */ #endif /* CONFIG_CTRL_IFACE_UDP_IPV6 */
dst = priv->ctrl_dst; dst = *head;
while (dst) { while (dst) {
#ifdef CONFIG_CTRL_IFACE_UDP_IPV6 #ifdef CONFIG_CTRL_IFACE_UDP_IPV6
if (from->sin6_port == dst->addr.sin6_port && if (from->sin6_port == dst->addr.sin6_port &&
@ -118,7 +120,7 @@ static int wpa_supplicant_ctrl_iface_detach(struct ctrl_iface_priv *priv,
ntohs(from->sin_port)); ntohs(from->sin_port));
#endif /* CONFIG_CTRL_IFACE_UDP_IPV6 */ #endif /* CONFIG_CTRL_IFACE_UDP_IPV6 */
if (prev == NULL) if (prev == NULL)
priv->ctrl_dst = dst->next; *head = dst->next;
else else
prev->next = dst->next; prev->next = dst->next;
os_free(dst); os_free(dst);
@ -282,14 +284,16 @@ static void wpa_supplicant_ctrl_iface_receive(int sock, void *eloop_ctx,
pos++; pos++;
if (os_strcmp(pos, "ATTACH") == 0) { if (os_strcmp(pos, "ATTACH") == 0) {
if (wpa_supplicant_ctrl_iface_attach(priv, &from, fromlen)) if (wpa_supplicant_ctrl_iface_attach(&priv->ctrl_dst,
&from, fromlen))
reply_len = 1; reply_len = 1;
else { else {
new_attached = 1; new_attached = 1;
reply_len = 2; reply_len = 2;
} }
} else if (os_strcmp(pos, "DETACH") == 0) { } else if (os_strcmp(pos, "DETACH") == 0) {
if (wpa_supplicant_ctrl_iface_detach(priv, &from, fromlen)) if (wpa_supplicant_ctrl_iface_detach(&priv->ctrl_dst,
&from, fromlen))
reply_len = 1; reply_len = 1;
else else
reply_len = 2; reply_len = 2;
@ -329,7 +333,9 @@ static void wpa_supplicant_ctrl_iface_msg_cb(void *ctx, int level,
struct wpa_supplicant *wpa_s = ctx; struct wpa_supplicant *wpa_s = ctx;
if (wpa_s == NULL || wpa_s->ctrl_iface == NULL) if (wpa_s == NULL || wpa_s->ctrl_iface == NULL)
return; return;
wpa_supplicant_ctrl_iface_send(wpa_s->ctrl_iface, level, txt, len); wpa_supplicant_ctrl_iface_send(wpa_s, NULL, wpa_s->ctrl_iface->sock,
&wpa_s->ctrl_iface->ctrl_dst,
level, txt, len);
} }
@ -453,12 +459,14 @@ void wpa_supplicant_ctrl_iface_deinit(struct ctrl_iface_priv *priv)
} }
static void wpa_supplicant_ctrl_iface_send(struct ctrl_iface_priv *priv, static void wpa_supplicant_ctrl_iface_send(struct wpa_supplicant *wpa_s,
const char *ifname, int sock,
struct wpa_ctrl_dst **head,
int level, const char *buf, int level, const char *buf,
size_t len) size_t len)
{ {
struct wpa_ctrl_dst *dst, *next; struct wpa_ctrl_dst *dst, *next;
char levelstr[10]; char levelstr[64];
int idx; int idx;
char *sbuf; char *sbuf;
int llen; int llen;
@ -466,10 +474,14 @@ static void wpa_supplicant_ctrl_iface_send(struct ctrl_iface_priv *priv,
char addr[INET6_ADDRSTRLEN]; char addr[INET6_ADDRSTRLEN];
#endif /* CONFIG_CTRL_IFACE_UDP_IPV6 */ #endif /* CONFIG_CTRL_IFACE_UDP_IPV6 */
dst = priv->ctrl_dst; dst = *head;
if (priv->sock < 0 || dst == NULL) if (sock < 0 || dst == NULL)
return; return;
if (ifname)
os_snprintf(levelstr, sizeof(levelstr), "IFACE=%s <%d>",
ifname, level);
else
os_snprintf(levelstr, sizeof(levelstr), "<%d>", level); os_snprintf(levelstr, sizeof(levelstr), "<%d>", level);
llen = os_strlen(levelstr); llen = os_strlen(levelstr);
@ -494,7 +506,7 @@ static void wpa_supplicant_ctrl_iface_send(struct ctrl_iface_priv *priv,
inet_ntoa(dst->addr.sin_addr), inet_ntoa(dst->addr.sin_addr),
ntohs(dst->addr.sin_port)); ntohs(dst->addr.sin_port));
#endif /* CONFIG_CTRL_IFACE_UDP_IPV6 */ #endif /* CONFIG_CTRL_IFACE_UDP_IPV6 */
if (sendto(priv->sock, sbuf, llen + len, 0, if (sendto(sock, sbuf, llen + len, 0,
(struct sockaddr *) &dst->addr, (struct sockaddr *) &dst->addr,
sizeof(dst->addr)) < 0) { sizeof(dst->addr)) < 0) {
wpa_printf(MSG_ERROR, wpa_printf(MSG_ERROR,
@ -503,7 +515,7 @@ static void wpa_supplicant_ctrl_iface_send(struct ctrl_iface_priv *priv,
dst->errors++; dst->errors++;
if (dst->errors > 10) { if (dst->errors > 10) {
wpa_supplicant_ctrl_iface_detach( wpa_supplicant_ctrl_iface_detach(
priv, &dst->addr, head, &dst->addr,
dst->addrlen); dst->addrlen);
} }
} else } else