ua1zbe
/
hbnet2
mirror of https://github.com/kf7eel/hbnet
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix web app bug, try EXPOSE_ALL

This commit is contained in:
KF7EEL 2022-10-03 19:28:56 -07:00
parent 1469a523ef
commit 86925192e4
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bridge.py
View File

@ -501,9 +501,20 @@ def all_unit_mmdvm_peer(_data):
for system in CONFIG['SYSTEMS']:
if CONFIG['SYSTEMS'][system]['ENABLED']:
if CONFIG['SYSTEMS'][system]['MODE'] == 'PEER':
if 'ALL_MMDVM_UNIT' in CONFIG['SYSTEMS'][system]['OPTIONS']:
if b'ALL_MMDVM_UNIT' in CONFIG['SYSTEMS'][system]['OPTIONS']:
systems[system].send_system(_data)
def expose_all(_data):
for system in CONFIG['SYSTEMS']:
if CONFIG['SYSTEMS'][system]['ENABLED']:
if CONFIG['SYSTEMS'][system]['MODE'] == 'PEER':
if 'EXPOSE_ALL' in CONFIG['SYSTEMS'][system]['OTHER_OPTIONS']:
systems[system].send_system(_data)
if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE':
## print(CONFIG['SYSTEMS'][system]['OTHER_OPTIONS'])
if 'EXPOSE_ALL' in CONFIG['SYSTEMS'][system]['OTHER_OPTIONS']:
systems[system].send_system(SVRD + b'MDAT' + _data)
@ -1600,20 +1611,23 @@ class routerHBP(HBSYSTEM):
if _call_type == 'group':
self.group_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
mirror_traffic(_data)
expose_all(_data)
elif _call_type == 'unit':
if self._system not in UNIT:
logger.error('(%s) *UNIT CALL NOT FORWARDED* UNIT calling is disabled for this system (INGRESS)', self._system)
else:
self.unit_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
mirror_traffic(_data)
all_unit_mmdvm_peer(_data)
expose_all(_data)
elif _call_type == 'vcsbk':
self.group_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _frame_type, _dtype_vseq, _stream_id, _data)
logger.debug('CSBK recieved, forwarded to destination TG.')
mirror_traffic(_data)
expose_all(_data)
else:
logger.error('Unknown call type recieved -- not processed')
mirror_traffic(_data)
expose_all(_data)
#
# Socket-based reporting section

4
web/app.py
View File

@ -56,7 +56,7 @@ from cryptography.fernet import Fernet
from flaskext.markdown import Markdown
peer_locations = {}
hbnet_version = 'V 09282022'
hbnet_version = 'V 10032022'
# Query radioid.net for list of IDs
def get_ids(callsign):
@ -7463,7 +7463,7 @@ Name: <strong>''' + p.name + '''</strong>&nbsp; -&nbsp; Port: <strong>''' + str(
usr_nm = ''
except:
usr_lnk = ''
print(usr_link)
# print(usr_link)
content = content + '''
<tr>
<td><p><a href="https://www.radioid.net/database/view?id=''' + str(int_id(i[0])) + '''" target="_blank" rel="noopener"><button type="button" class="btn btn-warning">''' + str(int_id(i[0])) + '''</button></a><br /><br />''' + usr_lnk + '''</td>