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

Viewing changes to wpa_supplicant/wpa_gui-qt4/wpagui.cpp

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

wpa_supplicant/wpa_gui-qt4/wpagui.cpp

* wpa_gui - WpaGui class

* This program is free software; you can redistribute it and/or modify

* it under the terms of the GNU General Public License version 2 as

#include "wpagui.h"

#include "dirent.h"

#include "wpa_ctrl.h"

#include "common/wpa_ctrl.h"

#include "userdatarequest.h"

#include "networkconfig.h"

#ifdef CONFIG_NATIVE_WINDOWS

fileStopServiceAction = new QAction(this);

fileStopServiceAction->setObjectName("Stop Service");

fileStopServiceAction->setIconText("Stop Service");

fileStopServiceAction->setIconText(tr("Stop Service"));

fileMenu->insertAction(actionWPS, fileStopServiceAction);

fileStartServiceAction = new QAction(this);

fileStartServiceAction->setObjectName("Start Service");

fileStartServiceAction->setIconText("Start Service");

fileStartServiceAction->setIconText(tr("Start Service"));

fileMenu->insertAction(fileStopServiceAction, fileStartServiceAction);

connect(fileStartServiceAction, SIGNAL(triggered()), this,

SLOT(stopService()));

addInterfaceAction = new QAction(this);

addInterfaceAction->setIconText("Add Interface");

addInterfaceAction->setIconText(tr("Add Interface"));

fileMenu->insertAction(fileStartServiceAction, addInterfaceAction);

connect(addInterfaceAction, SIGNAL(triggered()), this,

connect(fileSaveConfigAction, SIGNAL(triggered()), this,

SLOT(saveConfig()));

connect(actionWPS, SIGNAL(triggered()), this, SLOT(wpsDialog()));

connect(actionPeers, SIGNAL(triggered()), this, SLOT(peersDialog()));

connect(fileExitAction, SIGNAL(triggered()), qApp, SLOT(quit()));

connect(networkAddAction, SIGNAL(triggered()), this,

SLOT(addNetwork()));

133

134

135

eh = NULL;

135

136

scanres = NULL;

137

peers = NULL;

136

138

add_iface = NULL;

137

139

udr = NULL;

138

140

tray_icon = NULL;

162

164

show();

163

165

164

166

connectedToService = false;

165

textStatus->setText("connecting to wpa_supplicant");

167

textStatus->setText(tr("connecting to wpa_supplicant"));

166

168

timer = new QTimer(this);

167

169

connect(timer, SIGNAL(timeout()), SLOT(ping()));

168

170

timer->setSingleShot(FALSE);

205

207

scanres = NULL;

206

208

}

207

209

210

if (peers) {

211

peers->close();

212

delete peers;

213

peers = NULL;

214

}

215

208

216

if (add_iface) {

209

217

add_iface->close();

210

218

delete add_iface;

332

340

first = false;

333

341

if (QMessageBox::warning(

334

342

this, qAppName(),

335

"wpa_supplicant service is not running.\n"

336

"Do you want to start it?",

343

tr("wpa_supplicant service is not "

344

"running.\n"

345

"Do you want to start it?"),

337

346

QMessageBox::Yes | QMessageBox::No) ==

338

347

QMessageBox::Yes)

339

348

startService();

435

444

}

436

445

437

446

438

static void wpa_gui_msg_cb(char *msg, size_t)

439

{

440

/* This should not happen anymore since two control connections are

441

* used. */

442

printf("missed message: %s\n", msg);

443

}

444

445

446

447

int WpaGui::ctrlRequest(const char *cmd, char *buf, size_t *buflen)

447

448

{

448

449

int ret;

449

450

451

if (ctrl_conn == NULL)

451

452

return -3;

452

ret = wpa_ctrl_request(ctrl_conn, cmd, strlen(cmd), buf, buflen,

453

wpa_gui_msg_cb);

453

ret = wpa_ctrl_request(ctrl_conn, cmd, strlen(cmd), buf, buflen, NULL);

454

if (ret == -2)

455

printf("'%s' command timed out.\n", cmd);

456

else if (ret < 0)

460

}

