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

Viewing changes to wpa_supplicant/ctrl_iface_dbus_handlers.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_dbus_handlers.c

* WPA Supplicant / dbus-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 "common.h"

#include "config.h"

#include "wpa_supplicant_i.h"

#include "ctrl_iface_dbus.h"

#include "ctrl_iface_dbus_handlers.h"

#include "eap_peer/eap_methods.h"

#include "dbus_dict_helpers.h"

#include "ieee802_11_defs.h"

/**

* wpas_dbus_new_invalid_opts_error - Return a new invalid options error message

* @message: Pointer to incoming dbus message this error refers to

* Returns: a dbus error message

* Convenience function to create and return an invalid options error

static DBusMessage * wpas_dbus_new_invalid_opts_error(DBusMessage *message,

const char *arg)

{

DBusMessage *reply;

reply = dbus_message_new_error(message, WPAS_ERROR_INVALID_OPTS,

"Did not receive correct message "

"arguments.");

if (arg != NULL)

dbus_message_append_args(reply, DBUS_TYPE_STRING, &arg,

DBUS_TYPE_INVALID);

return reply;

}

/**

* wpas_dbus_new_success_reply - Return a new success reply message

* @message: Pointer to incoming dbus message this reply refers to

* Returns: a dbus message containing a single UINT32 that indicates

* success (ie, a value of 1)

* Convenience function to create and return a success reply message

static DBusMessage * wpas_dbus_new_success_reply(DBusMessage *message)

{

DBusMessage *reply;

unsigned int success = 1;

reply = dbus_message_new_method_return(message);

dbus_message_append_args(reply, DBUS_TYPE_UINT32, &success,

DBUS_TYPE_INVALID);

return reply;

}

static void wpas_dbus_free_wpa_interface(struct wpa_interface *iface)

{

free((char *) iface->driver);

free((char *) iface->driver_param);

free((char *) iface->confname);

free((char *) iface->bridge_ifname);

}

/**

* wpas_dbus_global_add_interface - Request registration of a network interface

* @message: Pointer to incoming dbus message

* @global: %wpa_supplicant global data structure

* Returns: The object path of the new interface object,

* or a dbus error message with more information

* Handler function for "addInterface" method call. Handles requests

* by dbus clients to register a network interface that wpa_supplicant

* will manage.

DBusMessage * wpas_dbus_global_add_interface(DBusMessage *message,

struct wpa_global *global)

{

struct wpa_interface iface;

char *ifname = NULL;

DBusMessage *reply = NULL;

DBusMessageIter iter;

memset(&iface, 0, sizeof(iface));

100

dbus_message_iter_init(message, &iter);

101

102

/* First argument: interface name (DBUS_TYPE_STRING)

103

* Required; must be non-zero length

104

105

if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_STRING)

106

goto error;

107

dbus_message_iter_get_basic(&iter, &ifname);

108

if (!strlen(ifname))

109

goto error;

110

iface.ifname = ifname;

111

112

/* Second argument: dict of options */

113

if (dbus_message_iter_next(&iter)) {

114

DBusMessageIter iter_dict;

115

struct wpa_dbus_dict_entry entry;

116

117

if (!wpa_dbus_dict_open_read(&iter, &iter_dict))

118

goto error;

119

while (wpa_dbus_dict_has_dict_entry(&iter_dict)) {

120

if (!wpa_dbus_dict_get_entry(&iter_dict, &entry))

121

goto error;

122

if (!strcmp(entry.key, "driver") &&

123

(entry.type == DBUS_TYPE_STRING)) {

124

iface.driver = strdup(entry.str_value);

125

if (iface.driver == NULL)

126

goto error;

127

} else if (!strcmp(entry.key, "driver-params") &&

128

(entry.type == DBUS_TYPE_STRING)) {

129

iface.driver_param = strdup(entry.str_value);

130

if (iface.driver_param == NULL)

131

goto error;

132

} else if (!strcmp(entry.key, "config-file") &&

133

(entry.type == DBUS_TYPE_STRING)) {

134

iface.confname = strdup(entry.str_value);

135

if (iface.confname == NULL)

136

goto error;

137

} else if (!strcmp(entry.key, "bridge-ifname") &&

138

(entry.type == DBUS_TYPE_STRING)) {

139

iface.bridge_ifname = strdup(entry.str_value);

140

if (iface.bridge_ifname == NULL)

141

goto error;

142

} else {

143

wpa_dbus_dict_entry_clear(&entry);

144

goto error;

145

}

146

wpa_dbus_dict_entry_clear(&entry);

147

}

148

}

149

150

151

* Try to get the wpa_supplicant record for this iface, return

152

* an error if we already control it.

153

154

if (wpa_supplicant_get_iface(global, iface.ifname) != 0) {

155

reply = dbus_message_new_error(message,

156

WPAS_ERROR_EXISTS_ERROR,

157

"wpa_supplicant already "

158

"controls this interface.");

159

} else {

160

struct wpa_supplicant *wpa_s;

161

/* Otherwise, have wpa_supplicant attach to it. */

162

if ((wpa_s = wpa_supplicant_add_iface(global, &iface))) {

163

const char *path = wpa_supplicant_get_dbus_path(wpa_s);

164

reply = dbus_message_new_method_return(message);

165

dbus_message_append_args(reply, DBUS_TYPE_OBJECT_PATH,

166

&path, DBUS_TYPE_INVALID);

167

} else {

168

reply = dbus_message_new_error(message,

169

WPAS_ERROR_ADD_ERROR,

170

"wpa_supplicant "

171

"couldn't grab this "

172

"interface.");

173

}

174

}

