~ubuntu-branches/ubuntu/saucy/wpasupplicant/saucy

Committer: Bazaar Package Importer
Author(s): Mathieu Trudel-Lapierre
Date: 2010-11-22 09:43:43 UTC
mfrom: (1.1.16 upstream)
Revision ID: james.westby@ubuntu.com-20101122094343-qgsxaojvmswfri77

Tags: 0.7.3-0ubuntu1

* Get wpasupplicant 0.7.3 from Debian's SVN. Leaving 0.7.3-1 as unreleased
for now.
* Build-Depend on debhelper 8, since the packaging from Debian uses compat 8.

files added:
.pc/02_dbus_group_policy.patch/wpa_supplicant/dbus

.pc/02_dbus_group_policy.patch/wpa_supplicant/dbus/dbus-wpa_supplicant.conf

.pc/07_dbus_service_syslog.patch/wpa_supplicant/dbus

.pc/07_dbus_service_syslog.patch/wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service

.pc/07_dbus_service_syslog.patch/wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service

debian/wpasupplicant.lintian-overrides

src/ap

src/ap/Makefile

src/ap/accounting.c

src/ap/accounting.h

src/ap/ap_config.c

src/ap/ap_config.h

src/ap/ap_drv_ops.c

src/ap/ap_drv_ops.h

src/ap/ap_list.c

src/ap/ap_list.h

src/ap/ap_mlme.c

src/ap/ap_mlme.h

src/ap/authsrv.c

src/ap/authsrv.h

src/ap/beacon.c

src/ap/beacon.h

src/ap/ctrl_iface_ap.c

src/ap/ctrl_iface_ap.h

src/ap/drv_callbacks.c

src/ap/hostapd.c

src/ap/hostapd.h

src/ap/hw_features.c

src/ap/hw_features.h

src/ap/iapp.c

src/ap/iapp.h

src/ap/ieee802_11.c

src/ap/ieee802_11.h

src/ap/ieee802_11_auth.c

src/ap/ieee802_11_auth.h

src/ap/ieee802_11_ht.c

src/ap/ieee802_1x.c

src/ap/ieee802_1x.h

src/ap/peerkey_auth.c

src/ap/pmksa_cache_auth.c

src/ap/pmksa_cache_auth.h

src/ap/preauth_auth.c

src/ap/preauth_auth.h

src/ap/sta_info.c

src/ap/sta_info.h

src/ap/tkip_countermeasures.c

src/ap/tkip_countermeasures.h

src/ap/utils.c

src/ap/vlan_init.c

src/ap/vlan_init.h

src/ap/wmm.c

src/ap/wmm.h

src/ap/wpa_auth.c

src/ap/wpa_auth.h

src/ap/wpa_auth_ft.c

src/ap/wpa_auth_glue.c

src/ap/wpa_auth_glue.h

src/ap/wpa_auth_i.h

src/ap/wpa_auth_ie.c

src/ap/wpa_auth_ie.h

src/ap/wps_hostapd.c

src/ap/wps_hostapd.h

src/crypto/.gitignore

src/crypto/aes-cbc.c

src/crypto/aes-ctr.c

src/crypto/aes-eax.c

src/crypto/aes-encblock.c

src/crypto/aes-internal-dec.c

src/crypto/aes-internal-enc.c

src/crypto/aes-internal.c

src/crypto/aes-omac1.c

src/crypto/aes-unwrap.c

src/crypto/aes-wrap.c

src/crypto/aes_i.h

src/crypto/crypto_internal-cipher.c

src/crypto/crypto_internal-modexp.c

src/crypto/crypto_internal-rsa.c

src/crypto/crypto_nss.c

src/crypto/des-internal.c

src/crypto/des_i.h

src/crypto/dh_group5.c

src/crypto/dh_group5.h

src/crypto/fips_prf_cryptoapi.c

src/crypto/fips_prf_gnutls.c

src/crypto/fips_prf_internal.c

src/crypto/fips_prf_nss.c

src/crypto/fips_prf_openssl.c

src/crypto/md4-internal.c

src/crypto/md5-internal.c

src/crypto/md5-non-fips.c

src/crypto/md5_i.h

src/crypto/milenage.c

src/crypto/milenage.h

src/crypto/sha1-internal.c

src/crypto/sha1-pbkdf2.c

src/crypto/sha1-tlsprf.c

src/crypto/sha1-tprf.c

src/crypto/sha1_i.h

src/crypto/sha256-internal.c

src/crypto/tls_nss.c

src/drivers/.gitignore

src/drivers/driver_atheros.c

src/drivers/driver_none.c

src/drivers/drivers.mak

src/drivers/linux_ioctl.c

src/drivers/linux_ioctl.h

src/drivers/netlink.c

src/drivers/netlink.h

src/drivers/nl80211_copy.h

src/drivers/wireless_copy.h

src/eap_server/eap_server.c

src/eap_server/eap_server_aka.c

src/eap_server/eap_server_fast.c

src/eap_server/eap_server_gpsk.c

src/eap_server/eap_server_gtc.c

src/eap_server/eap_server_identity.c

src/eap_server/eap_server_ikev2.c

src/eap_server/eap_server_md5.c

src/eap_server/eap_server_methods.c

src/eap_server/eap_server_mschapv2.c

src/eap_server/eap_server_pax.c

src/eap_server/eap_server_peap.c

src/eap_server/eap_server_psk.c

src/eap_server/eap_server_sake.c

src/eap_server/eap_server_sim.c

src/eap_server/eap_server_tls.c

src/eap_server/eap_server_tls_common.c

src/eap_server/eap_server_tnc.c

src/eap_server/eap_server_ttls.c

src/eap_server/eap_server_vendor_test.c

src/eap_server/eap_server_wsc.c

src/eapol_auth

src/eapol_auth/Makefile

src/eapol_auth/eapol_auth_dump.c

src/eapol_auth/eapol_auth_sm.c

src/eapol_auth/eapol_auth_sm.h

src/eapol_auth/eapol_auth_sm_i.h

src/lib.rules

src/radius/.gitignore

src/tls/.gitignore

src/tls/pkcs1.c

src/tls/pkcs1.h

src/tls/pkcs5.c

src/tls/pkcs5.h

src/tls/pkcs8.c

src/tls/pkcs8.h

src/utils/.gitignore

src/utils/list.h

src/utils/radiotap.c

src/utils/radiotap.h

src/utils/radiotap_iter.h

src/utils/trace.c

src/utils/trace.h

src/wps/http.h

src/wps/http_client.c

src/wps/http_client.h

src/wps/http_server.c

src/wps/http_server.h

src/wps/ndef.c

src/wps/upnp_xml.c

src/wps/upnp_xml.h

src/wps/wps_er.c

src/wps/wps_er.h

src/wps/wps_er_ssdp.c

src/wps/wps_nfc.c

src/wps/wps_nfc_pn531.c

src/wps/wps_ufd.c

src/wps/wps_upnp_ap.c

wpa_supplicant/ap.c

wpa_supplicant/ap.h

wpa_supplicant/bgscan.c