461

462

463

QString WpaGui::wpaStateTranslate(char *state)

464

{

465

if (!strcmp(state, "DISCONNECTED"))

466

return tr("Disconnected");

467

else if (!strcmp(state, "INACTIVE"))

468

return tr("Inactive");

469

else if (!strcmp(state, "SCANNING"))

470

return tr("Scanning");

471

else if (!strcmp(state, "AUTHENTICATING"))

472

return tr("Authenticating");

473

else if (!strcmp(state, "ASSOCIATING"))

474

return tr("Associating");

475

else if (!strcmp(state, "ASSOCIATED"))

476

return tr("Associated");

477

else if (!strcmp(state, "4WAY_HANDSHAKE"))

478

return tr("4-Way Handshake");

479

else if (!strcmp(state, "GROUP_HANDSHAKE"))

480

return tr("Group Handshake");

481

else if (!strcmp(state, "COMPLETED"))

482

return tr("Completed");

483

else

484

return tr("Unknown");

485

}

486

487

463

488

void WpaGui::updateStatus()

464

489

{

465

490

char buf[2048], *start, *end, *pos;

469

494

470

495

len = sizeof(buf) - 1;

471

496

if (ctrl_conn == NULL || ctrlRequest("STATUS", buf, &len) < 0) {

472

textStatus->setText("Could not get status from "

473

"wpa_supplicant");

497

textStatus->setText(tr("Could not get status from "

498

"wpa_supplicant"));

474

499

textAuthentication->clear();

475

500

textEncryption->clear();

476

501

textSsid->clear();

484

509

first = false;

485

510

if (QMessageBox::information(

486

511

this, qAppName(),

487

"No network interfaces in use.\n"

488

"Would you like to add one?",

512

tr("No network interfaces in use.\n"

513

"Would you like to add one?"),

489

514

QMessageBox::Yes | QMessageBox::No) ==

490

515

QMessageBox::Yes)

491

516

addInterface();

500

525

bool bssid_updated = false, ipaddr_updated = false;

501

526

bool status_updated = false;

502

527

char *pairwise_cipher = NULL, *group_cipher = NULL;

528

char *mode = NULL;

503

529

504

530

start = buf;

505

531

while (*start) {

527

553

textIpAddress->setText(pos);

528

554

} else if (strcmp(start, "wpa_state") == 0) {

529

555

status_updated = true;

530

textStatus->setText(pos);

556

textStatus->setText(wpaStateTranslate(pos));

531

557

} else if (strcmp(start, "key_mgmt") == 0) {

532

558

auth_updated = true;

533

559

textAuthentication->setText(pos);

536

562

pairwise_cipher = pos;

537

563

} else if (strcmp(start, "group_cipher") == 0) {

538

564

group_cipher = pos;

565

} else if (strcmp(start, "mode") == 0) {

566

mode = pos;

539

567

}

540

568

}

541

569

543

571

break;

544

572

start = end + 1;

545

573

}

574

if (status_updated && mode)

575

textStatus->setText(textStatus->text() + " (" + mode + ")");

546

576

547

577

if (pairwise_cipher || group_cipher) {

548

578

QString encr;

649

679

}

650

680

651

681

if (networkSelect->count() > 1)

652

networkSelect->addItem("Select any network");

682

networkSelect->addItem(tr("Select any network"));

653

683

654

684

if (!current && first_active >= 0)

655

685

networkSelect->setCurrentIndex(first_active);

682

712

void WpaGui::helpAbout()

683

713

