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

Simplify ctrl_iface sendto() use

Browse source 
Prepare reply buffer first for all cases and then use a single sendto()
call instead of three calls depending on reply type. This allows simpler
error handling for control interface send operations.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2013-09-23 17:52:10 +03:00 committed by Jouni Malinen
parent 6668efda58
commit 742e715b31
1 changed files with 26 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
wpa_supplicant/ctrl_iface_unix.c
View file

@ -143,7 +143,7 @@ static void wpa_supplicant_ctrl_iface_receive(int sock, void *eloop_ctx,
int res; int res;
struct sockaddr_un from; struct sockaddr_un from;
socklen_t fromlen = sizeof(from); socklen_t fromlen = sizeof(from);
char *reply = NULL; char *reply = NULL, *reply_buf = NULL;
size_t reply_len = 0; size_t reply_len = 0;
int new_attached = 0; int new_attached = 0;
@ -177,8 +177,17 @@ static void wpa_supplicant_ctrl_iface_receive(int sock, void *eloop_ctx,
else else
reply_len = 2; reply_len = 2;
} else { } else {
reply = wpa_supplicant_ctrl_iface_process(wpa_s, buf, reply_buf = wpa_supplicant_ctrl_iface_process(wpa_s, buf,
&reply_len); &reply_len);
reply = reply_buf;
}
if (!reply && reply_len == 1) {
reply = "FAIL\n";
reply_len = 5;
} else if (!reply && reply_len == 2) {
reply = "OK\n";
reply_len = 3;
} }
if (reply) { if (reply) {
@ -188,22 +197,8 @@ static void wpa_supplicant_ctrl_iface_receive(int sock, void *eloop_ctx,
"ctrl_iface sendto failed: %s", "ctrl_iface sendto failed: %s",
strerror(errno)); strerror(errno));
} }
os_free(reply);
} else if (reply_len == 1) {
if (sendto(sock, "FAIL\n", 5, 0, (struct sockaddr *) &from,
fromlen) < 0) {
wpa_dbg(wpa_s, MSG_DEBUG,
"ctrl_iface sendto failed: %s",
strerror(errno));
}
} else if (reply_len == 2) {
if (sendto(sock, "OK\n", 3, 0, (struct sockaddr *) &from,
fromlen) < 0) {
wpa_dbg(wpa_s, MSG_DEBUG,
"ctrl_iface sendto failed: %s",
strerror(errno));
}
} }
os_free(reply_buf);
if (new_attached) if (new_attached)
eapol_sm_notify_ctrl_attached(wpa_s->eapol); eapol_sm_notify_ctrl_attached(wpa_s->eapol);
@ -708,7 +703,7 @@ static void wpa_supplicant_global_ctrl_iface_receive(int sock, void *eloop_ctx,
int res; int res;
struct sockaddr_un from; struct sockaddr_un from;
socklen_t fromlen = sizeof(from); socklen_t fromlen = sizeof(from);
char *reply = NULL; char *reply = NULL, *reply_buf = NULL;
size_t reply_len; size_t reply_len;
res = recvfrom(sock, buf, sizeof(buf) - 1, 0, res = recvfrom(sock, buf, sizeof(buf) - 1, 0,
@ -733,8 +728,17 @@ static void wpa_supplicant_global_ctrl_iface_receive(int sock, void *eloop_ctx,
else else
reply_len = 2; reply_len = 2;
} else { } else {
reply = wpa_supplicant_global_ctrl_iface_process(global, buf, reply_buf = wpa_supplicant_global_ctrl_iface_process(
&reply_len); global, buf, &reply_len);
reply = reply_buf;
}
if (!reply && reply_len == 1) {
reply = "FAIL\n";
reply_len = 5;
} else if (!reply && reply_len == 2) {
reply = "OK\n";
reply_len = 3;
} }
if (reply) { if (reply) {
@ -743,20 +747,8 @@ static void wpa_supplicant_global_ctrl_iface_receive(int sock, void *eloop_ctx,
wpa_printf(MSG_DEBUG, "ctrl_iface sendto failed: %s", wpa_printf(MSG_DEBUG, "ctrl_iface sendto failed: %s",
strerror(errno)); strerror(errno));
} }
os_free(reply);
} else if (reply_len == 1) {
if (sendto(sock, "FAIL\n", 5, 0, (struct sockaddr *) &from,
fromlen) < 0) {
wpa_printf(MSG_DEBUG, "ctrl_iface sendto failed: %s",
strerror(errno));
}
} else if (reply_len == 2) {
if (sendto(sock, "OK\n", 3, 0, (struct sockaddr *) &from,
fromlen) < 0) {
wpa_printf(MSG_DEBUG, "ctrl_iface sendto failed: %s",
strerror(errno));
}
} }
os_free(reply_buf);
} }