~ubuntu-branches/ubuntu/gutsy/wpasupplicant/gutsy

Viewing changes to wpa_supplicant/ctrl_iface_unix.c

Committer: Bazaar Package Importer
Author(s): Reinhard Tartler, Alexander Sack
Date: 2007-08-26 16:06:57 UTC
mfrom: (1.1.9 upstream)
Revision ID: james.westby@ubuntu.com-20070826160657-2m8pxoweuxe8f93t

Tags: 0.6.0+0.5.8-0ubuntu1

* New upstream release
* remove patch 11_erroneous_manpage_ref, applied upstream
* remove patch 25_wpas_dbus_unregister_iface_fix, applied upstream

[ Alexander Sack ]
* bumping upstream version to replace development version 0.6.0 with
  this package from stable release branch.
* attempt to fix wierd timeout and high latency issues by going
  back to stable upstream version (0.5.9) (LP: #140763,
  LP: #141233).

files added:
ChangeLog

Makefile

README-Windows.txt

aes.c

aes.h

aes_wrap.c

aes_wrap.h

asn1.c

asn1.h

asn1_test.c

base64.c

base64.h

bignum.c

bignum.h

build_config.h

common.c

common.h

config.c

config.h

config_file.c

config_none.c

config_ssid.h

config_types.h

config_winreg.c

crypto.c

crypto.h

crypto_cryptoapi.c

crypto_gnutls.c

crypto_internal.c

crypto_libtomcrypt.c

crypto_none.c

ctrl_iface.c

ctrl_iface.h

ctrl_iface_dbus.c

ctrl_iface_dbus.h

ctrl_iface_dbus_handlers.c

ctrl_iface_dbus_handlers.h

ctrl_iface_named_pipe.c

ctrl_iface_udp.c

ctrl_iface_unix.c

dbus-wpa_supplicant.conf

dbus_dict_helpers.c

dbus_dict_helpers.h

debian/functions.sh

debian/ifupdown.sh

debian/patches/01_config.dpatch

debian/patches/02_debian_doc_examples.dpatch

debian/patches/10_orinoco_wep_key_fix.dpatch

debian/patches/20_include_madwifi.dpatch

debian/patches/21_madwifi_r1794_includes.dpatch

debian/patches/21_madwifiold_20060207_includes.dpatch

debian/wpa_action.8

debian/wpa_action.sh

debian/wpa_supplicant.init-daemon

debian/wpasupplicant.preinst

defconfig

defs.h

des.c

doc/code_structure.doxygen

doc/ctrl_iface.doxygen

doc/docbook

doc/docbook/Makefile

doc/docbook/wpa_background.8

doc/docbook/wpa_background.sgml

doc/docbook/wpa_cli.8

doc/docbook/wpa_cli.sgml

doc/docbook/wpa_passphrase.8

doc/docbook/wpa_passphrase.sgml

doc/docbook/wpa_supplicant.8

doc/docbook/wpa_supplicant.conf.5

doc/docbook/wpa_supplicant.conf.sgml

doc/docbook/wpa_supplicant.sgml

doc/doxygen.fast

doc/doxygen.full

doc/driver_wrapper.doxygen

doc/eap.doxygen

doc/kerneldoc2doxygen.pl

doc/mainpage.doxygen

doc/porting.doxygen

doc/testing_tools.doxygen

doc/wpa_supplicant.fig

driver.h

driver_atmel.c

driver_broadcom.c

driver_bsd.c

driver_hostap.c

driver_hostap.h

driver_ipw.c

driver_madwifi.c

driver_ndis.c

driver_ndis.h

driver_ndis_.c

driver_ndiswrapper.c

driver_prism54.c

driver_test.c

driver_wext.c

driver_wext.h

driver_wired.c

drivers.c

eap.c

eap.h

eap_aka.c

eap_defs.h

eap_fast.c

eap_gpsk.c

eap_gpsk_common.c

eap_gpsk_common.h

eap_gtc.c

eap_i.h

eap_leap.c

eap_md5.c

eap_methods.c

eap_methods.h

eap_mschapv2.c

eap_otp.c

eap_pax.c

eap_pax_common.c

eap_pax_common.h

eap_peap.c

eap_psk.c

eap_psk_common.c

eap_psk_common.h

eap_sake.c

eap_sake_common.c

eap_sake_common.h

eap_sim.c

eap_sim_common.c

eap_sim_common.h

eap_testing.txt

eap_tls.c

eap_tls_common.c

eap_tls_common.h

eap_tlv.c

eap_tlv.h

eap_ttls.c

eap_ttls.h

eap_vendor_test.c

eapol_sm.c

eapol_sm.h

eapol_test.c

eloop.c

eloop.h

eloop_none.c

eloop_win.c

events.c

examples

examples/ieee8021x.conf

examples/plaintext.conf

examples/wep.conf

examples/wpa-psk-tkip.conf

examples/wpa2-eap-ccmp.conf

hostapd.h

includes.h

l2_packet.h

l2_packet_freebsd.c

l2_packet_linux.c

l2_packet_ndis.c

l2_packet_none.c

l2_packet_pcap.c

l2_packet_winpcap.c

libtommath.c

main.c

main_none.c

main_winmain.c

main_winsvc.c

md4.c

md5.c

md5.h

mlme.c

mlme.h

ms_funcs.c

ms_funcs.h

ndis_events.c

nmake.mak

openssl-0.9.8d-tls-extensions.patch

openssl-0.9.8e-tls-extensions.patch

openssl-tls-extensions.patch

os.h

os_internal.c

os_none.c

os_unix.c

os_win32.c

pcsc_funcs.c

pcsc_funcs.h

pmksa_cache.c

pmksa_cache.h

preauth.c

preauth.h

preauth_test.c

priv_netlink.h

radius.c

radius.h

radius_client.c

radius_client.h

rc4.c

rc4.h

rsa.c

rsa.h

sha1.c

sha1.h

sha256.c

sha256.h

state_machine.h

tests

tests/test_aes.c

tests/test_eap_sim_common.c

tests/test_md4.c

tests/test_md5.c

tests/test_ms_funcs.c

tests/test_sha1.c

tests/test_sha256.c

tests/test_x509v3.c

tls.h

tls_gnutls.c

tls_internal.c

tls_none.c

tls_openssl.c

tls_schannel.c

tlsv1_client.c

tlsv1_client.h

tlsv1_common.c

tlsv1_common.h

todo.txt

version.h

vs2005

vs2005/eapol_test

vs2005/eapol_test/eapol_test.vcproj

vs2005/win_if_list

vs2005/win_if_list/win_if_list.vcproj

vs2005/wpa_cli

vs2005/wpa_cli/wpa_cli.vcproj

vs2005/wpa_passphrase

vs2005/wpa_passphrase/wpa_passphrase.vcproj

vs2005/wpa_supplicant

vs2005/wpa_supplicant.sln

vs2005/wpa_supplicant/wpa_supplicant.vcproj

vs2005/wpasvc

vs2005/wpasvc/wpasvc.vcproj

win_example.reg

win_if_list.c

wireless_copy.h

wpa.c

wpa.h

wpa_cli.c

wpa_common.h

wpa_ctrl.c

wpa_ctrl.h

wpa_gui

wpa_gui-qt4

wpa_gui-qt4/eventhistory.cpp

wpa_gui-qt4/eventhistory.h

wpa_gui-qt4/eventhistory.ui

wpa_gui-qt4/main.cpp

wpa_gui-qt4/networkconfig.cpp

wpa_gui-qt4/networkconfig.h

wpa_gui-qt4/networkconfig.ui

wpa_gui-qt4/scanresults.cpp

wpa_gui-qt4/scanresults.h

wpa_gui-qt4/scanresults.ui

wpa_gui-qt4/setup-mingw-cross-compiling

wpa_gui-qt4/userdatarequest.cpp

wpa_gui-qt4/userdatarequest.h

wpa_gui-qt4/userdatarequest.ui

wpa_gui-qt4/wpa_gui.pro

wpa_gui-qt4/wpagui.cpp

wpa_gui-qt4/wpagui.h

wpa_gui-qt4/wpagui.ui

wpa_gui-qt4/wpamsg.h

wpa_gui/eventhistory.ui

wpa_gui/eventhistory.ui.h

wpa_gui/main.cpp

wpa_gui/networkconfig.ui

wpa_gui/networkconfig.ui.h

wpa_gui/scanresults.ui

wpa_gui/scanresults.ui.h

wpa_gui/setup-mingw-cross-compiling

wpa_gui/userdatarequest.ui

wpa_gui/userdatarequest.ui.h

wpa_gui/wpa_gui.pro

wpa_gui/wpagui.ui

wpa_gui/wpagui.ui.h

wpa_gui/wpamsg.h

wpa_i.h

wpa_passphrase.c

wpa_supplicant.c

wpa_supplicant.conf

wpa_supplicant.h

wpa_supplicant_i.h

x509v3.c

x509v3.h

files removed:
debian/dbus-wpa_supplicant.service

debian/dot.config.mk

debian/ifupdown

debian/ifupdown/functions.sh

debian/ifupdown/ifupdown.sh

debian/ifupdown/wpa_action.8

debian/ifupdown/wpa_action.sh

debian/mk-madwifi-header-patch

debian/patches/10_fix_non_wpa_zero_len_ssid.dpatch

debian/patches/20_madwifi_headers

debian/patches/30_dbus_policy.dpatch

debian/patches/40_debian_doc_examples.dpatch

patches

patches/openssl-0.9.8-tls-extensions.patch

patches/openssl-0.9.8d-tls-extensions.patch

patches/openssl-0.9.8e-tls-extensions.patch

src/Makefile

src/common

src/common/Makefile

src/common/defs.h

src/common/ieee802_11_defs.h

src/common/version.h

src/common/wireless_copy.h

src/common/wpa_common.c

src/common/wpa_common.h

src/common/wpa_ctrl.c

src/common/wpa_ctrl.h

src/crypto

src/crypto/Makefile

src/crypto/aes.c

src/crypto/aes.h

src/crypto/aes_wrap.c

src/crypto/aes_wrap.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/des.c

src/crypto/md4.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/rc4.h

src/crypto/sha1.c

src/crypto/sha1.h

src/crypto/sha256.c

src/crypto/sha256.h

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

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_ipw.c

src/drivers/driver_madwifi.c

src/drivers/driver_ndis.c

src/drivers/driver_ndis.h

src/drivers/driver_ndis_.c

src/drivers/driver_ndiswrapper.c

src/drivers/driver_prism54.c

src/drivers/driver_ralink.c

src/drivers/driver_ralink.h

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/ndis_events.c

src/drivers/priv_netlink.h

src/eap_common

src/eap_common/Makefile

src/eap_common/eap_common.c

src/eap_common/eap_common.h

src/eap_common/eap_defs.h

src/eap_common/eap_gpsk_common.c

src/eap_common/eap_gpsk_common.h

src/eap_common/eap_pax_common.c

src/eap_common/eap_pax_common.h

src/eap_common/eap_psk_common.c

src/eap_common/eap_psk_common.h

src/eap_common/eap_sake_common.c

src/eap_common/eap_sake_common.h

src/eap_common/eap_sim_common.c

src/eap_common/eap_sim_common.h

src/eap_common/eap_ttls.h

src/eap_peer

src/eap_peer/Makefile

src/eap_peer/eap.c

src/eap_peer/eap.h

src/eap_peer/eap_aka.c

src/eap_peer/eap_fast.c

src/eap_peer/eap_fast_pac.c

src/eap_peer/eap_fast_pac.h

src/eap_peer/eap_gpsk.c

src/eap_peer/eap_gtc.c

src/eap_peer/eap_i.h

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_otp.c

src/eap_peer/eap_pax.c

src/eap_peer/eap_peap.c

src/eap_peer/eap_psk.c

src/eap_peer/eap_sake.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_tlv.c

src/eap_peer/eap_tlv.h

src/eap_peer/eap_tnc.c

src/eap_peer/eap_ttls.c

src/eap_peer/eap_vendor_test.c

src/eap_peer/tncc.c

src/eap_peer/tncc.h

src/eap_server

src/eap_server/Makefile

src/eap_server/eap.c

src/eap_server/eap.h

src/eap_server/eap_aka.c

src/eap_server/eap_gpsk.c

src/eap_server/eap_gtc.c

src/eap_server/eap_i.h

src/eap_server/eap_identity.c

src/eap_server/eap_md5.c

src/eap_server/eap_methods.c

src/eap_server/eap_methods.h

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_sim_db.c

src/eap_server/eap_sim_db.h

src/eap_server/eap_tls.c

src/eap_server/eap_tls_common.c

src/eap_server/eap_tls_common.h

src/eap_server/eap_tlv.c

src/eap_server/eap_ttls.c

src/eap_server/eap_vendor_test.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/l2_packet

src/l2_packet/Makefile

src/l2_packet/l2_packet.h

src/l2_packet/l2_packet_freebsd.c

src/l2_packet/l2_packet_linux.c

src/l2_packet/l2_packet_ndis.c

src/l2_packet/l2_packet_none.c

src/l2_packet/l2_packet_pcap.c

src/l2_packet/l2_packet_winpcap.c

src/radius

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

src/rsn_supp/Makefile

src/rsn_supp/peerkey.c

src/rsn_supp/peerkey.h

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

src/tls/Makefile

src/tls/asn1.c

src/tls/asn1.h

src/tls/asn1_test.c

src/tls/bignum.c

src/tls/bignum.h

src/tls/libtommath.c

src/tls/rsa.c

src/tls/rsa.h

src/tls/tlsv1_client.c

src/tls/tlsv1_client.h

src/tls/tlsv1_common.c

src/tls/tlsv1_common.h

src/tls/x509v3.c

src/tls/x509v3.h

src/utils

src/utils/Makefile

src/utils/base64.c

src/utils/base64.h

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/includes.h

src/utils/ip_addr.c

src/utils/ip_addr.h

src/utils/os.h

src/utils/os_internal.c

src/utils/os_none.c

src/utils/os_unix.c

src/utils/os_win32.c

src/utils/pcsc_funcs.c

src/utils/pcsc_funcs.h

src/utils/state_machine.h

src/utils/wpa_debug.c

src/utils/wpa_debug.h

wpa_supplicant

wpa_supplicant/ChangeLog

wpa_supplicant/Makefile

wpa_supplicant/README

wpa_supplicant/README-Windows.txt

wpa_supplicant/config.c

wpa_supplicant/config.h

wpa_supplicant/config_file.c

wpa_supplicant/config_none.c

wpa_supplicant/config_ssid.h

wpa_supplicant/config_winreg.c

wpa_supplicant/ctrl_iface.c

wpa_supplicant/ctrl_iface.h

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/ctrl_iface_named_pipe.c

wpa_supplicant/ctrl_iface_udp.c

wpa_supplicant/ctrl_iface_unix.c

wpa_supplicant/dbus-wpa_supplicant.conf

wpa_supplicant/dbus_dict_helpers.c

wpa_supplicant/dbus_dict_helpers.h

wpa_supplicant/defconfig

wpa_supplicant/doc

wpa_supplicant/doc/code_structure.doxygen

wpa_supplicant/doc/ctrl_iface.doxygen

wpa_supplicant/doc/docbook

wpa_supplicant/doc/docbook/Makefile

wpa_supplicant/doc/docbook/wpa_background.8

wpa_supplicant/doc/docbook/wpa_background.sgml

wpa_supplicant/doc/docbook/wpa_cli.8

wpa_supplicant/doc/docbook/wpa_cli.sgml

wpa_supplicant/doc/docbook/wpa_passphrase.8

wpa_supplicant/doc/docbook/wpa_passphrase.sgml

wpa_supplicant/doc/docbook/wpa_supplicant.8

wpa_supplicant/doc/docbook/wpa_supplicant.conf.5

wpa_supplicant/doc/docbook/wpa_supplicant.conf.sgml

wpa_supplicant/doc/docbook/wpa_supplicant.sgml

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/eap_testing.txt

wpa_supplicant/eapol_sm.c

wpa_supplicant/eapol_sm.h

wpa_supplicant/eapol_test.c

wpa_supplicant/events.c

wpa_supplicant/examples

wpa_supplicant/examples/ieee8021x.conf

wpa_supplicant/examples/plaintext.conf

wpa_supplicant/examples/wep.conf

wpa_supplicant/examples/wpa-psk-tkip.conf

wpa_supplicant/examples/wpa2-eap-ccmp.conf

wpa_supplicant/examples/wpas-test.py

wpa_supplicant/main.c

wpa_supplicant/main_none.c

wpa_supplicant/main_symbian.cpp

wpa_supplicant/main_winmain.c

wpa_supplicant/main_winsvc.c

wpa_supplicant/mlme.c

wpa_supplicant/mlme.h

wpa_supplicant/nmake.mak

wpa_supplicant/preauth_test.c

wpa_supplicant/symbian

wpa_supplicant/symbian/README.symbian

wpa_supplicant/symbian/bld.inf

wpa_supplicant/symbian/wpa_supplicant.mmp

wpa_supplicant/tests

wpa_supplicant/tests/link_test.c

wpa_supplicant/tests/test_aes.c

wpa_supplicant/tests/test_eap_sim_common.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_wpa.c

wpa_supplicant/tests/test_x509v3.c

wpa_supplicant/todo.txt

wpa_supplicant/vs2005

wpa_supplicant/vs2005/eapol_test

wpa_supplicant/vs2005/eapol_test/eapol_test.vcproj

wpa_supplicant/vs2005/win_if_list

wpa_supplicant/vs2005/win_if_list/win_if_list.vcproj

wpa_supplicant/vs2005/wpa_cli

wpa_supplicant/vs2005/wpa_cli/wpa_cli.vcproj

wpa_supplicant/vs2005/wpa_passphrase

wpa_supplicant/vs2005/wpa_passphrase/wpa_passphrase.vcproj

wpa_supplicant/vs2005/wpa_supplicant

wpa_supplicant/vs2005/wpa_supplicant.sln

wpa_supplicant/vs2005/wpa_supplicant/wpa_supplicant.vcproj

wpa_supplicant/vs2005/wpasvc

wpa_supplicant/vs2005/wpasvc/wpasvc.vcproj

wpa_supplicant/win_example.reg

wpa_supplicant/win_if_list.c

wpa_supplicant/wpa_cli.c

wpa_supplicant/wpa_gui

wpa_supplicant/wpa_gui-qt4

wpa_supplicant/wpa_gui-qt4/eventhistory.cpp

wpa_supplicant/wpa_gui-qt4/eventhistory.h

wpa_supplicant/wpa_gui-qt4/eventhistory.ui

wpa_supplicant/wpa_gui-qt4/main.cpp

wpa_supplicant/wpa_gui-qt4/networkconfig.cpp

wpa_supplicant/wpa_gui-qt4/networkconfig.h

wpa_supplicant/wpa_gui-qt4/networkconfig.ui

wpa_supplicant/wpa_gui-qt4/scanresults.cpp

wpa_supplicant/wpa_gui-qt4/scanresults.h

wpa_supplicant/wpa_gui-qt4/scanresults.ui

wpa_supplicant/wpa_gui-qt4/setup-mingw-cross-compiling

wpa_supplicant/wpa_gui-qt4/userdatarequest.cpp

wpa_supplicant/wpa_gui-qt4/userdatarequest.h

wpa_supplicant/wpa_gui-qt4/userdatarequest.ui

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-qt4/wpamsg.h

wpa_supplicant/wpa_gui/eventhistory.ui

wpa_supplicant/wpa_gui/eventhistory.ui.h

wpa_supplicant/wpa_gui/main.cpp

wpa_supplicant/wpa_gui/networkconfig.ui

wpa_supplicant/wpa_gui/networkconfig.ui.h

wpa_supplicant/wpa_gui/scanresults.ui

wpa_supplicant/wpa_gui/scanresults.ui.h

wpa_supplicant/wpa_gui/setup-mingw-cross-compiling

wpa_supplicant/wpa_gui/userdatarequest.ui

wpa_supplicant/wpa_gui/userdatarequest.ui.h

wpa_supplicant/wpa_gui/wpa_gui.pro

wpa_supplicant/wpa_gui/wpagui.ui

wpa_supplicant/wpa_gui/wpagui.ui.h

wpa_supplicant/wpa_gui/wpamsg.h

wpa_supplicant/wpa_passphrase.c

wpa_supplicant/wpa_supplicant.c

wpa_supplicant/wpa_supplicant.conf

wpa_supplicant/wpa_supplicant_i.h

files modified:
README

debian/NEWS

debian/README.Debian

debian/README.modes

debian/changelog

debian/control

debian/copyright

debian/patches/00list

debian/rules

debian/watch

debian/wpagui.install

debian/wpasupplicant.docs

debian/wpasupplicant.examples

debian/wpasupplicant.install

debian/wpasupplicant.manpages

debian/wpasupplicant.postinst

debian/wpasupplicant.wpa-ifupdown.init

Show diffs side-by-side

added added

removed removed

wpa_supplicant/ctrl_iface_unix.c

* WPA Supplicant / UNIX domain socket -based control interface

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

#include <sys/un.h>

#include <sys/stat.h>

#include <grp.h>

#include "common.h"

#include "eloop.h"

#include "config.h"

#include "eapol_sm.h"

#include "wpa_supplicant_i.h"

#include "ctrl_iface.h"

/* Per-interface ctrl_iface */

/**

* struct wpa_ctrl_dst - Internal data structure of control interface monitors

* This structure is used to store information about registered control

* interface monitors into struct wpa_supplicant. This data is private to

* ctrl_iface_unix.c and should not be touched directly from other files.

struct wpa_ctrl_dst {

struct wpa_ctrl_dst *next;

struct sockaddr_un addr;

socklen_t addrlen;

int debug_level;

int errors;

};

struct ctrl_iface_priv {

struct wpa_supplicant *wpa_s;

int sock;

struct wpa_ctrl_dst *ctrl_dst;

};

static void wpa_supplicant_ctrl_iface_send(struct ctrl_iface_priv *priv,

int level, const char *buf,

size_t len);

static int wpa_supplicant_ctrl_iface_attach(struct ctrl_iface_priv *priv,

struct sockaddr_un *from,

socklen_t fromlen)

{

struct wpa_ctrl_dst *dst;

dst = os_zalloc(sizeof(*dst));

if (dst == NULL)

return -1;

os_memcpy(&dst->addr, from, sizeof(struct sockaddr_un));

dst->addrlen = fromlen;

dst->debug_level = MSG_INFO;

dst->next = priv->ctrl_dst;

priv->ctrl_dst = dst;

wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor attached",

(u8 *) from->sun_path, fromlen - sizeof(from->sun_family));

return 0;

}

static int wpa_supplicant_ctrl_iface_detach(struct ctrl_iface_priv *priv,

struct sockaddr_un *from,

socklen_t fromlen)

{

struct wpa_ctrl_dst *dst, *prev = NULL;

dst = priv->ctrl_dst;

while (dst) {

if (fromlen == dst->addrlen &&

os_memcmp(from->sun_path, dst->addr.sun_path,

fromlen - sizeof(from->sun_family)) == 0) {

if (prev == NULL)

priv->ctrl_dst = dst->next;

else

prev->next = dst->next;

os_free(dst);

wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor detached",

(u8 *) from->sun_path,

fromlen - sizeof(from->sun_family));

return 0;

}

prev = dst;

dst = dst->next;

100

}

101

return -1;

102

}

103

104

105

static int wpa_supplicant_ctrl_iface_level(struct ctrl_iface_priv *priv,

106

struct sockaddr_un *from,

107

socklen_t fromlen,

108

char *level)

109

{

110

struct wpa_ctrl_dst *dst;

111

112

wpa_printf(MSG_DEBUG, "CTRL_IFACE LEVEL %s", level);

113

114

dst = priv->ctrl_dst;

115

while (dst) {

116

if (fromlen == dst->addrlen &&

117

os_memcmp(from->sun_path, dst->addr.sun_path,

118

fromlen - sizeof(from->sun_family)) == 0) {

119

wpa_hexdump(MSG_DEBUG, "CTRL_IFACE changed monitor "

120

"level", (u8 *) from->sun_path,

121

fromlen - sizeof(from->sun_family));

122

dst->debug_level = atoi(level);

123

return 0;

124

}

125

dst = dst->next;

126

}

127

128

return -1;

129

}

130

131

132

static void wpa_supplicant_ctrl_iface_receive(int sock, void *eloop_ctx,

133

void *sock_ctx)

134

{

135

struct wpa_supplicant *wpa_s = eloop_ctx;

136

struct ctrl_iface_priv *priv = sock_ctx;

137

char buf[256];

138

int res;

139

struct sockaddr_un from;

140

socklen_t fromlen = sizeof(from);

141

char *reply = NULL;

142

size_t reply_len = 0;

143

int new_attached = 0;

144

145

res = recvfrom(sock, buf, sizeof(buf) - 1, 0,

146

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

147

if (res < 0) {

148

perror("recvfrom(ctrl_iface)");

149

return;

150

}

151

buf[res] = '\0';

152

153

if (os_strcmp(buf, "ATTACH") == 0) {

154

if (wpa_supplicant_ctrl_iface_attach(priv, &from, fromlen))

155

reply_len = 1;

156

else {

157

new_attached = 1;

158

reply_len = 2;

159

}

160

} else if (os_strcmp(buf, "DETACH") == 0) {

161

if (wpa_supplicant_ctrl_iface_detach(priv, &from, fromlen))

162

reply_len = 1;

163

else

164

reply_len = 2;

165

} else if (os_strncmp(buf, "LEVEL ", 6) == 0) {

166

if (wpa_supplicant_ctrl_iface_level(priv, &from, fromlen,

167

buf + 6))

168

reply_len = 1;

169

else

170

reply_len = 2;

171

} else {

172

reply = wpa_supplicant_ctrl_iface_process(wpa_s, buf,

173

&reply_len);

174

}

175

176

if (reply) {

177

sendto(sock, reply, reply_len, 0, (struct sockaddr *) &from,

178

fromlen);

179

os_free(reply);

180

} else if (reply_len == 1) {

181

sendto(sock, "FAIL\n", 5, 0, (struct sockaddr *) &from,

182

fromlen);

183

} else if (reply_len == 2) {

184

sendto(sock, "OK\n", 3, 0, (struct sockaddr *) &from,

185

fromlen);

186

}

187

188

if (new_attached)

189

eapol_sm_notify_ctrl_attached(wpa_s->eapol);

190

}

191

192

193

static char * wpa_supplicant_ctrl_iface_path(struct wpa_supplicant *wpa_s)

194

{

195

char *buf;

196

size_t len;

197

char *pbuf, *dir = NULL, *gid_str = NULL;

198

int res;

199

200

if (wpa_s->conf->ctrl_interface == NULL)

201

return NULL;

202

203

pbuf = os_strdup(wpa_s->conf->ctrl_interface);

204

if (pbuf == NULL)

205

return NULL;

206

if (os_strncmp(pbuf, "DIR=", 4) == 0) {

207

dir = pbuf + 4;

208

gid_str = os_strstr(dir, " GROUP=");

209

if (gid_str) {

210

*gid_str = '\0';

211

gid_str += 7;

212

}

213

} else

214

dir = pbuf;

215

216

len = os_strlen(dir) + os_strlen(wpa_s->ifname) + 2;

217

buf = os_malloc(len);

218

if (buf == NULL) {

219

os_free(pbuf);

220

return NULL;

221

}

222

223

res = os_snprintf(buf, len, "%s/%s", dir, wpa_s->ifname);

224

if (res < 0 || (size_t) res >= len) {

225

os_free(pbuf);

226

os_free(buf);

227

return NULL;

228

}

229

#ifdef __CYGWIN__

230

{

231

/* Windows/WinPcap uses interface names that are not suitable

232

* as a file name - convert invalid chars to underscores */

233

char *pos = buf;

234

while (*pos) {

235

if (*pos == '\\')

236

*pos = '_';

237

pos++;

238

}

239

}