175

wpas_dbus_free_wpa_interface(&iface);

176

return reply;

177

178

error:

179

wpas_dbus_free_wpa_interface(&iface);

180

return wpas_dbus_new_invalid_opts_error(message, NULL);

181

}

182

183

184

/**

185

* wpas_dbus_global_remove_interface - Request deregistration of an interface

186

* @message: Pointer to incoming dbus message

187

* @global: wpa_supplicant global data structure

188

* Returns: a dbus message containing a UINT32 indicating success (1) or

189

* failure (0), or returns a dbus error message with more information

190

191

* Handler function for "removeInterface" method call. Handles requests

192

* by dbus clients to deregister a network interface that wpa_supplicant

193

* currently manages.

194

195

DBusMessage * wpas_dbus_global_remove_interface(DBusMessage *message,

196

struct wpa_global *global)

197

{

198

struct wpa_supplicant *wpa_s;

199

char *path;

200

DBusMessage *reply = NULL;

201

202

if (!dbus_message_get_args(message, NULL,

203

DBUS_TYPE_OBJECT_PATH, &path,

204

DBUS_TYPE_INVALID)) {

205

reply = wpas_dbus_new_invalid_opts_error(message, NULL);

206

goto out;

207

}

208

209

wpa_s = wpa_supplicant_get_iface_by_dbus_path(global, path);

210

if (wpa_s == NULL) {

211

reply = wpas_dbus_new_invalid_iface_error(message);

212

goto out;

213

}

214

215

if (!wpa_supplicant_remove_iface(global, wpa_s)) {

216

reply = wpas_dbus_new_success_reply(message);

217

} else {

218

reply = dbus_message_new_error(message,

219

WPAS_ERROR_REMOVE_ERROR,

220

"wpa_supplicant couldn't "

221

"remove this interface.");

222

}

223

224

out:

225

return reply;

226

}

227

228

229

/**

230

* wpas_dbus_global_get_interface - Get the object path for an interface name

231

* @message: Pointer to incoming dbus message

232

* @global: %wpa_supplicant global data structure

233

* Returns: The object path of the interface object,

234

* or a dbus error message with more information

235

236

* Handler function for "getInterface" method call. Handles requests

237

* by dbus clients for the object path of an specific network interface.

238

239

DBusMessage * wpas_dbus_global_get_interface(DBusMessage *message,

240

struct wpa_global *global)

241

{

242

DBusMessage *reply = NULL;

243

const char *ifname;

244

const char *path;

245

struct wpa_supplicant *wpa_s;

246

247

if (!dbus_message_get_args(message, NULL,

248

DBUS_TYPE_STRING, &ifname,

249

DBUS_TYPE_INVALID)) {

250

reply = wpas_dbus_new_invalid_opts_error(message, NULL);

251

goto out;

252

}

253

254

wpa_s = wpa_supplicant_get_iface(global, ifname);

255

if (wpa_s == NULL) {

256

reply = wpas_dbus_new_invalid_iface_error(message);

257

goto out;

258

}

259

260

path = wpa_supplicant_get_dbus_path(wpa_s);

261

if (path == NULL) {

262

reply = dbus_message_new_error(message,

263

WPAS_ERROR_INTERNAL_ERROR,

264

"an internal error occurred "

265

"getting the interface.");

266

goto out;

267

}

268

269

reply = dbus_message_new_method_return(message);

270

dbus_message_append_args(reply,

271

DBUS_TYPE_OBJECT_PATH, &path,

272

DBUS_TYPE_INVALID);

273

274

out:

275

return reply;

276

}

277

278

279

/**

280

* wpas_dbus_iface_scan - Request a wireless scan on an interface

281

* @message: Pointer to incoming dbus message

282

* @wpa_s: wpa_supplicant structure for a network interface

283

* Returns: a dbus message containing a UINT32 indicating success (1) or

284

* failure (0)

285

286

* Handler function for "scan" method call of a network device. Requests

287

* that wpa_supplicant perform a wireless scan as soon as possible

288

* on a particular wireless interface.

289

290

DBusMessage * wpas_dbus_iface_scan(DBusMessage *message,

291

struct wpa_supplicant *wpa_s)

292

{

293

wpa_s->scan_req = 2;

294

wpa_supplicant_req_scan(wpa_s, 0, 0);

295

return wpas_dbus_new_success_reply(message);

296

}

297

298

299

/**

300

* wpas_dbus_iface_scan_results - Get the results of a recent scan request

301

* @message: Pointer to incoming dbus message

302

* @wpa_s: wpa_supplicant structure for a network interface

303

* Returns: a dbus message containing a dbus array of objects paths, or returns

304

* a dbus error message if not scan results could be found

305

306

* Handler function for "scanResults" method call of a network device. Returns

307

* a dbus message containing the object paths of wireless networks found.

308

309

DBusMessage * wpas_dbus_iface_scan_results(DBusMessage *message,

310

struct wpa_supplicant *wpa_s)

311

{

312

DBusMessage *reply = NULL;

313

DBusMessageIter iter;

314

DBusMessageIter sub_iter;

315

int i;

316

317

/* Ensure we've actually got scan results to return */

318

