aboutsummaryrefslogtreecommitdiffstats
path: root/src/eap_server
diff options
context:
space:
mode:
authorDmitry Shmidt <dimitrysh@google.com>2013-11-04 18:44:24 -0800
committerDmitry Shmidt <dimitrysh@google.com>2013-11-04 18:44:24 -0800
commitcce06667447b5aec83452adb0c15100ada531095 (patch)
treedb6df7284213a7942b7f3adf46afd525f4b2166f /src/eap_server
parente6c91e4c8125a2e7b31d176a52644aa9cab146f1 (diff)
downloadandroid_external_wpa_supplicant_8-cce06667447b5aec83452adb0c15100ada531095.tar.gz
android_external_wpa_supplicant_8-cce06667447b5aec83452adb0c15100ada531095.tar.bz2
android_external_wpa_supplicant_8-cce06667447b5aec83452adb0c15100ada531095.zip
Cumulative patch from commit d4f1a347ceca31fd9cf14070fd000235d5f4e9c1
d4f1a34 Allow AP mode configuration with VHT enabled on 2.4 GHz bb337dd DFS: Do not use cf1 to override freq for 20 MHz channels 0dfd2c6 Document AP mode startup functions fee947b hostapd: Use correct wpa_printf verbosity level for message 2fe210c hostapd: Fix multi-BSS configuration file parsing regression e4ba031 hostapd: Use start_ctrl_iface() from hostapd_add_iface() bf7f09b Fix AP mode QoS Map configuration to be per-BSS dc036d9 DFS: Convert hostapd_data use to hostapd_iface 2db938e hostapd: Fill in phyname automatically 5ae6449 hostapd: Add ctrl_iface STATUS command afadaff Optimize 40 MHz HT co-ex scan on AP 7d6d737 hostapd: Add AP-ENABLED/DISABLED ctrl_iface events e1c5faf hostapd: Track interface state f0793bf hostapd: Wait for channel list update after country code change ae134e1 hostapd: Add ctrl_iface events for ACS ad08e14 hostapd: Move ctrl_iface initialization to happen earlier c20cb02 hostapd: Remove hostapd_interface_init2() 4a5deb9 hostapd: Simplify interface initialization 186c905 DFS: Add control interface events for various DFS events ddf5517 hostapd: Add control interface test commands for radar detection 884f1a3 nl80211: Verify radar event attributes exist before using them 71cdf6b hostapd: Fix ENABLE failure to not remove interface 18ca733 SAE: Fix group selection 65015b2 Replace unnecessary UTF-8 characters with ASCII versions 61323e7 Convert perror/printf calls to wpa_printf 3f134b4 hostapd: Accept RELOG from global control interface b253e6f hostapd: Use wpa_printf() for hostapd_logger() to stdout c092d83 P2P: Clear pending group formation data on group removal 9100b66 P2P: Debug print reason for specific SSID for scan 2aec4f3 Allow add-BSS operation to re-use existing netdev 5592065 hostapd: Allow a single BSS to be removed from an interface 2e2fff3 hostapd: Allow a single BSS to be added to an interface a1fb569 hostapd: Make hostapd_interface_init_bss() available externally 66936c6 hostapd: Make hostapd_init() available externally 390e489 hostapd: Allow the first BSS in a multi-BSS setup to be removed 834ee56 nl80211: Make wpa_driver_nl80211_data::first_bss pointer 748c0ac nl80211: Fix monitor interface reference counting 08e55eb nl80211: Add a debug print for DEL_BEACON 33b0b33 hostapd: Fix error path in hostapd_add_iface() 770ecdf ACS: Do not get stuck while failing to do a subsequent scan 813d4ba DFS: Add support for multi-BSS 954e71d DFS: Reset cac_started properly 6a398dd DFS: Sanitize channel availability checks 32595da DFS: Fix HT40/VHT calculation 0648c3b hostapd: Add -T Linux tracing option 392e68e Set GTK rekey offload information after initial group key handshake bbc706a nl80211: Add debug prints for NL80211_CMD_SET_STATION 731ca63 Update regulatory change to all virtual interface for the phy 6f2db2f hostapd: Validate configuration parameters on RELOAD command eff0fd1 hostapd: Move generic configuration functions into src/ap 5afaa06 hostapd: Allow per-BSS (vif) configuration files ebd79f0 hostapd: Make hostapd_config::bss array of pointers a781e21 hostapd: Force PSK to be derived again on BSS reload 9f104b0 hostapd: Reuse hostapd_clear_old() for RELOAD command Change-Id: I7fbb26cbd4a2960af66a4373c0e6bbe5390a4940 Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Diffstat (limited to 'src/eap_server')
-rw-r--r--src/eap_server/eap_sim_db.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/eap_server/eap_sim_db.c b/src/eap_server/eap_sim_db.c
index 1b9d701e..345c7887 100644
--- a/src/eap_server/eap_sim_db.c
+++ b/src/eap_server/eap_sim_db.c
@@ -630,7 +630,7 @@ static int eap_sim_db_open_socket(struct eap_sim_db_data *data)
data->sock = socket(PF_UNIX, SOCK_DGRAM, 0);
if (data->sock < 0) {
- perror("socket(eap_sim_db)");
+ wpa_printf(MSG_INFO, "socket(eap_sim_db): %s", strerror(errno));
return -1;
}
@@ -641,7 +641,7 @@ static int eap_sim_db_open_socket(struct eap_sim_db_data *data)
os_free(data->local_sock);
data->local_sock = os_strdup(addr.sun_path);
if (bind(data->sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- perror("bind(eap_sim_db)");
+ wpa_printf(MSG_INFO, "bind(eap_sim_db): %s", strerror(errno));
close(data->sock);
data->sock = -1;
return -1;
@@ -651,7 +651,8 @@ static int eap_sim_db_open_socket(struct eap_sim_db_data *data)
addr.sun_family = AF_UNIX;
os_strlcpy(addr.sun_path, data->fname + 5, sizeof(addr.sun_path));
if (connect(data->sock, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
- perror("connect(eap_sim_db)");
+ wpa_printf(MSG_INFO, "connect(eap_sim_db): %s",
+ strerror(errno));
wpa_hexdump_ascii(MSG_INFO, "HLR/AuC GW socket",
(u8 *) addr.sun_path,
os_strlen(addr.sun_path));
@@ -804,7 +805,8 @@ static int eap_sim_db_send(struct eap_sim_db_data *data, const char *msg,
if (send(data->sock, msg, len, 0) < 0) {
_errno = errno;
- perror("send[EAP-SIM DB UNIX]");
+ wpa_printf(MSG_INFO, "send[EAP-SIM DB UNIX]: %s",
+ strerror(errno));
}
if (_errno == ENOTCONN || _errno == EDESTADDRREQ || _errno == EINVAL ||
@@ -816,7 +818,8 @@ static int eap_sim_db_send(struct eap_sim_db_data *data, const char *msg,
wpa_printf(MSG_DEBUG, "EAP-SIM DB: Reconnected to the "
"external server");
if (send(data->sock, msg, len, 0) < 0) {
- perror("send[EAP-SIM DB UNIX]");
+ wpa_printf(MSG_INFO, "send[EAP-SIM DB UNIX]: %s",
+ strerror(errno));
return -1;
}
}