~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/vlan_init.c

* hostapd / VLAN initialization

* 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 "hostapd.h"

#include "ap_config.h"

#include "vlan_init.h"

#ifdef CONFIG_FULL_DYNAMIC_VLAN

#include <net/if.h>

#include <sys/ioctl.h>

#include <linux/sockios.h>

#include <linux/if_vlan.h>

#include <linux/if_bridge.h>

#include "drivers/priv_netlink.h"

#include "utils/eloop.h"

struct full_dynamic_vlan {

int s; /* socket on which to listen for new/removed interfaces. */

};

static int ifconfig_helper(const char *if_name, int up)

{

int fd;

struct ifreq ifr;

if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {

wpa_printf(MSG_ERROR, "VLAN: %s: socket(AF_INET,SOCK_STREAM) "

"failed: %s", __func__, strerror(errno));

return -1;

}

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

os_strlcpy(ifr.ifr_name, if_name, IFNAMSIZ);

if (ioctl(fd, SIOCGIFFLAGS, &ifr) != 0) {

wpa_printf(MSG_ERROR, "VLAN: %s: ioctl(SIOCGIFFLAGS) failed "

"for interface %s: %s",

__func__, if_name, strerror(errno));

close(fd);

return -1;

}

if (up)

ifr.ifr_flags |= IFF_UP;

else

ifr.ifr_flags &= ~IFF_UP;

if (ioctl(fd, SIOCSIFFLAGS, &ifr) != 0) {

wpa_printf(MSG_ERROR, "VLAN: %s: ioctl(SIOCSIFFLAGS) failed "

"for interface %s (up=%d): %s",

__func__, if_name, up, strerror(errno));

close(fd);

return -1;

}

close(fd);

return 0;

}

static int ifconfig_up(const char *if_name)

{

wpa_printf(MSG_DEBUG, "VLAN: Set interface %s up", if_name);

return ifconfig_helper(if_name, 1);

}

static int ifconfig_down(const char *if_name)

{

wpa_printf(MSG_DEBUG, "VLAN: Set interface %s down", if_name);

return ifconfig_helper(if_name, 0);

}

* These are only available in recent linux headers (without the leading

* underscore).

100

#define _GET_VLAN_REALDEV_NAME_CMD 8

101

#define _GET_VLAN_VID_CMD 9

102

103

/* This value should be 256 ONLY. If it is something else, then hostapd

104

* might crash!, as this value has been hard-coded in 2.4.x kernel

105

* bridging code.

106

107

#define MAX_BR_PORTS 256

108

109

static int br_delif(const char *br_name, const char *if_name)

110

{

111

int fd;

112

struct ifreq ifr;

113

unsigned long args[2];

114

int if_index;

115

116

wpa_printf(MSG_DEBUG, "VLAN: br_delif(%s, %s)", br_name, if_name);

117

if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {

118

wpa_printf(MSG_ERROR, "VLAN: %s: socket(AF_INET,SOCK_STREAM) "

119

"failed: %s", __func__, strerror(errno));

120

return -1;

121

}

122

123

if_index = if_nametoindex(if_name);

124

125

if (if_index == 0) {

126

wpa_printf(MSG_ERROR, "VLAN: %s: Failure determining "

127

"interface index for '%s'",

128

__func__, if_name);

129

close(fd);

130

return -1;

131

}

132

133

args[0] = BRCTL_DEL_IF;

134

args[1] = if_index;

135

136

os_strlcpy(ifr.ifr_name, br_name, sizeof(ifr.ifr_name));

137

ifr.ifr_data = (__caddr_t) args;

138

139

if (ioctl(fd, SIOCDEVPRIVATE, &ifr) < 0 && errno != EINVAL) {

140

/* No error if interface already removed. */

141

wpa_printf(MSG_ERROR, "VLAN: %s: ioctl[SIOCDEVPRIVATE,"

142

"BRCTL_DEL_IF] failed for br_name=%s if_name=%s: "

143

"%s", __func__, br_name, if_name, strerror(errno));

144

close(fd);

145

return -1;

146

}

147

148

close(fd);

149

return 0;

150

}

151

152

153

154

Add interface 'if_name' to the bridge 'br_name'

155

156

returns -1 on error

157

returns 1 if the interface is already part of the bridge

158

returns 0 otherwise

159

160