if (wpa_s->scan_results == NULL &&

319

wpa_supplicant_get_scan_results(wpa_s) < 0) {

320

reply = dbus_message_new_error(message, WPAS_ERROR_SCAN_ERROR,

321

"An error ocurred getting scan "

322

"results.");

323

goto out;

324

}

325

326

/* Create and initialize the return message */

327

reply = dbus_message_new_method_return(message);

328

dbus_message_iter_init_append(reply, &iter);

329

dbus_message_iter_open_container(&iter, DBUS_TYPE_ARRAY,

330

DBUS_TYPE_OBJECT_PATH_AS_STRING,

331

&sub_iter);

332

333

/* Loop through scan results and append each result's object path */

334

for (i = 0; i < wpa_s->num_scan_results; i++) {

335

struct wpa_scan_result *res = &wpa_s->scan_results[i];

336

char *path;

337

338

path = os_zalloc(WPAS_DBUS_OBJECT_PATH_MAX);

339

if (path == NULL) {

340

perror("wpas_dbus_iface_scan_results[dbus]: out of "

341

"memory.");

342

wpa_printf(MSG_ERROR, "dbus control interface: not "

343

"enough memory to send scan results "

344

"signal.");

345

break;

346

}

347

/* Construct the object path for this network. Note that ':'

348

* is not a valid character in dbus object paths.

349

350

snprintf(path, WPAS_DBUS_OBJECT_PATH_MAX,

351

"%s/" WPAS_DBUS_BSSIDS_PART "/"

352

WPAS_DBUS_BSSID_FORMAT,

353

wpa_supplicant_get_dbus_path(wpa_s),

354

MAC2STR(res->bssid));

355

dbus_message_iter_append_basic(&sub_iter,

356

DBUS_TYPE_OBJECT_PATH, &path);

357

free(path);

358

}

359

360

dbus_message_iter_close_container(&iter, &sub_iter);

361

362

out:

363

return reply;

364

}

365

366

367

/**

368

* wpas_dbus_bssid_properties - Return the properties of a scanned network

369

* @message: Pointer to incoming dbus message

370

* @wpa_s: wpa_supplicant structure for a network interface

371

* @res: wpa_supplicant scan result for which to get properties

372

* Returns: a dbus message containing the properties for the requested network

373

374

* Handler function for "properties" method call of a scanned network.

375

* Returns a dbus message containing the the properties.

376

377

DBusMessage * wpas_dbus_bssid_properties(DBusMessage *message,

378

struct wpa_supplicant *wpa_s,

379

struct wpa_scan_result *res)

380

{

381

DBusMessage *reply = NULL;

382

char *bssid_data, *ssid_data, *wpa_ie_data, *rsn_ie_data;

383

DBusMessageIter iter, iter_dict;

384

385

/* dbus needs the address of a pointer to the actual value

386

* for array types, not the address of the value itself.

387

388

bssid_data = (char *) &res->bssid;

389

ssid_data = (char *) &res->ssid;

390

wpa_ie_data = (char *) &res->wpa_ie;

391

rsn_ie_data = (char *) &res->rsn_ie;

392

393

/* Dump the properties into a dbus message */

394

reply = dbus_message_new_method_return(message);

395

396

dbus_message_iter_init_append(reply, &iter);

397

if (!wpa_dbus_dict_open_write(&iter, &iter_dict))

398

goto error;

399

400

if (!wpa_dbus_dict_append_byte_array(&iter_dict, "bssid",

401

bssid_data, ETH_ALEN))

402

goto error;

403

if (!wpa_dbus_dict_append_byte_array(&iter_dict, "ssid",

404

ssid_data, res->ssid_len))

405

goto error;

406

if (res->wpa_ie_len) {

407

if (!wpa_dbus_dict_append_byte_array(&iter_dict, "wpaie",

408

wpa_ie_data,

409

res->wpa_ie_len)) {

410

goto error;

411

}

412

}

413

if (res->rsn_ie_len) {

414

if (!wpa_dbus_dict_append_byte_array(&iter_dict, "rsnie",

415

rsn_ie_data,

416

res->rsn_ie_len)) {

417

goto error;

418

}

419

}

420

if (res->freq) {

421

if (!wpa_dbus_dict_append_int32(&iter_dict, "frequency",

422

res->freq))

423

goto error;

424

}

425

if (!wpa_dbus_dict_append_uint16(&iter_dict, "capabilities",

426

res->caps))

427

goto error;

428

if (!wpa_dbus_dict_append_int32(&iter_dict, "quality", res->qual))

429

goto error;

430

if (!wpa_dbus_dict_append_int32(&iter_dict, "noise", res->noise))

431

goto error;

432

if (!wpa_dbus_dict_append_int32(&iter_dict, "level", res->level))

433

goto error;

434

if (!wpa_dbus_dict_append_int32(&iter_dict, "maxrate", res->maxrate))

435

goto error;

436

437

if (!wpa_dbus_dict_close_write(&iter, &iter_dict))

438

goto error;

439

440

return reply;

441

442

error:

443

if (reply)

444

dbus_message_unref(reply);

445

return dbus_message_new_error(message, WPAS_ERROR_INTERNAL_ERROR,

446

"an internal error occurred returning "

447

"BSSID properties.");

448

}

449

450

451

