KB8PMY
/
ADN-DMR-Peer-Server
mirror of https://github.com/Amateur-Digital-Network/ADN-DMR-Peer-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Auto topography discovery system:"

Browse Source 
This reverts commit 7eccd3e307.
debug
Simon 3 years ago
parent 685d7cc38d
commit 32d16b2eb0
4 changed files with 9 additions and 118 deletions
Show Stats Download Patch File Download Diff File

78
bridge_master.py
Unescape View File

@ -38,7 +38,6 @@ from time import time,sleep,perf_counter
import importlib.util
import re
import copy
import json
from setproctitle import setproctitle
#from crccheck.crc import Crc32
@ -127,7 +126,6 @@ def config_reports(_config, _factory):
i = i +1
logger.info('(REPORT) %s systems have at least one peer',i)
logger.info('(REPORT) Subscriber Map has %s entries',len(SUB_MAP))
logger.info('(REPORT) %s SERVER_ID\'s seen by topography system', len(TOPO))
logger.info('(REPORT) HBlink TCP reporting server configured')
@ -411,26 +409,6 @@ def subMapWrite():
except:
logger.warning('(SUBSCRIBER) Cannot write SUB_MAP to file')
def topoWrite():
try:
_fh = open(CONFIG['ALIASES']['PATH'] + CONFIG['ALIASES']['TOPO_FILE'],'w')
json.dump(TOPO,_fh)
_fh.close()
logger.info('(TOPO) Writing topography file to disk')
except:
logger.warning('(TOPO) Cannot write topography file to disk')
def topoRead():
_topo = {}
try:
_fh = open(CONFIG['ALIASES']['PATH'] + CONFIG['ALIASES']['TOPO_FILE'],'r')
_topo = json.load(_fh)
_fh.close()
logger.info('(TOPO) Reading topography file from disk')
except:
logger.warning('(TOPO) Cannot read topography file from disk')
finally:
return(_topo)
#Subscriber Map trimmer loop
def SubMapTrimmer():
@ -447,8 +425,6 @@ def SubMapTrimmer():
subMapWrite()
# run this every 10 seconds to trim stream ids
def stream_trimmer_loop():
logger.debug('(ROUTER) Trimming inactive stream IDs from system lists')
@ -561,25 +537,6 @@ def stream_trimmer_loop():
else:
logger.debug('(%s) Attemped to remove OpenBridge Stream ID %s not in the Stream ID list: %s', system, int_id(stream_id), [id for id in systems[system].STATUS])
def topoTrimmer():
logger.debug('(TOPO) Trimming stale entries')
_now = time()
_toprem = []
for _src in TOPO:
_dstrem = []
for _dst in TOPO[_src]:
if _now - TOPO[_src][_dst]['time'] > 1800:
_dstrem.append(_dst)
for _remove in _dstrem:
TOPO[_src].pop(_remove)
if len(TOPO[_src]) == 0:
_toprem.append(_src)
for _remove in _toprem:
TOPO.pop(_remove)
topoWrite()
def sendVoicePacket(self,pkt,_source_id,_dest_id,_slot):
_stream_id = pkt[16:20]
_pkt_time = time()
@ -1919,30 +1876,6 @@ class routerOBP(OPENBRIDGE):
self.STATUS[_stream_id]['lastSeq'] = False
def process_bcto(self,_uid,_src,_dst,_ver,_hops):
_uid = int_id(_uid)
_src = int_id(_src)
_dst = int_id(_dst)
_ver = int.from_bytes(_ver,'big')
_hops = int.from_bytes(_hops,'big')
if _src not in TOPO:
TOPO[_src] = {}
TOPO[_src][_dst] = {
'ver' : _ver,
'time' : time(),
'uid' : _uid,
'hops' : _hops,
}
def check_bcto_uid(self,_uid):
_uid = int_id(_uid)
for src in TOPO:
for dst in TOPO[src]:
if TOPO[src][dst]['uid'] == _uid:
return(True)
return(False)
class routerHBP(HBSYSTEM):
def __init__(self, _name, _config, _report):
@ -2970,9 +2903,6 @@ if __name__ == '__main__':
reactor.stop()
if CONFIG['ALIASES']['SUB_MAP_FILE']:
subMapWrite()
if CONFIG['ALIASES']['TOPO_FILE']:
topoWrite()
# Set signal handers so that we can gracefully exit if need be
for sig in [signal.SIGINT, signal.SIGTERM]:
@ -2990,7 +2920,7 @@ if __name__ == '__main__':
CONFIG['_LOCAL_SUBSCRIBER_IDS'] = local_subscriber_ids
CONFIG['_SERVER_IDS'] = server_ids
TOPO = topoRead()
# Import the ruiles file as a module, and create BRIDGES from it
spec = importlib.util.spec_from_file_location("module.name", cli_args.RULES_FILE)
@ -3187,12 +3117,6 @@ if __name__ == '__main__':
sub_trimmer = sub_trimmer_task.start(3600)#3600
sub_trimmer.addErrback(loopingErrHandle)
#topography trimmer
topo_trimmer_task = task.LoopingCall(topoTrimmer)
topo_trimmer = topo_trimmer_task.start(610)#610
topo_trimmer.addErrback(loopingErrHandle)
#more threads
reactor.suggestThreadPoolSize(100)

