diff --git a/bridge.py b/bridge.py index 421c0bd..5404ceb 100755 --- a/bridge.py +++ b/bridge.py @@ -353,10 +353,11 @@ def mirror_traffic(_data): if CONFIG['SYSTEMS'][system]['ENABLED']: if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE': print(CONFIG['SYSTEMS'][system]['OTHER_OPTIONS']) - if 'MIRROR_TRAFFIC' in CONFIG['SYSTEMS'][system]['OTHER_OPTIONS']: + if 'MIRROR_ALL_TRAFFIC' in CONFIG['SYSTEMS'][system]['OTHER_OPTIONS']: print('mirrored to ' + system) print(_data) systems[system].send_system(SVRD + b'DATA' + _data) + # Import Bridging rules @@ -1583,11 +1584,10 @@ if __name__ == '__main__': stream_trimmer = stream_trimmer_task.start(5) stream_trimmer.addErrback(loopingErrHandle) - logger.info('Unit calls will be bridged to: ' + str(UNIT)) + logger.info('UNIT calls will be bridged to: ' + str(UNIT)) # Download burn list if LOCAL_CONFIG['WEB_SERVICE']['REMOTE_CONFIG_ENABLED']: with open(CONFIG['WEB_SERVICE']['BURN_FILE'], 'w') as f: f.write(str(download_burnlist(CONFIG))) - print(CONFIG['SYSTEMS']) reactor.run() diff --git a/data_gateway.py b/data_gateway.py index 91a787c..54e60ee 100644 --- a/data_gateway.py +++ b/data_gateway.py @@ -1253,6 +1253,7 @@ class OBP(OPENBRIDGE): def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data): + print(_frame_type) UNIT_MAP[_rf_src] = (self._system, time()) if _rf_src not in PACKET_MATCH: PACKET_MATCH[_rf_src] = [_data, time()] @@ -1296,8 +1297,8 @@ class OBP(OPENBRIDGE): _dtype_vseq = (_bits & 0xF) # data, 1=voice header, 2=voice terminator; voice, 0=burst A ... 5=burst F _stream_id = _data[16:20] - # Record last packet to prevent duplicates, think finger printing. - PACKET_MATCH[_rf_src] = [_data, time()] +## # Record last packet to prevent duplicates, think finger printing. +## PACKET_MATCH[_rf_src] = [_data, time()] self.dmrd_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data)