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

fix data mirroring

This commit is contained in:
KF7EEL 2021-10-30 08:16:50 -07:00
parent 42f27eeac0
commit 665ee6f1a7
3 changed files with 116 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bridge.py
View File

@ -445,9 +445,7 @@ def mirror_traffic(_data):
if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE': if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE':
print(CONFIG['SYSTEMS'][system]['OTHER_OPTIONS']) print(CONFIG['SYSTEMS'][system]['OTHER_OPTIONS'])
if 'MIRROR_ALL_TRAFFIC' in CONFIG['SYSTEMS'][system]['OTHER_OPTIONS']: if 'MIRROR_ALL_TRAFFIC' in CONFIG['SYSTEMS'][system]['OTHER_OPTIONS']:
print('mirrored to ' + system) systems[system].send_system(SVRD + b'MDAT' + _data)
print(_data)
systems[system].send_system(SVRD + b'DATA' + _data)

214
data_gateway.py
View File

@ -1344,12 +1344,14 @@ def aprs_beacon_send():
logger.info(beacon_packet) logger.info(beacon_packet)
##### DMR data function #### ##### DMR data function ####
def data_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data): def data_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data, mirror = False):
# Capture data headers # Capture data headers
global n_packet_assembly, hdr_type global n_packet_assembly, hdr_type
#logger.info(_dtype_vseq) #logger.info(_dtype_vseq)
#logger.info(_call_type) #logger.info(_call_type)
#logger.info(_frame_type) #logger.info(_frame_type)
print(int_id(_stream_id))
print((_seq))
logger.info(strftime('%H:%M:%S - %m/%d/%y')) logger.info(strftime('%H:%M:%S - %m/%d/%y'))
#logger.info('Special debug for developement:') #logger.info('Special debug for developement:')
logger.info(ahex(bptc_decode(_data))) logger.info(ahex(bptc_decode(_data)))
@ -1402,49 +1404,50 @@ def data_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _fr
# Form APRS packet # Form APRS packet
#logger.info(aprs_loc_packet) #logger.info(aprs_loc_packet)
logger.info('Lat: ' + str(aprs_lat) + ' Lon: ' + str(aprs_lon)) logger.info('Lat: ' + str(aprs_lat) + ' Lon: ' + str(aprs_lon))
if mirror == False:
# 14FRS2013 simplified and moved settings retrieval # 14FRS2013 simplified and moved settings retrieval
user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read()) user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read())
if int_id(_rf_src) not in user_settings: if int_id(_rf_src) not in user_settings:
ssid = str(user_ssid) ssid = str(user_ssid)
icon_table = '/'
icon_icon = '['
comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))
else:
if user_settings[int_id(_rf_src)][1]['ssid'] == '':
ssid = user_ssid
if user_settings[int_id(_rf_src)][3]['comment'] == '':
comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))
if user_settings[int_id(_rf_src)][2]['icon'] == '':
icon_table = '/' icon_table = '/'
icon_icon = '[' icon_icon = '['
if user_settings[int_id(_rf_src)][2]['icon'] != '': comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))
icon_table = user_settings[int_id(_rf_src)][2]['icon'][0] else:
icon_icon = user_settings[int_id(_rf_src)][2]['icon'][1] if user_settings[int_id(_rf_src)][1]['ssid'] == '':
if user_settings[int_id(_rf_src)][1]['ssid'] != '': ssid = user_ssid
ssid = user_settings[int_id(_rf_src)][1]['ssid'] if user_settings[int_id(_rf_src)][3]['comment'] == '':
if user_settings[int_id(_rf_src)][3]['comment'] != '': comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))
comment = user_settings[int_id(_rf_src)][3]['comment'] if user_settings[int_id(_rf_src)][2]['icon'] == '':
aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid + '>APHBL3,TCPIP*:@' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(aprs_lat) + icon_table + str(aprs_lon) + icon_icon + '/' + str(comment) icon_table = '/'
logger.info(aprs_loc_packet) icon_icon = '['
logger.info('User comment: ' + comment) if user_settings[int_id(_rf_src)][2]['icon'] != '':
logger.info('User SSID: ' + ssid) icon_table = user_settings[int_id(_rf_src)][2]['icon'][0]
logger.info('User icon: ' + icon_table + icon_icon) icon_icon = user_settings[int_id(_rf_src)][2]['icon'][1]
# Attempt to prevent malformed packets from being uploaded. if user_settings[int_id(_rf_src)][1]['ssid'] != '':
try: ssid = user_settings[int_id(_rf_src)][1]['ssid']
aprslib.parse(aprs_loc_packet) if user_settings[int_id(_rf_src)][3]['comment'] != '':
float(lat_deg) < 91 comment = user_settings[int_id(_rf_src)][3]['comment']
float(lon_deg) < 121 aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid + '>APHBL3,TCPIP*:@' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(aprs_lat) + icon_table + str(aprs_lon) + icon_icon + '/' + str(comment)
## if int_id(_dst_id) == data_id: logger.info(aprs_loc_packet)
if int_id(_dst_id) in data_id: logger.info('User comment: ' + comment)
aprs_send(aprs_loc_packet) logger.info('User SSID: ' + ssid)
dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, aprs_lat, aprs_lon, time(), comment, int_id(_rf_src)) logger.info('User icon: ' + icon_table + icon_icon)
#logger.info('Sent APRS packet') # Attempt to prevent malformed packets from being uploaded.
except Exception as error_exception: try:
logger.info('Error. Failed to send packet. Packet may be malformed.') aprslib.parse(aprs_loc_packet)
logger.info(error_exception) float(lat_deg) < 91
logger.info(str(traceback.extract_tb(error_exception.__traceback__))) float(lon_deg) < 121
udt_block = 1 ## if int_id(_dst_id) == data_id:
hdr_type = '' if int_id(_dst_id) in data_id:
aprs_send(aprs_loc_packet)
dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, aprs_lat, aprs_lon, time(), comment, int_id(_rf_src))
#logger.info('Sent APRS packet')
except Exception as error_exception:
logger.info('Error. Failed to send packet. Packet may be malformed.')
logger.info(error_exception)
logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
udt_block = 1
hdr_type = ''
else: else:
pass pass
#NMEA type packets for Anytone like radios. #NMEA type packets for Anytone like radios.
@ -1498,57 +1501,58 @@ def data_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _fr
nmea_parse = re.sub('.*\$|\n.*|V\*.*', '', final_packet) nmea_parse = re.sub('.*\$|\n.*|V\*.*', '', final_packet)
loc = pynmea2.parse(nmea_parse, check=False) loc = pynmea2.parse(nmea_parse, check=False)
logger.info('Latitude: ' + str(loc.lat) + str(loc.lat_dir) + ' Longitude: ' + str(loc.lon) + str(loc.lon_dir) + ' Direction: ' + str(loc.true_course) + ' Speed: ' + str(loc.spd_over_grnd) + '\n') logger.info('Latitude: ' + str(loc.lat) + str(loc.lat_dir) + ' Longitude: ' + str(loc.lon) + str(loc.lon_dir) + ' Direction: ' + str(loc.true_course) + ' Speed: ' + str(loc.spd_over_grnd) + '\n')
try: if mirror == False:
# Begin APRS format and upload try:
# Disable opening file for reading to reduce "collision" or reading and writing at same time. # Begin APRS format and upload
# 14FRS2013 simplified and moved settings retrieval # Disable opening file for reading to reduce "collision" or reading and writing at same time.
user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read()) # 14FRS2013 simplified and moved settings retrieval
print(user_settings) user_settings = ast.literal_eval(os.popen('cat ' + user_settings_file).read())
if int_id(_rf_src) not in user_settings: print(user_settings)
ssid = str(user_ssid) if int_id(_rf_src) not in user_settings:
icon_table = '/' ssid = str(user_ssid)
icon_icon = '['
comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))
else:
if user_settings[int_id(_rf_src)][1]['ssid'] == '':
ssid = user_ssid
if user_settings[int_id(_rf_src)][3]['comment'] == '':
comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))
if user_settings[int_id(_rf_src)][2]['icon'] == '':
icon_table = '/' icon_table = '/'
icon_icon = '[' icon_icon = '['
if user_settings[int_id(_rf_src)][2]['icon'] != '': comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))
icon_table = user_settings[int_id(_rf_src)][2]['icon'][0] else:
icon_icon = user_settings[int_id(_rf_src)][2]['icon'][1] if user_settings[int_id(_rf_src)][1]['ssid'] == '':
if user_settings[int_id(_rf_src)][1]['ssid'] != '': ssid = user_ssid
ssid = user_settings[int_id(_rf_src)][1]['ssid'] if user_settings[int_id(_rf_src)][3]['comment'] == '':
if user_settings[int_id(_rf_src)][3]['comment'] != '': comment = aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))
comment = user_settings[int_id(_rf_src)][3]['comment'] if user_settings[int_id(_rf_src)][2]['icon'] == '':
aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid + '>APHBL3,TCPIP*:@' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(loc.lat[0:7]) + str(loc.lat_dir) + icon_table + str(loc.lon[0:8]) + str(loc.lon_dir) + icon_icon + str(round(loc.true_course)).zfill(3) + '/' + str(round(loc.spd_over_grnd)).zfill(3) + '/' + str(comment) icon_table = '/'
logger.info(aprs_loc_packet) icon_icon = '['
logger.info('User comment: ' + comment) if user_settings[int_id(_rf_src)][2]['icon'] != '':
logger.info('User SSID: ' + ssid) icon_table = user_settings[int_id(_rf_src)][2]['icon'][0]
logger.info('User icon: ' + icon_table + icon_icon) icon_icon = user_settings[int_id(_rf_src)][2]['icon'][1]
except Exception as error_exception: if user_settings[int_id(_rf_src)][1]['ssid'] != '':
logger.info('Error or user settings file not found, proceeding with default settings.') ssid = user_settings[int_id(_rf_src)][1]['ssid']
aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + str(user_ssid) + '>APHBL3,TCPIP*:@' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(loc.lat[0:7]) + str(loc.lat_dir) + '/' + str(loc.lon[0:8]) + str(loc.lon_dir) + '[' + str(round(loc.true_course)).zfill(3) + '/' + str(round(loc.spd_over_grnd)).zfill(3) + '/' + aprs_comment + ' DMR ID: ' + str(int_id(_rf_src)) if user_settings[int_id(_rf_src)][3]['comment'] != '':
logger.info(error_exception) comment = user_settings[int_id(_rf_src)][3]['comment']
logger.info(str(traceback.extract_tb(error_exception.__traceback__))) aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid + '>APHBL3,TCPIP*:@' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(loc.lat[0:7]) + str(loc.lat_dir) + icon_table + str(loc.lon[0:8]) + str(loc.lon_dir) + icon_icon + str(round(loc.true_course)).zfill(3) + '/' + str(round(loc.spd_over_grnd)).zfill(3) + '/' + str(comment)
try: logger.info(aprs_loc_packet)
# Try parse of APRS packet. If it fails, it will not upload to APRS-IS logger.info('User comment: ' + comment)
aprslib.parse(aprs_loc_packet) logger.info('User SSID: ' + ssid)
# Float values of lat and lon. Anything that is not a number will cause it to fail. logger.info('User icon: ' + icon_table + icon_icon)
float(loc.lat) except Exception as error_exception:
float(loc.lon) logger.info('Error or user settings file not found, proceeding with default settings.')
## if int_id(_dst_id) == data_id: aprs_loc_packet = str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + str(user_ssid) + '>APHBL3,TCPIP*:@' + str(datetime.datetime.utcnow().strftime("%H%M%Sh")) + str(loc.lat[0:7]) + str(loc.lat_dir) + '/' + str(loc.lon[0:8]) + str(loc.lon_dir) + '[' + str(round(loc.true_course)).zfill(3) + '/' + str(round(loc.spd_over_grnd)).zfill(3) + '/' + aprs_comment + ' DMR ID: ' + str(int_id(_rf_src))
if int_id(_dst_id) in data_id: logger.info(error_exception)
logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
try:
# Try parse of APRS packet. If it fails, it will not upload to APRS-IS
aprslib.parse(aprs_loc_packet)
# Float values of lat and lon. Anything that is not a number will cause it to fail.
float(loc.lat)
float(loc.lon)
## if int_id(_dst_id) == data_id:
if int_id(_dst_id) in data_id:
aprs_send(aprs_loc_packet) aprs_send(aprs_loc_packet)
dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, str(loc.lat[0:7]) + str(loc.lat_dir), str(loc.lon[0:8]) + str(loc.lon_dir), time(), comment, int_id(_rf_src)) dashboard_loc_write(str(get_alias(int_id(_rf_src), subscriber_ids)) + '-' + ssid, str(loc.lat[0:7]) + str(loc.lat_dir), str(loc.lon[0:8]) + str(loc.lon_dir), time(), comment, int_id(_rf_src))
except Exception as error_exception: except Exception as error_exception:
logger.info('Failed to parse packet. Packet may be deformed. Not uploaded.') logger.info('Failed to parse packet. Packet may be deformed. Not uploaded.')
logger.info(error_exception) logger.info(error_exception)
logger.info(str(traceback.extract_tb(error_exception.__traceback__))) logger.info(str(traceback.extract_tb(error_exception.__traceback__)))
# Get callsign based on DMR ID # Get callsign based on DMR ID
# End APRS-IS upload # End APRS-IS upload
# Assume this is an SMS message # Assume this is an SMS message
@ -1672,17 +1676,18 @@ class OBP(OPENBRIDGE):
def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data): def dmrd_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data):
print(_frame_type) print(_frame_type)
UNIT_MAP[_rf_src] = (self._system, time()) ## UNIT_MAP[_rf_src] = (self._system, time())
UNIT_MAP[_rf_src] = (_seq, time())
if _rf_src not in PACKET_MATCH: if _rf_src not in PACKET_MATCH:
PACKET_MATCH[_rf_src] = [_data, time()] PACKET_MATCH[_rf_src] = [_seq, time()]
# Check to see if we have already received this packet # Check to see if we have already received this packet
elif _data == PACKET_MATCH[_rf_src][0] and time() - 1 < PACKET_MATCH[_rf_src][1]: elif _seq == PACKET_MATCH[_rf_src][0] and time() - 1 < PACKET_MATCH[_rf_src][1]:
print('matched, dropping') print('matched, dropping')
pass pass
print(PACKET_MATCH) print(PACKET_MATCH)
else: else:
PACKET_MATCH[_rf_src] = [_data, time()] PACKET_MATCH[_rf_src] = [_seq, time()]
print('OBP RCVD') print('OBP RCVD')
if _dtype_vseq in [3,6,7] and _call_type == 'unit' or _call_type == 'group' and _dtype_vseq == 6 or _call_type == 'vcsbk': if _dtype_vseq in [3,6,7] and _call_type == 'unit' or _call_type == 'group' and _dtype_vseq == 6 or _call_type == 'vcsbk':
data_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data) data_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data)
@ -1697,7 +1702,6 @@ class OBP(OPENBRIDGE):
if _mode == b'DATA' or _mode == b'MDAT': if _mode == b'DATA' or _mode == b'MDAT':
## print(ahex(_data)) ## print(ahex(_data))
# DMR Data packet, sent via SVRD # DMR Data packet, sent via SVRD
_peer_id = _data[11:15] _peer_id = _data[11:15]
_seq = _data[4] _seq = _data[4]
_rf_src = _data[5:8] _rf_src = _data[5:8]
@ -1720,14 +1724,20 @@ class OBP(OPENBRIDGE):
print(int_id(_dst_id)) print(int_id(_dst_id))
print((_dtype_vseq)) print((_dtype_vseq))
print(ahex(bptc_decode(_data))) print(ahex(bptc_decode(_data)))
if _mode == b'MDAT' or _mode == b'DATA':
print('MDAT')
## self.dmrd_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data)
if _seq == PACKET_MATCH[_rf_src][0] and time() - 1 < PACKET_MATCH[_rf_src][1]:
print('matched, dropping')
pass
## # Record last packet to prevent duplicates, think finger printing. else:
## PACKET_MATCH[_rf_src] = [_data, time()] print('no match')
if _mode == b'MDAT':
data_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data, True)
self.dmrd_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data) if _mode == b'DATA':
data_received(self, _peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data)
@ -1824,8 +1834,8 @@ if __name__ == '__main__':
#### use_api = CONFIG['DATA_CONFIG']['USE_API'] #### use_api = CONFIG['DATA_CONFIG']['USE_API']
if CONFIG['WEB_SERVICE']['REMOTE_CONFIG_ENABLED'] == True: if CONFIG['WEB_SERVICE']['REMOTE_CONFIG_ENABLED'] == True:
#### if 'DUAL_DASH' in CONFIG['WEB_SERVICE']['']
pass pass
if CONFIG['WEB_SERVICE']['REMOTE_CONFIG_ENABLED'] == False: if CONFIG['WEB_SERVICE']['REMOTE_CONFIG_ENABLED'] == False:
# Check if user_settings (for APRS settings of users) exists. Creat it if not. # Check if user_settings (for APRS settings of users) exists. Creat it if not.
if Path(user_settings_file).is_file(): if Path(user_settings_file).is_file():