7
config.py
Unescape View File

@ -148,8 +148,7 @@ def build_config(_config_file):
'ANNOUNCEMENT_LANGUAGES': config.get(section, 'ANNOUNCEMENT_LANGUAGES'),
'SERVER_ID': config.getint(section, 'SERVER_ID').to_bytes(4, 'big'),
'DATA_GATEWAY': config.getboolean(section, 'DATA_GATEWAY'),
'VALIDATE_SERVER_IDS': config.getboolean(section, 'VALIDATE_SERVER_IDS'),
'ISO_COUNTRY_CODE' : config.get(section, 'ISO_COUNTRY_CODE'),
'VALIDATE_SERVER_IDS': config.getboolean(section, 'VALIDATE_SERVER_IDS')
})
if not CONFIG['GLOBAL']['ANNOUNCEMENT_LANGUAGES']:
@ -187,9 +186,7 @@ def build_config(_config_file):
'SUB_MAP_FILE': config.get(section, 'SUB_MAP_FILE'),
'LOCAL_SUBSCRIBER_FILE': config.get(section, 'LOCAL_SUBSCRIBER_FILE'),
'SERVER_ID_URL': config.get(section, 'SERVER_ID_URL'),
'SERVER_ID_FILE': config.get(section, 'SERVER_ID_FILE'),
'TOPO_FILE': config.get(section, 'TOPO_FILE'),
'SERVER_ID_FILE': config.get(section, 'SERVER_ID_FILE')
})

3
const.py
Unescape View File

@ -83,10 +83,9 @@ BCKA = b'BCKA'
BCSQ = b'BCSQ'
BCST = b'BCST'
BCVE = b'BCVE'
BCTO = b'BCTO'
#Protocol version
VER = 6
VER = 5
# Higheset peer ID permitted by HBP
PEER_MAX = 4294967295

37
hblink.py
Unescape View File