wpa_supplicant/bgscan.h

wpa_supplicant/bgscan_simple.c

wpa_supplicant/bss.c

wpa_supplicant/bss.h

wpa_supplicant/dbus

wpa_supplicant/dbus/.gitignore

wpa_supplicant/dbus/Makefile

wpa_supplicant/dbus/dbus-wpa_supplicant.conf

wpa_supplicant/dbus/dbus_common.c

wpa_supplicant/dbus/dbus_common.h

wpa_supplicant/dbus/dbus_common_i.h

wpa_supplicant/dbus/dbus_dict_helpers.c

wpa_supplicant/dbus/dbus_dict_helpers.h

wpa_supplicant/dbus/dbus_new.c

wpa_supplicant/dbus/dbus_new.h

wpa_supplicant/dbus/dbus_new_handlers.c

wpa_supplicant/dbus/dbus_new_handlers.h

wpa_supplicant/dbus/dbus_new_handlers_wps.c

wpa_supplicant/dbus/dbus_new_helpers.c

wpa_supplicant/dbus/dbus_new_helpers.h

wpa_supplicant/dbus/dbus_new_introspect.c

wpa_supplicant/dbus/dbus_old.c

wpa_supplicant/dbus/dbus_old.h

wpa_supplicant/dbus/dbus_old_handlers.c

wpa_supplicant/dbus/dbus_old_handlers.h

wpa_supplicant/dbus/dbus_old_handlers_wps.c

wpa_supplicant/dbus/fi.epitest.hostap.WPASupplicant.service

wpa_supplicant/dbus/fi.w1.wpa_supplicant1.service

wpa_supplicant/driver_i.h

wpa_supplicant/eap_register.c

wpa_supplicant/examples/60_wpa_supplicant

wpa_supplicant/examples/wpas-dbus-new-getall.py

wpa_supplicant/examples/wpas-dbus-new-signals.py

wpa_supplicant/examples/wpas-dbus-new-wps.py

wpa_supplicant/examples/wpas-dbus-new.py

wpa_supplicant/ibss_rsn.c

wpa_supplicant/ibss_rsn.h

wpa_supplicant/notify.c

wpa_supplicant/notify.h

wpa_supplicant/scan.h

wpa_supplicant/sme.c

wpa_supplicant/sme.h

wpa_supplicant/wpa_gui-qt4/icons/ap.svg

wpa_supplicant/wpa_gui-qt4/icons/laptop.svg

wpa_supplicant/wpa_gui-qt4/lang

wpa_supplicant/wpa_gui-qt4/lang/.gitignore

wpa_supplicant/wpa_gui-qt4/lang/wpa_gui_de.ts

wpa_supplicant/wpa_gui-qt4/peers.cpp

wpa_supplicant/wpa_gui-qt4/peers.h

wpa_supplicant/wpa_gui-qt4/peers.ui

wpa_supplicant/wpa_gui-qt4/stringquery.cpp

wpa_supplicant/wpa_gui-qt4/stringquery.h

wpa_supplicant/xcode

wpa_supplicant/xcode/wpa_supplicant.xcodeproj

wpa_supplicant/xcode/wpa_supplicant.xcodeproj/project.pbxproj

files removed:
.pc/02_dbus_group_policy.patch/wpa_supplicant/dbus-wpa_supplicant.conf

.pc/07_dbus_service_syslog.patch/wpa_supplicant/dbus-wpa_supplicant.service

.pc/11_syslog.patch

.pc/11_syslog.patch/src

.pc/11_syslog.patch/src/utils

.pc/11_syslog.patch/src/utils/wpa_debug.c

.pc/11_syslog.patch/src/utils/wpa_debug.h

.pc/11_syslog.patch/wpa_supplicant

.pc/11_syslog.patch/wpa_supplicant/Makefile

.pc/11_syslog.patch/wpa_supplicant/main.c

.pc/11_syslog.patch/wpa_supplicant/wpa_supplicant.c

.pc/11_syslog.patch/wpa_supplicant/wpa_supplicant_i.h

.pc/18_wpa_gui_wps_ap_avail_annoyance.patch

.pc/18_wpa_gui_wps_ap_avail_annoyance.patch/wpa_supplicant

.pc/18_wpa_gui_wps_ap_avail_annoyance.patch/wpa_supplicant/wpa_gui-qt4

.pc/18_wpa_gui_wps_ap_avail_annoyance.patch/wpa_supplicant/wpa_gui-qt4/wpagui.cpp

.pc/20_wpa_msg_ctrl_wps.patch

.pc/20_wpa_msg_ctrl_wps.patch/wpa_supplicant

.pc/20_wpa_msg_ctrl_wps.patch/wpa_supplicant/wps_supplicant.c

.pc/21_kfreebsd.patch

.pc/21_kfreebsd.patch/src

.pc/21_kfreebsd.patch/src/drivers

.pc/21_kfreebsd.patch/src/drivers/driver_bsd.c

.pc/21_kfreebsd.patch/src/drivers/driver_wired.c

.pc/21_kfreebsd.patch/src/l2_packet

.pc/21_kfreebsd.patch/src/l2_packet/l2_packet_freebsd.c

.pc/21_kfreebsd.patch/src/utils

.pc/21_kfreebsd.patch/src/utils/common.h

.pc/21_kfreebsd.patch/src/wps

.pc/21_kfreebsd.patch/src/wps/wps_upnp.c

.pc/21_kfreebsd.patch/wpa_supplicant

.pc/21_kfreebsd.patch/wpa_supplicant/ctrl_iface_unix.c

.pc/30_cfg80211_association_optimisation.patch

.pc/30_cfg80211_association_optimisation.patch/src

.pc/30_cfg80211_association_optimisation.patch/src/drivers

.pc/30_cfg80211_association_optimisation.patch/src/drivers/driver_wext.c

.pc/30_cfg80211_association_optimisation.patch/src/drivers/driver_wext.h

src/common/nl80211_copy.h

src/common/wireless_copy.h

src/crypto/aes.c

src/crypto/aes_wrap.c

src/crypto/des.c

src/crypto/md4.c

src/crypto/rc4.h

src/drivers/driver_prism54.c

src/drivers/driver_ps3.c

src/drivers/radiotap.c

src/drivers/radiotap.h

src/drivers/radiotap_iter.h

src/drivers/scan_helpers.c

src/eap_server/eap.c

src/eap_server/eap_aka.c

src/eap_server/eap_fast.c

src/eap_server/eap_gpsk.c

src/eap_server/eap_gtc.c

src/eap_server/eap_identity.c

src/eap_server/eap_ikev2.c

src/eap_server/eap_md5.c

src/eap_server/eap_methods.c

src/eap_server/eap_mschapv2.c

src/eap_server/eap_pax.c

src/eap_server/eap_peap.c

src/eap_server/eap_psk.c

src/eap_server/eap_sake.c

src/eap_server/eap_sim.c

src/eap_server/eap_tls.c

src/eap_server/eap_tls_common.c

src/eap_server/eap_tnc.c