static int br_addif(const char *br_name, const char *if_name)

161

{

162

int fd;

163

struct ifreq ifr;

164

unsigned long args[2];

165

int if_index;

166

167

wpa_printf(MSG_DEBUG, "VLAN: br_addif(%s, %s)", br_name, if_name);

168

if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {

169

wpa_printf(MSG_ERROR, "VLAN: %s: socket(AF_INET,SOCK_STREAM) "

170

"failed: %s", __func__, strerror(errno));

171

return -1;

172

}

173

174

if_index = if_nametoindex(if_name);

175

176

if (if_index == 0) {

177

wpa_printf(MSG_ERROR, "VLAN: %s: Failure determining "

178

"interface index for '%s'",

179

__func__, if_name);

180

close(fd);

181

return -1;

182

}

183

184

args[0] = BRCTL_ADD_IF;

185

args[1] = if_index;

186

187

os_strlcpy(ifr.ifr_name, br_name, sizeof(ifr.ifr_name));

188

ifr.ifr_data = (__caddr_t) args;

189

190

if (ioctl(fd, SIOCDEVPRIVATE, &ifr) < 0) {

191

if (errno == EBUSY) {

192

/* The interface is already added. */

193

close(fd);

194

return 1;

195

}

196

197

wpa_printf(MSG_ERROR, "VLAN: %s: ioctl[SIOCDEVPRIVATE,"

198

"BRCTL_ADD_IF] failed for br_name=%s if_name=%s: "

199

"%s", __func__, br_name, if_name, strerror(errno));

200

close(fd);

201

return -1;

202

}

203

204

close(fd);

205

return 0;

206

}

207

208

209

static int br_delbr(const char *br_name)

210

{

211

int fd;

212

unsigned long arg[2];

213

214

wpa_printf(MSG_DEBUG, "VLAN: br_delbr(%s)", br_name);

215

if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {

216

wpa_printf(MSG_ERROR, "VLAN: %s: socket(AF_INET,SOCK_STREAM) "

217

"failed: %s", __func__, strerror(errno));

218

return -1;

219

}

220

221

arg[0] = BRCTL_DEL_BRIDGE;

222

arg[1] = (unsigned long) br_name;

223

224

if (ioctl(fd, SIOCGIFBR, arg) < 0 && errno != ENXIO) {

225

/* No error if bridge already removed. */

226

wpa_printf(MSG_ERROR, "VLAN: %s: BRCTL_DEL_BRIDGE failed for "

227

"%s: %s", __func__, br_name, strerror(errno));

228

close(fd);

229

return -1;

230

}

231

232

close(fd);

233

return 0;

234

}

235

236

237

238

Add a bridge with the name 'br_name'.

239

240

returns -1 on error

241

returns 1 if the bridge already exists

242

returns 0 otherwise

243

244

static int br_addbr(const char *br_name)

245

{

246

int fd;

247

unsigned long arg[4];

248

struct ifreq ifr;

249

250

wpa_printf(MSG_DEBUG, "VLAN: br_addbr(%s)", br_name);

251

if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {

252

wpa_printf(MSG_ERROR, "VLAN: %s: socket(AF_INET,SOCK_STREAM) "

253

"failed: %s", __func__, strerror(errno));

254

return -1;

255

}

256

257

arg[0] = BRCTL_ADD_BRIDGE;

258

arg[1] = (unsigned long) br_name;

259

260

if (ioctl(fd, SIOCGIFBR, arg) < 0) {

261

if (errno == EEXIST) {

262

/* The bridge is already added. */

263

close(fd);

264

return 1;

265

} else {

266

wpa_printf(MSG_ERROR, "VLAN: %s: BRCTL_ADD_BRIDGE "

267

"failed for %s: %s",

268

__func__, br_name, strerror(errno));

269

close(fd);

270

return -1;

271

}

272

}

273

274

/* Decrease forwarding delay to avoid EAPOL timeouts. */

275

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

276

os_strlcpy(ifr.ifr_name, br_name, IFNAMSIZ);

277

arg[0] = BRCTL_SET_BRIDGE_FORWARD_DELAY;

278

arg[1] = 1;

279

arg[2] = 0;

280

arg[3] = 0;

281

ifr.ifr_data = (char *) &arg;

282

if (ioctl(fd, SIOCDEVPRIVATE, &ifr) < 0) {

283

wpa_printf(MSG_ERROR, "VLAN: %s: "

284

"BRCTL_SET_BRIDGE_FORWARD_DELAY (1 sec) failed for "

285

"%s: %s", __func__, br_name, strerror(errno));

286

/* Continue anyway */

287

}

288

289

close(fd);

290

return 0;

291

}

