|
|
|
@ -970,7 +970,7 @@ class routerOBP(OPENBRIDGE):
|
|
|
|
_bridge2 = '#'+_bridge
|
|
|
|
_bridge2 = '#'+_bridge
|
|
|
|
if _bridge2 in BRIDGES:
|
|
|
|
if _bridge2 in BRIDGES:
|
|
|
|
self.to_target(_peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data, pkt_time, dmrpkt, _bits,_bridge,_system,True)
|
|
|
|
self.to_target(_peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data, pkt_time, dmrpkt, _bits,_bridge,_system,True)
|
|
|
|
_refIgnore.push(_bridge2)
|
|
|
|
_refIgnore.append(_bridge2)
|
|
|
|
|
|
|
|
|
|
|
|
elif _bridge[0:1] == '#':
|
|
|
|
elif _bridge[0:1] == '#':
|
|
|
|
for _system in BRIDGES[_bridge]:
|
|
|
|
for _system in BRIDGES[_bridge]:
|
|
|
|
@ -981,7 +981,7 @@ class routerOBP(OPENBRIDGE):
|
|
|
|
_bridge2 = _bridge[1:]
|
|
|
|
_bridge2 = _bridge[1:]
|
|
|
|
if _bridge2 in BRIDGES:
|
|
|
|
if _bridge2 in BRIDGES:
|
|
|
|
self.to_target(_peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data, pkt_time, dmrpkt, _bits,_bridge,_system,True)
|
|
|
|
self.to_target(_peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data, pkt_time, dmrpkt, _bits,_bridge,_system,True)
|
|
|
|
_tgIgnore.push(_bridge2)
|
|
|
|
_tgIgnore.append(_bridge2)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -1401,7 +1401,7 @@ class routerHBP(HBSYSTEM):
|
|
|
|
_bridge2 = '#'+_bridge
|
|
|
|
_bridge2 = '#'+_bridge
|
|
|
|
if _bridge2 in BRIDGES:
|
|
|
|
if _bridge2 in BRIDGES:
|
|
|
|
self.to_target(_peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data, pkt_time, dmrpkt, _bits,_bridge,_system,True)
|
|
|
|
self.to_target(_peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data, pkt_time, dmrpkt, _bits,_bridge,_system,True)
|
|
|
|
_refIgnore.push(_bridge2)
|
|
|
|
_refIgnore.append(_bridge2)
|
|
|
|
|
|
|
|
|
|
|
|
elif _bridge[0:1] == '#':
|
|
|
|
elif _bridge[0:1] == '#':
|
|
|
|
for _system in BRIDGES[_bridge]:
|
|
|
|
for _system in BRIDGES[_bridge]:
|
|
|
|
@ -1412,7 +1412,7 @@ class routerHBP(HBSYSTEM):
|
|
|
|
_bridge2 = _bridge[1:]
|
|
|
|
_bridge2 = _bridge[1:]
|
|
|
|
if _bridge2 in BRIDGES:
|
|
|
|
if _bridge2 in BRIDGES:
|
|
|
|
self.to_target(_peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data, pkt_time, dmrpkt, _bits,_bridge,_system,True)
|
|
|
|
self.to_target(_peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data, pkt_time, dmrpkt, _bits,_bridge,_system,True)
|
|
|
|
_tgIgnore.push(_bridge2)
|
|
|
|
_tgIgnore.append(_bridge2)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# Final actions - Is this a voice terminator?
|
|
|
|
# Final actions - Is this a voice terminator?
|
|
|
|
|