src/eap_server/eap_ttls.c

src/eap_server/eap_vendor_test.c

src/eap_server/eap_wsc.c

src/hlr_auc_gw

src/hlr_auc_gw/Makefile

src/hlr_auc_gw/hlr_auc_gw.c

src/hlr_auc_gw/hlr_auc_gw.milenage_db

src/hlr_auc_gw/milenage.c

src/hlr_auc_gw/milenage.h

src/tls/asn1_test.c

wpa_supplicant/ctrl_iface_dbus.c

wpa_supplicant/ctrl_iface_dbus.h

wpa_supplicant/ctrl_iface_dbus_handlers.c

wpa_supplicant/ctrl_iface_dbus_handlers.h

wpa_supplicant/dbus-wpa_supplicant.conf

wpa_supplicant/dbus-wpa_supplicant.service

wpa_supplicant/dbus_dict_helpers.c

wpa_supplicant/dbus_dict_helpers.h

wpa_supplicant/doc/.gitignore

wpa_supplicant/doc/code_structure.doxygen

wpa_supplicant/doc/ctrl_iface.doxygen

wpa_supplicant/doc/doxygen.fast

wpa_supplicant/doc/doxygen.full

wpa_supplicant/doc/driver_wrapper.doxygen

wpa_supplicant/doc/eap.doxygen

wpa_supplicant/doc/kerneldoc2doxygen.pl

wpa_supplicant/doc/mainpage.doxygen

wpa_supplicant/doc/porting.doxygen

wpa_supplicant/doc/testing_tools.doxygen

wpa_supplicant/doc/wpa_supplicant.fig

wpa_supplicant/tests/test_aes.c

wpa_supplicant/tests/test_md4.c

wpa_supplicant/tests/test_md5.c

wpa_supplicant/tests/test_ms_funcs.c

wpa_supplicant/tests/test_sha1.c

wpa_supplicant/tests/test_sha256.c

wpa_supplicant/tests/test_x509v3.c

wpa_supplicant/tests/test_x509v3_nist.sh

wpa_supplicant/tests/test_x509v3_nist2.sh

files modified:
.pc/01_use_pkg-config_for_pcsc-lite_module.patch/wpa_supplicant/Makefile

.pc/applied-patches

debian/changelog

debian/compat

debian/config/kfreebsd

debian/config/linux

debian/control

debian/copyright

debian/ifupdown/action_wpa.sh

debian/ifupdown/functions.sh

debian/ifupdown/wpa_action

debian/patches/01_use_pkg-config_for_pcsc-lite_module.patch

debian/patches/02_dbus_group_policy.patch

debian/patches/07_dbus_service_syslog.patch

debian/patches/series

debian/rules

debian/watch

debian/wpasupplicant.links

src/Makefile

src/common/Makefile

src/common/defs.h

src/common/ieee802_11_common.c

src/common/ieee802_11_common.h

src/common/ieee802_11_defs.h

src/common/privsep_commands.h

src/common/version.h

src/common/wpa_common.c

src/common/wpa_common.h

src/common/wpa_ctrl.h

src/crypto/Makefile

src/crypto/aes.h

src/crypto/crypto.h

src/crypto/crypto_cryptoapi.c

src/crypto/crypto_gnutls.c

src/crypto/crypto_internal.c

src/crypto/crypto_libtomcrypt.c

src/crypto/crypto_none.c

src/crypto/crypto_openssl.c

src/crypto/dh_groups.c

src/crypto/md5.c

src/crypto/md5.h

src/crypto/ms_funcs.c

src/crypto/ms_funcs.h

src/crypto/rc4.c

src/crypto/sha1.c

src/crypto/sha1.h

src/crypto/sha256.c

src/crypto/tls.h

src/crypto/tls_gnutls.c

src/crypto/tls_internal.c

src/crypto/tls_none.c

src/crypto/tls_openssl.c

src/crypto/tls_schannel.c

src/drivers/Makefile

src/drivers/driver.h

src/drivers/driver_atmel.c

src/drivers/driver_broadcom.c

src/drivers/driver_bsd.c

src/drivers/driver_hostap.c

src/drivers/driver_hostap.h

src/drivers/driver_iphone.m

src/drivers/driver_ipw.c

src/drivers/driver_madwifi.c

src/drivers/driver_ndis.c

src/drivers/driver_ndis.h

src/drivers/driver_ndiswrapper.c

src/drivers/driver_nl80211.c

src/drivers/driver_osx.m

src/drivers/driver_privsep.c

src/drivers/driver_ralink.c

src/drivers/driver_ralink.h

src/drivers/driver_roboswitch.c

src/drivers/driver_test.c

src/drivers/driver_wext.c

src/drivers/driver_wext.h

src/drivers/driver_wired.c

src/drivers/drivers.c

src/drivers/priv_netlink.h

src/eap_common/Makefile

src/eap_common/chap.c

src/eap_common/chap.h

src/eap_common/eap_fast_common.c

src/eap_common/eap_gpsk_common.c

src/eap_common/eap_pax_common.c

src/eap_common/eap_peap_common.c

src/eap_common/eap_psk_common.c

src/eap_common/eap_sake_common.c

src/eap_common/eap_sim_common.c

src/eap_common/eap_sim_common.h

src/eap_common/ikev2_common.c

src/eap_peer/Makefile

src/eap_peer/eap.c

src/eap_peer/eap.h

src/eap_peer/eap_aka.c

src/eap_peer/eap_config.h

src/eap_peer/eap_fast.c

src/eap_peer/eap_fast_pac.c

src/eap_peer/eap_leap.c

src/eap_peer/eap_md5.c

src/eap_peer/eap_methods.c

src/eap_peer/eap_methods.h

src/eap_peer/eap_mschapv2.c

src/eap_peer/eap_pax.c

src/eap_peer/eap_peap.c

src/eap_peer/eap_psk.c

src/eap_peer/eap_sim.c

src/eap_peer/eap_tls.c

src/eap_peer/eap_tls_common.c

src/eap_peer/eap_tls_common.h

src/eap_peer/eap_tnc.c

src/eap_peer/eap_ttls.c

src/eap_peer/eap_wsc.c

src/eap_peer/ikev2.c

src/eap_peer/mschapv2.c

src/eap_peer/mschapv2.h

src/eap_server/Makefile

src/eap_server/eap.h

src/eap_server/eap_i.h

src/eap_server/eap_methods.h

src/eap_server/eap_sim_db.c

src/eap_server/eap_sim_db.h

src/eap_server/eap_tls_common.h

src/eap_server/ikev2.c

src/eap_server/tncs.c

src/eapol_supp/Makefile

src/eapol_supp/eapol_supp_sm.c

src/eapol_supp/eapol_supp_sm.h

src/l2_packet/Makefile

src/l2_packet/l2_packet_ndis.c

src/l2_packet/l2_packet_privsep.c

src/radius/Makefile

src/radius/radius.c

src/radius/radius.h

src/radius/radius_client.c

src/radius/radius_client.h

src/radius/radius_server.c

src/radius/radius_server.h