292

293

294

static int br_getnumports(const char *br_name)

295

{

296

int fd;

297

int i;

298

int port_cnt = 0;

299

unsigned long arg[4];

300

int ifindices[MAX_BR_PORTS];

301

struct ifreq ifr;

302

303

if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {

304

wpa_printf(MSG_ERROR, "VLAN: %s: socket(AF_INET,SOCK_STREAM) "

305

"failed: %s", __func__, strerror(errno));

306

return -1;

307

}

308

309

arg[0] = BRCTL_GET_PORT_LIST;

310

arg[1] = (unsigned long) ifindices;

311

arg[2] = MAX_BR_PORTS;

312

arg[3] = 0;

313

314

os_memset(ifindices, 0, sizeof(ifindices));

315

os_strlcpy(ifr.ifr_name, br_name, sizeof(ifr.ifr_name));

316

ifr.ifr_data = (__caddr_t) arg;

317

318

if (ioctl(fd, SIOCDEVPRIVATE, &ifr) < 0) {

319

wpa_printf(MSG_ERROR, "VLAN: %s: BRCTL_GET_PORT_LIST "

320

"failed for %s: %s",

321

__func__, br_name, strerror(errno));

322

close(fd);

323

return -1;

324

}

325

326

for (i = 1; i < MAX_BR_PORTS; i++) {

327

if (ifindices[i] > 0) {

328

port_cnt++;

329

}

330

}

331

332

close(fd);

333

return port_cnt;

334

}

335

336

337

static int vlan_rem(const char *if_name)

338

{

339

int fd;

340

struct vlan_ioctl_args if_request;

341

342

wpa_printf(MSG_DEBUG, "VLAN: vlan_rem(%s)", if_name);

343

if ((os_strlen(if_name) + 1) > sizeof(if_request.device1)) {

344

wpa_printf(MSG_ERROR, "VLAN: Interface name too long: '%s'",

345

if_name);

346

return -1;

347

}

348

349

if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {

350

wpa_printf(MSG_ERROR, "VLAN: %s: socket(AF_INET,SOCK_STREAM) "

351

"failed: %s", __func__, strerror(errno));

352

return -1;

353

}

354

355

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

356

357

os_strlcpy(if_request.device1, if_name, sizeof(if_request.device1));

358

if_request.cmd = DEL_VLAN_CMD;

359

360

if (ioctl(fd, SIOCSIFVLAN, &if_request) < 0) {

361

wpa_printf(MSG_ERROR, "VLAN: %s: DEL_VLAN_CMD failed for %s: "

362

"%s", __func__, if_name, strerror(errno));

363

close(fd);

364

return -1;

365

}

366

367

close(fd);

368

return 0;

369

}

370

371

372

373

Add a vlan interface with VLAN ID 'vid' and tagged interface

374

'if_name'.

375

376

returns -1 on error

377

returns 1 if the interface already exists

378

returns 0 otherwise

379

380

static int vlan_add(const char *if_name, int vid)

381

