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

Add debug prints for wpa_supplicant ctrl_iface socket send operations

Browse source 
This makes it easier to track the output queue state on a control
interface socket and determine what could be causing issues with running
out of space in the buffer.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2015-08-14 19:22:08 +03:00 committed by Jouni Malinen
parent ac8757cc35
commit 2e95cfc188
1 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
wpa_supplicant/ctrl_iface_unix.c
View file

@ -13,6 +13,10 @@
#include <stddef.h> #include <stddef.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#ifdef __linux__
#include <sys/ioctl.h>
#include <linux/sockios.h>
#endif /* __linux__ */
#ifdef ANDROID #ifdef ANDROID
#include <cutils/sockets.h> #include <cutils/sockets.h>
#endif /* ANDROID */ #endif /* ANDROID */
@ -72,6 +76,32 @@ static int wpas_ctrl_iface_global_reinit(struct wpa_global *global,
struct ctrl_iface_global_priv *priv); struct ctrl_iface_global_priv *priv);
static void wpas_ctrl_sock_debug(const char *title, int sock, const char *buf,
size_t len)
{
#ifdef __linux__
socklen_t optlen;
int sndbuf, outq;
int level = MSG_DEBUG;
if (len >= 5 && os_strncmp(buf, "PONG\n", 5) == 0)
level = MSG_EXCESSIVE;
optlen = sizeof(sndbuf);
sndbuf = 0;
if (getsockopt(sock, SOL_SOCKET, SO_SNDBUF, &sndbuf, &optlen) < 0)
sndbuf = -1;
if (ioctl(sock, SIOCOUTQ, &outq) < 0)
outq = -1;
wpa_printf(level,
"CTRL-DEBUG: %s: sock=%d sndbuf=%d outq=%d send_len=%d",
title, sock, sndbuf, outq, (int) len);
#endif /* __linux__ */
}
static int wpa_supplicant_ctrl_iface_attach(struct dl_list *ctrl_dst, static int wpa_supplicant_ctrl_iface_attach(struct dl_list *ctrl_dst,
struct sockaddr_un *from, struct sockaddr_un *from,
socklen_t fromlen, int global) socklen_t fromlen, int global)
@ -215,6 +245,8 @@ static void wpa_supplicant_ctrl_iface_receive(int sock, void *eloop_ctx,
} }
if (reply) { if (reply) {
wpas_ctrl_sock_debug("ctrl_sock-sendto", sock, reply,
reply_len);
if (sendto(sock, reply, reply_len, 0, (struct sockaddr *) &from, if (sendto(sock, reply, reply_len, 0, (struct sockaddr *) &from,
fromlen) < 0) { fromlen) < 0) {
int _errno = errno; int _errno = errno;
@ -716,6 +748,7 @@ static void wpa_supplicant_ctrl_iface_send(struct wpa_supplicant *wpa_s,
offsetof(struct sockaddr_un, sun_path)); offsetof(struct sockaddr_un, sun_path));
msg.msg_name = (void *) &dst->addr; msg.msg_name = (void *) &dst->addr;
msg.msg_namelen = dst->addrlen; msg.msg_namelen = dst->addrlen;
wpas_ctrl_sock_debug("ctrl_sock-sendmsg", sock, buf, len);
if (sendmsg(sock, &msg, MSG_DONTWAIT) >= 0) { if (sendmsg(sock, &msg, MSG_DONTWAIT) >= 0) {
wpa_printf(MSG_DEBUG, "CTRL_IFACE monitor sent successfully to %s", wpa_printf(MSG_DEBUG, "CTRL_IFACE monitor sent successfully to %s",
addr_txt); addr_txt);
@ -872,6 +905,8 @@ static void wpa_supplicant_global_ctrl_iface_receive(int sock, void *eloop_ctx,
} }
if (reply) { if (reply) {
wpas_ctrl_sock_debug("global_ctrl_sock-sendto",
sock, reply, reply_len);
if (sendto(sock, reply, reply_len, 0, (struct sockaddr *) &from, if (sendto(sock, reply, reply_len, 0, (struct sockaddr *) &from,
fromlen) < 0) { fromlen) < 0) {
wpa_printf(MSG_DEBUG, "ctrl_iface sendto failed: %s", wpa_printf(MSG_DEBUG, "ctrl_iface sendto failed: %s",