src/rsn_supp/Makefile

src/rsn_supp/peerkey.c

src/rsn_supp/pmksa_cache.c

src/rsn_supp/pmksa_cache.h

src/rsn_supp/preauth.c

src/rsn_supp/preauth.h

src/rsn_supp/wpa.c

src/rsn_supp/wpa.h

src/rsn_supp/wpa_ft.c

src/rsn_supp/wpa_i.h

src/rsn_supp/wpa_ie.c

src/rsn_supp/wpa_ie.h

src/tls/Makefile

src/tls/asn1.c

src/tls/asn1.h

src/tls/rsa.c

src/tls/tlsv1_client.c

src/tls/tlsv1_client_read.c

src/tls/tlsv1_client_write.c

src/tls/tlsv1_common.h

src/tls/tlsv1_cred.c

src/tls/tlsv1_record.c

src/tls/tlsv1_record.h

src/tls/tlsv1_server.c

src/tls/tlsv1_server_read.c

src/tls/tlsv1_server_write.c

src/tls/x509v3.c

src/tls/x509v3.h

src/utils/Makefile

src/utils/base64.c

src/utils/build_config.h

src/utils/common.c

src/utils/common.h

src/utils/eloop.c

src/utils/eloop.h

src/utils/eloop_none.c

src/utils/eloop_win.c

src/utils/ip_addr.h

src/utils/os.h

src/utils/os_internal.c

src/utils/os_unix.c

src/utils/uuid.c

src/utils/uuid.h

src/utils/wpa_debug.c

src/utils/wpabuf.c

src/utils/wpabuf.h

src/wps/Makefile

src/wps/httpread.c

src/wps/httpread.h

src/wps/wps.c

src/wps/wps.h

src/wps/wps_attr_build.c

src/wps/wps_attr_parse.c

src/wps/wps_attr_process.c

src/wps/wps_common.c

src/wps/wps_defs.h

src/wps/wps_dev_attr.c

src/wps/wps_enrollee.c

src/wps/wps_i.h

src/wps/wps_registrar.c

src/wps/wps_upnp.c

src/wps/wps_upnp.h

src/wps/wps_upnp_event.c

src/wps/wps_upnp_i.h

src/wps/wps_upnp_ssdp.c

src/wps/wps_upnp_web.c

wpa_supplicant/ChangeLog

wpa_supplicant/Makefile

wpa_supplicant/README

wpa_supplicant/README-WPS

wpa_supplicant/config.c

wpa_supplicant/config.h

wpa_supplicant/config_file.c

wpa_supplicant/config_ssid.h

wpa_supplicant/config_winreg.c

wpa_supplicant/ctrl_iface.c

wpa_supplicant/ctrl_iface_named_pipe.c

wpa_supplicant/ctrl_iface_udp.c

wpa_supplicant/ctrl_iface_unix.c

wpa_supplicant/defconfig

wpa_supplicant/doc/docbook/wpa_background.8

wpa_supplicant/doc/docbook/wpa_cli.8

wpa_supplicant/doc/docbook/wpa_gui.8

wpa_supplicant/doc/docbook/wpa_passphrase.8

wpa_supplicant/doc/docbook/wpa_priv.8

wpa_supplicant/doc/docbook/wpa_supplicant.8

wpa_supplicant/doc/docbook/wpa_supplicant.conf.5

wpa_supplicant/doc/docbook/wpa_supplicant.sgml

wpa_supplicant/eapol_test.c

wpa_supplicant/events.c

wpa_supplicant/main.c

wpa_supplicant/mlme.c

wpa_supplicant/mlme.h

wpa_supplicant/nmake.mak

wpa_supplicant/preauth_test.c

wpa_supplicant/scan.c

wpa_supplicant/symbian/wpa_supplicant.mmp

wpa_supplicant/tests/test_eap_sim_common.c

wpa_supplicant/tests/test_wpa.c

wpa_supplicant/todo.txt

wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj

wpa_supplicant/vs2005/wpa_cli/wpa_cli.vcproj

wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj

wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj

wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj

wpa_supplicant/wpa_cli.c

wpa_supplicant/wpa_gui-qt4/addinterface.cpp

wpa_supplicant/wpa_gui-qt4/eventhistory.cpp

wpa_supplicant/wpa_gui-qt4/icons.qrc

wpa_supplicant/wpa_gui-qt4/icons/Makefile

wpa_supplicant/wpa_gui-qt4/icons/README

wpa_supplicant/wpa_gui-qt4/icons_png.qrc

wpa_supplicant/wpa_gui-qt4/main.cpp

wpa_supplicant/wpa_gui-qt4/networkconfig.cpp

wpa_supplicant/wpa_gui-qt4/networkconfig.ui

wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp

wpa_supplicant/wpa_gui-qt4/wpa_gui.pro

wpa_supplicant/wpa_gui-qt4/wpagui.cpp

wpa_supplicant/wpa_gui-qt4/wpagui.h

wpa_supplicant/wpa_gui-qt4/wpagui.ui

wpa_supplicant/wpa_gui/scanresults.ui

wpa_supplicant/wpa_gui/userdatarequest.ui

wpa_supplicant/wpa_gui/wpa_gui.pro

wpa_supplicant/wpa_gui/wpagui.ui

wpa_supplicant/wpa_passphrase.c

wpa_supplicant/wpa_priv.c

wpa_supplicant/wpa_supplicant.c

wpa_supplicant/wpa_supplicant.conf

wpa_supplicant/wpa_supplicant.nsi

wpa_supplicant/wpa_supplicant_i.h

wpa_supplicant/wpas_glue.c

wpa_supplicant/wps_supplicant.c

wpa_supplicant/wps_supplicant.h

Show diffs side-by-side

added added

removed removed

src/ap/sta_info.c

* hostapd / Station table

* 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

* published by the Free Software Foundation.

* Alternatively, this software may be distributed under the terms of BSD

* license.

* See README and COPYING for more details.

#include "utils/includes.h"

#include "utils/common.h"

#include "utils/eloop.h"

#include "common/ieee802_11_defs.h"

#include "radius/radius.h"

#include "radius/radius_client.h"

#include "drivers/driver.h"

#include "hostapd.h"

#include "accounting.h"

#include "ieee802_1x.h"

#include "ieee802_11.h"

#include "wpa_auth.h"

#include "preauth_auth.h"

#include "ap_config.h"

#include "beacon.h"

#include "ap_mlme.h"

#include "vlan_init.h"

#include "sta_info.h"

static void ap_sta_remove_in_other_bss(struct hostapd_data *hapd,

struct sta_info *sta);

static void ap_handle_session_timer(void *eloop_ctx, void *timeout_ctx);

#ifdef CONFIG_IEEE80211W

static void ap_sa_query_timer(void *eloop_ctx, void *timeout_ctx);

#endif /* CONFIG_IEEE80211W */

int ap_for_each_sta(struct hostapd_data *hapd,

int (*cb)(struct hostapd_data *hapd, struct sta_info *sta,

void *ctx),

void *ctx)

