Convert perror/printf calls to wpa_printf
This makes debug and error logging more consistent and allows them to be directed to a file more easily. Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen
parent
8f47f31dd8
commit
61323e70e1
12 changed files with 156 additions and 143 deletions
|
|
@ -300,7 +300,7 @@ static void radius_client_handle_send_error(struct radius_client_data *radius,
|
|||
{
|
||||
#ifndef CONFIG_NATIVE_WINDOWS
|
||||
int _errno = errno;
|
||||
perror("send[RADIUS]");
|
||||
wpa_printf(MSG_INFO, "send[RADIUS]: %s", strerror(errno));
|
||||
if (_errno == ENOTCONN || _errno == EDESTADDRREQ || _errno == EINVAL ||
|
||||
_errno == EBADF) {
|
||||
hostapd_logger(radius->ctx, NULL, HOSTAPD_MODULE_RADIUS,
|
||||
|
|
@ -361,8 +361,7 @@ static int radius_client_retransmit(struct radius_client_data *radius,
|
|||
if (entry->next_wait > RADIUS_CLIENT_MAX_WAIT)
|
||||
entry->next_wait = RADIUS_CLIENT_MAX_WAIT;
|
||||
if (entry->attempts >= RADIUS_CLIENT_MAX_RETRIES) {
|
||||
printf("Removing un-ACKed RADIUS message due to too many "
|
||||
"failed retransmit attempts\n");
|
||||
wpa_printf(MSG_INFO, "RADIUS: Removing un-ACKed message due to too many failed retransmit attempts");
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
@ -526,7 +525,7 @@ static void radius_client_list_add(struct radius_client_data *radius,
|
|||
|
||||
entry = os_zalloc(sizeof(*entry));
|
||||
if (entry == NULL) {
|
||||
printf("Failed to add RADIUS packet into retransmit list\n");
|
||||
wpa_printf(MSG_INFO, "RADIUS: Failed to add packet into retransmit list");
|
||||
radius_msg_free(msg);
|
||||
return;
|
||||
}
|
||||
|
|
@ -547,8 +546,7 @@ static void radius_client_list_add(struct radius_client_data *radius,
|
|||
radius_client_update_timeout(radius);
|
||||
|
||||
if (radius->num_msgs >= RADIUS_CLIENT_MAX_ENTRIES) {
|
||||
printf("Removing the oldest un-ACKed RADIUS packet due to "
|
||||
"retransmit list limits.\n");
|
||||
wpa_printf(MSG_INFO, "RADIUS: Removing the oldest un-ACKed packet due to retransmit list limits");
|
||||
prev = NULL;
|
||||
while (entry->next) {
|
||||
prev = entry;
|
||||
|
|
@ -710,21 +708,20 @@ static void radius_client_receive(int sock, void *eloop_ctx, void *sock_ctx)
|
|||
|
||||
len = recv(sock, buf, sizeof(buf), MSG_DONTWAIT);
|
||||
if (len < 0) {
|
||||
perror("recv[RADIUS]");
|
||||
wpa_printf(MSG_INFO, "recv[RADIUS]: %s", strerror(errno));
|
||||
return;
|
||||
}
|
||||
hostapd_logger(radius->ctx, NULL, HOSTAPD_MODULE_RADIUS,
|
||||
HOSTAPD_LEVEL_DEBUG, "Received %d bytes from RADIUS "
|
||||
"server", len);
|
||||
if (len == sizeof(buf)) {
|
||||
printf("Possibly too long UDP frame for our buffer - "
|
||||
"dropping it\n");
|
||||
wpa_printf(MSG_INFO, "RADIUS: Possibly too long UDP frame for our buffer - dropping it");
|
||||
return;
|
||||
}
|
||||
|
||||
msg = radius_msg_parse(buf, len);
|
||||
if (msg == NULL) {
|
||||
printf("Parsing incoming RADIUS frame failed\n");
|
||||
wpa_printf(MSG_INFO, "RADIUS: Parsing incoming frame failed");
|
||||
rconf->malformed_responses++;
|
||||
return;
|
||||
}
|
||||
|
|
@ -1041,13 +1038,14 @@ radius_change_server(struct radius_client_data *radius,
|
|||
}
|
||||
|
||||
if (bind(sel_sock, cl_addr, claddrlen) < 0) {
|
||||
perror("bind[radius]");
|
||||
wpa_printf(MSG_INFO, "bind[radius]: %s",
|
||||
strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
if (connect(sel_sock, addr, addrlen) < 0) {
|
||||
perror("connect[radius]");
|
||||
wpa_printf(MSG_INFO, "connect[radius]: %s", strerror(errno));
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -1123,8 +1121,8 @@ static int radius_client_disable_pmtu_discovery(int s)
|
|||
r = setsockopt(s, IPPROTO_IP, IP_MTU_DISCOVER, &action,
|
||||
sizeof(action));
|
||||
if (r == -1)
|
||||
wpa_printf(MSG_ERROR, "Failed to set IP_MTU_DISCOVER: "
|
||||
"%s", strerror(errno));
|
||||
wpa_printf(MSG_ERROR, "RADIUS: Failed to set IP_MTU_DISCOVER: %s",
|
||||
strerror(errno));
|
||||
#endif
|
||||
return r;
|
||||
}
|
||||
|
|
@ -1137,7 +1135,8 @@ static int radius_client_init_auth(struct radius_client_data *radius)
|
|||
|
||||
radius->auth_serv_sock = socket(PF_INET, SOCK_DGRAM, 0);
|
||||
if (radius->auth_serv_sock < 0)
|
||||
perror("socket[PF_INET,SOCK_DGRAM]");
|
||||
wpa_printf(MSG_INFO, "RADIUS: socket[PF_INET,SOCK_DGRAM]: %s",
|
||||
strerror(errno));
|
||||
else {
|
||||
radius_client_disable_pmtu_discovery(radius->auth_serv_sock);
|
||||
ok++;
|
||||
|
|
@ -1146,7 +1145,8 @@ static int radius_client_init_auth(struct radius_client_data *radius)
|
|||
#ifdef CONFIG_IPV6
|
||||
radius->auth_serv_sock6 = socket(PF_INET6, SOCK_DGRAM, 0);
|
||||
if (radius->auth_serv_sock6 < 0)
|
||||
perror("socket[PF_INET6,SOCK_DGRAM]");
|
||||
wpa_printf(MSG_INFO, "RADIUS: socket[PF_INET6,SOCK_DGRAM]: %s",
|
||||
strerror(errno));
|
||||
else
|
||||
ok++;
|
||||
#endif /* CONFIG_IPV6 */
|
||||
|
|
@ -1162,8 +1162,7 @@ static int radius_client_init_auth(struct radius_client_data *radius)
|
|||
eloop_register_read_sock(radius->auth_serv_sock,
|
||||
radius_client_receive, radius,
|
||||
(void *) RADIUS_AUTH)) {
|
||||
printf("Could not register read socket for authentication "
|
||||
"server\n");
|
||||
wpa_printf(MSG_INFO, "RADIUS: Could not register read socket for authentication server");
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -1172,8 +1171,7 @@ static int radius_client_init_auth(struct radius_client_data *radius)
|
|||
eloop_register_read_sock(radius->auth_serv_sock6,
|
||||
radius_client_receive, radius,
|
||||
(void *) RADIUS_AUTH)) {
|
||||
printf("Could not register read socket for authentication "
|
||||
"server\n");
|
||||
wpa_printf(MSG_INFO, "RADIUS: Could not register read socket for authentication server");
|
||||
return -1;
|
||||
}
|
||||
#endif /* CONFIG_IPV6 */
|
||||
|
|
@ -1189,7 +1187,8 @@ static int radius_client_init_acct(struct radius_client_data *radius)
|
|||
|
||||
radius->acct_serv_sock = socket(PF_INET, SOCK_DGRAM, 0);
|
||||
if (radius->acct_serv_sock < 0)
|
||||
perror("socket[PF_INET,SOCK_DGRAM]");
|
||||
wpa_printf(MSG_INFO, "RADIUS: socket[PF_INET,SOCK_DGRAM]: %s",
|
||||
strerror(errno));
|
||||
else {
|
||||
radius_client_disable_pmtu_discovery(radius->acct_serv_sock);
|
||||
ok++;
|
||||
|
|
@ -1198,7 +1197,8 @@ static int radius_client_init_acct(struct radius_client_data *radius)
|
|||
#ifdef CONFIG_IPV6
|
||||
radius->acct_serv_sock6 = socket(PF_INET6, SOCK_DGRAM, 0);
|
||||
if (radius->acct_serv_sock6 < 0)
|
||||
perror("socket[PF_INET6,SOCK_DGRAM]");
|
||||
wpa_printf(MSG_INFO, "RADIUS: socket[PF_INET6,SOCK_DGRAM]: %s",
|
||||
strerror(errno));
|
||||
else
|
||||
ok++;
|
||||
#endif /* CONFIG_IPV6 */
|
||||
|
|
@ -1214,8 +1214,7 @@ static int radius_client_init_acct(struct radius_client_data *radius)
|
|||
eloop_register_read_sock(radius->acct_serv_sock,
|
||||
radius_client_receive, radius,
|
||||
(void *) RADIUS_ACCT)) {
|
||||
printf("Could not register read socket for accounting "
|
||||
"server\n");
|
||||
wpa_printf(MSG_INFO, "RADIUS: Could not register read socket for accounting server");
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
|
@ -1224,8 +1223,7 @@ static int radius_client_init_acct(struct radius_client_data *radius)
|
|||
eloop_register_read_sock(radius->acct_serv_sock6,
|
||||
radius_client_receive, radius,
|
||||
(void *) RADIUS_ACCT)) {
|
||||
printf("Could not register read socket for accounting "
|
||||
"server\n");
|
||||
wpa_printf(MSG_INFO, "RADIUS: Could not register read socket for accounting server");
|
||||
return -1;
|
||||
}
|
||||
#endif /* CONFIG_IPV6 */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue