mirror of
https://github.com/bluekitchen/btstack.git
synced 2025-01-01 00:28:18 +00:00
Fix TypeError. Do not call ord() with embty byte object.
This commit is contained in:
parent
d54424c330
commit
1b466dbe99
@ -5,60 +5,59 @@
|
||||
|
||||
import sys
|
||||
|
||||
|
||||
def read_net_32(f):
|
||||
a = f.read(1)
|
||||
if a == '':
|
||||
return -1
|
||||
if not a:
|
||||
return -1
|
||||
b = f.read(1)
|
||||
if b == '':
|
||||
return -1
|
||||
if not b:
|
||||
return -1
|
||||
c = f.read(1)
|
||||
if c == '':
|
||||
return -1
|
||||
if not c:
|
||||
return -1
|
||||
d = f.read(1)
|
||||
if d == '':
|
||||
return -1
|
||||
if not d:
|
||||
return -1
|
||||
return ord(a) << 24 | ord(b) << 16 | ord(c) << 8 | ord(d)
|
||||
|
||||
|
||||
def as_hex(data):
|
||||
str_list = []
|
||||
for byte in data:
|
||||
str_list.append("{0:02x} ".format(byte))
|
||||
return ''.join(str_list)
|
||||
str_list = []
|
||||
for byte in data:
|
||||
str_list.append("{0:02x} ".format(byte))
|
||||
return ''.join(str_list)
|
||||
|
||||
|
||||
if len(sys.argv) == 1:
|
||||
print ('Dump TLV file')
|
||||
print ('Copyright 2017, BlueKitchen GmbH')
|
||||
print ('')
|
||||
print ('Usage: ', sys.argv[0], 'file.tlv')
|
||||
exit(0)
|
||||
print('Dump TLV file')
|
||||
print('Copyright 2017, BlueKitchen GmbH')
|
||||
print('')
|
||||
print('Usage: ', sys.argv[0], 'file.tlv')
|
||||
exit(0)
|
||||
|
||||
infile = sys.argv[1]
|
||||
|
||||
with open (infile, 'rb') as fin:
|
||||
pos = 0
|
||||
try:
|
||||
# check header
|
||||
magic_0 = read_net_32(fin)
|
||||
magic_1 = read_net_32(fin)
|
||||
if magic_0 != 0x42547374 or magic_1 != 0x61636b00:
|
||||
print("%x" % magic_0)
|
||||
print("%x" % magic_1)
|
||||
print ("Not a valid BTstack .tlv file\n")
|
||||
exit(0)
|
||||
pos += 8
|
||||
print("Valid .tlv file")
|
||||
while True:
|
||||
tag = read_net_32(fin)
|
||||
if tag < 0:
|
||||
break
|
||||
pos += 4
|
||||
len = read_net_32(fin)
|
||||
pos += 4
|
||||
packet = fin.read(len)
|
||||
pos += len
|
||||
print('%04x: ' % tag + as_hex(packet))
|
||||
print("Done")
|
||||
|
||||
except TypeError:
|
||||
print ("Error parsing tlv at offset %u (%x)." % (pos, pos))
|
||||
with open(infile, 'rb') as fin:
|
||||
pos = 0
|
||||
# check header
|
||||
magic_0 = read_net_32(fin)
|
||||
magic_1 = read_net_32(fin)
|
||||
if magic_0 != 0x42547374 or magic_1 != 0x61636b00:
|
||||
print("%x" % magic_0)
|
||||
print("%x" % magic_1)
|
||||
print("Not a valid BTstack .tlv file\n")
|
||||
exit(0)
|
||||
pos += 8
|
||||
print("Valid .tlv file")
|
||||
while True:
|
||||
tag = read_net_32(fin)
|
||||
if tag < 0:
|
||||
break
|
||||
pos += 4
|
||||
len = read_net_32(fin)
|
||||
pos += 4
|
||||
packet = fin.read(len)
|
||||
pos += len
|
||||
print('%04x: ' % tag + as_hex(packet))
|
||||
print("Done")
|
||||
|
Loading…
Reference in New Issue
Block a user