aboutsummaryrefslogtreecommitdiffstats
path: root/wpa_supplicant/examples
diff options
context:
space:
mode:
authorJouni Malinen <jouni@qca.qualcomm.com>2013-11-29 11:01:39 (GMT)
committerJouni Malinen <j@w1.fi>2014-01-27 20:08:14 (GMT)
commit12288d848c9a507cfa834cbda1eec0bef7c53b5a (patch)
tree37f342a108264bc590010f38b533faa21b69c594 /wpa_supplicant/examples
parentc209dd11080de6defb048450fe0474dcf70d10ca (diff)
downloadhostap-12288d848c9a507cfa834cbda1eec0bef7c53b5a.zip
hostap-12288d848c9a507cfa834cbda1eec0bef7c53b5a.tar.gz
hostap-12288d848c9a507cfa834cbda1eec0bef7c53b5a.tar.bz2
WPS NFC: Protect nfcpy pretty print calls against exceptions
nfcpy does not yet support all the new message formats, so some of the pretty() calls can result in exceptions. Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>
Diffstat (limited to 'wpa_supplicant/examples')
-rwxr-xr-xwpa_supplicant/examples/wps-nfc.py32
1 files changed, 25 insertions, 7 deletions
diff --git a/wpa_supplicant/examples/wps-nfc.py b/wpa_supplicant/examples/wps-nfc.py
index 5946512..35d1270 100755
--- a/wpa_supplicant/examples/wps-nfc.py
+++ b/wpa_supplicant/examples/wps-nfc.py
@@ -126,7 +126,10 @@ class HandoverServer(nfc.handover.HandoverServer):
def process_request(self, request):
self.ho_server_processing = True
print "HandoverServer - request received"
- print "Parsed handover request: " + request.pretty()
+ try:
+ print "Parsed handover request: " + request.pretty()
+ except Exception, e:
+ print e
sel = nfc.ndef.HandoverSelectMessage(version="1.2")
@@ -147,7 +150,10 @@ class HandoverServer(nfc.handover.HandoverServer):
sel.add_carrier(message[0], "active", message[1:])
print "Handover select:"
- print sel.pretty()
+ try:
+ print sel.pretty()
+ except Exception, e:
+ print e
print str(sel).encode("hex")
print "Sending handover select"
@@ -170,7 +176,11 @@ def wps_handover_init(llc):
message.add_carrier(datamsg[0], "active", datamsg[1:])
print "Handover request:"
- print message.pretty()
+ try:
+ print message.pretty()
+ except Exception, e:
+ print e
+ print str(message).encode("hex")
client = nfc.handover.HandoverClient(llc)
try:
@@ -199,18 +209,26 @@ def wps_handover_init(llc):
return
print "Received message"
- print message.pretty()
+ try:
+ print message.pretty()
+ except Exception, e:
+ print e
+ print str(message).encode("hex")
message = nfc.ndef.HandoverSelectMessage(message)
print "Handover select received"
- print message.pretty()
+ try:
+ print message.pretty()
+ except Exception, e:
+ print e
for carrier in message.carriers:
print "Remote carrier type: " + carrier.type
if carrier.type == "application/vnd.wfa.wsc":
print "WPS carrier type match - send to wpa_supplicant"
wpas_report_handover(data, carrier.record, "INIT")
- wifi = nfc.ndef.WifiConfigRecord(carrier.record)
- print wifi.pretty()
+ # nfcpy does not support the new format..
+ #wifi = nfc.ndef.WifiConfigRecord(carrier.record)
+ #print wifi.pretty()
print "Remove peer"
client.close()