From 620a9818bfa9966e96522d385869712a229d00f3 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 4 Aug 2022 02:38:59 +0100 Subject: [PATCH] dfkldlk --- config.py | 3 ++- hblink.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/config.py b/config.py index 1cb289b..504b9c9 100755 --- a/config.py +++ b/config.py @@ -148,7 +148,8 @@ def build_config(_config_file): 'ANNOUNCEMENT_LANGUAGES': config.get(section, 'ANNOUNCEMENT_LANGUAGES'), 'SERVER_ID': config.getint(section, 'SERVER_ID').to_bytes(4, 'big'), 'DATA_GATEWAY': config.getboolean(section, 'DATA_GATEWAY'), - 'VALIDATE_SERVER_IDS': config.getboolean(section, 'VALIDATE_SERVER_IDS') + 'VALIDATE_SERVER_IDS': config.getboolean(section, 'VALIDATE_SERVER_IDS'), + 'ISO_COUNTRY_CODE' : config.get(section, 'ISO_COUNTRY_CODE'), }) if not CONFIG['GLOBAL']['ANNOUNCEMENT_LANGUAGES']: diff --git a/hblink.py b/hblink.py index f3de9e6..8412024 100755 --- a/hblink.py +++ b/hblink.py @@ -275,7 +275,7 @@ class OPENBRIDGE(DatagramProtocol): for system in self._CONFIG['SYSTEMS']: if self._CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE': if self._config['ENHANCED_OBP'] and self._config['TARGET_IP']: - if '_bcka' in self._config and self._config['_bcka'] > time() - 60: + if '_bcka' in self._CONFIG['SYSTEMS'][system] and self._CONFIG['SYSTEMS'][system]['_bcka'] < time() - 60: continue _packet = b''.join([BCTO,self._CONFIG['GLOBAL']['SERVER_ID'],self._CONFIG['SYSTEMS'][system]['NETWORK_ID'],self._CONFIG['SYSTEMS'][system]['VER'].to_bytes(1,"big"),_hops]) _h = blake2b(key=self._config['PASSPHRASE'], digest_size=16)