{

struct sta_info *sta;

for (sta = hapd->sta_list; sta; sta = sta->next) {

if (cb(hapd, sta, ctx))

return 1;

}

return 0;

}

struct sta_info * ap_get_sta(struct hostapd_data *hapd, const u8 *sta)

{

struct sta_info *s;

s = hapd->sta_hash[STA_HASH(sta)];

while (s != NULL && os_memcmp(s->addr, sta, 6) != 0)

s = s->hnext;

return s;

}

static void ap_sta_list_del(struct hostapd_data *hapd, struct sta_info *sta)

{

struct sta_info *tmp;

if (hapd->sta_list == sta) {

hapd->sta_list = sta->next;

return;

}

tmp = hapd->sta_list;

while (tmp != NULL && tmp->next != sta)

tmp = tmp->next;

if (tmp == NULL) {

wpa_printf(MSG_DEBUG, "Could not remove STA " MACSTR " from "

"list.", MAC2STR(sta->addr));

} else

tmp->next = sta->next;

}

void ap_sta_hash_add(struct hostapd_data *hapd, struct sta_info *sta)

{

sta->hnext = hapd->sta_hash[STA_HASH(sta->addr)];

hapd->sta_hash[STA_HASH(sta->addr)] = sta;

}

static void ap_sta_hash_del(struct hostapd_data *hapd, struct sta_info *sta)

{

struct sta_info *s;

100

s = hapd->sta_hash[STA_HASH(sta->addr)];

101

if (s == NULL) return;

102

if (os_memcmp(s->addr, sta->addr, 6) == 0) {

103

hapd->sta_hash[STA_HASH(sta->addr)] = s->hnext;

104

return;

105

}

106

107

while (s->hnext != NULL &&

108

os_memcmp(s->hnext->addr, sta->addr, ETH_ALEN) != 0)

109

s = s->hnext;

110

if (s->hnext != NULL)

111

s->hnext = s->hnext->hnext;

112

else

113

wpa_printf(MSG_DEBUG, "AP: could not remove STA " MACSTR

114

" from hash table", MAC2STR(sta->addr));

115

}

116

117

118

void ap_free_sta(struct hostapd_data *hapd, struct sta_info *sta)

119

{

120

int set_beacon = 0;

121

122

accounting_sta_stop(hapd, sta);

123

124

if (sta->flags & WLAN_STA_WDS)

125

hapd->drv.set_wds_sta(hapd, sta->addr, sta->aid, 0);

126

127

if (!(sta->flags & WLAN_STA_PREAUTH))

128

hapd->drv.sta_remove(hapd, sta->addr);

129

130

ap_sta_hash_del(hapd, sta);

131

ap_sta_list_del(hapd, sta);

132

133

if (sta->aid > 0)

134

hapd->sta_aid[(sta->aid - 1) / 32] &=

135

~BIT((sta->aid - 1) % 32);

136

137

hapd->num_sta--;

138

if (sta->nonerp_set) {

139

sta->nonerp_set = 0;

140

hapd->iface->num_sta_non_erp--;

141

if (hapd->iface->num_sta_non_erp == 0)

142

set_beacon++;

143

}

144

145

if (sta->no_short_slot_time_set) {

146

sta->no_short_slot_time_set = 0;

147

hapd->iface->num_sta_no_short_slot_time--;

148

if (hapd->iface->current_mode->mode == HOSTAPD_MODE_IEEE80211G

149

&& hapd->iface->num_sta_no_short_slot_time == 0)

150

set_beacon++;

151

}

152

153

if (sta->no_short_preamble_set) {

154

sta->no_short_preamble_set = 0;

155

hapd->iface->num_sta_no_short_preamble--;

156

if (hapd->iface->current_mode->mode == HOSTAPD_MODE_IEEE80211G

157

&& hapd->iface->num_sta_no_short_preamble == 0)

158

set_beacon++;

159

}

160

161

if (sta->no_ht_gf_set) {

162

sta->no_ht_gf_set = 0;

163

hapd->iface->num_sta_ht_no_gf--;

164

}

165

166

if (sta->no_ht_set) {

167

sta->no_ht_set = 0;

168

hapd->iface->num_sta_no_ht--;

169

}

170

171

if (sta->ht_20mhz_set) {

172

sta->ht_20mhz_set = 0;

173

hapd->iface->num_sta_ht_20mhz--;

174

}

175

176

#if defined(NEED_AP_MLME) && defined(CONFIG_IEEE80211N)

177

if (hostapd_ht_operation_update(hapd->iface) > 0)

178

set_beacon++;

179

#endif /* NEED_AP_MLME && CONFIG_IEEE80211N */

180

181

if (set_beacon)

182

ieee802_11_set_beacons(hapd->iface);

183

184

eloop_cancel_timeout(ap_handle_timer, hapd, sta);

185

eloop_cancel_timeout(ap_handle_session_timer, hapd, sta);

186

187

ieee802_1x_free_station(sta);

188

wpa_auth_sta_deinit(sta->wpa_sm);

189

rsn_preauth_free_station(hapd, sta);

190

#ifndef CONFIG_NO_RADIUS

191

radius_client_flush_auth(hapd->radius, sta->addr);

192

#endif /* CONFIG_NO_RADIUS */

193

194

os_free(sta->last_assoc_req);

195

os_free(sta->challenge);

196

197

#ifdef CONFIG_IEEE80211W

198

os_free(sta->sa_query_trans_id);

199

eloop_cancel_timeout(ap_sa_query_timer, hapd, sta);

200

#endif /* CONFIG_IEEE80211W */

201

202

wpabuf_free(sta->wps_ie);

203

204

os_free(sta->ht_capabilities);

205

206

os_free(sta);

207

}

208

209

210

void hostapd_free_stas(struct hostapd_data *hapd)

211

{

212

struct sta_info *sta, *prev;

213

214

sta = hapd->sta_list;

215

216

while (sta) {

217

prev = sta;

218

if (sta->flags & WLAN_STA_AUTH) {

219

mlme_deauthenticate_indication(

220

hapd, sta, WLAN_REASON_UNSPECIFIED);

221

}

222

sta = sta->next;

223

wpa_printf(MSG_DEBUG, "Removing station " MACSTR,

224

MAC2STR(prev->addr));

225

ap_free_sta(hapd, prev);

226

}

227

}

228

229

230