240

#endif /* __CYGWIN__ */

241

os_free(pbuf);

242

return buf;

243

}

244

245

246

static void wpa_supplicant_ctrl_iface_msg_cb(void *ctx, int level,

247

const char *txt, size_t len)

248

{

249

struct wpa_supplicant *wpa_s = ctx;

250

if (wpa_s == NULL || wpa_s->ctrl_iface == NULL)

251

return;

252

wpa_supplicant_ctrl_iface_send(wpa_s->ctrl_iface, level, txt, len);

253

}

254

255

256

struct ctrl_iface_priv *

257

wpa_supplicant_ctrl_iface_init(struct wpa_supplicant *wpa_s)

258

{

259

struct ctrl_iface_priv *priv;

260

struct sockaddr_un addr;

261

char *fname = NULL;

262

gid_t gid = 0;

263

int gid_set = 0;

264

char *buf, *dir = NULL, *gid_str = NULL;

265

struct group *grp;

266

char *endp;

267

268

priv = os_zalloc(sizeof(*priv));

269

if (priv == NULL)

270

return NULL;

271

priv->wpa_s = wpa_s;

272

priv->sock = -1;

273

274

if (wpa_s->conf->ctrl_interface == NULL)

275

return priv;

276

277

buf = os_strdup(wpa_s->conf->ctrl_interface);

278

if (buf == NULL)

279

goto fail;

280

if (os_strncmp(buf, "DIR=", 4) == 0) {

281

dir = buf + 4;

282

gid_str = os_strstr(dir, " GROUP=");

283

if (gid_str) {

284

*gid_str = '\0';

285

gid_str += 7;

286

}

287

} else {

288

dir = buf;

289

gid_str = wpa_s->conf->ctrl_interface_group;

290

}

291

292

if (mkdir(dir, S_IRWXU | S_IRWXG) < 0) {

293

if (errno == EEXIST) {

294

wpa_printf(MSG_DEBUG, "Using existing control "

295

"interface directory.");

296

} else {

297

perror("mkdir[ctrl_interface]");

298

goto fail;

299

}

300

}

301

302

if (gid_str) {

303

grp = getgrnam(gid_str);

304

if (grp) {

305

gid = grp->gr_gid;

306

gid_set = 1;

307

wpa_printf(MSG_DEBUG, "ctrl_interface_group=%d"

308

" (from group name '%s')",

309

(int) gid, gid_str);

310

} else {

311

/* Group name not found - try to parse this as gid */

312

gid = strtol(gid_str, &endp, 10);

313

if (*gid_str == '\0' || *endp != '\0') {

314

wpa_printf(MSG_DEBUG, "CTRL: Invalid group "

315

"'%s'", gid_str);

316

goto fail;

317

}

318

gid_set = 1;

319

wpa_printf(MSG_DEBUG, "ctrl_interface_group=%d",

320

(int) gid);

321

}

322

}

323

324

if (gid_set && chown(dir, -1, gid) < 0) {

325

perror("chown[ctrl_interface]");

326

goto fail;

327

}

328

329

if (os_strlen(dir) + 1 + os_strlen(wpa_s->ifname) >=

330

sizeof(addr.sun_path)) {

331

wpa_printf(MSG_ERROR, "ctrl_iface path limit exceeded");

332

goto fail;

333

}

334

335

priv->sock = socket(PF_UNIX, SOCK_DGRAM, 0);

336

if (priv->sock < 0) {

337

perror("socket(PF_UNIX)");

338

goto fail;

339

}

340

341

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

342

addr.sun_family = AF_UNIX;

343

fname = wpa_supplicant_ctrl_iface_path(wpa_s);

344

if (fname == NULL)

345

goto fail;

346

os_strlcpy(addr.sun_path, fname, sizeof(addr.sun_path));

347

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

348

wpa_printf(MSG_DEBUG, "ctrl_iface bind(PF_UNIX) failed: %s",

349

strerror(errno));

350

if (connect(priv->sock, (struct sockaddr *) &addr,

351

sizeof(addr)) < 0) {

352

wpa_printf(MSG_DEBUG, "ctrl_iface exists, but does not"

353

" allow connections - assuming it was left"

354

"over from forced program termination");

355

if (unlink(fname) < 0) {

356

perror("unlink[ctrl_iface]");

357

wpa_printf(MSG_ERROR, "Could not unlink "

358

"existing ctrl_iface socket '%s'",

359

fname);

360

goto fail;

361

}

362

if (bind(priv->sock, (struct sockaddr *) &addr,

363

sizeof(addr)) < 0) {

364

perror("bind(PF_UNIX)");

365

goto fail;

366

}

367

wpa_printf(MSG_DEBUG, "Successfully replaced leftover "

368

"ctrl_iface socket '%s'", fname);

369

} else {

370

wpa_printf(MSG_INFO, "ctrl_iface exists and seems to "

371

"be in use - cannot override it");

372

wpa_printf(MSG_INFO, "Delete '%s' manually if it is "

373

"not used anymore", fname);

374

os_free(fname);

375

fname = NULL;

376

goto fail;

377

}

378

}