{

382

int fd;

383

struct vlan_ioctl_args if_request;

384

385

wpa_printf(MSG_DEBUG, "VLAN: vlan_add(if_name=%s, vid=%d)",

386

if_name, vid);

387

ifconfig_up(if_name);

388

389

if ((os_strlen(if_name) + 1) > sizeof(if_request.device1)) {

390

wpa_printf(MSG_ERROR, "VLAN: Interface name too long: '%s'",

391

if_name);

392

return -1;

393

}

394

395

if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {

396

wpa_printf(MSG_ERROR, "VLAN: %s: socket(AF_INET,SOCK_STREAM) "

397

"failed: %s", __func__, strerror(errno));

398

return -1;

399

}

400

401

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

402

403

/* Determine if a suitable vlan device already exists. */

404

405

os_snprintf(if_request.device1, sizeof(if_request.device1), "vlan%d",

406

vid);

407

408

if_request.cmd = _GET_VLAN_VID_CMD;

409

410

if (ioctl(fd, SIOCSIFVLAN, &if_request) == 0) {

411

412

if (if_request.u.VID == vid) {

413

if_request.cmd = _GET_VLAN_REALDEV_NAME_CMD;

414

415

if (ioctl(fd, SIOCSIFVLAN, &if_request) == 0 &&

416

os_strncmp(if_request.u.device2, if_name,

417

sizeof(if_request.u.device2)) == 0) {

418

close(fd);

419

wpa_printf(MSG_DEBUG, "VLAN: vlan_add: "

420

"if_name %s exists already",

421

if_request.device1);

422

return 1;

423

}

424

}

425

}

426

427

/* A suitable vlan device does not already exist, add one. */

428

429

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

430

os_strlcpy(if_request.device1, if_name, sizeof(if_request.device1));

431

if_request.u.VID = vid;

432

if_request.cmd = ADD_VLAN_CMD;

433

434

if (ioctl(fd, SIOCSIFVLAN, &if_request) < 0) {

435

wpa_printf(MSG_ERROR, "VLAN: %s: ADD_VLAN_CMD failed for %s: "

436

"%s",

437

__func__, if_request.device1, strerror(errno));

438

close(fd);

439

return -1;

440

}

441

442

close(fd);

443

return 0;

444

}

445

446

447

static int vlan_set_name_type(unsigned int name_type)

448

{

449

int fd;

450

struct vlan_ioctl_args if_request;

451

452

wpa_printf(MSG_DEBUG, "VLAN: vlan_set_name_type(name_type=%u)",

453

name_type);

454

if ((fd = socket(AF_INET, SOCK_STREAM, 0)) < 0) {

455

wpa_printf(MSG_ERROR, "VLAN: %s: socket(AF_INET,SOCK_STREAM) "

456

"failed: %s", __func__, strerror(errno));

457

return -1;

458

}

459

460

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

461

462

if_request.u.name_type = name_type;

463

if_request.cmd = SET_VLAN_NAME_TYPE_CMD;

464

if (ioctl(fd, SIOCSIFVLAN, &if_request) < 0) {

465

wpa_printf(MSG_ERROR, "VLAN: %s: SET_VLAN_NAME_TYPE_CMD "

466

"name_type=%u failed: %s",

467

__func__, name_type, strerror(errno));

468

close(fd);

469

return -1;

470

}

471

472

close(fd);

473

return 0;

474

}

475

476

477

static void vlan_newlink(char *ifname, struct hostapd_data *hapd)

478

{

479

char vlan_ifname[IFNAMSIZ];

480

char br_name[IFNAMSIZ];

481

struct hostapd_vlan *vlan = hapd->conf->vlan;

482

char *tagged_interface = hapd->conf->ssid.vlan_tagged_interface;

483

484

wpa_printf(MSG_DEBUG, "VLAN: vlan_newlink(%s)", ifname);

485

486

while (vlan) {

487

if (os_strcmp(ifname, vlan->ifname) == 0) {

488

489

os_snprintf(br_name, sizeof(br_name), "brvlan%d",

490

vlan->vlan_id);

491

492

if (!br_addbr(br_name))

493

vlan->clean |= DVLAN_CLEAN_BR;

494

495

ifconfig_up(br_name);

496

497

if (tagged_interface) {

498

499

if (!vlan_add(tagged_interface, vlan->vlan_id))

500

vlan->clean |= DVLAN_CLEAN_VLAN;

501

502

os_snprintf(vlan_ifname, sizeof(vlan_ifname),

503

"vlan%d", vlan->vlan_id);

504

505

if (!br_addif(br_name, vlan_ifname))

506

vlan->clean |= DVLAN_CLEAN_VLAN_PORT;

507

508

ifconfig_up(vlan_ifname);

509

}

510

511

if (!br_addif(br_name, ifname))

512

vlan->clean |= DVLAN_CLEAN_WLAN_PORT;

513

514

ifconfig_up(ifname);

515

516

break;

517

}

518

vlan = vlan->next;

519

}

520

}

521

522

523

static void vlan_dellink(char *ifname, struct hostapd_data *hapd)

524

