DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

tests: MAC address ASCII string generation in python3 compatible manner

Browse source 
Use struct.unpack() to get a list of int and then generate a list of
hexstr octets from it for ':'.join() to get consistent behavior for both
python2 and python3.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2019-02-04 12:23:45 +02:00
parent 0607346f12
commit c37ef330d0
1 changed files with 7 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
tests/hwsim/test_dbus.py
View file

@ -9,6 +9,7 @@ import logging
logger = logging.getLogger() logger = logging.getLogger()
import subprocess import subprocess
import time import time
import struct
import sys import sys
try: try:
@ -3553,11 +3554,7 @@ def test_dbus_p2p_autogo(dev, apdev):
logger.debug("provisionDiscoveryRequestDisplayPin - peer=%s pin=%s" % (peer_object, pin)) logger.debug("provisionDiscoveryRequestDisplayPin - peer=%s pin=%s" % (peer_object, pin))
self.peer_path = peer_object self.peer_path = peer_object
peer = binascii.unhexlify(peer_object.split('/')[-1]) peer = binascii.unhexlify(peer_object.split('/')[-1])
addr = "" addr = ':'.join([ "%02x" % i for i in struct.unpack('6B', peer) ])
for p in peer:
if len(addr) > 0:
addr += ':'
addr += '%02x' % ord(p)
params = { 'Role': 'registrar', params = { 'Role': 'registrar',
'P2PDeviceAddress': self.peer['DeviceAddress'], 'P2PDeviceAddress': self.peer['DeviceAddress'],
@ -3767,11 +3764,7 @@ def test_dbus_p2p_autogo_pbc(dev, apdev):
logger.debug("provisionDiscoveryPBCRequest - peer=%s" % peer_object) logger.debug("provisionDiscoveryPBCRequest - peer=%s" % peer_object)
self.peer_path = peer_object self.peer_path = peer_object
peer = binascii.unhexlify(peer_object.split('/')[-1]) peer = binascii.unhexlify(peer_object.split('/')[-1])
addr = "" addr = ':'.join([ "%02x" % i for i in struct.unpack('6B', peer) ])
for p in peer:
if len(addr) > 0:
addr += ':'
addr += '%02x' % ord(p)
params = { 'Role': 'registrar', params = { 'Role': 'registrar',
'P2PDeviceAddress': self.peer['DeviceAddress'], 'P2PDeviceAddress': self.peer['DeviceAddress'],
'Type': 'pbc' } 'Type': 'pbc' }
@ -3832,7 +3825,7 @@ def test_dbus_p2p_autogo_legacy(dev, apdev):
res = g_obj.GetAll(WPAS_DBUS_GROUP, res = g_obj.GetAll(WPAS_DBUS_GROUP,
dbus_interface=dbus.PROPERTIES_IFACE, dbus_interface=dbus.PROPERTIES_IFACE,
byte_arrays=True) byte_arrays=True)
bssid = ':'.join([binascii.hexlify(l) for l in res['BSSID']]) bssid = ':'.join([ "%02x" % i for i in struct.unpack('6B', res['BSSID']) ])
pin = '12345670' pin = '12345670'
params = { 'Role': 'enrollee', params = { 'Role': 'enrollee',
@ -4279,7 +4272,7 @@ def test_dbus_p2p_reinvoke_persistent(dev, apdev):
res = g_obj.GetAll(WPAS_DBUS_GROUP, res = g_obj.GetAll(WPAS_DBUS_GROUP,
dbus_interface=dbus.PROPERTIES_IFACE, dbus_interface=dbus.PROPERTIES_IFACE,
byte_arrays=True) byte_arrays=True)
bssid = ':'.join([binascii.hexlify(l) for l in res['BSSID']]) bssid = ':'.join([ "%02x" % i for i in struct.unpack('6B', res['BSSID']) ])
dev1 = WpaSupplicant('wlan1', '/tmp/wpas-wlan1') dev1 = WpaSupplicant('wlan1', '/tmp/wpas-wlan1')
dev1.scan_for_bss(bssid, freq=2412) dev1.scan_for_bss(bssid, freq=2412)
dev1.global_request("P2P_CONNECT " + addr0 + " 12345670 join") dev1.global_request("P2P_CONNECT " + addr0 + " 12345670 join")
@ -4328,11 +4321,7 @@ def test_dbus_p2p_reinvoke_persistent(dev, apdev):
logger.debug("provisionDiscoveryRequestDisplayPin - peer=%s pin=%s" % (peer_object, pin)) logger.debug("provisionDiscoveryRequestDisplayPin - peer=%s pin=%s" % (peer_object, pin))
self.peer_path = peer_object self.peer_path = peer_object
peer = binascii.unhexlify(peer_object.split('/')[-1]) peer = binascii.unhexlify(peer_object.split('/')[-1])
addr = "" addr = ':'.join([ "%02x" % i for i in struct.unpack('6B', peer) ])
for p in peer:
if len(addr) > 0:
addr += ':'
addr += '%02x' % ord(p)
params = { 'Role': 'registrar', params = { 'Role': 'registrar',
'P2PDeviceAddress': self.peer['DeviceAddress'], 'P2PDeviceAddress': self.peer['DeviceAddress'],
'Bssid': self.peer['DeviceAddress'], 'Bssid': self.peer['DeviceAddress'],
@ -5021,7 +5010,7 @@ def test_dbus_p2p_two_groups(dev, apdev):
g_wps = dbus.Interface(self.g2_if_obj, WPAS_DBUS_IFACE_WPS) g_wps = dbus.Interface(self.g2_if_obj, WPAS_DBUS_IFACE_WPS)
g_wps.Start(params) g_wps.Start(params)
bssid = ':'.join([binascii.hexlify(l) for l in self.g2_bssid]) bssid = ':'.join([ "%02x" % i for i in struct.unpack('6B', self.g2_bssid) ])
dev2 = WpaSupplicant('wlan2', '/tmp/wpas-wlan2') dev2 = WpaSupplicant('wlan2', '/tmp/wpas-wlan2')
dev2.scan_for_bss(bssid, freq=2412) dev2.scan_for_bss(bssid, freq=2412)
dev2.global_request("P2P_CONNECT " + bssid + " 12345670 join freq=2412") dev2.global_request("P2P_CONNECT " + bssid + " 12345670 join freq=2412")