aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJouni Malinen <jouni.malinen@atheros.com>2010-01-04 14:34:06 (GMT)
committerJouni Malinen <j@w1.fi>2010-01-04 14:34:06 (GMT)
commit777f07b62db9a00738dd77bab8a1964bea52926f (patch)
treee885f96091980d180932073b90b7b647b71c6c02
parent27f43d8de5161a77d14e39ccbd0ae5cc8cc0e582 (diff)
downloadhostap-777f07b62db9a00738dd77bab8a1964bea52926f.zip
hostap-777f07b62db9a00738dd77bab8a1964bea52926f.tar.gz
hostap-777f07b62db9a00738dd77bab8a1964bea52926f.tar.bz2
dbus: Update example scripts to use PropertiesChanged
The StateChanged signal was removed, to use PropertiesChanged instead.
-rwxr-xr-xwpa_supplicant/examples/wpas-dbus-new-wps.py9
-rwxr-xr-xwpa_supplicant/examples/wpas-dbus-new.py9
2 files changed, 10 insertions, 8 deletions
diff --git a/wpa_supplicant/examples/wpas-dbus-new-wps.py b/wpa_supplicant/examples/wpas-dbus-new-wps.py
index 607a22b..b886385 100755
--- a/wpa_supplicant/examples/wpas-dbus-new-wps.py
+++ b/wpa_supplicant/examples/wpas-dbus-new-wps.py
@@ -13,8 +13,9 @@ WPAS_DBUS_OPATH = "/fi/w1/wpa_supplicant1"
WPAS_DBUS_INTERFACES_INTERFACE = "fi.w1.wpa_supplicant1.Interface"
WPAS_DBUS_WPS_INTERFACE = "fi.w1.wpa_supplicant1.Interface.WPS"
-def stateChanged(newState, oldState):
- print "StateChanged(%s -> %s)" % (oldState, newState)
+def propertiesChanged(properties):
+ if properties.has_key("State"):
+ print "PropertiesChanged: State: %s" % (properties["State"])
def scanDone(success):
print "Scan done: success=%s" % success
@@ -52,9 +53,9 @@ def main():
bus.add_signal_receiver(bssRemoved,
dbus_interface=WPAS_DBUS_INTERFACES_INTERFACE,
signal_name="BSSRemoved")
- bus.add_signal_receiver(stateChanged,
+ bus.add_signal_receiver(propertiesChanged,
dbus_interface=WPAS_DBUS_INTERFACES_INTERFACE,
- signal_name="StateChanged")
+ signal_name="PropertiesChanged")
bus.add_signal_receiver(wpsEvent,
dbus_interface=WPAS_DBUS_WPS_INTERFACE,
signal_name="Event")
diff --git a/wpa_supplicant/examples/wpas-dbus-new.py b/wpa_supplicant/examples/wpas-dbus-new.py
index 156b4fb..b9714bd 100755
--- a/wpa_supplicant/examples/wpas-dbus-new.py
+++ b/wpa_supplicant/examples/wpas-dbus-new.py
@@ -33,8 +33,9 @@ def list_interfaces(wpas_obj):
dbus_interface=dbus.PROPERTIES_IFACE)
print ifname
-def stateChanged(newState, oldState):
- print "StateChanged(%s -> %s)" % (oldState, newState)
+def propertiesChanged(properties):
+ if properties.has_key("State"):
+ print "PropertiesChanged: State: %s" % (properties["State"])
def showBss(bss):
net_obj = bus.get_object(WPAS_DBUS_SERVICE, bss)
@@ -110,9 +111,9 @@ def main():
bus.add_signal_receiver(bssRemoved,
dbus_interface=WPAS_DBUS_INTERFACES_INTERFACE,
signal_name="BSSRemoved")
- bus.add_signal_receiver(stateChanged,
+ bus.add_signal_receiver(propertiesChanged,
dbus_interface=WPAS_DBUS_INTERFACES_INTERFACE,
- signal_name="StateChanged")
+ signal_name="PropertiesChanged")
ifname = sys.argv[1]