{

525

char vlan_ifname[IFNAMSIZ];

526

char br_name[IFNAMSIZ];

527

struct hostapd_vlan *first, *prev, *vlan = hapd->conf->vlan;

528

char *tagged_interface = hapd->conf->ssid.vlan_tagged_interface;

529

530

wpa_printf(MSG_DEBUG, "VLAN: vlan_dellink(%s)", ifname);

531

532

first = prev = vlan;

533

534

while (vlan) {

535

if (os_strcmp(ifname, vlan->ifname) == 0) {

536

os_snprintf(br_name, sizeof(br_name), "brvlan%d",

537

vlan->vlan_id);

538

539

if (vlan->clean & DVLAN_CLEAN_WLAN_PORT)

540

br_delif(br_name, vlan->ifname);

541

542

if (tagged_interface) {

543

os_snprintf(vlan_ifname, sizeof(vlan_ifname),

544

"vlan%d", vlan->vlan_id);

545

if (vlan->clean & DVLAN_CLEAN_VLAN_PORT)

546

br_delif(br_name, vlan_ifname);

547

ifconfig_down(vlan_ifname);

548

549

if (vlan->clean & DVLAN_CLEAN_VLAN)

550

vlan_rem(vlan_ifname);

551

}

552

553

if ((vlan->clean & DVLAN_CLEAN_BR) &&

554

br_getnumports(br_name) == 0) {

555

ifconfig_down(br_name);

556

br_delbr(br_name);

557

}

558

559

if (vlan == first) {

560

hapd->conf->vlan = vlan->next;

561

} else {

562

prev->next = vlan->next;

563

}

564

os_free(vlan);

565

566

break;

567

}

568

prev = vlan;

569

vlan = vlan->next;

570

}

571

}

572

573

574

static void

575

vlan_read_ifnames(struct nlmsghdr *h, size_t len, int del,

576

struct hostapd_data *hapd)

577

{

578

struct ifinfomsg *ifi;

579

int attrlen, nlmsg_len, rta_len;

580

struct rtattr *attr;

581

582

if (len < sizeof(*ifi))

583

return;

584

585

ifi = NLMSG_DATA(h);

586

587

nlmsg_len = NLMSG_ALIGN(sizeof(struct ifinfomsg));

588

589

attrlen = h->nlmsg_len - nlmsg_len;

590

if (attrlen < 0)

591

return;

592

593

attr = (struct rtattr *) (((char *) ifi) + nlmsg_len);

594

595

rta_len = RTA_ALIGN(sizeof(struct rtattr));

596

while (RTA_OK(attr, attrlen)) {

597

char ifname[IFNAMSIZ + 1];

598

599

if (attr->rta_type == IFLA_IFNAME) {

600

int n = attr->rta_len - rta_len;

601

if (n < 0)

602

break;

603

604

os_memset(ifname, 0, sizeof(ifname));

605

606

if ((size_t) n > sizeof(ifname))

607

n = sizeof(ifname);

608

os_memcpy(ifname, ((char *) attr) + rta_len, n);

609

610

if (del)

611

vlan_dellink(ifname, hapd);

612

else

613

vlan_newlink(ifname, hapd);

614

}

615

616

attr = RTA_NEXT(attr, attrlen);

617

}

618

}

619

620

621

static void vlan_event_receive(int sock, void *eloop_ctx, void *sock_ctx)

622

{

623

char buf[8192];

624

int left;

625

struct sockaddr_nl from;

626

socklen_t fromlen;

627

struct nlmsghdr *h;

628

struct hostapd_data *hapd = eloop_ctx;

629

630

fromlen = sizeof(from);

631

left = recvfrom(sock, buf, sizeof(buf), MSG_DONTWAIT,

632

(struct sockaddr *) &from, &fromlen);

633

if (left < 0) {

634

if (errno != EINTR && errno != EAGAIN)

635

wpa_printf(MSG_ERROR, "VLAN: %s: recvfrom failed: %s",

636

__func__, strerror(errno));

637

return;

638

}

639

640

h = (struct nlmsghdr *) buf;

641

while (left >= (int) sizeof(*h)) {

642

int len, plen;

643

644

len = h->nlmsg_len;

645

plen = len - sizeof(*h);

646

if (len > left || plen < 0) {

647

wpa_printf(MSG_DEBUG, "VLAN: Malformed netlink "

648

"message: len=%d left=%d plen=%d",

649

len, left, plen);

650

break;

651

}

652

653

switch (h->nlmsg_type) {

654

case RTM_NEWLINK:

655

vlan_read_ifnames(h, plen, 0, hapd);

656

break;

657

case RTM_DELLINK:

658

vlan_read_ifnames(h, plen, 1, hapd);

659

break;

660

}

661

662

len = NLMSG_ALIGN(len);

663

left -= len;

664

h = (struct nlmsghdr *) ((char *) h + len);

665

}

666

667

if (left > 0) {

668

wpa_printf(MSG_DEBUG, "VLAN: %s: %d extra bytes in the end of "

669

"netlink message", __func__, left);

670

}

671

}