379

380

if (gid_set && chown(fname, -1, gid) < 0) {

381

perror("chown[ctrl_interface/ifname]");

382

goto fail;

383

}

384

385

if (chmod(fname, S_IRWXU | S_IRWXG) < 0) {

386

perror("chmod[ctrl_interface/ifname]");

387

goto fail;

388

}

389

os_free(fname);

390

391

eloop_register_read_sock(priv->sock, wpa_supplicant_ctrl_iface_receive,

392

wpa_s, priv);

393

wpa_msg_register_cb(wpa_supplicant_ctrl_iface_msg_cb);

394

395

os_free(buf);

396

return priv;

397

398

fail:

399

if (priv->sock >= 0)

400

close(priv->sock);

401

os_free(priv);

402

if (fname) {

403

unlink(fname);

404

os_free(fname);

405

}

406

os_free(buf);

407

return NULL;

408

}

409

410

411

void wpa_supplicant_ctrl_iface_deinit(struct ctrl_iface_priv *priv)

412

{

413

struct wpa_ctrl_dst *dst, *prev;

414

415

if (priv->sock > -1) {

416

char *fname;

417

char *buf, *dir = NULL, *gid_str = NULL;

418

eloop_unregister_read_sock(priv->sock);

419

if (priv->ctrl_dst) {

420

421

* Wait a second before closing the control socket if

422

* there are any attached monitors in order to allow

423

* them to receive any pending messages.

424

425

wpa_printf(MSG_DEBUG, "CTRL_IFACE wait for attached "

426

"monitors to receive messages");

427

os_sleep(1, 0);

428

}

429

close(priv->sock);

430

priv->sock = -1;

431

fname = wpa_supplicant_ctrl_iface_path(priv->wpa_s);

432

if (fname) {

433

unlink(fname);

434

os_free(fname);

435

}

436

437

buf = os_strdup(priv->wpa_s->conf->ctrl_interface);

438

if (buf == NULL)

439

goto free_dst;

440

if (os_strncmp(buf, "DIR=", 4) == 0) {

441

dir = buf + 4;

442

gid_str = os_strstr(dir, " GROUP=");

443

if (gid_str) {

444

*gid_str = '\0';

445

gid_str += 7;

446

}

447

} else

448

dir = buf;

449

450

if (rmdir(dir) < 0) {

451

if (errno == ENOTEMPTY) {

452

wpa_printf(MSG_DEBUG, "Control interface "

453

"directory not empty - leaving it "

454

"behind");

455

} else {

456

perror("rmdir[ctrl_interface]");

457

}

458

}

459

os_free(buf);

460

}

461

462

free_dst:

463

dst = priv->ctrl_dst;

464

while (dst) {

465

prev = dst;

466

dst = dst->next;

467

os_free(prev);

468

}

469

os_free(priv);

470

}

