X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=test%2Flist-networks;h=8f7e01bb8465e94bde138969401e41ac9e47ac35;hb=67e4d9d3cc18b494eb07639eb33e29342100ca7b;hp=d3fa34d982ba093aa20af4b6fc9b5561a0bb334c;hpb=5734f815db47e848c34bb84cd05293134652f635;p=connman

diff --git a/test/list-networks b/test/list-networks
index d3fa34d..8f7e01b 100755
--- a/test/list-networks
+++ b/test/list-networks
@@ -1,26 +1,50 @@
 #!/usr/bin/python
 
 import dbus
+import string
 
 bus = dbus.SystemBus()
 
 manager = dbus.Interface(bus.get_object("org.moblin.connman", "/"),
 					"org.moblin.connman.Manager")
 
-elements = manager.ListElements()
+properties = manager.GetProperties()
 
-for path in elements:
-	element = dbus.Interface(bus.get_object("org.moblin.connman", path),
-						"org.moblin.connman.Element")
+def convert_ssid(ssid_list):
+	ssid = ""
+	for byte in ssid_list:
+		if (str(byte) in string.printable):
+			ssid = ssid + str(byte)
+		else:
+			ssid = ssid + "."
+	return ssid
 
-	properties = element.GetProperties()
+for path in properties["Devices"]:
+	device = dbus.Interface(bus.get_object("org.moblin.connman", path),
+						"org.moblin.connman.Device")
 
-	if (properties["Type"] == "device"):
-		print "[ %s ]" % (path)
+	properties = device.GetProperties()
 
-	if (properties["Type"] == "network"):
-		if (properties["Connected"] == 1):
-			state = "*"
-		else:
-			state = " "
-		print "    %s %s" % (state, properties["SSID"])
+	if (properties["Type"] != "wifi" and properties["Type"] != "wimax"):
+		continue;
+
+	print "[ %s ]" % (path)
+
+	for path in properties["Networks"]:
+		network = dbus.Interface(bus.get_object("org.moblin.connman", path),
+						"org.moblin.connman.Network")
+
+		properties = network.GetProperties()
+
+		print "    [ %s ]" % (path)
+
+		for key in properties.keys():
+			if (key == "WiFi.SSID"):
+				ssid = convert_ssid(properties[key])
+				print "        %s = [ %s ]" % (key, ssid)
+			elif (key == "WiFi.Strength"):
+				print "        %s = %d" % (key, properties[key])
+			else:
+				print "        %s = %s" % (key, properties[key])
+
+	print