{

684

714

QMessageBox::about(this, "wpa_gui for wpa_supplicant",

685

715

686

716

"Jouni Malinen <j@w1.fi>\n"

687

717

"and contributors.\n"

688

718

"\n"

822

852

WpaMsg wm(pos, priority);

823

853

if (eh)

824

854

eh->addEvent(wm);

855

if (peers)

856

peers->event_notify(wm);

825

857

msgs.append(wm);

826

858

while (msgs.count() > 100)

827

859

msgs.pop_front();

848

880

scanres->updateResults();

849

881

else if (str_match(pos, WPA_EVENT_DISCONNECTED))

850

882

showTrayMessage(QSystemTrayIcon::Information, 3,

851

"Disconnected from network.");

883

tr("Disconnected from network."));

852

884

else if (str_match(pos, WPA_EVENT_CONNECTED)) {

853

885

showTrayMessage(QSystemTrayIcon::Information, 3,

854

"Connection to network established.");

886

tr("Connection to network established."));

855

887

QTimer::singleShot(5 * 1000, this, SLOT(showTrayStatus()));

856

888

stopWpsRun(true);

857

889

} else if (str_match(pos, WPS_EVENT_AP_AVAILABLE_PBC)) {

858

wpsStatusText->setText("WPS AP in active PBC mode found");

890

wpsStatusText->setText(tr("WPS AP in active PBC mode found"));

859

891

if (textStatus->text() == "INACTIVE" ||

860

892

textStatus->text() == "DISCONNECTED")

861

893

wpaguiTab->setCurrentWidget(wpsTab);

862

wpsInstructions->setText("Press the PBC button on the screen "

863

"to start registration");

894

wpsInstructions->setText(tr("Press the PBC button on the "

895

"screen to start registration"));

864

896

} else if (str_match(pos, WPS_EVENT_AP_AVAILABLE_PIN)) {

865

wpsStatusText->setText("WPS AP with recently selected "

866

"registrar");

897

wpsStatusText->setText(tr("WPS AP with recently selected "

898

"registrar"));

867

899

if (textStatus->text() == "INACTIVE" ||

868

900

textStatus->text() == "DISCONNECTED")

869

901

wpaguiTab->setCurrentWidget(wpsTab);

870

902

} else if (str_match(pos, WPS_EVENT_AP_AVAILABLE)) {

871

wpsStatusText->setText("WPS AP detected");

903

wpsStatusText->setText(tr("WPS AP detected"));

872

904

} else if (str_match(pos, WPS_EVENT_OVERLAP)) {

873

wpsStatusText->setText("PBC mode overlap detected");

874

wpsInstructions->setText("More than one AP is currently in "

875

"active WPS PBC mode. Wait couple of "

876

"minutes and try again");

905

wpsStatusText->setText(tr("PBC mode overlap detected"));

906

wpsInstructions->setText(tr("More than one AP is currently in "

907

"active WPS PBC mode. Wait couple "

908

"of minutes and try again"));

877

909

wpaguiTab->setCurrentWidget(wpsTab);

878

910

} else if (str_match(pos, WPS_EVENT_CRED_RECEIVED)) {

879

wpsStatusText->setText("Network configuration received");

911

wpsStatusText->setText(tr("Network configuration received"));

880

912

wpaguiTab->setCurrentWidget(wpsTab);

881

913

} else if (str_match(pos, WPA_EVENT_EAP_METHOD)) {

882

914

if (strstr(pos, "(WSC)"))

883

wpsStatusText->setText("Registration started");

915

wpsStatusText->setText(tr("Registration started"));

884

916

} else if (str_match(pos, WPS_EVENT_M2D)) {

885

wpsStatusText->setText("Registrar does not yet know PIN");

917

wpsStatusText->setText(tr("Registrar does not yet know PIN"));

886

918

} else if (str_match(pos, WPS_EVENT_FAIL)) {

887

wpsStatusText->setText("Registration failed");

919

wpsStatusText->setText(tr("Registration failed"));

888

920

} else if (str_match(pos, WPS_EVENT_SUCCESS)) {

889

wpsStatusText->setText("Registration succeeded");

921

wpsStatusText->setText(tr("Registration succeeded"));

890

922

}

891

923

}

892

924

939

971

char reply[10];

940

972

size_t reply_len = sizeof(reply);

941

973

942

if (cmd.startsWith("Select any")) {

974

if (cmd.contains(QRegExp("^\\d+:")))

975

cmd.truncate(cmd.indexOf(':'));

976

else

943

977

cmd = "any";

944

} else {

945

int pos = cmd.indexOf(':');

946

if (pos < 0) {

947

printf("Invalid selectNetwork '%s'\n",

948

cmd.toAscii().constData());

949

return;

950

}

951

cmd.truncate(pos);

952

}

