diff --git a/bridge.py b/bridge.py index afa31f9..86d6dc3 100755 --- a/bridge.py +++ b/bridge.py @@ -791,7 +791,11 @@ class routerHBP(HBSYSTEM): systems[_target['SYSTEM']]._report.send_bridgeEvent('GROUP VOICE,END,TX,{},{},{},{},{},{},{:.2f}'.format(_target['SYSTEM'], int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), _target['TS'], int_id(_target['TGID']), call_duration).encode(encoding='utf-8', errors='ignore')) # Create a Burst B-E packet (Embedded LC) elif _dtype_vseq in [1,2,3,4]: - dmrbits = dmrbits[0:116] + _target_status[_target['TS']]['TX_EMB_LC'][_dtype_vseq] + dmrbits[148:264] + #catch weird bug, so we can work out what's going on (N2CID) + try: + dmrbits = dmrbits[0:116] + _target_status[_target['TS']]['TX_EMB_LC'][_dtype_vseq] + dmrbits[148:264] + except Exception as e: + logger.warning('(N2CID) Caught error [non-fatal] %s',e) dmrpkt = dmrbits.tobytes() _tmp_data = b''.join([_tmp_data, dmrpkt, _data[53:55]]) diff --git a/hotspot_proxy_v2.py b/hotspot_proxy_v2.py index 35bb2ee..bad2ba2 100644 --- a/hotspot_proxy_v2.py +++ b/hotspot_proxy_v2.py @@ -283,6 +283,7 @@ if __name__ == '__main__': BlackList = [1234567] #e.g. {10.0.0.1: 0, 10.0.0.2: 0} IPBlackList = {} + UsePrivilegedHelper = False #******************* @@ -313,6 +314,11 @@ if __name__ == '__main__': ClientInfo = bool(os.environ['FDPROXY_CLIENTINFO']) if 'FDPROXY_LISTENPORT' in os.environ: ListenPort = int(os.environ['FDPROXY_LISTENPORT']) + if 'USE_PRIV_HELPER' in os.environ: + UsePrivilegedHelper = os.environ['USE_PRIV_HELPER'] + + if UsePrivilegedHelper: + for port in range(DestportStart,DestPortEnd+1,1): CONNTRACK[port] = False