From 52da820554e965725e33fa04512739d2780a2a44 Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 30 May 2021 02:46:52 +0100 Subject: [PATCH] Send SERVER_ID not NETWORK_ID in packets on OBP. --- config.py | 2 +- hblink.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.py b/config.py index 3940aef..720931a 100755 --- a/config.py +++ b/config.py @@ -125,7 +125,7 @@ def build_config(_config_file): 'GEN_STAT_BRIDGES': config.getboolean(section, 'GEN_STAT_BRIDGES'), 'ALLOW_NULL_PASSPHRASE': config.getboolean(section, 'ALLOW_NULL_PASSPHRASE'), 'ANNOUNCEMENT_LANGUAGES': config.get(section, 'ANNOUNCEMENT_LANGUAGES'), - 'SERVER_ID': config.get(section, 'SERVER_ID') + 'SERVER_ID': config.get(section, 'SERVER_ID').to_bytes(4, 'big') }) diff --git a/hblink.py b/hblink.py index 48d6046..56257ee 100755 --- a/hblink.py +++ b/hblink.py @@ -132,7 +132,7 @@ class OPENBRIDGE(DatagramProtocol): def send_system(self, _packet): if _packet[:4] == DMRD: #_packet = _packet[:11] + self._config['NETWORK_ID'] + _packet[15:] - _packet = b''.join([_packet[:11], self._config['NETWORK_ID'], _packet[15:]]) + _packet = b''.join([_packet[:11], self._CONFIG['GLOBAL']['SERVER_ID'], _packet[15:]]) #_packet += hmac_new(self._config['PASSPHRASE'],_packet,sha1).digest() _packet = b''.join([_packet, (hmac_new(self._config['PASSPHRASE'],_packet,sha1).digest())]) self.transport.write(_packet, (self._config['TARGET_IP'], self._config['TARGET_PORT']))