953

978

cmd.prepend("SELECT_NETWORK ");

954

979

ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);

955

980

triggerUpdate();

963

988

char reply[10];

964

989

size_t reply_len = sizeof(reply);

965

990

966

if (!cmd.startsWith("all")) {

967

int pos = cmd.indexOf(':');

968

if (pos < 0) {

969

printf("Invalid enableNetwork '%s'\n",

970

cmd.toAscii().constData());

971

return;

972

}

973

cmd.truncate(pos);

991

if (cmd.contains(QRegExp("^\\d+:")))

992

cmd.truncate(cmd.indexOf(':'));

993

else if (!cmd.startsWith("all")) {

994

printf("Invalid editNetwork '%s'\n",

995

cmd.toAscii().constData());

996

return;

974

997

}

975

998

cmd.prepend("ENABLE_NETWORK ");

976

999

ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);

984

1007

char reply[10];

985

1008

size_t reply_len = sizeof(reply);

986

1009

987

if (!cmd.startsWith("all")) {

988

int pos = cmd.indexOf(':');

989

if (pos < 0) {

990

printf("Invalid disableNetwork '%s'\n",

991

cmd.toAscii().constData());

992

return;

993

}

994

cmd.truncate(pos);

1010

if (cmd.contains(QRegExp("^\\d+:")))

1011

cmd.truncate(cmd.indexOf(':'));

1012

else if (!cmd.startsWith("all")) {

1013

printf("Invalid editNetwork '%s'\n",

1014

cmd.toAscii().constData());

1015

return;

995

1016

}

996

1017

cmd.prepend("DISABLE_NETWORK ");

997

1018

ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);

1004

1025

QString cmd(sel);

1005

1026

int id = -1;

1006

1027

1007