/**

452

* wpas_dbus_iface_capabilities - Return interface capabilities

453

* @message: Pointer to incoming dbus message

454

* @wpa_s: wpa_supplicant structure for a network interface

455

* Returns: A dbus message containing a dict of strings

456

457

* Handler function for "capabilities" method call of an interface.

458

459

DBusMessage * wpas_dbus_iface_capabilities(DBusMessage *message,

460

struct wpa_supplicant *wpa_s)

461

{

462

DBusMessage *reply = NULL;

463

struct wpa_driver_capa capa;

464

int res;

465

DBusMessageIter iter, iter_dict;

466

char **eap_methods;

467

size_t num_items;

468

dbus_bool_t strict = FALSE;

469

DBusMessageIter iter_dict_entry, iter_dict_val, iter_array;

470

471

if (!dbus_message_get_args(message, NULL,

472

DBUS_TYPE_BOOLEAN, &strict,

473

DBUS_TYPE_INVALID))

474

strict = FALSE;

475

476

reply = dbus_message_new_method_return(message);

477

478

dbus_message_iter_init_append(reply, &iter);

479

if (!wpa_dbus_dict_open_write(&iter, &iter_dict))

480

goto error;

481

482

/* EAP methods */

483

eap_methods = eap_get_names_as_string_array(&num_items);

484

if (eap_methods) {

485

dbus_bool_t success = FALSE;

486

size_t i = 0;

487

488

success = wpa_dbus_dict_append_string_array(

489

&iter_dict, "eap", (const char **) eap_methods,

490

num_items);

491

492

/* free returned method array */

493

while (eap_methods[i])

494

free(eap_methods[i++]);

495

free(eap_methods);

496

497

if (!success)

498

goto error;

499

}

500

501

res = wpa_drv_get_capa(wpa_s, &capa);

502

503

/***** pairwise cipher */

504

if (res < 0) {

505

if (!strict) {

506

const char *args[] = {"CCMP", "TKIP", "NONE"};

507

if (!wpa_dbus_dict_append_string_array(

508

&iter_dict, "pairwise", args,

509

sizeof(args) / sizeof(char*)))

510

goto error;

511

}

512

} else {

513

if (!wpa_dbus_dict_begin_string_array(&iter_dict, "pairwise",

514

&iter_dict_entry,

515

&iter_dict_val,

516

&iter_array))

517

goto error;

518

519

if (capa.enc & WPA_DRIVER_CAPA_ENC_CCMP) {

520

if (!wpa_dbus_dict_string_array_add_element(

521

&iter_array, "CCMP"))

522

goto error;

523

}

524

525

if (capa.enc & WPA_DRIVER_CAPA_ENC_TKIP) {

526

if (!wpa_dbus_dict_string_array_add_element(

527

&iter_array, "TKIP"))

528

goto error;

529

}

530

531

if (capa.key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_WPA_NONE) {

532

if (!wpa_dbus_dict_string_array_add_element(

533

&iter_array, "NONE"))

534

goto error;

535

}

536

537

if (!wpa_dbus_dict_end_string_array(&iter_dict,

538

&iter_dict_entry,

539

&iter_dict_val,

540

&iter_array))

541

goto error;

542

}

543

544

/***** group cipher */

545

if (res < 0) {

546

if (!strict) {

547

const char *args[] = {

548

"CCMP", "TKIP", "WEP104", "WEP40"

549

};

550

if (!wpa_dbus_dict_append_string_array(

551

&iter_dict, "group", args,

552

sizeof(args) / sizeof(char*)))

553

goto error;

554

}

555

} else {

556

if (!wpa_dbus_dict_begin_string_array(&iter_dict, "group",

557

&iter_dict_entry,

558

&iter_dict_val,

559

&iter_array))

560

goto error;

561

562

if (capa.enc & WPA_DRIVER_CAPA_ENC_CCMP) {

563

if (!wpa_dbus_dict_string_array_add_element(

564

&iter_array, "CCMP"))

565

goto error;

566

}

567

568

if (capa.enc & WPA_DRIVER_CAPA_ENC_TKIP) {

569

if (!wpa_dbus_dict_string_array_add_element(

570

&iter_array, "TKIP"))

571

goto error;

572

}

573

574

if (capa.enc & WPA_DRIVER_CAPA_ENC_WEP104) {

575

if (!wpa_dbus_dict_string_array_add_element(

576

&iter_array, "WEP104"))

577

goto error;

578

}

579

580

if (capa.enc & WPA_DRIVER_CAPA_ENC_WEP40) {

581

if (!wpa_dbus_dict_string_array_add_element(

582

&iter_array, "WEP40"))

583

goto error;

584

}

585

586

if (!wpa_dbus_dict_end_string_array(&iter_dict,

587

&iter_dict_entry,

588

&iter_dict_val,

589

&iter_array))

590

goto error;

591

}

592

593

/***** key management */

594

