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

add RPTS from hblink3, cosmetic update

This commit is contained in:
KF7EEL 2022-02-22 09:57:58 -08:00
parent 330147ec03
commit 44122f677a
5 changed files with 17 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
const.py
View File

@ -68,6 +68,8 @@ RPTC = b'RPTC'
RPTP = b'RPTP'
RPTA = b'RPTA'
RPTO = b'RPTO'
RPTS = b'RPTS'
RPTSBKN = b'RPTSBKN'
# Sever Data and Encrypted OBP
SVRD = b'SVRD'

43
hblink.py
View File

@ -271,36 +271,8 @@ class OPENBRIDGE(DatagramProtocol):
# Server Data packet, decrypt and process it.
elif _packet[:4] == SVRD:
_d_pkt = decrypt_packet(self._config['ENCRYPTION_KEY'], _packet[4:])
## logger.info('SVRD Received: ' + str(_d_pkt))
# DMR Data packet, sent via SVRD
## if _d_pkt[4:8] == b'DATA':
## print('----------------------')
## _data = _d_pkt[4:]
## _peer_id = _data[11:15]
## _seq = _data[4]
## _rf_src = _data[5:8]
## _dst_id = _data[8:11]
## _bits = _data[15]
## _slot = 2 if (_bits & 0x80) else 1
## #_call_type = 'unit' if (_bits & 0x40) else 'group'
## if _bits & 0x40:
## _call_type = 'unit'
## elif (_bits & 0x23) == 0x23:
## _call_type = 'vcsbk'
## else:
## _call_type = 'group'
## _frame_type = (_bits & 0x30) >> 4
## _dtype_vseq = (_bits & 0xF) # data, 1=voice header, 2=voice terminator; voice, 0=burst A ... 5=burst F
## _stream_id = _data[16:20]
## print(_stream_id)
##
## print(_call_type)
## self.dmrd_received(_peer_id, _rf_src, _dst_id, _seq, _slot, _call_type, _frame_type, _dtype_vseq, _stream_id, _data)
## else:
_d_pkt = decrypt_packet(self._config['ENCRYPTION_KEY'], _packet[4:])
self.svrd_received(_d_pkt[4:8], _d_pkt[8:])
## print(ahex(_d_pkt[8:]))
#************************************************
# HB MASTER CLASS
@ -499,9 +471,6 @@ class HBSYSTEM(DatagramProtocol):
self._stats['PINGS_SENT'] += 1
self._stats['PING_OUTSTANDING'] = True
# Experimental function to return data from hblink.py into bridge.py
def dat_test(self):
return self._peers
def send_peers(self, _packet):
for _peer in self._peers:
@ -639,9 +608,9 @@ class HBSYSTEM(DatagramProtocol):
elif _command == RPTL: # RPTLogin -- a repeater wants to login
_peer_id = _data[4:8]
print()
print((self._config['REG_ACL']))
print()
## print()
## print((self._config['REG_ACL']))
## print()
# Check to see if we've reached the maximum number of allowed peers
if len(self._peers) < self._config['MAX_PEERS']:
# Check for valid Radio ID
@ -988,6 +957,10 @@ class HBSYSTEM(DatagramProtocol):
self._stats['CONNECTION'] = 'NO'
logger.info('(%s) MSTCL Recieved', self._system)
elif _command == RPTS:
if _data[:7] == RPTSBKN:
logger.info('(%s) Received Site Beacon with Repeater ID: %s', self._system, int_id(_data[7:]))
else:
logger.error('(%s) Received an invalid command in packet: %s', self._system, ahex(_data))

10
requirements.txt
View File

@ -1,8 +1,8 @@
bitstring>=3.1.5
bitarray>=0.8.1
Twisted>=16.3.0
dmr_utils3>=0.1.27
configparser>=3.0.0
bitstring>=3.1.9
bitarray>=2.3.5
Twisted>=21.7.0
dmr_utils3>=0.1.29
configparser>=5.2.0
aprslib>=0.6.42
pynmea2
maidenhead

2
web/app.py
View File

@ -54,7 +54,7 @@ import os, ast
from cryptography.fernet import Fernet
peer_locations = {}
hbnet_version = '0.0.1-pre_pre_alpha'
hbnet_version = 'HWS 0.0.1-pre_pre_alpha'
# Query radioid.net for list of IDs
def get_ids(callsign):

2
web/templates/flask_user_layout.html
View File

@ -107,8 +107,8 @@
{% if global_config['mode'] == 'FULL' or global_config['mode'] == 'DMR_ONLY' %}
<li><a class="dropdown-item" href="{{url}}/manage_rules">Manage Rules</a></li>
<li><hr class="dropdown-divider"></li>
{% endif %}
<li><hr class="dropdown-divider"></li>
<li><a class="dropdown-item" href="{{url}}/add_user">Add User</a></li>
<li><a class="dropdown-item" href="{{url}}/list_users">Manage Users</a></li>