From 23786bc6908cf1753980a7b842f6938377f3e5e9 Mon Sep 17 00:00:00 2001 From: Simon Date: Sun, 27 Aug 2023 22:28:50 +0100 Subject: [PATCH 1/3] Fix regression where statics are not working --- bridge_master.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bridge_master.py b/bridge_master.py index 35f4974..7e49c72 100644 --- a/bridge_master.py +++ b/bridge_master.py @@ -831,7 +831,7 @@ def options_config(): _options[k] = v logger.debug('(OPTIONS) Options found for %s',_system) - if '_opt_key' in CONFIG['SYSTEMS'][_system]: + if '_opt_key' in CONFIG['SYSTEMS'][_system] and CONFIG['SYSTEMS'][_system]['_opt_key']: if 'KEY' not in _options: logger.debug('(OPTIONS) %s, options key set but no key in options string, skipping',_system) continue @@ -842,8 +842,8 @@ def options_config(): logger.debug('(OPTIONS) %s, _opt_key not set but key sent. Setting to sent key',_system) CONFIG['SYSTEMS'][_system]['_opt_key'] = _options['KEY'] else: - logger.debug('(OPTIONS) %s, _opt_key not set and no key sent. Generate random key',_system) - CONFIG['SYSTEMS'][_system]['_opt_key'] = randint(0,65535) + logger.debug('(OPTIONS) %s, _opt_key not set and no key sent. Set to false',_system) + CONFIG['SYSTEMS'][_system]['_opt_key'] = False From 6ec6a0d2bfdb14c208f5965218a9edbaee773748 Mon Sep 17 00:00:00 2001 From: Simon Date: Tue, 5 Sep 2023 22:14:28 +0100 Subject: [PATCH 2/3] Stop stat trimmer killing bridges that are in use by statics. --- bridge_master.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridge_master.py b/bridge_master.py index 7e49c72..8d60718 100644 --- a/bridge_master.py +++ b/bridge_master.py @@ -380,7 +380,7 @@ def statTrimmer(): _bridge_stat = True if _system['TO_TYPE'] == 'ON' and _system['ACTIVE']: _in_use = True - elif _system['TO_TYPE'] == 'OFF' and not _system['ACTIVE']: + elif _system['TO_TYPE'] == 'OFF': _in_use = True if _bridge_stat and not _in_use: _remove_bridges.append(_bridge) From 1ff64198049d579da6404697395a0c2f94995ba5 Mon Sep 17 00:00:00 2001 From: Simon Date: Thu, 14 Sep 2023 17:37:05 +0100 Subject: [PATCH 3/3] Remove default talkgroups and dial-a-tg options as these can cause server issues. --- bridge_master.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bridge_master.py b/bridge_master.py index 8d60718..c83b0ba 100644 --- a/bridge_master.py +++ b/bridge_master.py @@ -2747,7 +2747,7 @@ if __name__ == '__main__': _systemname = ''.join([system,'-',str(count)]) generator[_systemname] = copy.deepcopy(CONFIG['SYSTEMS'][system]) generator[_systemname]['PORT'] = generator[_systemname]['PORT'] + count - generator[_systemname]['_default_options'] = "TS1_STATIC={};TS2_STATIC={};SINGLE={};DEFAULT_UA_TIMER={};DEFAULT_REFLECTOR={};VOICE={};LANG={}".format(generator[_systemname]['TS1_STATIC'],generator[_systemname]['TS2_STATIC'],int(generator[_systemname]['SINGLE_MODE']),generator[_systemname]['DEFAULT_UA_TIMER'],generator[_systemname]['DEFAULT_REFLECTOR'],int(generator[_systemname]['VOICE_IDENT']), generator[_systemname]['ANNOUNCEMENT_LANGUAGE']) + generator[_systemname]['_default_options'] = "SINGLE={};DEFAULT_UA_TIMER={};VOICE={};LANG={}".format(int(generator[_systemname]['SINGLE_MODE']),generator[_systemname]['DEFAULT_UA_TIMER'],int(generator[_systemname]['VOICE_IDENT']), generator[_systemname]['ANNOUNCEMENT_LANGUAGE']) logger.debug('(GLOBAL) Generator - generated system %s',_systemname) generator[_systemname]['_default_options'] systemdelete.append(system)