/*
* hostapd / Initialization and configuration
- * Copyright (c) 2002-2008, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2002-2009, Jouni Malinen <j@w1.fi>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
#include "ieee802_11_auth.h"
#include "ap_list.h"
#include "sta_info.h"
-#include "driver.h"
+#include "driver_i.h"
#include "radius/radius_client.h"
#include "radius/radius_server.h"
+#include "radius/radius.h"
#include "wpa.h"
#include "preauth.h"
#include "wme.h"
#include "eap_server/tncs.h"
#include "version.h"
#include "l2_packet/l2_packet.h"
+#include "wps_hostapd.h"
static int hostapd_radius_get_eap_user(void *ctx, const u8 *identity,
size_t identity_len, int phase2,
struct eap_user *user);
+static int hostapd_flush_old_stations(struct hostapd_data *hapd);
+static int hostapd_setup_wpa(struct hostapd_data *hapd);
+static int hostapd_setup_encryption(char *iface, struct hostapd_data *hapd);
struct hapd_interfaces {
size_t count;
struct hostapd_iface **iface;
};
-unsigned char rfc1042_header[6] = { 0xaa, 0xaa, 0x03, 0x00, 0x00, 0x00 };
-
extern int wpa_debug_level;
extern int wpa_debug_show_keys;
/* Start IEEE 802.1X authentication process for new stations */
ieee802_1x_new_station(hapd, sta);
if (reassoc) {
- if (sta->auth_alg != WLAN_AUTH_FT)
+ if (sta->auth_alg != WLAN_AUTH_FT &&
+ !(sta->flags & (WLAN_STA_WPS | WLAN_STA_MAYBE_WPS)))
wpa_auth_sm_event(sta->wpa_sm, WPA_REAUTH);
} else
wpa_auth_sta_associated(hapd->wpa_auth, sta->wpa_sm);
}
+void hostapd_tx_status(struct hostapd_data *hapd, const u8 *addr,
+ const u8 *buf, size_t len, int ack)
+{
+ struct sta_info *sta;
+
+ sta = ap_get_sta(hapd, addr);
+ if (sta && sta->flags & WLAN_STA_PENDING_POLL) {
+ wpa_printf(MSG_DEBUG, "STA " MACSTR " %s pending "
+ "activity poll", MAC2STR(sta->addr),
+ ack ? "ACKed" : "did not ACK");
+ if (ack)
+ sta->flags &= ~WLAN_STA_PENDING_POLL;
+ }
+ if (sta)
+ ieee802_1x_tx_status(hapd, sta, buf, len, ack);
+}
+
+
+void hostapd_rx_from_unknown_sta(struct hostapd_data *hapd, const u8 *addr)
+{
+ struct sta_info *sta;
+
+ sta = ap_get_sta(hapd, addr);
+ if (!sta || !(sta->flags & WLAN_STA_ASSOC)) {
+ wpa_printf(MSG_DEBUG, "Data/PS-poll frame from not associated "
+ "STA " MACSTR, MAC2STR(addr));
+ if (sta && (sta->flags & WLAN_STA_AUTH))
+ hostapd_sta_disassoc(
+ hapd, addr,
+ WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
+ else
+ hostapd_sta_deauth(
+ hapd, addr,
+ WLAN_REASON_CLASS3_FRAME_FROM_NONASSOC_STA);
+ }
+}
+
+
+int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
+ const u8 *ie, size_t ielen)
+{
+ struct sta_info *sta;
+ int new_assoc, res;
+
+ hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
+ HOSTAPD_LEVEL_INFO, "associated");
+
+ sta = ap_get_sta(hapd, addr);
+ if (sta) {
+ accounting_sta_stop(hapd, sta);
+ } else {
+ sta = ap_sta_add(hapd, addr);
+ if (sta == NULL)
+ return -1;
+ }
+ sta->flags &= ~(WLAN_STA_WPS | WLAN_STA_MAYBE_WPS);
+
+ if (hapd->conf->wpa) {
+ if (ie == NULL || ielen == 0) {
+ if (hapd->conf->wps_state) {
+ wpa_printf(MSG_DEBUG, "STA did not include "
+ "WPA/RSN IE in (Re)Association "
+ "Request - possible WPS use");
+ sta->flags |= WLAN_STA_MAYBE_WPS;
+ goto skip_wpa_check;
+ }
+
+ wpa_printf(MSG_DEBUG, "No WPA/RSN IE from STA");
+ return -1;
+ }
+ if (hapd->conf->wps_state && ie[0] == 0xdd && ie[1] >= 4 &&
+ os_memcmp(ie + 2, "\x00\x50\xf2\x04", 4) == 0) {
+ sta->flags |= WLAN_STA_WPS;
+ goto skip_wpa_check;
+ }
+
+ if (sta->wpa_sm == NULL)
+ sta->wpa_sm = wpa_auth_sta_init(hapd->wpa_auth,
+ sta->addr);
+ if (sta->wpa_sm == NULL) {
+ wpa_printf(MSG_ERROR, "Failed to initialize WPA state "
+ "machine");
+ return -1;
+ }
+ res = wpa_validate_wpa_ie(hapd->wpa_auth, sta->wpa_sm,
+ ie, ielen, NULL, 0);
+ if (res != WPA_IE_OK) {
+ wpa_printf(MSG_DEBUG, "WPA/RSN information element "
+ "rejected? (res %u)", res);
+ wpa_hexdump(MSG_DEBUG, "IE", ie, ielen);
+ return -1;
+ }
+ }
+skip_wpa_check:
+
+ new_assoc = (sta->flags & WLAN_STA_ASSOC) == 0;
+ sta->flags |= WLAN_STA_AUTH | WLAN_STA_ASSOC;
+ wpa_auth_sm_event(sta->wpa_sm, WPA_ASSOC);
+
+ hostapd_new_assoc_sta(hapd, sta, !new_assoc);
+
+ ieee802_1x_notify_port_enabled(sta->eapol_sm, 1);
+
+ return 0;
+}
+
+
+void hostapd_notif_disassoc(struct hostapd_data *hapd, const u8 *addr)
+{
+ struct sta_info *sta;
+
+ hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
+ HOSTAPD_LEVEL_INFO, "disassociated");
+
+ sta = ap_get_sta(hapd, addr);
+ if (sta == NULL) {
+ wpa_printf(MSG_DEBUG, "Disassociation notification for "
+ "unknown STA " MACSTR, MAC2STR(addr));
+ return;
+ }
+
+ sta->flags &= ~(WLAN_STA_AUTH | WLAN_STA_ASSOC);
+ wpa_auth_sm_event(sta->wpa_sm, WPA_DISASSOC);
+ sta->acct_terminate_cause = RADIUS_ACCT_TERMINATE_CAUSE_USER_REQUEST;
+ ieee802_1x_notify_port_enabled(sta->eapol_sm, 0);
+ ap_free_sta(hapd, sta);
+}
+
+
+void hostapd_eapol_receive(struct hostapd_data *hapd, const u8 *sa,
+ const u8 *buf, size_t len)
+{
+ ieee802_1x_receive(hapd, sa, buf, len);
+}
+
+
#ifdef EAP_SERVER
static int hostapd_sim_db_cb_sta(struct hostapd_data *hapd,
struct sta_info *sta, void *ctx)
#endif /* EAP_SERVER */
+/**
+ * handle_term - SIGINT and SIGTERM handler to terminate hostapd process
+ */
static void handle_term(int sig, void *eloop_ctx, void *signal_ctx)
{
- printf("Signal %d received - terminating\n", sig);
+ wpa_printf(MSG_DEBUG, "Signal %d received - terminating", sig);
eloop_terminate();
}
wconf->wpa_group_rekey = conf->wpa_group_rekey;
wconf->wpa_strict_rekey = conf->wpa_strict_rekey;
wconf->wpa_gmk_rekey = conf->wpa_gmk_rekey;
+ wconf->wpa_ptk_rekey = conf->wpa_ptk_rekey;
wconf->rsn_pairwise = conf->rsn_pairwise;
wconf->rsn_preauth = conf->rsn_preauth;
wconf->eapol_version = conf->eapol_version;
}
-#ifndef CONFIG_NATIVE_WINDOWS
-static void handle_reload(int sig, void *eloop_ctx, void *signal_ctx)
+int hostapd_reload_config(struct hostapd_iface *iface)
{
- struct hapd_interfaces *hapds = (struct hapd_interfaces *) eloop_ctx;
- struct hostapd_config *newconf;
- size_t i;
+ struct hostapd_data *hapd = iface->bss[0];
+ struct hostapd_config *newconf, *oldconf;
struct wpa_auth_config wpa_auth_conf;
- printf("Signal %d received - reloading configuration\n", sig);
+ newconf = hostapd_config_read(iface->config_fname);
+ if (newconf == NULL)
+ return -1;
- for (i = 0; i < hapds->count; i++) {
- struct hostapd_data *hapd = hapds->iface[i]->bss[0];
- newconf = hostapd_config_read(hapds->iface[i]->config_fname);
- if (newconf == NULL) {
- printf("Failed to read new configuration file - "
- "continuing with old.\n");
- continue;
- }
- /* TODO: update dynamic data based on changed configuration
- * items (e.g., open/close sockets, remove stations added to
- * deny list, etc.) */
- radius_client_flush(hapd->radius, 0);
- hostapd_config_free(hapd->iconf);
+ /*
+ * Deauthenticate all stations since the new configuration may not
+ * allow them to use the BSS anymore.
+ */
+ hostapd_flush_old_stations(hapd);
+
+ /* TODO: update dynamic data based on changed configuration
+ * items (e.g., open/close sockets, etc.) */
+ radius_client_flush(hapd->radius, 0);
+
+ oldconf = hapd->iconf;
+ hapd->iconf = newconf;
+ hapd->conf = &newconf->bss[0];
+ iface->conf = newconf;
+
+ if (hostapd_setup_wpa_psk(hapd->conf)) {
+ wpa_printf(MSG_ERROR, "Failed to re-configure WPA PSK "
+ "after reloading configuration");
+ }
+ if (hapd->conf->wpa && hapd->wpa_auth == NULL)
+ hostapd_setup_wpa(hapd);
+ else if (hapd->conf->wpa) {
hostapd_wpa_auth_conf(&newconf->bss[0], &wpa_auth_conf);
wpa_reconfig(hapd->wpa_auth, &wpa_auth_conf);
+ } else if (hapd->wpa_auth) {
+ wpa_deinit(hapd->wpa_auth);
+ hapd->wpa_auth = NULL;
+ hostapd_set_privacy(hapd, 0);
+ hostapd_setup_encryption(hapd->conf->iface, hapd);
+ }
+
+ ieee802_11_set_beacon(hapd);
+
+ hostapd_config_free(oldconf);
+
+ wpa_printf(MSG_DEBUG, "Reconfigured interface %s", hapd->conf->iface);
+
+ return 0;
+}
+
+
+#ifndef CONFIG_NATIVE_WINDOWS
+/**
+ * handle_reload - SIGHUP handler to reload configuration
+ */
+static void handle_reload(int sig, void *eloop_ctx, void *signal_ctx)
+{
+ struct hapd_interfaces *hapds = (struct hapd_interfaces *) eloop_ctx;
+ size_t i;
- hapd->iconf = newconf;
- hapd->conf = &newconf->bss[0];
- hapds->iface[i]->conf = newconf;
+ wpa_printf(MSG_DEBUG, "Signal %d received - reloading configuration",
+ sig);
- if (hostapd_setup_wpa_psk(hapd->conf)) {
- wpa_printf(MSG_ERROR, "Failed to re-configure WPA PSK "
- "after reloading configuration");
+ for (i = 0; i < hapds->count; i++) {
+ if (hostapd_reload_config(hapds->iface[i]) < 0) {
+ wpa_printf(MSG_WARNING, "Failed to read new "
+ "configuration file - continuing with "
+ "old.");
+ continue;
}
}
}
#ifdef HOSTAPD_DUMP_STATE
+/**
+ * hostapd_dump_state - SIGUSR1 handler to dump hostapd state to a text file
+ */
static void hostapd_dump_state(struct hostapd_data *hapd)
{
FILE *f;
char *buf;
if (!hapd->conf->dump_log_name) {
- printf("Dump file not defined - ignoring dump request\n");
+ wpa_printf(MSG_DEBUG, "Dump file not defined - ignoring dump "
+ "request");
return;
}
- printf("Dumping hostapd state to '%s'\n", hapd->conf->dump_log_name);
+ wpa_printf(MSG_DEBUG, "Dumping hostapd state to '%s'",
+ hapd->conf->dump_log_name);
f = fopen(hapd->conf->dump_log_name, "w");
if (f == NULL) {
- printf("Could not open dump file '%s' for writing.\n",
- hapd->conf->dump_log_name);
+ wpa_printf(MSG_WARNING, "Could not open dump file '%s' for "
+ "writing.", hapd->conf->dump_log_name);
return;
}
fprintf(f, "\nSTA=" MACSTR "\n", MAC2STR(sta->addr));
fprintf(f,
- " AID=%d flags=0x%x %s%s%s%s%s%s%s%s%s%s%s%s\n"
+ " AID=%d flags=0x%x %s%s%s%s%s%s%s%s%s%s%s%s%s%s\n"
" capability=0x%x listen_interval=%d\n",
sta->aid,
sta->flags,
(sta->flags & WLAN_STA_PREAUTH ? "[PREAUTH]" : ""),
(sta->flags & WLAN_STA_WME ? "[WME]" : ""),
(sta->flags & WLAN_STA_MFP ? "[MFP]" : ""),
+ (sta->flags & WLAN_STA_WPS ? "[WPS]" : ""),
+ (sta->flags & WLAN_STA_MAYBE_WPS ? "[MAYBE_WPS]" : ""),
(sta->flags & WLAN_STA_NONERP ? "[NonERP]" : ""),
sta->capability,
sta->listen_interval);
for (i = 0; i < NUM_WEP_KEYS; i++) {
if (hostapd_set_encryption(ifname, hapd, "none", NULL, i, NULL,
0, i == 0 ? 1 : 0)) {
- printf("Failed to clear default encryption keys "
- "(ifname=%s keyidx=%d)\n", ifname, i);
+ wpa_printf(MSG_DEBUG, "Failed to clear default "
+ "encryption keys (ifname=%s keyidx=%d)",
+ ifname, i);
}
}
+#ifdef CONFIG_IEEE80211W
+ if (hapd->conf->ieee80211w) {
+ for (i = NUM_WEP_KEYS; i < NUM_WEP_KEYS + 2; i++) {
+ if (hostapd_set_encryption(ifname, hapd, "none", NULL,
+ i, NULL, 0,
+ i == 0 ? 1 : 0)) {
+ wpa_printf(MSG_DEBUG, "Failed to clear "
+ "default mgmt encryption keys "
+ "(ifname=%s keyidx=%d)", ifname, i);
+ }
+ }
+ }
+#endif /* CONFIG_IEEE80211W */
}
ssid->wep.key[idx],
ssid->wep.len[idx],
idx == ssid->wep.idx)) {
- printf("Could not set WEP encryption.\n");
+ wpa_printf(MSG_WARNING, "Could not set WEP encryption.");
errors++;
}
idx, key->key[idx],
key->len[idx],
idx == key->idx)) {
- printf("Could not set dynamic VLAN WEP "
- "encryption.\n");
+ wpa_printf(MSG_WARNING, "Could not set "
+ "dynamic VLAN WEP encryption.");
errors++;
}
}
l2_packet_deinit(hapd->l2);
#endif /* CONFIG_IEEE80211R */
+ hostapd_deinit_wps(hapd);
+
hostapd_wireless_event_deinit(hapd);
#ifdef EAP_TLS_FUNCS
if (hapd->interface_added &&
hostapd_bss_remove(hapd, hapd->conf->iface)) {
- printf("Failed to remove BSS interface %s\n",
- hapd->conf->iface);
+ wpa_printf(MSG_WARNING, "Failed to remove BSS interface %s",
+ hapd->conf->iface);
}
}
i, hapd->conf->ssid.wep.key[i],
hapd->conf->ssid.wep.len[i],
i == hapd->conf->ssid.wep.idx)) {
- printf("Could not set WEP encryption.\n");
+ wpa_printf(MSG_WARNING, "Could not set WEP "
+ "encryption.");
return -1;
}
if (hapd->conf->ssid.wep.key[i] &&
{
int ret = 0;
+ if (hostapd_drv_none(hapd))
+ return 0;
+
wpa_printf(MSG_DEBUG, "Flushing old station entries");
if (hostapd_flush(hapd)) {
- printf("Could not connect to kernel driver.\n");
+ wpa_printf(MSG_WARNING, "Could not connect to kernel driver.");
ret = -1;
}
wpa_printf(MSG_DEBUG, "Deauthenticate all stations");
unsigned int i = iface->conf->num_bss, bits = 0, j;
int res;
+ if (hostapd_drv_none(hapd))
+ return 0;
+
/* Generate BSSID mask that is large enough to cover the BSSIDs. */
/* Determine the bits necessary to cover the number of BSSIDs. */
return 0;
if (res < 0) {
- printf("Driver did not accept BSSID mask " MACSTR " for start "
- "address " MACSTR ".\n",
- MAC2STR(mask), MAC2STR(hapd->own_addr));
+ wpa_printf(MSG_ERROR, "Driver did not accept BSSID mask "
+ MACSTR " for start address " MACSTR ".",
+ MAC2STR(mask), MAC2STR(hapd->own_addr));
return -1;
}
for (i = 0; i < ETH_ALEN; i++) {
if ((hapd->own_addr[i] & mask[i]) != hapd->own_addr[i]) {
- printf("Invalid BSSID mask " MACSTR " for start "
- "address " MACSTR ".\n"
- "Start address must be the first address in the"
- " block (i.e., addr AND mask == addr).\n",
- MAC2STR(mask), MAC2STR(hapd->own_addr));
+ wpa_printf(MSG_ERROR, "Invalid BSSID mask " MACSTR
+ " for start address " MACSTR ".",
+ MAC2STR(mask), MAC2STR(hapd->own_addr));
+ wpa_printf(MSG_ERROR, "Start address must be the "
+ "first address in the block (i.e., addr "
+ "AND mask == addr).");
return -1;
}
}
#endif /* CONFIG_IEEE80211R */
hapd->wpa_auth = wpa_init(hapd->own_addr, &_conf, &cb);
if (hapd->wpa_auth == NULL) {
- printf("WPA initialization failed.\n");
+ wpa_printf(MSG_ERROR, "WPA initialization failed.");
return -1;
}
}
if (rsn_preauth_iface_init(hapd)) {
- printf("Initialization of RSN pre-authentication "
- "failed.\n");
+ wpa_printf(MSG_ERROR, "Initialization of RSN "
+ "pre-authentication failed.");
return -1;
}
srv.ssl_ctx = hapd->ssl_ctx;
srv.pac_opaque_encr_key = conf->pac_opaque_encr_key;
srv.eap_fast_a_id = conf->eap_fast_a_id;
+ srv.eap_fast_a_id_len = conf->eap_fast_a_id_len;
+ srv.eap_fast_a_id_info = conf->eap_fast_a_id_info;
+ srv.eap_fast_prov = conf->eap_fast_prov;
+ srv.pac_key_lifetime = conf->pac_key_lifetime;
+ srv.pac_key_refresh_time = conf->pac_key_refresh_time;
srv.eap_sim_aka_result_ind = conf->eap_sim_aka_result_ind;
srv.tnc = conf->tnc;
+ srv.wps = hapd->wps;
srv.ipv6 = conf->radius_server_ipv6;
srv.get_eap_user = hostapd_radius_get_eap_user;
+ srv.eap_req_id_text = conf->eap_req_id_text;
+ srv.eap_req_id_text_len = conf->eap_req_id_text_len;
hapd->radius_srv = radius_server_init(&srv);
if (hapd->radius_srv == NULL) {
- printf("RADIUS server initialization failed.\n");
+ wpa_printf(MSG_ERROR, "RADIUS server initialization failed.");
return -1;
}
if (hostapd_mac_comp(hapd->own_addr,
hapd->iface->bss[0]->own_addr) ==
0) {
- printf("BSS '%s' may not have BSSID "
- "set to the MAC address of the radio\n",
- hapd->conf->iface);
+ wpa_printf(MSG_ERROR, "BSS '%s' may not have "
+ "BSSID set to the MAC address of "
+ "the radio", hapd->conf->iface);
return -1;
}
}
hapd->interface_added = 1;
if (hostapd_bss_add(hapd->iface->bss[0], hapd->conf->iface,
hapd->own_addr)) {
- printf("Failed to add BSS (BSSID=" MACSTR ")\n",
- MAC2STR(hapd->own_addr));
+ wpa_printf(MSG_ERROR, "Failed to add BSS (BSSID="
+ MACSTR ")", MAC2STR(hapd->own_addr));
return -1;
}
}
*/
ssid_len = hostapd_get_ssid(hapd, ssid, sizeof(ssid));
if (ssid_len < 0) {
- printf("Could not read SSID from system\n");
+ wpa_printf(MSG_ERROR, "Could not read SSID from system");
return -1;
}
if (conf->ssid.ssid_set) {
conf->ssid.ssid[conf->ssid.ssid_len] = '\0';
}
- printf("Using interface %s with hwaddr " MACSTR " and ssid '%s'\n",
- hapd->conf->iface, MAC2STR(hapd->own_addr),
- hapd->conf->ssid.ssid);
+ if (!hostapd_drv_none(hapd)) {
+ wpa_printf(MSG_ERROR, "Using interface %s with hwaddr " MACSTR
+ " and ssid '%s'",
+ hapd->conf->iface, MAC2STR(hapd->own_addr),
+ hapd->conf->ssid.ssid);
+ }
if (hostapd_setup_wpa_psk(conf)) {
- printf("WPA-PSK setup failed.\n");
+ wpa_printf(MSG_ERROR, "WPA-PSK setup failed.");
return -1;
}
/* Set flag for whether SSID is broadcast in beacons */
if (hostapd_set_broadcast_ssid(hapd,
!!hapd->conf->ignore_broadcast_ssid)) {
- printf("Could not set broadcast SSID flag for kernel "
- "driver\n");
+ wpa_printf(MSG_ERROR, "Could not set broadcast SSID flag for "
+ "kernel driver");
return -1;
}
if (hostapd_set_dtim_period(hapd, hapd->conf->dtim_period)) {
- printf("Could not set DTIM period for kernel driver\n");
+ wpa_printf(MSG_ERROR, "Could not set DTIM period for kernel "
+ "driver");
return -1;
}
* response frames) */
if (set_ssid && hostapd_set_ssid(hapd, (u8 *) conf->ssid.ssid,
conf->ssid.ssid_len)) {
- printf("Could not set SSID for kernel driver\n");
+ wpa_printf(MSG_ERROR, "Could not set SSID for kernel driver");
return -1;
}
conf->radius->msg_dumps = 1;
hapd->radius = radius_client_init(hapd, conf->radius);
if (hapd->radius == NULL) {
- printf("RADIUS client initialization failed.\n");
+ wpa_printf(MSG_ERROR, "RADIUS client initialization failed.");
return -1;
}
if (hostapd_acl_init(hapd)) {
- printf("ACL initialization failed.\n");
+ wpa_printf(MSG_ERROR, "ACL initialization failed.");
return -1;
}
+ if (hostapd_init_wps(hapd, conf))
+ return -1;
if (ieee802_1x_init(hapd)) {
- printf("IEEE 802.1X initialization failed.\n");
+ wpa_printf(MSG_ERROR, "IEEE 802.1X initialization failed.");
return -1;
}
return -1;
if (accounting_init(hapd)) {
- printf("Accounting initialization failed.\n");
+ wpa_printf(MSG_ERROR, "Accounting initialization failed.");
return -1;
}
if (hapd->conf->ieee802_11f &&
(hapd->iapp = iapp_init(hapd, hapd->conf->iapp_iface)) == NULL) {
- printf("IEEE 802.11F (IAPP) initialization failed.\n");
+ wpa_printf(MSG_ERROR, "IEEE 802.11F (IAPP) initialization "
+ "failed.");
return -1;
}
if (hostapd_ctrl_iface_init(hapd)) {
- printf("Failed to setup control interface\n");
+ wpa_printf(MSG_ERROR, "Failed to setup control interface");
return -1;
}
- if (vlan_init(hapd)) {
- printf("VLAN initialization failed.\n");
+ if (!hostapd_drv_none(hapd) && vlan_init(hapd)) {
+ wpa_printf(MSG_ERROR, "VLAN initialization failed.");
return -1;
}
#ifdef CONFIG_IEEE80211R
- hapd->l2 = l2_packet_init(hapd->conf->iface, NULL, ETH_P_RRB,
- hostapd_rrb_receive, hapd, 0);
- if (hapd->l2 == NULL &&
- (hapd->driver == NULL || hapd->driver->send_ether == NULL)) {
- printf("Failed to open l2_packet interface\n");
- return -1;
+ if (!hostapd_drv_none(hapd)) {
+ hapd->l2 = l2_packet_init(hapd->conf->iface, NULL, ETH_P_RRB,
+ hostapd_rrb_receive, hapd, 0);
+ if (hapd->l2 == NULL &&
+ (hapd->driver == NULL ||
+ hapd->driver->send_ether == NULL)) {
+ wpa_printf(MSG_ERROR, "Failed to open l2_packet "
+ "interface");
+ return -1;
+ }
}
#endif /* CONFIG_IEEE80211R */
}
-/**
- * setup_interface2 - Setup (initialize) an interface (part 2)
- * @iface: Pointer to interface data.
- * Returns: 0 on success; -1 on failure.
- *
- * Flushes old stations, sets the channel, DFS parameters, encryption,
- * beacons, and WDS links based on the configuration.
- */
-static int setup_interface2(struct hostapd_iface *iface)
+static void hostapd_tx_queue_params(struct hostapd_iface *iface)
{
struct hostapd_data *hapd = iface->bss[0];
- int freq;
- size_t j;
- int ret = 0;
- u8 *prev_addr;
+ int i;
+ struct hostapd_tx_queue_params *p;
- hostapd_flush_old_stations(hapd);
- hostapd_set_privacy(hapd, 0);
+ for (i = 0; i < NUM_TX_QUEUES; i++) {
+ p = &iface->conf->tx_queue[i];
- if (hapd->iconf->channel) {
- freq = hostapd_hw_get_freq(hapd, hapd->iconf->channel);
- printf("Mode: %s Channel: %d Frequency: %d MHz\n",
- hostapd_hw_mode_txt(hapd->iconf->hw_mode),
- hapd->iconf->channel, freq);
+ if (!p->configured)
+ continue;
- if (hostapd_set_freq(hapd, hapd->iconf->hw_mode, freq)) {
- printf("Could not set channel for kernel driver\n");
- return -1;
+ if (hostapd_set_tx_queue_params(hapd, i, p->aifs, p->cwmin,
+ p->cwmax, p->burst)) {
+ wpa_printf(MSG_DEBUG, "Failed to set TX queue "
+ "parameters for queue %d.", i);
+ /* Continue anyway */
}
}
-
- hostapd_broadcast_wep_clear(hapd);
- if (hostapd_setup_encryption(hapd->conf->iface, hapd))
- return -1;
-
- hostapd_set_beacon_int(hapd, hapd->iconf->beacon_int);
- ieee802_11_set_beacon(hapd);
-
- if (hapd->iconf->rts_threshold > -1 &&
- hostapd_set_rts(hapd, hapd->iconf->rts_threshold)) {
- printf("Could not set RTS threshold for kernel driver\n");
- return -1;
- }
-
- if (hapd->iconf->fragm_threshold > -1 &&
- hostapd_set_frag(hapd, hapd->iconf->fragm_threshold)) {
- printf("Could not set fragmentation threshold for kernel "
- "driver\n");
- return -1;
- }
-
- prev_addr = hapd->own_addr;
-
- for (j = 0; j < iface->num_bss; j++) {
- hapd = iface->bss[j];
- if (j)
- os_memcpy(hapd->own_addr, prev_addr, ETH_ALEN);
- if (hostapd_setup_bss(hapd, j == 0))
- return -1;
- if (hostapd_mac_comp_empty(hapd->conf->bssid) == 0)
- prev_addr = hapd->own_addr;
- }
-
- ap_list_init(iface);
-
- if (hostapd_driver_commit(hapd) < 0) {
- wpa_printf(MSG_ERROR, "%s: Failed to commit driver "
- "configuration", __func__);
- return -1;
- }
-
- return ret;
-}
-
-
-static void setup_interface_start(void *eloop_data, void *user_ctx);
-static void setup_interface2_handler(void *eloop_data, void *user_ctx);
-
-/**
- * setup_interface_finalize - Finish setup interface & call the callback
- * @iface: Pointer to interface data.
- * @status: Status of the setup interface (0 on success; -1 on failure).
- * Returns: 0 on success; -1 on failure (e.g., was not in progress).
- */
-static int setup_interface_finalize(struct hostapd_iface *iface, int status)
-{
- hostapd_iface_cb cb;
-
- if (!iface->setup_cb)
- return -1;
-
- eloop_cancel_timeout(setup_interface_start, iface, NULL);
- eloop_cancel_timeout(setup_interface2_handler, iface, NULL);
- hostapd_select_hw_mode_stop(iface);
-
- cb = iface->setup_cb;
-
- iface->setup_cb = NULL;
-
- cb(iface, status);
-
- return 0;
-}
-
-
-/**
- * setup_interface2_wrapper - Wrapper for setup_interface2()
- * @iface: Pointer to interface data.
- * @status: Status of the hw mode select.
- *
- * Wrapper for setup_interface2() to calls finalize function upon completion.
- */
-static void setup_interface2_wrapper(struct hostapd_iface *iface, int status)
-{
- int ret = status;
- if (ret)
- printf("Could not select hw_mode and channel. (%d)\n", ret);
- else
- ret = setup_interface2(iface);
-
- setup_interface_finalize(iface, ret);
-}
-
-
-/**
- * setup_interface2_handler - Used for immediate call of setup_interface2
- * @eloop_data: Stores the struct hostapd_iface * for the interface.
- * @user_ctx: Unused.
- */
-static void setup_interface2_handler(void *eloop_data, void *user_ctx)
-{
- struct hostapd_iface *iface = eloop_data;
-
- setup_interface2_wrapper(iface, 0);
}
}
-/**
- * setup_interface1 - Setup (initialize) an interface (part 1)
- * @iface: Pointer to interface data
- * Returns: 0 on success, -1 on failure
- *
- * Initializes the driver interface, validates the configuration,
- * and sets driver parameters based on the configuration.
- * Schedules setup_interface2() to be called immediately or after
- * hardware mode setup takes place.
- */
-static int setup_interface1(struct hostapd_iface *iface)
+static int setup_interface(struct hostapd_iface *iface)
{
struct hostapd_data *hapd = iface->bss[0];
struct hostapd_bss_config *conf = hapd->conf;
size_t i;
char country[4];
u8 *b = conf->bssid;
+ int freq;
+ size_t j;
+ int ret = 0;
+ u8 *prev_addr;
/*
* Initialize the driver interface and make sure that all BSSes get
}
if (hapd->drv_priv == NULL) {
- printf("%s driver initialization failed.\n",
- hapd->driver ? hapd->driver->name : "Unknown");
+ wpa_printf(MSG_ERROR, "%s driver initialization failed.",
+ hapd->driver ? hapd->driver->name : "Unknown");
hapd->driver = NULL;
return -1;
}
os_memcpy(country, hapd->iconf->country, 3);
country[3] = '\0';
if (hostapd_set_country(hapd, country) < 0) {
- printf("Failed to set country code\n");
+ wpa_printf(MSG_ERROR, "Failed to set country code");
return -1;
}
- if (hapd->iconf->ieee80211d || hapd->iconf->ieee80211h) {
- if (hostapd_set_ieee80211d(hapd, 1) < 0) {
- printf("Failed to set ieee80211d (%d)\n",
- hapd->iconf->ieee80211d);
- return -1;
- }
+ if (hapd->iconf->ieee80211d &&
+ hostapd_set_ieee80211d(hapd, 1) < 0) {
+ wpa_printf(MSG_ERROR, "Failed to set ieee80211d (%d)",
+ hapd->iconf->ieee80211d);
+ return -1;
}
if (hapd->iconf->bridge_packets != INTERNAL_BRIDGE_DO_NOT_CONTROL &&
hostapd_set_internal_bridge(hapd, hapd->iconf->bridge_packets)) {
- printf("Failed to set bridge_packets for kernel driver\n");
+ wpa_printf(MSG_ERROR, "Failed to set bridge_packets for "
+ "kernel driver");
return -1;
}
/* Not all drivers support this yet, so continue without hw
* feature data. */
} else {
- return hostapd_select_hw_mode_start(iface,
- setup_interface2_wrapper);
+ int ret = hostapd_select_hw_mode(iface);
+ if (ret < 0) {
+ wpa_printf(MSG_ERROR, "Could not select hw_mode and "
+ "channel. (%d)", ret);
+ return -1;
+ }
}
- eloop_register_timeout(0, 0, setup_interface2_handler, iface, NULL);
- return 0;
-}
+ hostapd_flush_old_stations(hapd);
+ hostapd_set_privacy(hapd, 0);
+ if (hapd->iconf->channel) {
+ freq = hostapd_hw_get_freq(hapd, hapd->iconf->channel);
+ wpa_printf(MSG_DEBUG, "Mode: %s Channel: %d "
+ "Frequency: %d MHz",
+ hostapd_hw_mode_txt(hapd->iconf->hw_mode),
+ hapd->iconf->channel, freq);
+
+ if (hostapd_set_freq(hapd, hapd->iconf->hw_mode, freq,
+ hapd->iconf->ieee80211n,
+ hapd->iconf->secondary_channel)) {
+ wpa_printf(MSG_ERROR, "Could not set channel for "
+ "kernel driver");
+ return -1;
+ }
+ }
-/**
- * setup_interface_start - Handler to start setup interface
- * @eloop_data: Stores the struct hostapd_iface * for the interface.
- * @user_ctx: Unused.
- *
- * An eloop handler is used so that all errors can be processed by the
- * callback without introducing stack recursion.
- */
-static void setup_interface_start(void *eloop_data, void *user_ctx)
-{
- struct hostapd_iface *iface = eloop_data;
+ hostapd_broadcast_wep_clear(hapd);
+ if (hostapd_setup_encryption(hapd->conf->iface, hapd))
+ return -1;
- int ret;
+ hostapd_set_beacon_int(hapd, hapd->iconf->beacon_int);
+ ieee802_11_set_beacon(hapd);
+
+ if (hapd->iconf->rts_threshold > -1 &&
+ hostapd_set_rts(hapd, hapd->iconf->rts_threshold)) {
+ wpa_printf(MSG_ERROR, "Could not set RTS threshold for "
+ "kernel driver");
+ return -1;
+ }
+
+ if (hapd->iconf->fragm_threshold > -1 &&
+ hostapd_set_frag(hapd, hapd->iconf->fragm_threshold)) {
+ wpa_printf(MSG_ERROR, "Could not set fragmentation threshold "
+ "for kernel driver");
+ return -1;
+ }
+
+ prev_addr = hapd->own_addr;
+
+ for (j = 0; j < iface->num_bss; j++) {
+ hapd = iface->bss[j];
+ if (j)
+ os_memcpy(hapd->own_addr, prev_addr, ETH_ALEN);
+ if (hostapd_setup_bss(hapd, j == 0))
+ return -1;
+ if (hostapd_mac_comp_empty(hapd->conf->bssid) == 0)
+ prev_addr = hapd->own_addr;
+ }
+
+ hostapd_tx_queue_params(iface);
+
+ ap_list_init(iface);
+
+ if (hostapd_driver_commit(hapd) < 0) {
+ wpa_printf(MSG_ERROR, "%s: Failed to commit driver "
+ "configuration", __func__);
+ return -1;
+ }
- ret = setup_interface1(iface);
- if (ret)
- setup_interface_finalize(iface, ret);
+ return ret;
}
/**
- * hostapd_setup_interface_start - Start the setup of an interface
+ * hostapd_setup_interface - Setup of an interface
* @iface: Pointer to interface data.
- * @cb: The function to callback when done.
- * Returns: 0 if it starts successfully; cb will be called when done.
- * -1 on failure; cb will not be called.
+ * Returns: 0 on success, -1 on failure
*
* Initializes the driver interface, validates the configuration,
* and sets driver parameters based on the configuration.
- * Flushes old stations, sets the channel, DFS parameters, encryption,
+ * Flushes old stations, sets the channel, encryption,
* beacons, and WDS links based on the configuration.
*/
-int hostapd_setup_interface_start(struct hostapd_iface *iface,
- hostapd_iface_cb cb)
+static int hostapd_setup_interface(struct hostapd_iface *iface)
{
- if (iface->setup_cb) {
- wpa_printf(MSG_DEBUG,
- "%s: Interface setup already in progress.\n",
+ int ret;
+
+ ret = setup_interface(iface);
+ if (ret) {
+ wpa_printf(MSG_DEBUG, "%s: Unable to setup interface.",
iface->bss[0]->conf->iface);
+ eloop_terminate();
return -1;
+ } else if (!hostapd_drv_none(iface->bss[0])) {
+ wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
+ iface->bss[0]->conf->iface);
}
- iface->setup_cb = cb;
-
- eloop_register_timeout(0, 0, setup_interface_start, iface, NULL);
-
return 0;
}
-/**
- * hostapd_setup_interace_stop - Stops the setup of an interface
- * @iface: Pointer to interface data
- * Returns: 0 if successfully stopped;
- * -1 on failure (i.e., was not in progress)
- */
-int hostapd_setup_interface_stop(struct hostapd_iface *iface)
-{
- return setup_interface_finalize(iface, -1);
-}
-
-
static void show_version(void)
{
fprintf(stderr,
"hostapd v" VERSION_STR "\n"
"User space daemon for IEEE 802.11 AP management,\n"
"IEEE 802.1X/WPA/WPA2/EAP/RADIUS Authenticator\n"
- "Copyright (c) 2002-2008, Jouni Malinen <j@w1.fi> "
+ "Copyright (c) 2002-2009, Jouni Malinen <j@w1.fi> "
"and contributors\n");
}
hapd->ssl_ctx = tls_init(NULL);
if (hapd->ssl_ctx == NULL) {
- printf("Failed to initialize TLS\n");
+ wpa_printf(MSG_ERROR, "Failed to initialize TLS");
goto fail;
}
params.dh_file = hapd->conf->dh_file;
if (tls_global_set_params(hapd->ssl_ctx, ¶ms)) {
- printf("Failed to set TLS parameters\n");
+ wpa_printf(MSG_ERROR, "Failed to set TLS parameters");
goto fail;
}
if (tls_global_set_verify(hapd->ssl_ctx,
hapd->conf->check_crl)) {
- printf("Failed to enable check_crl\n");
+ wpa_printf(MSG_ERROR, "Failed to enable check_crl");
goto fail;
}
}
eap_sim_db_init(hapd->conf->eap_sim_db,
hostapd_sim_db_cb, hapd);
if (hapd->eap_sim_db_priv == NULL) {
- printf("Failed to initialize EAP-SIM database "
- "interface\n");
+ wpa_printf(MSG_ERROR, "Failed to initialize EAP-SIM "
+ "database interface");
goto fail;
}
}
#endif /* EAP_SERVER */
- if (hapd->conf->assoc_ap)
- hapd->assoc_ap_state = WAIT_BEACON;
-
hapd->driver = hapd->iconf->driver;
return hapd;
}
-/**
- * register_drivers - Register driver interfaces
- *
- * This function is generated by Makefile (into driver_conf.c) to call all
- * configured driver interfaces to register them to core hostapd.
- */
-void register_drivers(void);
-
-
-/**
- * setup_interface_done - Callback when an interface is done being setup.
- * @iface: Pointer to interface data.
- * @status: Status of the interface setup (0 on success; -1 on failure).
- */
-static void setup_interface_done(struct hostapd_iface *iface, int status)
-{
- if (status) {
- wpa_printf(MSG_DEBUG, "%s: Unable to setup interface.",
- iface->bss[0]->conf->iface);
- eloop_terminate();
- } else
- wpa_printf(MSG_DEBUG, "%s: Setup of interface done.",
- iface->bss[0]->conf->iface);
-}
-
-
int main(int argc, char *argv[])
{
struct hapd_interfaces interfaces;
/* Initialize interfaces */
for (i = 0; i < interfaces.count; i++) {
- printf("Configuration file: %s\n", argv[optind + i]);
+ wpa_printf(MSG_ERROR, "Configuration file: %s",
+ argv[optind + i]);
interfaces.iface[i] = hostapd_init(argv[optind + i]);
if (!interfaces.iface[i])
goto out;
logger_stdout_level--;
}
- ret = hostapd_setup_interface_start(interfaces.iface[i],
- setup_interface_done);
+ ret = hostapd_setup_interface(interfaces.iface[i]);
if (ret)
goto out;
for (i = 0; i < interfaces.count; i++) {
if (!interfaces.iface[i])
continue;
- hostapd_setup_interface_stop(interfaces.iface[i]);
hostapd_cleanup_iface_pre(interfaces.iface[i]);
for (j = 0; j < interfaces.iface[i]->num_bss; j++) {
struct hostapd_data *hapd =
projects / wpasupplicant / blobdiff