if (res < 0) {

595

if (!strict) {

596

const char *args[] = {

597

"WPA-PSK", "WPA-EAP", "IEEE8021X", "WPA-NONE",

598

"NONE"

599

};

600

if (!wpa_dbus_dict_append_string_array(

601

&iter_dict, "key_mgmt", args,

602

sizeof(args) / sizeof(char*)))

603

goto error;

604

}

605

} else {

606

if (!wpa_dbus_dict_begin_string_array(&iter_dict, "key_mgmt",

607

&iter_dict_entry,

608

&iter_dict_val,

609

&iter_array))

610

goto error;

611

612

if (!wpa_dbus_dict_string_array_add_element(&iter_array,

613

"NONE"))

614

goto error;

615

616

if (!wpa_dbus_dict_string_array_add_element(&iter_array,

617

"IEEE8021X"))

618

goto error;

619

620

if (capa.key_mgmt & (WPA_DRIVER_CAPA_KEY_MGMT_WPA |

621

WPA_DRIVER_CAPA_KEY_MGMT_WPA2)) {

622

if (!wpa_dbus_dict_string_array_add_element(

623

&iter_array, "WPA-EAP"))

624

goto error;

625

}

626

627

if (capa.key_mgmt & (WPA_DRIVER_CAPA_KEY_MGMT_WPA_PSK |

628

WPA_DRIVER_CAPA_KEY_MGMT_WPA2_PSK)) {

629

if (!wpa_dbus_dict_string_array_add_element(

630

&iter_array, "WPA-PSK"))

631

goto error;

632

}

633

634

if (capa.key_mgmt & WPA_DRIVER_CAPA_KEY_MGMT_WPA_NONE) {

635

if (!wpa_dbus_dict_string_array_add_element(

636

&iter_array, "WPA-NONE"))

637

goto error;

638

}

639

640

if (!wpa_dbus_dict_end_string_array(&iter_dict,

641

&iter_dict_entry,

642

&iter_dict_val,

643

&iter_array))

644

goto error;

645

}

646

647

/***** WPA protocol */

648

if (res < 0) {

649

if (!strict) {

650

const char *args[] = { "RSN", "WPA" };

651

if (!wpa_dbus_dict_append_string_array(

652

&iter_dict, "proto", args,

653

sizeof(args) / sizeof(char*)))

654

goto error;

655

}

656

} else {

657

if (!wpa_dbus_dict_begin_string_array(&iter_dict, "proto",

658

&iter_dict_entry,

659

&iter_dict_val,

660

&iter_array))

661

goto error;

662

663

if (capa.key_mgmt & (WPA_DRIVER_CAPA_KEY_MGMT_WPA2 |

664

WPA_DRIVER_CAPA_KEY_MGMT_WPA2_PSK)) {

665

if (!wpa_dbus_dict_string_array_add_element(

666

&iter_array, "RSN"))

667

goto error;

668

}

669

670

if (capa.key_mgmt & (WPA_DRIVER_CAPA_KEY_MGMT_WPA |

671

WPA_DRIVER_CAPA_KEY_MGMT_WPA_PSK)) {

672

if (!wpa_dbus_dict_string_array_add_element(

673

&iter_array, "WPA"))

674

goto error;

675

}

676

677

if (!wpa_dbus_dict_end_string_array(&iter_dict,

678

&iter_dict_entry,

679

&iter_dict_val,

680

&iter_array))

681

goto error;

682

}

683

684

/***** auth alg */

685

if (res < 0) {

686

if (!strict) {

687

const char *args[] = { "OPEN", "SHARED", "LEAP" };

688

if (!wpa_dbus_dict_append_string_array(

689

&iter_dict, "auth_alg", args,

690

sizeof(args) / sizeof(char*)))

691

goto error;

692

}

693

} else {

694

if (!wpa_dbus_dict_begin_string_array(&iter_dict, "auth_alg",

695

&iter_dict_entry,

696

&iter_dict_val,

697

&iter_array))

698

goto error;

699

700

if (capa.auth & (WPA_DRIVER_AUTH_OPEN)) {

701

if (!wpa_dbus_dict_string_array_add_element(

702

&iter_array, "OPEN"))

703

goto error;

704

}

705

706

if (capa.auth & (WPA_DRIVER_AUTH_SHARED)) {

707

if (!wpa_dbus_dict_string_array_add_element(

708

&iter_array, "SHARED"))

709

goto error;

710

}

711

712

if (capa.auth & (WPA_DRIVER_AUTH_LEAP)) {

713

if (!wpa_dbus_dict_string_array_add_element(

714

&iter_array, "LEAP"))

715

goto error;

716

}

717

718

if (!wpa_dbus_dict_end_string_array(&iter_dict,

719

&iter_dict_entry,

720

&iter_dict_val,

721

&iter_array))

722

goto error;

723

}

724

725

if (!wpa_dbus_dict_close_write(&iter, &iter_dict))

726

goto error;

727

728

return reply;

729

730

error:

731

if (reply)

732

dbus_message_unref(reply);

733

return dbus_message_new_error(message, WPAS_ERROR_INTERNAL_ERROR,

734

"an internal error occurred returning "

735

"interface capabilities.");

736

}

737

738

739

/**

740

* wpas_dbus_iface_add_network - Add a new configured network

741

* @message: Pointer to incoming dbus message

742

* @wpa_s: wpa_supplicant structure for a network interface

743

* Returns: A dbus message containing the object path of the new network

744

745

* Handler function for "addNetwork" method call of a network interface.

746

747

DBusMessage * wpas_dbus_iface_add_network(DBusMessage *message,

748

struct wpa_supplicant *wpa_s)

749

{

750

DBusMessage *reply = NULL;

751

struct wpa_ssid *ssid;

752

char *path = NULL;

753

754

path = os_zalloc(WPAS_DBUS_OBJECT_PATH_MAX);

755

if (path == NULL) {

756

perror("wpas_dbus_iface_scan_results[dbus]: out of "

757

"memory.");

758

wpa_printf(MSG_ERROR, "dbus control interface: not "

759

"enough memory to send scan results "

760

"signal.");

761

goto out;

762

}

763

764

ssid = wpa_config_add_network(wpa_s->conf);

765

if (ssid == NULL) {

766

reply = dbus_message_new_error(message,

767

WPAS_ERROR_ADD_NETWORK_ERROR,

768

"wpa_supplicant could not add "

769

"a network on this interface.");

770

goto out;

771

}

772

ssid->disabled = 1;

773

wpa_config_set_network_defaults(ssid);

774

775

/* Construct the object path for this network. */