/**

231

* ap_handle_timer - Per STA timer handler

232

* @eloop_ctx: struct hostapd_data *

233

* @timeout_ctx: struct sta_info *

234

235

* This function is called to check station activity and to remove inactive

236

* stations.

237

238

void ap_handle_timer(void *eloop_ctx, void *timeout_ctx)

239

{

240

struct hostapd_data *hapd = eloop_ctx;

241

struct sta_info *sta = timeout_ctx;

242

unsigned long next_time = 0;

243

244

if (sta->timeout_next == STA_REMOVE) {

245

hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,

246

HOSTAPD_LEVEL_INFO, "deauthenticated due to "

247

"local deauth request");

248

ap_free_sta(hapd, sta);

249

return;

250

}

251

252

if ((sta->flags & WLAN_STA_ASSOC) &&

253

(sta->timeout_next == STA_NULLFUNC ||

254

sta->timeout_next == STA_DISASSOC)) {

255

int inactive_sec;

256

wpa_printf(MSG_DEBUG, "Checking STA " MACSTR " inactivity:",

257

MAC2STR(sta->addr));

258

inactive_sec = hapd->drv.get_inact_sec(hapd, sta->addr);

259

if (inactive_sec == -1) {

260

wpa_printf(MSG_DEBUG, "Could not get station info "

261

"from kernel driver for " MACSTR ".",

262

MAC2STR(sta->addr));

263

} else if (inactive_sec < hapd->conf->ap_max_inactivity &&

264

sta->flags & WLAN_STA_ASSOC) {

265

/* station activity detected; reset timeout state */

266

wpa_printf(MSG_DEBUG, " Station has been active");

267

sta->timeout_next = STA_NULLFUNC;

268

next_time = hapd->conf->ap_max_inactivity -

269

inactive_sec;

270

}

271

}

272

273

if ((sta->flags & WLAN_STA_ASSOC) &&

274

sta->timeout_next == STA_DISASSOC &&

275

!(sta->flags & WLAN_STA_PENDING_POLL)) {

276

wpa_printf(MSG_DEBUG, " Station has ACKed data poll");

277

/* data nullfunc frame poll did not produce TX errors; assume

278

* station ACKed it */

279

sta->timeout_next = STA_NULLFUNC;

280

next_time = hapd->conf->ap_max_inactivity;

281

}

282

283

if (next_time) {

284

eloop_register_timeout(next_time, 0, ap_handle_timer, hapd,

285

sta);

286

return;

287

}

288

289

if (sta->timeout_next == STA_NULLFUNC &&

290

(sta->flags & WLAN_STA_ASSOC)) {

291

#ifndef CONFIG_NATIVE_WINDOWS

292

/* send data frame to poll STA and check whether this frame

293

* is ACKed */

294

struct ieee80211_hdr hdr;

295

296

wpa_printf(MSG_DEBUG, " Polling STA with data frame");

297

sta->flags |= WLAN_STA_PENDING_POLL;

298

299

os_memset(&hdr, 0, sizeof(hdr));

300

if (hapd->driver &&

301

os_strcmp(hapd->driver->name, "hostap") == 0) {

302

303

* WLAN_FC_STYPE_NULLFUNC would be more appropriate,

304

* but it is apparently not retried so TX Exc events

305

* are not received for it.

306

307

hdr.frame_control =

308

IEEE80211_FC(WLAN_FC_TYPE_DATA,

309

WLAN_FC_STYPE_DATA);

310

} else {

311

hdr.frame_control =

312

IEEE80211_FC(WLAN_FC_TYPE_DATA,

313

WLAN_FC_STYPE_NULLFUNC);

314

}

315

316

hdr.frame_control |= host_to_le16(WLAN_FC_FROMDS);

317

os_memcpy(hdr.IEEE80211_DA_FROMDS, sta->addr, ETH_ALEN);

318

os_memcpy(hdr.IEEE80211_BSSID_FROMDS, hapd->own_addr,

319

ETH_ALEN);

320

os_memcpy(hdr.IEEE80211_SA_FROMDS, hapd->own_addr, ETH_ALEN);

321

322

if (hapd->drv.send_mgmt_frame(hapd, &hdr, sizeof(hdr)) < 0)

323

perror("ap_handle_timer: send");

324

#endif /* CONFIG_NATIVE_WINDOWS */

325

} else if (sta->timeout_next != STA_REMOVE) {

326

int deauth = sta->timeout_next == STA_DEAUTH;

327

328

wpa_printf(MSG_DEBUG, "Sending %s info to STA " MACSTR,

329

deauth ? "deauthentication" : "disassociation",

330

MAC2STR(sta->addr));

331

332

if (deauth) {

333

hapd->drv.sta_deauth(hapd, sta->addr,

334

WLAN_REASON_PREV_AUTH_NOT_VALID);

335

} else {

336

hapd->drv.sta_disassoc(

337

hapd, sta->addr,

338

WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY);

339

}

340

}

341

342

switch (sta->timeout_next) {

343

case STA_NULLFUNC:

344

sta->timeout_next = STA_DISASSOC;

345

eloop_register_timeout(AP_DISASSOC_DELAY, 0, ap_handle_timer,

346

hapd, sta);

347

break;

348

case STA_DISASSOC:

349

sta->flags &= ~WLAN_STA_ASSOC;

350

ieee802_1x_notify_port_enabled(sta->eapol_sm, 0);

351

if (!sta->acct_terminate_cause)

352

sta->acct_terminate_cause =

353

RADIUS_ACCT_TERMINATE_CAUSE_IDLE_TIMEOUT;

354

accounting_sta_stop(hapd, sta);

355

ieee802_1x_free_station(sta);

356

hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,

357

HOSTAPD_LEVEL_INFO, "disassociated due to "

358

"inactivity");

359

sta->timeout_next = STA_DEAUTH;

360

eloop_register_timeout(AP_DEAUTH_DELAY, 0, ap_handle_timer,

361

hapd, sta);

362

mlme_disassociate_indication(

363

hapd, sta, WLAN_REASON_DISASSOC_DUE_TO_INACTIVITY);

364

break;

365

case STA_DEAUTH:

366

case STA_REMOVE:

367

hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,

368

HOSTAPD_LEVEL_INFO, "deauthenticated due to "

369

"inactivity");

370

if (!sta->acct_terminate_cause)

371

sta->acct_terminate_cause =

372

RADIUS_ACCT_TERMINATE_CAUSE_IDLE_TIMEOUT;

373

mlme_deauthenticate_indication(

374

hapd, sta,

375

WLAN_REASON_PREV_AUTH_NOT_VALID);

376

ap_free_sta(hapd, sta);

377

break;

378

}

379

}

380

381

382

static void ap_handle_session_timer(void *eloop_ctx, void *timeout_ctx)

383

{

384

struct hostapd_data *hapd = eloop_ctx;

385

struct sta_info *sta = timeout_ctx;

386

u8 addr[ETH_ALEN];

387

388

if (!(sta->flags & WLAN_STA_AUTH))

389

return;

390

391

mlme_deauthenticate_indication(hapd, sta,

392

WLAN_REASON_PREV_AUTH_NOT_VALID);

393

hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,

394

HOSTAPD_LEVEL_INFO, "deauthenticated due to "

395

"session timeout");

396

sta->acct_terminate_cause =

397

RADIUS_ACCT_TERMINATE_CAUSE_SESSION_TIMEOUT;

398

os_memcpy(addr, sta->addr, ETH_ALEN);

399

ap_free_sta(hapd, sta);

400

hapd->drv.sta_deauth(hapd, addr, WLAN_REASON_PREV_AUTH_NOT_VALID);

401

}

402

403

404

void ap_sta_session_timeout(struct hostapd_data *hapd, struct sta_info *sta,

405

u32 session_timeout)

406