471

472

473

/**

474

* wpa_supplicant_ctrl_iface_send - Send a control interface packet to monitors

475

* @priv: Pointer to private data from wpa_supplicant_ctrl_iface_init()

476

* @level: Priority level of the message

477

* @buf: Message data

478

* @len: Message length

479

480

* Send a packet to all monitor programs attached to the control interface.

481

482

static void wpa_supplicant_ctrl_iface_send(struct ctrl_iface_priv *priv,

483

int level, const char *buf,

484

size_t len)

485

{

486

struct wpa_ctrl_dst *dst, *next;

487

char levelstr[10];

488

int idx, res;

489

struct msghdr msg;

490

struct iovec io[2];

491

492

dst = priv->ctrl_dst;

493

if (priv->sock < 0 || dst == NULL)

494

return;

495

496

res = os_snprintf(levelstr, sizeof(levelstr), "<%d>", level);

497

if (res < 0 || (size_t) res >= sizeof(levelstr))

498

return;

499

io[0].iov_base = levelstr;

500

io[0].iov_len = os_strlen(levelstr);

501

io[1].iov_base = (char *) buf;

502

io[1].iov_len = len;

503

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

504

msg.msg_iov = io;

505

msg.msg_iovlen = 2;

506

507

idx = 0;

508

while (dst) {

509

next = dst->next;

510

if (level >= dst->debug_level) {

511

wpa_hexdump(MSG_DEBUG, "CTRL_IFACE monitor send",

512

(u8 *) dst->addr.sun_path, dst->addrlen -

513

sizeof(dst->addr.sun_family));

514

msg.msg_name = (void *) &dst->addr;

515

msg.msg_namelen = dst->addrlen;

516

if (sendmsg(priv->sock, &msg, 0) < 0) {

517

perror("sendmsg(CTRL_IFACE monitor)");

518

dst->errors++;

519

if (dst->errors > 10) {

520

wpa_supplicant_ctrl_iface_detach(

521

priv, &dst->addr,

522

dst->addrlen);

523

}

524

} else

525

dst->errors = 0;

526

}

527

idx++;

528

dst = next;

529

}

530

}

531

532

533

void wpa_supplicant_ctrl_iface_wait(struct ctrl_iface_priv *priv)

534

{

535

wpa_printf(MSG_DEBUG, "CTRL_IFACE - %s - wait for monitor",

536

priv->wpa_s->ifname);

537

eloop_wait_for_read_sock(priv->sock);

538

}

539

540

541

/* Global ctrl_iface */