776

snprintf(path, WPAS_DBUS_OBJECT_PATH_MAX,

777

"%s/" WPAS_DBUS_NETWORKS_PART "/%d",

778

wpa_supplicant_get_dbus_path(wpa_s),

779

ssid->id);

780

781

reply = dbus_message_new_method_return(message);

782

dbus_message_append_args(reply, DBUS_TYPE_OBJECT_PATH,

783

&path, DBUS_TYPE_INVALID);

784

785

out:

786

free(path);

787

return reply;

788

}

789

790

791

/**

792

* wpas_dbus_iface_remove_network - Remove a configured network

793

* @message: Pointer to incoming dbus message

794

* @wpa_s: wpa_supplicant structure for a network interface

795

* Returns: A dbus message containing a UINT32 indicating success (1) or

796

* failure (0)

797

798

* Handler function for "removeNetwork" method call of a network interface.

799

800

DBusMessage * wpas_dbus_iface_remove_network(DBusMessage *message,

801

struct wpa_supplicant *wpa_s)

802

{

803

DBusMessage *reply = NULL;

804

const char *op;

805

char *iface = NULL, *net_id = NULL;

806

int id;

807

struct wpa_ssid *ssid;

808

809

if (!dbus_message_get_args(message, NULL,

810

DBUS_TYPE_OBJECT_PATH, &op,

811

DBUS_TYPE_INVALID)) {

812

reply = wpas_dbus_new_invalid_opts_error(message, NULL);

813

goto out;

814

}

815

816

/* Extract the network ID */

817

iface = wpas_dbus_decompose_object_path(op, &net_id, NULL);

818

if (iface == NULL) {

819

reply = wpas_dbus_new_invalid_network_error(message);

820

goto out;

821

}

822

/* Ensure the network is actually a child of this interface */

823

if (strcmp(iface, wpa_supplicant_get_dbus_path(wpa_s)) != 0) {

824

reply = wpas_dbus_new_invalid_network_error(message);

825

goto out;

826

}

827

828

id = strtoul(net_id, NULL, 10);

829

ssid = wpa_config_get_network(wpa_s->conf, id);

830

if (ssid == NULL) {

831

reply = wpas_dbus_new_invalid_network_error(message);

832

goto out;

833

}

834

835

if (wpa_config_remove_network(wpa_s->conf, id) < 0) {

836

reply = dbus_message_new_error(message,

837

WPAS_ERROR_REMOVE_NETWORK_ERROR,

838

"error removing the specified "

839

"on this interface.");

840

goto out;

841

}

842

843

if (ssid == wpa_s->current_ssid)

844

wpa_supplicant_disassociate(wpa_s, WLAN_REASON_DEAUTH_LEAVING);

845

reply = wpas_dbus_new_success_reply(message);

846

847

out:

848

free(iface);

849

free(net_id);

850

return reply;

851

}

852

853

854

static const char *dont_quote[] = {

855

"key_mgmt", "proto", "pairwise", "auth_alg", "group", "eap",

856

"opensc_engine_path", "pkcs11_engine_path", "pkcs11_module_path",

857

"bssid", NULL

858

};

859

860

static dbus_bool_t should_quote_opt(const char *key)

861

{

862

int i = 0;

863

while (dont_quote[i] != NULL) {

864

if (strcmp(key, dont_quote[i]) == 0)

865

return FALSE;

866

i++;

867

}

868

return TRUE;

869

}

870

871

/**

872

* wpas_dbus_iface_set_network - Set options for a configured network

873

* @message: Pointer to incoming dbus message

874

* @wpa_s: wpa_supplicant structure for a network interface

875

* @ssid: wpa_ssid structure for a configured network

876

* Returns: a dbus message containing a UINT32 indicating success (1) or

877

* failure (0)

878

879

* Handler function for "set" method call of a configured network.

880

881

DBusMessage * wpas_dbus_iface_set_network(DBusMessage *message,

882

struct wpa_supplicant *wpa_s,

883

struct wpa_ssid *ssid)

884

{

885

DBusMessage *reply = NULL;

886

struct wpa_dbus_dict_entry entry = { .type = DBUS_TYPE_STRING };

887

DBusMessageIter iter, iter_dict;

888

889

dbus_message_iter_init(message, &iter);

890

891

if (!wpa_dbus_dict_open_read(&iter, &iter_dict)) {

892

reply = wpas_dbus_new_invalid_opts_error(message, NULL);

893

goto out;

894

}

895

896

while (wpa_dbus_dict_has_dict_entry(&iter_dict)) {

897

char *value = NULL;

898

size_t size = 50;

899

int ret;

900

901

if (!wpa_dbus_dict_get_entry(&iter_dict, &entry)) {

902

reply = wpas_dbus_new_invalid_opts_error(message,

903

NULL);

904

goto out;

905

}

906

907

/* Type conversions, since wpa_supplicant wants strings */

908