672

673

674

static struct full_dynamic_vlan *

675

full_dynamic_vlan_init(struct hostapd_data *hapd)

676

{

677

struct sockaddr_nl local;

678

struct full_dynamic_vlan *priv;

679

680

priv = os_zalloc(sizeof(*priv));

681

if (priv == NULL)

682

return NULL;

683

684

vlan_set_name_type(VLAN_NAME_TYPE_PLUS_VID_NO_PAD);

685

686

priv->s = socket(PF_NETLINK, SOCK_RAW, NETLINK_ROUTE);

687

if (priv->s < 0) {

688

wpa_printf(MSG_ERROR, "VLAN: %s: socket(PF_NETLINK,SOCK_RAW,"

689

"NETLINK_ROUTE) failed: %s",

690

__func__, strerror(errno));

691

os_free(priv);

692

return NULL;

693

}

694

695

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

696

local.nl_family = AF_NETLINK;

697

local.nl_groups = RTMGRP_LINK;

698

if (bind(priv->s, (struct sockaddr *) &local, sizeof(local)) < 0) {

699

wpa_printf(MSG_ERROR, "VLAN: %s: bind(netlink) failed: %s",

700

__func__, strerror(errno));

701

close(priv->s);

702

os_free(priv);

703

return NULL;

704

}

705

706

if (eloop_register_read_sock(priv->s, vlan_event_receive, hapd, NULL))

707

{

708

close(priv->s);

709

os_free(priv);

710

return NULL;

711

}

712

713

return priv;

714

}

715

716

717

static void full_dynamic_vlan_deinit(struct full_dynamic_vlan *priv)

718

{

719

if (priv == NULL)

720

return;

721

eloop_unregister_read_sock(priv->s);

722

close(priv->s);

723

os_free(priv);

724

}

725

#endif /* CONFIG_FULL_DYNAMIC_VLAN */

726

727

728

int vlan_setup_encryption_dyn(struct hostapd_data *hapd,

729

struct hostapd_ssid *mssid, const char *dyn_vlan)

730

{

731

int i;

732

733

if (dyn_vlan == NULL)

734

return 0;

735

736

/* Static WEP keys are set here; IEEE 802.1X and WPA uses their own

737

* functions for setting up dynamic broadcast keys. */

738

for (i = 0; i < 4; i++) {

739

if (mssid->wep.key[i] &&

740

hapd->drv.set_key(dyn_vlan, hapd, WPA_ALG_WEP, NULL, i,

741

i == mssid->wep.idx, NULL, 0,

742

mssid->wep.key[i], mssid->wep.len[i])) {

743

wpa_printf(MSG_ERROR, "VLAN: Could not set WEP "

744

"encryption for dynamic VLAN");

745

return -1;

746

}

747

}

748

749

return 0;

750

}

751

752

753

static int vlan_dynamic_add(struct hostapd_data *hapd,

754

struct hostapd_vlan *vlan)

755

{

756

while (vlan) {

757

if (vlan->vlan_id != VLAN_ID_WILDCARD) {

758

if (hapd->drv.vlan_if_add(hapd, vlan->ifname)) {

759

if (errno != EEXIST) {

760

wpa_printf(MSG_ERROR, "VLAN: Could "

761

"not add VLAN %s: %s",

762

vlan->ifname,

763

strerror(errno));

764

return -1;

765

}

766

}

767

#ifdef CONFIG_FULL_DYNAMIC_VLAN

768

ifconfig_up(vlan->ifname);

769

#endif /* CONFIG_FULL_DYNAMIC_VLAN */

770

}

771

772

vlan = vlan->next;

773

}

774

775

return 0;

776

}

777

778

779

static void vlan_dynamic_remove(struct hostapd_data *hapd,

780

struct hostapd_vlan *vlan)