{

407

hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,

408

HOSTAPD_LEVEL_DEBUG, "setting session timeout to %d "

409

"seconds", session_timeout);

410

eloop_cancel_timeout(ap_handle_session_timer, hapd, sta);

411

eloop_register_timeout(session_timeout, 0, ap_handle_session_timer,

412

hapd, sta);

413

}

414

415

416

void ap_sta_no_session_timeout(struct hostapd_data *hapd, struct sta_info *sta)

417

{

418

eloop_cancel_timeout(ap_handle_session_timer, hapd, sta);

419

}

420

421

422

struct sta_info * ap_sta_add(struct hostapd_data *hapd, const u8 *addr)

423

{

424

struct sta_info *sta;

425

426

sta = ap_get_sta(hapd, addr);

427

if (sta)

428

return sta;

429

430

wpa_printf(MSG_DEBUG, " New STA");

431

if (hapd->num_sta >= hapd->conf->max_num_sta) {

432

/* FIX: might try to remove some old STAs first? */

433

wpa_printf(MSG_DEBUG, "no more room for new STAs (%d/%d)",

434

hapd->num_sta, hapd->conf->max_num_sta);

435

return NULL;

436

}

437

438

sta = os_zalloc(sizeof(struct sta_info));

439

if (sta == NULL) {

440

wpa_printf(MSG_ERROR, "malloc failed");

441

return NULL;

442

}

443

sta->acct_interim_interval = hapd->conf->acct_interim_interval;

444

445

/* initialize STA info data */

446

eloop_register_timeout(hapd->conf->ap_max_inactivity, 0,

447

ap_handle_timer, hapd, sta);

448

os_memcpy(sta->addr, addr, ETH_ALEN);

449

sta->next = hapd->sta_list;

450

hapd->sta_list = sta;

451

hapd->num_sta++;

452

ap_sta_hash_add(hapd, sta);

453

sta->ssid = &hapd->conf->ssid;

454

ap_sta_remove_in_other_bss(hapd, sta);

455

456

return sta;

457

}

458

459

460

static int ap_sta_remove(struct hostapd_data *hapd, struct sta_info *sta)

461

{

462

ieee802_1x_notify_port_enabled(sta->eapol_sm, 0);

463

464

wpa_printf(MSG_DEBUG, "Removing STA " MACSTR " from kernel driver",

465

MAC2STR(sta->addr));

466

if (hapd->drv.sta_remove(hapd, sta->addr) &&

467

sta->flags & WLAN_STA_ASSOC) {

468

wpa_printf(MSG_DEBUG, "Could not remove station " MACSTR

469

" from kernel driver.", MAC2STR(sta->addr));

470

return -1;

471

}

472

return 0;

473

}

474

475

476

static void ap_sta_remove_in_other_bss(struct hostapd_data *hapd,

477

struct sta_info *sta)

478

{

479

struct hostapd_iface *iface = hapd->iface;

480

size_t i;

481

482

for (i = 0; i < iface->num_bss; i++) {

483

struct hostapd_data *bss = iface->bss[i];

484

struct sta_info *sta2;

485

/* bss should always be set during operation, but it may be

486

* NULL during reconfiguration. Assume the STA is not

487

* associated to another BSS in that case to avoid NULL pointer

488

* dereferences. */

489

if (bss == hapd || bss == NULL)

490

continue;

491

sta2 = ap_get_sta(bss, sta->addr);

492

if (!sta2)

493

continue;

494

495

ap_sta_disconnect(bss, sta2, sta2->addr,

496

WLAN_REASON_PREV_AUTH_NOT_VALID);

497

}

498

}

499

500

501

void ap_sta_disassociate(struct hostapd_data *hapd, struct sta_info *sta,

502

u16 reason)

503

{

504

wpa_printf(MSG_DEBUG, "%s: disassociate STA " MACSTR,

505

hapd->conf->iface, MAC2STR(sta->addr));

506

sta->flags &= ~WLAN_STA_ASSOC;

507

ap_sta_remove(hapd, sta);

508

sta->timeout_next = STA_DEAUTH;

509

eloop_cancel_timeout(ap_handle_timer, hapd, sta);

510

eloop_register_timeout(AP_MAX_INACTIVITY_AFTER_DISASSOC, 0,

511

ap_handle_timer, hapd, sta);

512

accounting_sta_stop(hapd, sta);

513

ieee802_1x_free_station(sta);

514

515

mlme_disassociate_indication(hapd, sta, reason);

516

}

517

518

519

void ap_sta_deauthenticate(struct hostapd_data *hapd, struct sta_info *sta,

520

u16 reason)

521

{

522

wpa_printf(MSG_DEBUG, "%s: deauthenticate STA " MACSTR,

523

hapd->conf->iface, MAC2STR(sta->addr));

524

sta->flags &= ~(WLAN_STA_AUTH | WLAN_STA_ASSOC);

525

ap_sta_remove(hapd, sta);

526

sta->timeout_next = STA_REMOVE;

527

eloop_cancel_timeout(ap_handle_timer, hapd, sta);

528

eloop_register_timeout(AP_MAX_INACTIVITY_AFTER_DEAUTH, 0,

529

ap_handle_timer, hapd, sta);

530

accounting_sta_stop(hapd, sta);

531

ieee802_1x_free_station(sta);

532

533

mlme_deauthenticate_indication(hapd, sta, reason);

534

}

535

536

537

int ap_sta_bind_vlan(struct hostapd_data *hapd, struct sta_info *sta,

538

int old_vlanid)

539

{

540

#ifndef CONFIG_NO_VLAN

541

const char *iface;

542

struct hostapd_vlan *vlan = NULL;

543

int ret;

544

545

546

* Do not proceed furthur if the vlan id remains same. We do not want

547

* duplicate dynamic vlan entries.

548

549

if (sta->vlan_id == old_vlanid)

550

return 0;

551

552

553

* During 1x reauth, if the vlan id changes, then remove the old id and

554

* proceed furthur to add the new one.

555

556

if (old_vlanid > 0)

557

vlan_remove_dynamic(hapd, old_vlanid);

558

559

iface = hapd->conf->iface;

560

if (sta->ssid->vlan[0])

561

iface = sta->ssid->vlan;

562

563

if (sta->ssid->dynamic_vlan == DYNAMIC_VLAN_DISABLED)

564

sta->vlan_id = 0;

565

else if (sta->vlan_id > 0) {

566

vlan = hapd->conf->vlan;

567

while (vlan) {

568

if (vlan->vlan_id == sta->vlan_id ||

569

vlan->vlan_id == VLAN_ID_WILDCARD) {

570

iface = vlan->ifname;

571

break;

572

}

573

vlan = vlan->next;

574

}

575

}

576

577

if (sta->vlan_id > 0 && vlan == NULL) {

578

hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,

579

HOSTAPD_LEVEL_DEBUG, "could not find VLAN for "

580

"binding station to (vlan_id=%d)",

581

sta->vlan_id);

582

return -1;

583

} else if (sta->vlan_id > 0 && vlan->vlan_id == VLAN_ID_WILDCARD) {

584

vlan = vlan_add_dynamic(hapd, vlan, sta->vlan_id);

585

if (vlan == NULL) {

586

hostapd_logger(hapd, sta->addr,

587

HOSTAPD_MODULE_IEEE80211,

588

HOSTAPD_LEVEL_DEBUG, "could not add "

589

"dynamic VLAN interface for vlan_id=%d",

590

sta->vlan_id);

591

return -1;

592

}

593

594

iface = vlan->ifname;

595

if (vlan_setup_encryption_dyn(hapd, sta->ssid, iface) != 0) {

596

hostapd_logger(hapd, sta->addr,

597

HOSTAPD_MODULE_IEEE80211,

598

HOSTAPD_LEVEL_DEBUG, "could not "

599

"configure encryption for dynamic VLAN "

600

"interface for vlan_id=%d",

601

sta->vlan_id);

602

}

603

604

hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,

605

HOSTAPD_LEVEL_DEBUG, "added new dynamic VLAN "

606

"interface '%s'", iface);