if (entry.type == DBUS_TYPE_ARRAY &&

909

entry.array_type == DBUS_TYPE_BYTE) {

910

if (entry.array_len <= 0)

911

goto error;

912

913

size = entry.array_len * 2 + 1;

914

value = os_zalloc(size);

915

if (value == NULL)

916

goto error;

917

ret = wpa_snprintf_hex(value, size,

918

(u8 *) entry.bytearray_value,

919

entry.array_len);

920

if (ret <= 0)

921

goto error;

922

} else if (entry.type == DBUS_TYPE_STRING) {

923

if (should_quote_opt(entry.key)) {

924

size = strlen(entry.str_value);

925

/* Zero-length option check */

926

if (size <= 0)

927

goto error;

928

size += 3; /* For quotes and terminator */

929

value = os_zalloc(size);

930

if (value == NULL)

931

goto error;

932

ret = snprintf(value, size, "\"%s\"",

933

entry.str_value);

934

if (ret < 0 || (size_t) ret != (size - 1))

935

goto error;

936

} else {

937

value = strdup(entry.str_value);

938

if (value == NULL)

939

goto error;

940

}

941

} else if (entry.type == DBUS_TYPE_UINT32) {

942

value = os_zalloc(size);

943

if (value == NULL)

944

goto error;

945

ret = snprintf(value, size, "%u", entry.uint32_value);

946

if (ret <= 0)

947

goto error;

948

} else if (entry.type == DBUS_TYPE_INT32) {

949

value = os_zalloc(size);

950

if (value == NULL)

951

goto error;

952

ret = snprintf(value, size, "%d", entry.int32_value);

953

if (ret <= 0)

954

goto error;

955

} else

956

goto error;

957

958

if (wpa_config_set(ssid, entry.key, value, 0) < 0)

959

goto error;

960

961

if ((strcmp(entry.key, "psk") == 0 &&

962

value[0] == '"' && ssid->ssid_len) ||

963

(strcmp(entry.key, "ssid") == 0 && ssid->passphrase))

964

wpa_config_update_psk(ssid);

965

966

free(value);

967

wpa_dbus_dict_entry_clear(&entry);

968

continue;

969

970

error:

971

free(value);

972

reply = wpas_dbus_new_invalid_opts_error(message, entry.key);

973

wpa_dbus_dict_entry_clear(&entry);

974

break;

975

}

976

977

if (!reply)

978

reply = wpas_dbus_new_success_reply(message);

979

980

out:

981

return reply;

982

}

983

984

985

/**

986

* wpas_dbus_iface_enable_network - Mark a configured network as enabled

987

* @message: Pointer to incoming dbus message

988

* @wpa_s: wpa_supplicant structure for a network interface

989

* @ssid: wpa_ssid structure for a configured network

990

* Returns: A dbus message containing a UINT32 indicating success (1) or

991

* failure (0)

992

993

* Handler function for "enable" method call of a configured network.

994

995

DBusMessage * wpas_dbus_iface_enable_network(DBusMessage *message,

996

struct wpa_supplicant *wpa_s,

997

struct wpa_ssid *ssid)

998

{

999

if (wpa_s->current_ssid == NULL && ssid->disabled) {

1000

1001

* Try to reassociate since there is no current configuration

1002

* and a new network was made available.

1003

1004

wpa_s->reassociate = 1;

1005

wpa_supplicant_req_scan(wpa_s, 0, 0);

1006

}

1007

ssid->disabled = 0;

1008

1009

return wpas_dbus_new_success_reply(message);

1010

}

1011

1012

1013

/**

1014

* wpas_dbus_iface_disable_network - Mark a configured network as disabled

1015

* @message: Pointer to incoming dbus message

1016

* @wpa_s: wpa_supplicant structure for a network interface

1017

* @ssid: wpa_ssid structure for a configured network

1018

* Returns: A dbus message containing a UINT32 indicating success (1) or

1019

* failure (0)

1020

1021

* Handler function for "disable" method call of a configured network.

1022

1023

DBusMessage * wpas_dbus_iface_disable_network(DBusMessage *message,

1024

struct wpa_supplicant *wpa_s,

1025

struct wpa_ssid *ssid)

1026

{

1027

if (ssid == wpa_s->current_ssid)

1028

wpa_supplicant_disassociate(wpa_s, WLAN_REASON_DEAUTH_LEAVING);

1029

ssid->disabled = 1;

1030

1031

return wpas_dbus_new_success_reply(message);

1032

}

1033

1034

1035

/**

1036

* wpas_dbus_iface_select_network - Attempt association with a configured network

1037

* @message: Pointer to incoming dbus message

1038

* @wpa_s: wpa_supplicant structure for a network interface

1039

* Returns: A dbus message containing a UINT32 indicating success (1) or

1040

* failure (0)

1041

1042

* Handler function for "selectNetwork" method call of network interface.

1043

1044

DBusMessage * wpas_dbus_iface_select_network(DBusMessage *message,

1045

struct wpa_supplicant *wpa_s)

1046

{

1047

DBusMessage *reply = NULL;

1048

const char *op;

1049

struct wpa_ssid *ssid;

1050

char *iface_obj_path = NULL;

1051

char *network = NULL;

1052

1053

if (strlen(dbus_message_get_signature(message)) == 0) {

1054

/* Any network */

1055

ssid = wpa_s->conf->ssid;

1056

while (ssid) {

1057

ssid->disabled = 0;

1058

ssid = ssid->next;

1059

}