5
web/templates/flask_user_layout.html
View File

@ -55,7 +55,7 @@
</li> </li>
<li class="nav-item dropdown"> <li class="nav-item dropdown">
<a class="nav-link dropdown-toggle" href="#" id="aprs_menu" role="button" data-bs-toggle="dropdown" aria-expanded="false"> <a class="nav-link dropdown-toggle" href="#" id="aprs_menu" role="button" data-bs-toggle="dropdown" aria-expanded="false">
<i class="bi bi-hash"></i> Data <i class="bi bi-window"></i> Data
</a> </a>
<ul class="dropdown-menu" aria-labelledby="aprs_menu"> <ul class="dropdown-menu" aria-labelledby="aprs_menu">
<li><a class="dropdown-item" href="{{url}}/aprs"><i class="bi bi-geo"></i> APRS Dashboard </a></li> <li><a class="dropdown-item" href="{{url}}/aprs"><i class="bi bi-geo"></i> APRS Dashboard </a></li>
@ -63,6 +63,7 @@
<li><a class="dropdown-item" href="{{url}}/bb"><i class="bi bi-clipboard"></i> Bulletin Board </a></li> <li><a class="dropdown-item" href="{{url}}/bb"><i class="bi bi-clipboard"></i> Bulletin Board </a></li>
<li><a class="dropdown-item" href="{{url}}/ss"><i class="bi bi-people"></i> Social Status </a></li> <li><a class="dropdown-item" href="{{url}}/ss"><i class="bi bi-people"></i> Social Status </a></li>
<li><a class="dropdown-item" href="{{url}}/tp"><i class="bi bi-file-earmark-break"></i> Tiny Pages </a></li> <li><a class="dropdown-item" href="{{url}}/tp"><i class="bi bi-file-earmark-break"></i> Tiny Pages </a></li>
<li><a class="dropdown-item" href="{{url}}/tags"><i class="bi bi-hash"></i> Tags </a></li>
</ul> </ul>
</li> </li>
@ -190,7 +191,7 @@
<br/> <br/>
<hr class="no-margins"/> <hr class="no-margins"/>
<div id="footer-div" class="clearfix with-margins"> <div id="footer-div" class="clearfix with-margins">
<p style="text-align: center;"><strong>{{ user_manager.USER_APP_NAME }}<br /></strong><a href="https://hbnet.xyz">HBNet Project</a><br />V. <strong>Dev</strong>&nbsp;</p> <p style="text-align: center;"><strong>{{ user_manager.USER_APP_NAME }}<br /></strong><a href="https://hbnet.xyz">HBNet Project</a><br />V. <strong>0.0.1-alpha</strong>&nbsp;</p>
</div> </div>
{% endblock %} {% endblock %}