if (!cmd.startsWith("Select any")) {

1008

int pos = sel.indexOf(':');

1009

if (pos < 0) {

1010

printf("Invalid editNetwork '%s'\n",

1011

cmd.toAscii().constData());

1012

return;

1013

}

1014

cmd.truncate(pos);

1028

if (cmd.contains(QRegExp("^\\d+:"))) {

1029

cmd.truncate(cmd.indexOf(':'));

1015

1030

id = cmd.toInt();

1016

1031

}

1017

1032

1033

1048

void WpaGui::editSelectedNetwork()

1034

1049

{

1035

1050

if (networkSelect->count() < 1) {

1036

QMessageBox::information(this, "No Networks",

1037

"There are no networks to edit.\n");

1051

QMessageBox::information(

1052

this, tr("No Networks"),

1053

tr("There are no networks to edit.\n"));

1038

1054

return;

1039

1055

}

1040

1056

QString sel(networkSelect->currentText());

1045

1061

void WpaGui::editListedNetwork()

1046

1062

{

1047

1063

if (networkList->currentRow() < 0) {

1048

QMessageBox::information(this, "Select A Network",

1049

"Select a network from the list to"

1050

" edit it.\n");

1064

QMessageBox::information(this, tr("Select A Network"),

1065

tr("Select a network from the list to"

1066

" edit it.\n"));

1051

1067

return;

1052

1068

}

1053

1069

QString sel(networkList->currentItem()->text());

1081

1097

char reply[10];

1082

1098

size_t reply_len = sizeof(reply);

1083

1099

1084

if (cmd.startsWith("Select any"))

1100

if (cmd.contains(QRegExp("^\\d+:")))

1101

cmd.truncate(cmd.indexOf(':'));

1102

else if (!cmd.startsWith("all")) {

1103

printf("Invalid editNetwork '%s'\n",

1104

cmd.toAscii().constData());

1085

1105

return;

1086

1087

if (!cmd.startsWith("all")) {

1088

int pos = cmd.indexOf(':');

1089

if (pos < 0) {

1090

printf("Invalid removeNetwork '%s'\n",

1091

cmd.toAscii().constData());

1092

return;

1093

}

1094

cmd.truncate(pos);

1095

1106

}

1096

1107

cmd.prepend("REMOVE_NETWORK ");

1097

1108

ctrlRequest(cmd.toAscii().constData(), reply, &reply_len);

1102

1113

void WpaGui::removeSelectedNetwork()

1103

1114

{

1104

1115

if (networkSelect->count() < 1) {

1105

QMessageBox::information(this, "No Networks",

1106

"There are no networks to remove.\n");

1116

QMessageBox::information(this, tr("No Networks"),

1117

tr("There are no networks to remove."

1118

"\n"));

1107

1119

return;

1108

1120

}

1109

1121

QString sel(networkSelect->currentText());

1114

1126

void WpaGui::removeListedNetwork()

1115

1127

{

1116

1128

if (networkList->currentRow() < 0) {

1117

QMessageBox::information(this, "Select A Network",

1118

"Select a network from the list to"

1119

" remove it.\n");

1129

QMessageBox::information(this, tr("Select A Network"),

1130

tr("Select a network from the list "

1131

"to remove it.\n"));

1120

1132

return;

1121

1133

}

1122

1134

QString sel(networkList->currentItem()->text());

1226

1238

buf[len] = '\0';

1227

1239

1228

1240

if (str_match(buf, "FAIL"))

1229

QMessageBox::warning(this, "Failed to save configuration",

1230

"The configuration could not be saved.\n"

1231

"\n"

1232

"The update_config=1 configuration option\n"

1233

"must be used for configuration saving to\n"

1234

"be permitted.\n");

1241

QMessageBox::warning(

1242

this, tr("Failed to save configuration"),

1243

tr("The configuration could not be saved.\n"

1244

"\n"

1245

"The update_config=1 configuration option\n"

1246

"must be used for configuration saving to\n"

1247

"be permitted.\n"));

1235

1248

else

1236

QMessageBox::information(this, "Saved configuration",

1237

"The current configuration was saved."

1238

"\n");

1249

QMessageBox::information(

1250

this, tr("Saved configuration"),

1251

tr("The current configuration was saved."

1252

"\n"));

1239

1253

}

1240

1254

1241

1255

1254

1268

QApplication::setQuitOnLastWindowClosed(false);

1255

1269

1256

1270

tray_icon = new QSystemTrayIcon(this);

1257

tray_icon->setToolTip(qAppName() + " - wpa_supplicant user interface");

1271

tray_icon->setToolTip(qAppName() + tr(" - wpa_supplicant user interface"));

1258

1272

if (QImageReader::supportedImageFormats().contains(QByteArray("svg")))

1259

1273

tray_icon->setIcon(QIcon(":/icons/wpa_gui.svg"));

1260

1274

else

1268

1282

1269

1283

tray_menu = new QMenu(this);

1270

1284

1271

disconnectAction = new QAction("&Disconnect", this);

1272

reconnectAction = new QAction("Re&connect", this);

1285

disconnectAction = new QAction(tr("&Disconnect"), this);

1286

reconnectAction = new QAction(tr("Re&connect"), this);

1273

1287

connect(disconnectAction, SIGNAL(triggered()), this,

1274

1288

SLOT(disconnect()));

1275

1289

connect(reconnectAction, SIGNAL(triggered()), this,

1278

1292

tray_menu->addAction(reconnectAction);

1279

1293

tray_menu->addSeparator();

1280

1294

1281

eventAction = new QAction("&Event History", this);

1282

scanAction = new QAction("Scan &Results", this);

1283

statAction = new QAction("S&tatus", this);

1295

eventAction = new QAction(tr("&Event History"), this);

1296

scanAction = new QAction(tr("Scan &Results"), this);

1297

statAction = new QAction(tr("S&tatus"), this);

1284

1298

connect(eventAction, SIGNAL(triggered()), this, SLOT(eventHistory()));

1285

1299

connect(scanAction, SIGNAL(triggered()), this, SLOT(scan()));

1286

1300

connect(statAction, SIGNAL(triggered()), this, SLOT(showTrayStatus()));

1289

1303

tray_menu->addAction(statAction);

1290

1304

tray_menu->addSeparator();

1291

1305

1292

showAction = new QAction("&Show Window", this);

1293

hideAction = new QAction("&Hide Window", this);

1294

quitAction = new QAction("&Quit", this);

1306

showAction = new QAction(tr("&Show Window"), this);

1307

hideAction = new QAction(tr("&Hide Window"), this);

1308

quitAction = new QAction(tr("&Quit"), this);

1295

1309

connect(showAction, SIGNAL(triggered()), this, SLOT(show()));

1296

1310

connect(hideAction, SIGNAL(triggered()), this, SLOT(hide()));

1297

1311

connect(quitAction, SIGNAL(triggered()), qApp, SLOT(quit()));

1405

1419

scanres = NULL;

1406

1420

}

1407

1421

1422

if (peers) {

1423

peers->close();

1424

delete peers;

1425

peers = NULL;

1426

}

1427

1408

1428

if (udr) {

1409

1429

udr->close();

1410

1430

delete udr;

1416

1436

if (QSystemTrayIcon::supportsMessages()) {

1417

1437

hide();

1418

1438

showTrayMessage(QSystemTrayIcon::Information, 3,

1419

qAppName() + " will keep running in "

1420

"the system tray.");

1439

qAppName() +

1440

tr(" will keep running in "

1441

"the system tray."));

1421

1442

} else {

1422

QMessageBox::information(this, qAppName() + " systray",

1423

"The program will keep "

1424

"running in the system "

1425

"tray.");

1443

QMessageBox::information(this, qAppName() +

1444

tr(" systray"),

1445

tr("The program will keep "

1446

"running in the system "

1447

"tray."));

1426

1448

}

1427

1449

ackTrayIcon = true;

1428

1450

}

1437

1459

}

1438

1460

1439

1461

1462

void WpaGui::peersDialog()

1463

{

1464

if (peers) {

1465

peers->close();

1466

delete peers;

1467

}

1468

1469

peers = new Peers();

1470

if (peers == NULL)

1471

return;

1472

peers->setWpaGui(this);

1473

peers->show();

1474

peers->exec();

1475

}

1476

1477

1440

1478

void WpaGui::tabChanged(int index)

1441

1479

{

1442

1480

if (index != 2)

1460

1498

return;

1461

1499

1462

1500

wpsPinEdit->setEnabled(false);

1463

if (wpsStatusText->text().compare("WPS AP in active PBC mode found")) {

1464

wpsInstructions->setText("Press the push button on the AP to "

1465

"start the PBC mode.");

1501

if (wpsStatusText->text().compare(tr("WPS AP in active PBC mode found"))) {

1502

wpsInstructions->setText(tr("Press the push button on the AP to "

1503

"start the PBC mode."));

1466

1504

} else {

1467

wpsInstructions->setText("If you have not yet done so, press "

1505

wpsInstructions->setText(tr("If you have not yet done so, press "

1468

1506

"the push button on the AP to start "

1469

"the PBC mode.");

1507

"the PBC mode."));

1470

1508

}

1471

wpsStatusText->setText("Waiting for Registrar");

1509

wpsStatusText->setText(tr("Waiting for Registrar"));

1472

1510

wpsRunning = true;

1473

1511

}

1474

1512

1485

1523

1486

1524

wpsPinEdit->setText(reply);

1487

1525

wpsPinEdit->setEnabled(true);

1488

wpsInstructions->setText("Enter the generated PIN into the Registrar "

1526

wpsInstructions->setText(tr("Enter the generated PIN into the Registrar "

1489

1527

"(either the internal one in the AP or an "

1490

"external one).");

1491

wpsStatusText->setText("Waiting for Registrar");

1528

"external one)."));

1529

wpsStatusText->setText(tr("Waiting for Registrar"));

1492

1530

wpsRunning = true;

1493

1531

}

1494

1532

1498

1536

bssFromScan = bssid;

1499

1537

wpsApPinEdit->setEnabled(!bssFromScan.isEmpty());

1500

1538

wpsApPinButton->setEnabled(wpsApPinEdit->text().length() == 8);

1501

wpsStatusText->setText("WPS AP selected from scan results");

1502

wpsInstructions->setText("If you want to use an AP device PIN, e.g., "

1539

wpsStatusText->setText(tr("WPS AP selected from scan results"));

1540

wpsInstructions->setText(tr("If you want to use an AP device PIN, e.g., "

1503

1541

"from a label in the device, enter the eight "

1504

"digit AP PIN and click Use AP PIN button.");

1542

"digit AP PIN and click Use AP PIN button."));

1505

1543

}

1506

1544

1507

1545

1520

1558

if (ctrlRequest(cmd.toAscii().constData(), reply, &reply_len) < 0)

1521

1559

return;

1522

1560

1523

wpsStatusText->setText("Waiting for AP/Enrollee");

1561

wpsStatusText->setText(tr("Waiting for AP/Enrollee"));

1524

1562

wpsRunning = true;

1525

1563

}

1526

1564

1528

1566

void WpaGui::stopWpsRun(bool success)

1529

1567

{

1530

1568

if (wpsRunning)

1531

wpsStatusText->setText(success ? "Connected to the network" :

1532

"Stopped");

1569

wpsStatusText->setText(success ? tr("Connected to the network") :

1570

tr("Stopped"));

1533

1571

else

1534

1572

wpsStatusText->setText("");

1535

1573

wpsPinEdit->setEnabled(false);

1558

1596

ErrorMsg::ErrorMsg(QWidget *parent, DWORD last_err) :

1559

1597

QMessageBox(parent), err(last_err)

1560

1598

{

1561

setWindowTitle("wpa_gui error");

1599

setWindowTitle(tr("wpa_gui error"));

1562

1600

setIcon(QMessageBox::Warning);

1563

1601

}

1564

1602

1588

1626

1589

1627

scm = OpenSCManager(0, 0, SC_MANAGER_CONNECT);

1590

1628

if (!scm) {

1591

ErrorMsg(this).showMsg("OpenSCManager failed");

1629

ErrorMsg(this).showMsg(tr("OpenSCManager failed"));

1592

1630

return;

1593

1631

}

1594

1632

1595

1633

svc = OpenService(scm, WPASVC_NAME, SERVICE_START);

1596

1634

if (!svc) {

1597

ErrorMsg(this).showMsg("OpenService failed");

1635

ErrorMsg(this).showMsg(tr("OpenService failed"));

1598

1636

CloseServiceHandle(scm);

1599

1637

return;

1600

1638

}

1601

1639

1602

1640

if (!StartService(svc, 0, NULL)) {

1603

ErrorMsg(this).showMsg("Failed to start wpa_supplicant "

1604

"service");

1641

ErrorMsg(this).showMsg(tr("Failed to start wpa_supplicant "

1642

"service"));

1605

1643

}

1606

1644

1607

1645

CloseServiceHandle(svc);

1616

1654

1617

1655

scm = OpenSCManager(0, 0, SC_MANAGER_CONNECT);

1618

1656

if (!scm) {

1619

ErrorMsg(this).showMsg("OpenSCManager failed");

1657

ErrorMsg(this).showMsg(tr("OpenSCManager failed"));

1620

1658

return;

1621

1659

}

1622

1660

1623

1661

svc = OpenService(scm, WPASVC_NAME, SERVICE_STOP);

1624

1662

if (!svc) {

1625

ErrorMsg(this).showMsg("OpenService failed");

1663

ErrorMsg(this).showMsg(tr("OpenService failed"));

1626

1664

CloseServiceHandle(scm);

1627

1665

return;

1628

1666

}

1629

1667

1630

1668

if (!ControlService(svc, SERVICE_CONTROL_STOP, &status)) {

1631

ErrorMsg(this).showMsg("Failed to stop wpa_supplicant "

1632

"service");

1669

ErrorMsg(this).showMsg(tr("Failed to stop wpa_supplicant "

1670

"service"));

1633

1671

}

1634

1672

1635

1673

CloseServiceHandle(svc);

Older »