DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Clean up debug prints to use wpa_printf()

Browse source 
This converts most of the remaining perror() and printf() calls from
hostapd and wpa_supplicant to use wpa_printf().

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-12-24 12:43:35 +02:00
parent cad9b88be2
commit a193231dfb
22 changed files with 315 additions and 220 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/l2_packet/l2_packet_pcap.c
View file

@ -54,15 +54,16 @@ static int l2_packet_init_libdnet(struct l2_packet_data *l2)
l2->eth = eth_open(l2->ifname);
if (!l2->eth) {
printf("Failed to open interface '%s'.\n", l2->ifname);
perror("eth_open");
wpa_printf(MSG_ERROR,
"Failed to open interface '%s' - eth_open: %s",
l2->ifname, strerror(errno));
return -1;
}
if (eth_get(l2->eth, &own_addr) < 0) {
printf("Failed to get own hw address from interface '%s'.\n",
l2->ifname);
perror("eth_get");
wpa_printf(MSG_ERROR,
"Failed to get own hw address from interface '%s' - eth_get: %s",
l2->ifname, strerror(errno));
eth_close(l2->eth);
l2->eth = NULL;
return -1;

17
src/l2_packet/l2_packet_privsep.c
View file

@ -44,7 +44,7 @@ static int wpa_priv_cmd(struct l2_packet_data *l2, int cmd,
msg.msg_namelen = sizeof(l2->priv_addr);
if (sendmsg(l2->fd, &msg, 0) < 0) {
perror("L2: sendmsg(cmd)");
wpa_printf(MSG_ERROR, "L2: sendmsg(cmd): %s", strerror(errno));
return -1;
}
@ -82,7 +82,8 @@ int l2_packet_send(struct l2_packet_data *l2, const u8 *dst_addr, u16 proto,
msg.msg_namelen = sizeof(l2->priv_addr);
if (sendmsg(l2->fd, &msg, 0) < 0) {
perror("L2: sendmsg(packet_send)");
wpa_printf(MSG_ERROR, "L2: sendmsg(packet_send): %s",
strerror(errno));
return -1;
}
@ -102,7 +103,8 @@ static void l2_packet_receive(int sock, void *eloop_ctx, void *sock_ctx)
res = recvfrom(sock, buf, sizeof(buf), 0, (struct sockaddr *) &from,
&fromlen);
if (res < 0) {
perror("l2_packet_receive - recvfrom");
wpa_printf(MSG_ERROR, "l2_packet_receive - recvfrom: %s",
strerror(errno));
return;
}
if (res < ETH_ALEN) {
@ -162,7 +164,7 @@ struct l2_packet_data * l2_packet_init(
l2->fd = socket(PF_UNIX, SOCK_DGRAM, 0);
if (l2->fd < 0) {
perror("socket(PF_UNIX)");
wpa_printf(MSG_ERROR, "socket(PF_UNIX): %s", strerror(errno));
os_free(l2->own_socket_path);
l2->own_socket_path = NULL;
os_free(l2);
@ -173,7 +175,8 @@ struct l2_packet_data * l2_packet_init(
addr.sun_family = AF_UNIX;
os_strlcpy(addr.sun_path, l2->own_socket_path, sizeof(addr.sun_path));
if (bind(l2->fd, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
perror("l2-pkt-privsep: bind(PF_UNIX)");
wpa_printf(MSG_ERROR, "l2-pkt-privsep: bind(PF_UNIX): %s",
strerror(errno));
goto fail;
}
@ -191,14 +194,14 @@ struct l2_packet_data * l2_packet_init(
tv.tv_usec = 0;
res = select(l2->fd + 1, &rfds, NULL, NULL, &tv);
if (res < 0 && errno != EINTR) {
perror("select");
wpa_printf(MSG_ERROR, "select: %s", strerror(errno));
goto fail;
}
if (FD_ISSET(l2->fd, &rfds)) {
res = recv(l2->fd, reply, sizeof(reply), 0);
if (res < 0) {
perror("recv");
wpa_printf(MSG_ERROR, "recv: %s", strerror(errno));
goto fail;
}
} else {