From 236104813b3ae4645ca74cbe4c3573b8b5e98556 Mon Sep 17 00:00:00 2001
From: Simon <simon@gb7fr.org.uk>
Date: Sun, 19 Jun 2022 14:53:37 +0100
Subject: [PATCH] fix conflict with stash

---
 bridge_master.py  | 10 ++++++++++
 config.py         |  3 ++-
 playback_file.cfg |  3 +++
 playback_file.py  |  4 ++--
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/bridge_master.py b/bridge_master.py
index 06c55a5..09396a3 100644
--- a/bridge_master.py
+++ b/bridge_master.py
@@ -713,6 +713,14 @@ def ident():
                 #_say.append(AMBEobj.readSingleFile('alpha.ambe'))
                 _all_call = bytes_3(16777215)
                 _source_id= bytes_3(5000)
+
+                _dst_id = b''
+                
+                if CONFIG['SYSTEMS'][system]['OVERRIDE_IDENT_TG']:
+                    _dst_id = bytes_3(OVERRIDE_IDENT_TG)
+                else:
+                    _dst_id = _all_call
+                    
                 _peer_id = bytes_4(CONFIG['GLOBAL']['SERVER_ID'])
                 speech = pkt_gen(_source_id, _all_call, _peer_id, 1, _say)
 
@@ -760,6 +768,8 @@ def options_config():
                         _options['TS1_STATIC'] = _options.pop('TS1')
                     if 'TS2' in _options:
                         _options['TS2_STATIC'] = _options.pop('TS2')
+                    if 'VOICETG' in _options:
+                        _options['OVERRIDE_IDENT_TG'] = _options.pop('VOICETG')
                         
                     #DMR+ style options
                     if 'StartRef' in _options:
diff --git a/config.py b/config.py
index e6cf1f8..15caf6d 100755
--- a/config.py
+++ b/config.py
@@ -336,7 +336,8 @@ def build_config(_config_file):
                         'GENERATOR': config.getint(section, 'GENERATOR'),
                         'ANNOUNCEMENT_LANGUAGE': config.get(section, 'ANNOUNCEMENT_LANGUAGE'),
                         'ALLOW_UNREG_ID': config.getboolean(section,'ALLOW_UNREG_ID'),
-                        'PROXY_CONTROL' : config.getboolean(section,'PROXY_CONTROL')
+                        'PROXY_CONTROL' : config.getboolean(section,'PROXY_CONTROL'),
+                        'OVERRIDE_IDENT_TG': config.get(section, 'OVERRIDE_IDENT_TG')
                     }})
                     CONFIG['SYSTEMS'][section].update({'PEERS': {}})
                     
diff --git a/playback_file.cfg b/playback_file.cfg
index 47e72d2..89f269d 100644
--- a/playback_file.cfg
+++ b/playback_file.cfg
@@ -50,6 +50,7 @@ ALLOW_NULL_PASSPHRASE: False
 ANNOUNCEMENT_LANGUAGES: es_ES
 SERVER_ID: 9990
 DATA_GATEWAY: False
+VALIDATE_SERVER_IDS: False
 
 
 
@@ -113,6 +114,8 @@ TGID_URL: http://downloads.freedmr.uk/downloads/talkgroup_ids.json
 LOCAL_SUBSCRIBER_FILE: local_subscriber_ids.json
 STALE_DAYS: 7
 SUB_MAP_FILE:
+SERVER_ID_FILE:
+SERVER_ID_URL:
 
 #Read further repeater configs from MySQL
 [MYSQL]
diff --git a/playback_file.py b/playback_file.py
index ffe1bd4..2d13158 100644
--- a/playback_file.py
+++ b/playback_file.py
@@ -76,8 +76,8 @@ def playFileOnRequest(system,fileName,dstTG,subid):
         _say.append(AMBEobj.readSingleFile(fileName))
         _say.append(SILENCE)
         _say.append(SILENCE)
-    except IOError:
-        logger.warning('(%s) cannot read file %s',system,fileName)
+    except IOError as err:
+        logger.warning('(%s) cannot read file %s: %s',system,fileName,err)
         return
     speech = pkt_gen(_source_id, _dst_id, bytes_4(5000), 0, _say)
     sleep(1)