542

543

struct ctrl_iface_global_priv {

544

struct wpa_global *global;

545

int sock;

546

};

547

548

549

static void wpa_supplicant_global_ctrl_iface_receive(int sock, void *eloop_ctx,

550

void *sock_ctx)

551

{

552

struct wpa_global *global = eloop_ctx;

553

char buf[256];

554

int res;

555

struct sockaddr_un from;

556

socklen_t fromlen = sizeof(from);

557

char *reply;

558

size_t reply_len;

559

560

res = recvfrom(sock, buf, sizeof(buf) - 1, 0,

561

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

562

if (res < 0) {

563

perror("recvfrom(ctrl_iface)");

564

return;

565

}

566

buf[res] = '\0';

567

568

reply = wpa_supplicant_global_ctrl_iface_process(global, buf,

569

&reply_len);

570

571

if (reply) {

572

sendto(sock, reply, reply_len, 0, (struct sockaddr *) &from,

573

fromlen);

574

os_free(reply);

575

} else if (reply_len) {

576

sendto(sock, "FAIL\n", 5, 0, (struct sockaddr *) &from,

577

fromlen);

578

}

579

}

580

581

582

struct ctrl_iface_global_priv *

583

wpa_supplicant_global_ctrl_iface_init(struct wpa_global *global)

584

{

585

struct ctrl_iface_global_priv *priv;

586

struct sockaddr_un addr;

587

588

priv = os_zalloc(sizeof(*priv));

589

if (priv == NULL)

590

return NULL;

591

priv->global = global;

592

priv->sock = -1;

593

594

if (global->params.ctrl_interface == NULL)

595

return priv;

596

597

wpa_printf(MSG_DEBUG, "Global control interface '%s'",

598

global->params.ctrl_interface);

599

600

priv->sock = socket(PF_UNIX, SOCK_DGRAM, 0);

601

if (priv->sock < 0) {

602

perror("socket(PF_UNIX)");

603

goto fail;

604

}

605

606

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

607

addr.sun_family = AF_UNIX;

608

os_strlcpy(addr.sun_path, global->params.ctrl_interface,

609

sizeof(addr.sun_path));

610

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

611

perror("bind(PF_UNIX)");

612

if (connect(priv->sock, (struct sockaddr *) &addr,

613

sizeof(addr)) < 0) {

614

wpa_printf(MSG_DEBUG, "ctrl_iface exists, but does not"

615

" allow connections - assuming it was left"

616

"over from forced program termination");

617

if (unlink(global->params.ctrl_interface) < 0) {

618

perror("unlink[ctrl_iface]");

619

wpa_printf(MSG_ERROR, "Could not unlink "

620

"existing ctrl_iface socket '%s'",

621

global->params.ctrl_interface);

622

goto fail;

623

}

624

if (bind(priv->sock, (struct sockaddr *) &addr,

625

sizeof(addr)) < 0) {

626

perror("bind(PF_UNIX)");

627

goto fail;

628

}

629

wpa_printf(MSG_DEBUG, "Successfully replaced leftover "

630

"ctrl_iface socket '%s'",

631

global->params.ctrl_interface);

632

} else {

633

wpa_printf(MSG_INFO, "ctrl_iface exists and seems to "

634

"be in use - cannot override it");

635

wpa_printf(MSG_INFO, "Delete '%s' manually if it is "

636

"not used anymore",

637

global->params.ctrl_interface);

638

goto fail;

639

}

640

}

641

642

eloop_register_read_sock(priv->sock,

643

wpa_supplicant_global_ctrl_iface_receive,

644

global, NULL);

645

646

return priv;

647

648

fail:

649

if (priv->sock >= 0)

650

close(priv->sock);

651

os_free(priv);

652

return NULL;

653

}

654

655

656

void

657

wpa_supplicant_global_ctrl_iface_deinit(struct ctrl_iface_global_priv *priv)

658

{

659

if (priv->sock >= 0) {

660

eloop_unregister_read_sock(priv->sock);

661

close(priv->sock);

662

}

663

if (priv->global->params.ctrl_interface)

664

unlink(priv->global->params.ctrl_interface);

665

os_free(priv);

666

}

Older »