mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-01-07 09:55:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix TypeError. Do not call ord() with embty byte object.

Browse Source
This commit is contained in:
Boris Zweimüller 2021-10-07 13:51:34 +02:00
parent d54424c330
commit 1b466dbe99
1 changed files with 43 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tool/dump_tlv.py
View File

@ -5,46 +5,48 @@
import sys import sys
def read_net_32(f): def read_net_32(f):
a = f.read(1) a = f.read(1)
if a == '': if not a:
return -1 return -1
b = f.read(1) b = f.read(1)
if b == '': if not b:
return -1 return -1
c = f.read(1) c = f.read(1)
if c == '': if not c:
return -1 return -1
d = f.read(1) d = f.read(1)
if d == '': if not d:
return -1 return -1
return ord(a) << 24 | ord(b) << 16 | ord(c) << 8 | ord(d) return ord(a) << 24 | ord(b) << 16 | ord(c) << 8 | ord(d)
def as_hex(data): def as_hex(data):
str_list = [] str_list = []
for byte in data: for byte in data:
str_list.append("{0:02x} ".format(byte)) str_list.append("{0:02x} ".format(byte))
return ''.join(str_list) return ''.join(str_list)
if len(sys.argv) == 1: if len(sys.argv) == 1:
print ('Dump TLV file') print('Dump TLV file')
print ('Copyright 2017, BlueKitchen GmbH') print('Copyright 2017, BlueKitchen GmbH')
print ('') print('')
print ('Usage: ', sys.argv[0], 'file.tlv') print('Usage: ', sys.argv[0], 'file.tlv')
exit(0) exit(0)
infile = sys.argv[1] infile = sys.argv[1]
with open (infile, 'rb') as fin: with open(infile, 'rb') as fin:
pos = 0 pos = 0
try:
# check header # check header
magic_0 = read_net_32(fin) magic_0 = read_net_32(fin)
magic_1 = read_net_32(fin) magic_1 = read_net_32(fin)
if magic_0 != 0x42547374 or magic_1 != 0x61636b00: if magic_0 != 0x42547374 or magic_1 != 0x61636b00:
print("%x" % magic_0) print("%x" % magic_0)
print("%x" % magic_1) print("%x" % magic_1)
print ("Not a valid BTstack .tlv file\n") print("Not a valid BTstack .tlv file\n")
exit(0) exit(0)
pos += 8 pos += 8
print("Valid .tlv file") print("Valid .tlv file")
@ -59,6 +61,3 @@ with open (infile, 'rb') as fin:
pos += len pos += len
print('%04x: ' % tag + as_hex(packet)) print('%04x: ' % tag + as_hex(packet))
print("Done") print("Done")
except TypeError:
print ("Error parsing tlv at offset %u (%x)." % (pos, pos))