@ -163,11 +163,6 @@ class OPENBRIDGE(DatagramProtocol):
self._bcve = self._bcve_task.start(60)
self._bcve.addErrback(self.loopingErrHandle)
logger.debug('(%s) *BridgeControl* starting topography timer',self._system)
self._bcto_task = task.LoopingCall(self.send_my_bcto)
self._bcto = self._bcto_task.start(604)#600
self._bcto.addErrback(self.loopingErrHandle)
def dereg(self):
logger.info('(%s) is mode OPENBRIDGE. No De-Registration required, continuing shutdown', self._system)
@ -267,6 +262,7 @@ class OPENBRIDGE(DatagramProtocol):
logger.trace('(%s) *BridgeControl* sent BCVE. Ver: %s',self._system,VER)
else:
logger.trace('(%s) *BridgeControl* not sending BCVE, TARGET_IP currently not known',self._system)
<<<<<<< HEAD
def send_my_bcto(self):
if self._config['VER'] > 5:
@ -306,6 +302,8 @@ class OPENBRIDGE(DatagramProtocol):
logger.trace('(%s) *BridgeControl* retransmitted BCTO.',self._system)
else:
logger.trace('(%s) *BridgeControl* not retransmitting BCTO, TARGET_IP currently not known.',self._system)
=======
>>>>>>> parent of 7eccd3e (Auto topography discovery system:)
@ -313,9 +311,6 @@ class OPENBRIDGE(DatagramProtocol):
pass
#print(int_id(_peer_id), int_id(_rf_src), int_id(_dst_id), int_id(_seq), _slot, _call_type, _frame_type, repr(_dtype_vseq), int_id(_stream_id))
def process_bcto(self,src,dst,ver):
pass
def datagramReceived(self, _packet, _sockaddr):
# Keep This Line Commented Unless HEAVILY Debugging!
#logger.debug('(%s) RX packet from %s -- %s', self._system, _sockaddr, ahex(_packet))
@ -336,7 +331,7 @@ class OPENBRIDGE(DatagramProtocol):
if compare_digest(_hash, _ckhs) and (_sockaddr == self._config['TARGET_SOCK'] or self._config['RELAX_CHECKS']):
_peer_id = _data[11:15]
if self._config['NETWORK_ID'] != _peer_id:
logger.error('(%s) OpenBridge packet discarded because NETWORK_ID: %s Does not match sent Server ID: %s', self._system, int_id(self._config['NETWORK_ID']), int_id(_peer_id))
logger.error('(%s) OpenBridge packet discarded because NETWORK_ID: %s Does not match sent Peer ID: %s', self._system, int_id(self._config['NETWORK_ID']), int_id(_peer_id))
return
#This is a v1 packet, so all the extended stuff we can set to default
@ -752,30 +747,6 @@ class OPENBRIDGE(DatagramProtocol):
h,p = _sockaddr
logger.warning('(%s) *ProtoControl* BCVE invalid, packet discarded - OPCODE: %s DATA: %s HMAC LENGTH: %s HMAC: %s SRC IP: %s SRC PORT: %s', self._system, _packet[:4], repr(_packet[:53]), len(_packet[53:]), repr(_packet[53:]),h,p)
if _packet[:4] == BCTO:
if self._config['VER'] > 5:
_hash = _packet[18:]
_h = blake2b(key=self._config['PASSPHRASE'], digest_size=16)
_h.update(_packet[:18])
_hash2 = _h.digest()
_uid = _packet[4:8]
_src = _packet[8:12]
_dst = _packet[12:16]
_ver = _packet[16:17]
_hops = _packet[17:18]
if _hash == _hash2:
logger.trace('(%s) *ProtoControl* BCTO received: %s connected to %s with proto ver. %s. HOPS: %s ',self._system, int_id(_src), int_id(_dst), int.from_bytes(_ver,'big'), int.from_bytes(_hops,'big'))
if int.from_bytes(_hops,'big') < 10 and _src != self._CONFIG['GLOBAL']['SERVER_ID'] and not self.check_bcto_uid(_uid):
self.retransmit_bcto(_packet[4:17],int.from_bytes(_hops,'big'))
else:
logger.trace('(%s) *BridgeControl* not retransmitting BCTO - hop count exceeded, already seen or my packet',self._system)
if not self.check_bcto_uid(_uid):
self.process_bcto(_uid,_src,_dst,_ver,_hops)
else:
h,p = _sockaddr
logger.warning('(%s) *ProtoControl* BCTO invalid, packet discarded - OPCODE: %s DATA: %s HMAC LENGTH: %s HMAC: %s SRC IP: %s SRC PORT: %s', self._system, _packet[:4], repr(_packet[:18]), len(_packet[18:]),repr(_packet[18:]),h,p)

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.