automake build system

[mech_eap.orig] / wpa_supplicant / examples / wpas-dbus-new.py

diff --git a/wpa_supplicant/examples/wpas-dbus-new.py b/wpa_supplicant/examples/wpas-dbus-new.py
index b9714bd..25072ce 100755 (executable)
--- a/wpa_supplicant/examples/wpas-dbus-new.py
+++ b/wpa_supplicant/examples/wpas-dbus-new.py
@@ -12,7 +12,7 @@ WPAS_DBUS_OPATH = "/fi/w1/wpa_supplicant1"
 
 WPAS_DBUS_INTERFACES_INTERFACE = "fi.w1.wpa_supplicant1.Interface"
 WPAS_DBUS_INTERFACES_OPATH = "/fi/w1/wpa_supplicant1/Interfaces"
-WPAS_DBUS_BSS_INTERFACE = "fi.w1.wpa_supplicant1.Interface.BSS"
+WPAS_DBUS_BSS_INTERFACE = "fi.w1.wpa_supplicant1.BSS"
 
 def byte_array_to_string(s):
        import urllib
@@ -52,28 +52,30 @@ def showBss(bss):
                          dbus_interface=dbus.PROPERTIES_IFACE)
        ssid = byte_array_to_string(val)
 
-       val = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'WPAIE',
+       val = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'WPA',
                          dbus_interface=dbus.PROPERTIES_IFACE)
        wpa = "no"
-       if val != None:
+       if len(val["KeyMgmt"]) > 0:
                wpa = "yes"
-       val = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'RSNIE',
+       val = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'RSN',
                          dbus_interface=dbus.PROPERTIES_IFACE)
        wpa2 = "no"
-       if val != None:
+       if len(val["KeyMgmt"]) > 0:
                wpa2 = "yes"
        freq = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'Frequency',
                           dbus_interface=dbus.PROPERTIES_IFACE)
        signal = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'Signal',
                             dbus_interface=dbus.PROPERTIES_IFACE)
-       val = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'MaxRate',
+       val = net_obj.Get(WPAS_DBUS_BSS_INTERFACE, 'Rates',
                          dbus_interface=dbus.PROPERTIES_IFACE)
-       maxrate = val / 1000000
+       if len(val) > 0:
+               maxrate = val[0] / 1000000
+       else:
+               maxrate = 0
 
        print "  %s  ::  ssid='%s'  wpa=%s  wpa2=%s  signal=%d  rate=%d  freq=%d" % (bssid, ssid, wpa, wpa2, signal, maxrate, freq)
 
 def scanDone(success):
-       gobject.MainLoop().quit()
        print "Scan done: success=%s" % success
        
        res = if_obj.Get(WPAS_DBUS_INTERFACES_INTERFACE, 'BSSs',