1060

wpa_s->reassociate = 1;

1061

wpa_supplicant_req_scan(wpa_s, 0, 0);

1062

} else {

1063

const char *obj_path;

1064

int nid;

1065

1066

if (!dbus_message_get_args(message, NULL,

1067

DBUS_TYPE_OBJECT_PATH, &op,

1068

DBUS_TYPE_INVALID)) {

1069

reply = wpas_dbus_new_invalid_opts_error(message,

1070

NULL);

1071

goto out;

1072

}

1073

1074

/* Extract the network number */

1075

iface_obj_path = wpas_dbus_decompose_object_path(op,

1076

&network,

1077

NULL);

1078

if (iface_obj_path == NULL) {

1079

reply = wpas_dbus_new_invalid_iface_error(message);

1080

goto out;

1081

}

1082

/* Ensure the object path really points to this interface */

1083

obj_path = wpa_supplicant_get_dbus_path(wpa_s);

1084

if (strcmp(iface_obj_path, obj_path) != 0) {

1085

reply = wpas_dbus_new_invalid_network_error(message);

1086

goto out;

1087

}

1088

1089

nid = strtoul(network, NULL, 10);

1090

if (errno == EINVAL) {

1091

reply = wpas_dbus_new_invalid_network_error(message);

1092

goto out;

1093

}

1094

1095

ssid = wpa_config_get_network(wpa_s->conf, nid);

1096

if (ssid == NULL) {

1097

reply = wpas_dbus_new_invalid_network_error(message);

1098

goto out;

1099

}

1100

1101

/* Finally, associate with the network */

1102

if (ssid != wpa_s->current_ssid && wpa_s->current_ssid)

1103

wpa_supplicant_disassociate(

1104

wpa_s, WLAN_REASON_DEAUTH_LEAVING);

1105

1106

/* Mark all other networks disabled and trigger reassociation

1107

1108

ssid = wpa_s->conf->ssid;

1109

while (ssid) {

1110

ssid->disabled = (nid != ssid->id);

1111

ssid = ssid->next;

1112

}

1113

wpa_s->disconnected = 0;

1114

wpa_s->reassociate = 1;

1115

wpa_supplicant_req_scan(wpa_s, 0, 0);

1116

}

1117

1118

reply = wpas_dbus_new_success_reply(message);

1119

1120

out:

1121

free(iface_obj_path);

1122

free(network);

1123

return reply;

1124

}

1125

1126

1127

/**

1128

* wpas_dbus_iface_disconnect - Terminate the current connection

1129

* @message: Pointer to incoming dbus message

1130

* @wpa_s: wpa_supplicant structure for a network interface

1131

* Returns: A dbus message containing a UINT32 indicating success (1) or

1132

* failure (0)

1133

1134

* Handler function for "disconnect" method call of network interface.

1135

1136

DBusMessage * wpas_dbus_iface_disconnect(DBusMessage *message,

1137

struct wpa_supplicant *wpa_s)

1138

{

1139

wpa_s->disconnected = 1;

1140

wpa_supplicant_disassociate(wpa_s, WLAN_REASON_DEAUTH_LEAVING);

1141

1142

return wpas_dbus_new_success_reply(message);

1143

}

1144

1145

1146

/**

1147

* wpas_dbus_iface_set_ap_scan - Control roaming mode

1148

* @message: Pointer to incoming dbus message

1149

* @wpa_s: wpa_supplicant structure for a network interface

1150

* Returns: A dbus message containing a UINT32 indicating success (1) or

1151

* failure (0)

1152

1153

* Handler function for "setAPScan" method call.

1154

1155

DBusMessage * wpas_dbus_iface_set_ap_scan(DBusMessage *message,

1156

struct wpa_supplicant *wpa_s)

1157

{

1158

DBusMessage *reply = NULL;

1159

dbus_uint32_t ap_scan = 1;

1160

1161

if (!dbus_message_get_args(message, NULL, DBUS_TYPE_UINT32, &ap_scan,

1162

DBUS_TYPE_INVALID)) {

1163

reply = wpas_dbus_new_invalid_opts_error(message, NULL);

1164

goto out;

1165

}

1166

1167

if (ap_scan > 2) {

1168

reply = wpas_dbus_new_invalid_opts_error(message, NULL);

1169

goto out;

1170

}

1171

wpa_s->conf->ap_scan = ap_scan;

1172

reply = wpas_dbus_new_success_reply(message);

1173

1174

out:

1175

return reply;

1176

}

1177

1178

1179

/**

1180

* wpas_dbus_iface_get_state - Get interface state

1181

* @message: Pointer to incoming dbus message

1182

* @wpa_s: wpa_supplicant structure for a network interface

1183

* Returns: A dbus message containing a STRING representing the current

1184

* interface state

1185

1186

* Handler function for "state" method call.

1187

1188

DBusMessage * wpas_dbus_iface_get_state(DBusMessage *message,

1189

struct wpa_supplicant *wpa_s)

1190

{

1191

DBusMessage *reply = NULL;

1192

const char *str_state;

1193

1194

reply = dbus_message_new_method_return(message);

1195

if (reply != NULL) {

1196

str_state = wpa_supplicant_state_txt(wpa_s->wpa_state);

1197

dbus_message_append_args(reply, DBUS_TYPE_STRING, &str_state,

1198

DBUS_TYPE_INVALID);

1199

}

1200

1201

return reply;

1202

}

Older »