ua1zbe
/
FreeDMR
mirror of http://gitlab.hacknix.net/hacknix/FreeDMR.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Trap weird error reported by N2CID so we can see what's going on 

Note this error appears to be in HBLink3 as well and may be related to
Python or library version
This commit is contained in:
Simon 2023-05-05 00:06:26 +01:00
parent 93a3fc2443
commit b3739178ce
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bridge.py
View File

@ -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]])

6
hotspot_proxy_v2.py
View File

@ -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