781

{

782

struct hostapd_vlan *next;

783

784

while (vlan) {

785

next = vlan->next;

786

787

if (vlan->vlan_id != VLAN_ID_WILDCARD &&

788

hapd->drv.vlan_if_remove(hapd, vlan->ifname)) {

789

wpa_printf(MSG_ERROR, "VLAN: Could not remove VLAN "

790

"iface: %s: %s",

791

vlan->ifname, strerror(errno));

792

}

793

#ifdef CONFIG_FULL_DYNAMIC_VLAN

794

if (vlan->clean)

795

vlan_dellink(vlan->ifname, hapd);

796

#endif /* CONFIG_FULL_DYNAMIC_VLAN */

797

798

vlan = next;

799

}

800

}

801

802

803

int vlan_init(struct hostapd_data *hapd)

804

{

805

#ifdef CONFIG_FULL_DYNAMIC_VLAN

806

hapd->full_dynamic_vlan = full_dynamic_vlan_init(hapd);

807

#endif /* CONFIG_FULL_DYNAMIC_VLAN */

808

809

if (vlan_dynamic_add(hapd, hapd->conf->vlan))

810

return -1;

811

812

return 0;

813

}

814

815

816

void vlan_deinit(struct hostapd_data *hapd)

817

{

818

vlan_dynamic_remove(hapd, hapd->conf->vlan);

819

820

#ifdef CONFIG_FULL_DYNAMIC_VLAN

821

full_dynamic_vlan_deinit(hapd->full_dynamic_vlan);

822

#endif /* CONFIG_FULL_DYNAMIC_VLAN */

823

}

824

825

826

struct hostapd_vlan * vlan_add_dynamic(struct hostapd_data *hapd,

827

struct hostapd_vlan *vlan,

828

int vlan_id)

829

{

830

struct hostapd_vlan *n;

831

char *ifname, *pos;

832

833

if (vlan == NULL || vlan_id <= 0 || vlan_id > MAX_VLAN_ID ||

834

vlan->vlan_id != VLAN_ID_WILDCARD)

835

return NULL;

836

837

wpa_printf(MSG_DEBUG, "VLAN: %s(vlan_id=%d ifname=%s)",

838

__func__, vlan_id, vlan->ifname);

839

ifname = os_strdup(vlan->ifname);

840

if (ifname == NULL)

841

return NULL;

842

pos = os_strchr(ifname, '#');

843

if (pos == NULL) {

844

os_free(ifname);

845

return NULL;

846

}

847

*pos++ = '\0';

848

849

n = os_zalloc(sizeof(*n));

850

if (n == NULL) {

851

os_free(ifname);

852

return NULL;

853

}

854

855

n->vlan_id = vlan_id;

856

n->dynamic_vlan = 1;

857

858

os_snprintf(n->ifname, sizeof(n->ifname), "%s%d%s", ifname, vlan_id,

859

pos);

860

os_free(ifname);

861

862

if (hapd->drv.vlan_if_add(hapd, n->ifname)) {

863

os_free(n);

864

return NULL;

865

}

866

867

n->next = hapd->conf->vlan;

868

hapd->conf->vlan = n;

869

870

#ifdef CONFIG_FULL_DYNAMIC_VLAN

871

ifconfig_up(n->ifname);

872

#endif /* CONFIG_FULL_DYNAMIC_VLAN */

873

874

return n;

875

}

876

877

878

int vlan_remove_dynamic(struct hostapd_data *hapd, int vlan_id)

879

{

880

struct hostapd_vlan *vlan;

881

882

if (vlan_id <= 0 || vlan_id > MAX_VLAN_ID)

883

return 1;

884

885

wpa_printf(MSG_DEBUG, "VLAN: %s(vlan_id=%d)", __func__, vlan_id);

886

887

vlan = hapd->conf->vlan;

888

while (vlan) {

889

if (vlan->vlan_id == vlan_id && vlan->dynamic_vlan > 0) {

890

vlan->dynamic_vlan--;

891

break;

892

}

893

vlan = vlan->next;

894

}

895

896

if (vlan == NULL)

897

return 1;

898

899

if (vlan->dynamic_vlan == 0)

900

hapd->drv.vlan_if_remove(hapd, vlan->ifname);

901

902

return 0;

903

}

Older »