607

} else if (vlan && vlan->vlan_id == sta->vlan_id) {

608

if (sta->vlan_id > 0) {

609

vlan->dynamic_vlan++;

610

hostapd_logger(hapd, sta->addr,

611

HOSTAPD_MODULE_IEEE80211,

612

HOSTAPD_LEVEL_DEBUG, "updated existing "

613

"dynamic VLAN interface '%s'", iface);

614

}

615

616

617

* Update encryption configuration for statically generated

618

* VLAN interface. This is only used for static WEP

619

* configuration for the case where hostapd did not yet know

620

* which keys are to be used when the interface was added.

621

622

if (vlan_setup_encryption_dyn(hapd, sta->ssid, iface) != 0) {

623

hostapd_logger(hapd, sta->addr,

624

HOSTAPD_MODULE_IEEE80211,

625

HOSTAPD_LEVEL_DEBUG, "could not "

626

"configure encryption for VLAN "

627

"interface for vlan_id=%d",

628

sta->vlan_id);

629

}

630

}

631

632

hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,

633

HOSTAPD_LEVEL_DEBUG, "binding station to interface "

634

"'%s'", iface);

635

636

if (wpa_auth_sta_set_vlan(sta->wpa_sm, sta->vlan_id) < 0)

637

wpa_printf(MSG_INFO, "Failed to update VLAN-ID for WPA");

638

639

ret = hapd->drv.set_sta_vlan(iface, hapd, sta->addr, sta->vlan_id);

640

if (ret < 0) {

641

hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,

642

HOSTAPD_LEVEL_DEBUG, "could not bind the STA "

643

"entry to vlan_id=%d", sta->vlan_id);

644

}

645

return ret;

646

#else /* CONFIG_NO_VLAN */

647

return 0;

648

#endif /* CONFIG_NO_VLAN */

649

}

650

651

652

#ifdef CONFIG_IEEE80211W

653

654

int ap_check_sa_query_timeout(struct hostapd_data *hapd, struct sta_info *sta)

655

{

656

u32 tu;

657

struct os_time now, passed;

658

os_get_time(&now);

659

os_time_sub(&now, &sta->sa_query_start, &passed);

660

tu = (passed.sec * 1000000 + passed.usec) / 1024;

661

if (hapd->conf->assoc_sa_query_max_timeout < tu) {

662

hostapd_logger(hapd, sta->addr,

663

HOSTAPD_MODULE_IEEE80211,

664

HOSTAPD_LEVEL_DEBUG,

665

"association SA Query timed out");

666

sta->sa_query_timed_out = 1;

667

os_free(sta->sa_query_trans_id);

668

sta->sa_query_trans_id = NULL;

669

sta->sa_query_count = 0;

670

eloop_cancel_timeout(ap_sa_query_timer, hapd, sta);

671

return 1;

672

}

673

674

return 0;

675

}

676

677

678

static void ap_sa_query_timer(void *eloop_ctx, void *timeout_ctx)

679

{

680

struct hostapd_data *hapd = eloop_ctx;

681

struct sta_info *sta = timeout_ctx;

682

unsigned int timeout, sec, usec;

683

u8 *trans_id, *nbuf;

684

685

if (sta->sa_query_count > 0 &&

686

ap_check_sa_query_timeout(hapd, sta))

687

return;

688

689

nbuf = os_realloc(sta->sa_query_trans_id,

690

(sta->sa_query_count + 1) * WLAN_SA_QUERY_TR_ID_LEN);

691

if (nbuf == NULL)

692

return;

693

if (sta->sa_query_count == 0) {

694

/* Starting a new SA Query procedure */

695

os_get_time(&sta->sa_query_start);

696

}

697

trans_id = nbuf + sta->sa_query_count * WLAN_SA_QUERY_TR_ID_LEN;

698

sta->sa_query_trans_id = nbuf;

699

sta->sa_query_count++;

700

701

os_get_random(trans_id, WLAN_SA_QUERY_TR_ID_LEN);

702

703

timeout = hapd->conf->assoc_sa_query_retry_timeout;

704

sec = ((timeout / 1000) * 1024) / 1000;

705

usec = (timeout % 1000) * 1024;

706

eloop_register_timeout(sec, usec, ap_sa_query_timer, hapd, sta);

707

708

hostapd_logger(hapd, sta->addr, HOSTAPD_MODULE_IEEE80211,

709

HOSTAPD_LEVEL_DEBUG,

710

"association SA Query attempt %d", sta->sa_query_count);

711

712

#ifdef NEED_AP_MLME

713

ieee802_11_send_sa_query_req(hapd, sta->addr, trans_id);

714

#endif /* NEED_AP_MLME */

715

}

716

717

718

void ap_sta_start_sa_query(struct hostapd_data *hapd, struct sta_info *sta)

719

{

720

ap_sa_query_timer(hapd, sta);

721

}

722

723

724

void ap_sta_stop_sa_query(struct hostapd_data *hapd, struct sta_info *sta)

725

{

726

eloop_cancel_timeout(ap_sa_query_timer, hapd, sta);

727

os_free(sta->sa_query_trans_id);

728

sta->sa_query_trans_id = NULL;

729

sta->sa_query_count = 0;

730

}

731

732

#endif /* CONFIG_IEEE80211W */

733

734

735

void ap_sta_disconnect(struct hostapd_data *hapd, struct sta_info *sta,

736

const u8 *addr, u16 reason)

737

{

738

739

if (sta == NULL && addr)

740

sta = ap_get_sta(hapd, addr);

741

742

if (addr)

743

hapd->drv.sta_deauth(hapd, addr, reason);

744

745

if (sta == NULL)

746

return;

747

sta->flags &= ~(WLAN_STA_AUTH | WLAN_STA_ASSOC | WLAN_STA_AUTHORIZED);

748

eloop_cancel_timeout(ap_handle_timer, hapd, sta);

749

eloop_register_timeout(0, 0, ap_handle_timer, hapd, sta);

750

sta->timeout_next = STA_REMOVE;

751

}

Older »