Add randomize bdaddr implementation #28
Conversation
| @@ -72,6 +75,11 @@ def process_packet(socket): | |||
| if packet[13:25] != BLE_PACKET: | |||
| return | |||
|
|
|||
| # Print sender's bdaddr | |||
There was a problem hiding this comment.
Please change to Bluetooth MAC address
| # Print sender's bdaddr | ||
| bdaddr = packet[7:13] | ||
| bdaddr = bdaddr[::-1].hex().upper() | ||
| logger.info(f"Received packet from {':'.join(bdaddr[i:i+2] for i in range(0, len(bdaddr), 2))}") |
There was a problem hiding this comment.
Make this .debug; we don't want it in production.
| def generate_random_bdaddr(): | ||
| bdaddr = secrets.token_hex(6) | ||
| bdaddr = list(bdaddr) | ||
| locally_administer_elements = ['2', '6', 'a', 'e'] |
| bdaddr = list(bdaddr) | ||
| locally_administer_elements = ['2', '6', 'a', 'e'] | ||
|
|
||
| # The above values denote that the bdaddr is locally administared |
There was a problem hiding this comment.
Please comment before the line you comment.
| locally_administer_elements = ['2', '6', 'a', 'e'] | ||
|
|
||
| # The above values denote that the bdaddr is locally administared | ||
| bdaddr[1] = secrets.choice(locally_administer_elements) |
There was a problem hiding this comment.
Please comment each line with an example of what bdaddr will contain.
There was a problem hiding this comment.
I have added an example and comments to each line of this function.
| @@ -84,6 +85,17 @@ def set_transmit(interface, ephid, rssi): | |||
| run_command(cmd) | |||
|
|
|||
|
|
|||
| def generate_random_bdaddr(): | |||
| bdaddr = secrets.token_hex(6) | |||
There was a problem hiding this comment.
Would mac_addr be more appropriate?
There was a problem hiding this comment.
MAC address is used for both Ethernet and Bluetooth technologies.
I have selected bdaddr because it stands for the Bluetooth device address.
Maybe, we can also use bd_addr, but if you insist we can change it to mac_addr
There was a problem hiding this comment.
OK. Then add a function comment, documenting what the function does and explaining that it returns a random "Bluetooth Device (MAC) Address (bdaddr)".
| @@ -151,6 +163,18 @@ def main(): | |||
| transmitter.check_advance_day(now) | |||
| ephid = transmitter.get_ephid_for_time(now) | |||
| if ephid != current_ephid: | |||
| # Stop advetising before chaning bdaddr | |||
| bdaddr = generate_random_bdaddr() | ||
|
|
||
| # Change local device bdaddr and reset | ||
| run_command(["sudo", "bdaddr", "-i", interface, "-r", bdaddr]) |
There was a problem hiding this comment.
No need for sudo, because we run as root.
Issue: #12