ShaYmez/hbnet
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update hotspot proxy

Browse Source
This commit is contained in:
KF7EEL 2021-05-30 17:49:04 -07:00
parent 4343677843
commit dd45e351c3
2 changed files with 129 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
full_bridge.py
View File

@ -968,7 +968,7 @@ def hotspot_proxy(listen_port, port_start, port_stop):
DestPortEnd = port_stop DestPortEnd = port_stop
Timeout = 30 Timeout = 30
Stats = True Stats = True
Debug = True Debug = False
BlackList = [1234567] BlackList = [1234567]
@ -2871,60 +2871,86 @@ if __name__ == '__main__':
# HBlink instance creation # HBlink instance creation
logger.info('(GLOBAL) HBlink \'bridge.py\' -- SYSTEM STARTING...') logger.info('(GLOBAL) HBlink \'bridge.py\' -- SYSTEM STARTING...')
# Generates a series of MASTER instances for use with hotspot proxy from FreeDMR
## def generate_proxy_masters():
## n_systems = CONFIG['PROXY_TEMPLATE']['INTERNAL_PORT_STOP'] - CONFIG['PROXY_TEMPLATE']['INTERNAL_PORT_START']
## n_count = 0
## while n_count < n_systems:
##
## CONFIG['SYSTEMS'].update({'MMDVM-' + str(n_count): {
## 'MODE': 'MASTER',
## 'ENABLED': True,
## 'STATIC_APRS_POSITION_ENABLED': CONFIG['PROXY_TEMPLATE']['STATIC_APRS_POSITION_ENABLED'],
## 'REPEAT': CONFIG['PROXY_TEMPLATE']['REPEAT'],
## 'MAX_PEERS': 1,
## 'IP': '127.0.0.1',
## 'PORT': CONFIG['PROXY_TEMPLATE']['INTERNAL_PORT_START'] + n_count,
## 'PASSPHRASE': CONFIG['PROXY_TEMPLATE']['PASSPHRASE'],
## 'GROUP_HANGTIME': CONFIG['PROXY_TEMPLATE']['GROUP_HANGTIME'],
## 'USE_ACL': CONFIG['PROXY_TEMPLATE']['USE_ACL'],
## 'REG_ACL': CONFIG['PROXY_TEMPLATE']['REG_ACL'],
## 'SUB_ACL': CONFIG['PROXY_TEMPLATE']['SUB_ACL'],
## 'TG1_ACL': CONFIG['PROXY_TEMPLATE']['TG1_ACL'],
## 'TG2_ACL': CONFIG['PROXY_TEMPLATE']['TG2_ACL']
## }})
## CONFIG['SYSTEMS']['MMDVM-' + str(n_count)].update({'PEERS': {}})
## systems['MMDVM-' + str(n_count)] = routerHBP(system, CONFIG, report_server)
## n_count = n_count + 1
if CONFIG['PROXY_TEMPLATE']['ENABLED']:
if CONFIG['PROXY_A']['ENABLED']:
#generate_proxy_masters() #generate_proxy_masters()
n_systems = CONFIG['PROXY_TEMPLATE']['INTERNAL_PORT_STOP'] - CONFIG['PROXY_TEMPLATE']['INTERNAL_PORT_START'] n_systems = CONFIG['PROXY_A']['INTERNAL_PORT_STOP'] - CONFIG['PROXY_A']['INTERNAL_PORT_START']
n_count = 0 n_count = 0
while n_count < n_systems: while n_count < n_systems:
CONFIG['SYSTEMS'].update({CONFIG['PROXY_TEMPLATE']['NAME'] + '-' + str(n_count): { CONFIG['SYSTEMS'].update({CONFIG['PROXY_A']['NAME'] + '-' + str(n_count): {
'MODE': 'MASTER', 'MODE': 'MASTER',
'ENABLED': True, 'ENABLED': True,
'STATIC_APRS_POSITION_ENABLED': CONFIG['PROXY_TEMPLATE']['STATIC_APRS_POSITION_ENABLED'], 'STATIC_APRS_POSITION_ENABLED': CONFIG['PROXY_A']['STATIC_APRS_POSITION_ENABLED'],
'REPEAT': CONFIG['PROXY_TEMPLATE']['REPEAT'], 'REPEAT': CONFIG['PROXY_A']['REPEAT'],
'MAX_PEERS': 1, 'MAX_PEERS': 1,
'IP': '127.0.0.1', 'IP': '127.0.0.1',
'PORT': CONFIG['PROXY_TEMPLATE']['INTERNAL_PORT_START'] + n_count, 'PORT': CONFIG['PROXY_A']['INTERNAL_PORT_START'] + n_count,
'PASSPHRASE': CONFIG['PROXY_TEMPLATE']['PASSPHRASE'], 'PASSPHRASE': CONFIG['PROXY_A']['PASSPHRASE'],
'GROUP_HANGTIME': CONFIG['PROXY_TEMPLATE']['GROUP_HANGTIME'], 'GROUP_HANGTIME': CONFIG['PROXY_A']['GROUP_HANGTIME'],
'USE_ACL': CONFIG['PROXY_TEMPLATE']['USE_ACL'], 'USE_ACL': CONFIG['PROXY_A']['USE_ACL'],
'REG_ACL': sms_aprs_config.acl_build(CONFIG['PROXY_TEMPLATE']['REG_ACL'], 4294967295), 'REG_ACL': sms_aprs_config.acl_build(CONFIG['PROXY_A']['REG_ACL'], 4294967295),
'SUB_ACL': CONFIG['PROXY_TEMPLATE']['SUB_ACL'], 'SUB_ACL': sms_aprs_config.acl_build(CONFIG['PROXY_A']['SUB_ACL'], 4294967295),
'TGID_TS1_ACL': CONFIG['PROXY_TEMPLATE']['TGID_TS1_ACL'], 'TGID_TS1_ACL': CONFIG['PROXY_A']['TGID_TS1_ACL'],
'TGID_TS2_ACL': CONFIG['PROXY_TEMPLATE']['TGID_TS2_ACL'] 'TGID_TS2_ACL': CONFIG['PROXY_A']['TGID_TS2_ACL']
}}) }})
CONFIG['SYSTEMS'][CONFIG['PROXY_TEMPLATE']['NAME'] + '-' + str(n_count)].update({'PEERS': {}}) CONFIG['SYSTEMS'][CONFIG['PROXY_A']['NAME'] + '-' + str(n_count)].update({'PEERS': {}})
systems[CONFIG['PROXY_TEMPLATE']['NAME'] + '-' + str(n_count)] = routerHBP(CONFIG['PROXY_TEMPLATE']['NAME'] + '-' + str(n_count), CONFIG, report_server) systems[CONFIG['PROXY_A']['NAME'] + '-' + str(n_count)] = routerHBP(CONFIG['PROXY_A']['NAME'] + '-' + str(n_count), CONFIG, report_server)
n_count = n_count + 1
if CONFIG['PROXY_B']['ENABLED']:
#generate_proxy_masters()
n_systems = CONFIG['PROXY_B']['INTERNAL_PORT_STOP'] - CONFIG['PROXY_B']['INTERNAL_PORT_START']
n_count = 0
while n_count < n_systems:
CONFIG['SYSTEMS'].update({CONFIG['PROXY_B']['NAME'] + '-' + str(n_count): {
'MODE': 'MASTER',
'ENABLED': True,
'STATIC_APRS_POSITION_ENABLED': CONFIG['PROXY_B']['STATIC_APRS_POSITION_ENABLED'],
'REPEAT': CONFIG['PROXY_B']['REPEAT'],
'MAX_PEERS': 1,
'IP': '127.0.0.1',
'PORT': CONFIG['PROXY_B']['INTERNAL_PORT_START'] + n_count,
'PASSPHRASE': CONFIG['PROXY_B']['PASSPHRASE'],
'GROUP_HANGTIME': CONFIG['PROXY_B']['GROUP_HANGTIME'],
'USE_ACL': CONFIG['PROXY_B']['USE_ACL'],
'REG_ACL': sms_aprs_config.acl_build(CONFIG['PROXY_B']['REG_ACL'], 4294967295),
'SUB_ACL': sms_aprs_config.acl_build(CONFIG['PROXY_B']['SUB_ACL'], 4294967295),
'TGID_TS1_ACL': CONFIG['PROXY_B']['TGID_TS1_ACL'],
'TGID_TS2_ACL': CONFIG['PROXY_B']['TGID_TS2_ACL']
}})
CONFIG['SYSTEMS'][CONFIG['PROXY_B']['NAME'] + '-' + str(n_count)].update({'PEERS': {}})
systems[CONFIG['PROXY_B']['NAME'] + '-' + str(n_count)] = routerHBP(CONFIG['PROXY_B']['NAME'] + '-' + str(n_count), CONFIG, report_server)
n_count = n_count + 1
if CONFIG['PROXY_C']['ENABLED']:
#generate_proxy_masters()
n_systems = CONFIG['PROXY_C']['INTERNAL_PORT_STOP'] - CONFIG['PROXY_C']['INTERNAL_PORT_START']
n_count = 0
while n_count < n_systems:
CONFIG['SYSTEMS'].update({CONFIG['PROXY_C']['NAME'] + '-' + str(n_count): {
'MODE': 'MASTER',
'ENABLED': True,
'STATIC_APRS_POSITION_ENABLED': CONFIG['PROXY_C']['STATIC_APRS_POSITION_ENABLED'],
'REPEAT': CONFIG['PROXY_C']['REPEAT'],
'MAX_PEERS': 1,
'IP': '127.0.0.1',
'PORT': CONFIG['PROXY_C']['INTERNAL_PORT_START'] + n_count,
'PASSPHRASE': CONFIG['PROXY_C']['PASSPHRASE'],
'GROUP_HANGTIME': CONFIG['PROXY_C']['GROUP_HANGTIME'],
'USE_ACL': CONFIG['PROXY_C']['USE_ACL'],
'REG_ACL': sms_aprs_config.acl_build(CONFIG['PROXY_C']['REG_ACL'], 4294967295),
'SUB_ACL': sms_aprs_config.acl_build(CONFIG['PROXY_C']['SUB_ACL'], 4294967295),
'TGID_TS1_ACL': CONFIG['PROXY_C']['TGID_TS1_ACL'],
'TGID_TS2_ACL': CONFIG['PROXY_C']['TGID_TS2_ACL']
}})
CONFIG['SYSTEMS'][CONFIG['PROXY_C']['NAME'] + '-' + str(n_count)].update({'PEERS': {}})
systems[CONFIG['PROXY_C']['NAME'] + '-' + str(n_count)] = routerHBP(CONFIG['PROXY_C']['NAME'] + '-' + str(n_count), CONFIG, report_server)
n_count = n_count + 1 n_count = n_count + 1
for system in CONFIG['SYSTEMS']: for system in CONFIG['SYSTEMS']:
print((CONFIG['SYSTEMS']))
if CONFIG['SYSTEMS'][system]['ENABLED']: if CONFIG['SYSTEMS'][system]['ENABLED']:
if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE': if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE':
systems[system] = routerOBP(system, CONFIG, report_server) systems[system] = routerOBP(system, CONFIG, report_server)
@ -2966,10 +2992,18 @@ if __name__ == '__main__':
aprs_thread.start() aprs_thread.start()
# Create file for static positions - by IU7IGU # Create file for static positions - by IU7IGU
## open("nom_aprs","w").close ## open("nom_aprs","w").close
# if CONFIG['PROXY_TEMPLATE']['ENABLED']: if CONFIG['PROXY_A']['ENABLED']:
# proxy_thread = threading.Thread(target=hotspot_proxy, args=(CONFIG['PROXY_TEMPLATE']['EXTERNAL_PORT'],CONFIG['PROXY_TEMPLATE']['INTERNAL_PORT_START'],CONFIG['PROXY_TEMPLATE']['INTERNAL_PORT_STOP'],)) proxy_thread = threading.Thread(target=hotspot_proxy, args=(CONFIG['PROXY_A']['EXTERNAL_PORT'],CONFIG['PROXY_A']['INTERNAL_PORT_START'],CONFIG['PROXY_A']['INTERNAL_PORT_STOP'],))
# proxy_thread.daemon = True proxy_thread.daemon = True
# proxy_thread.start() proxy_thread.start()
if CONFIG['PROXY_B']['ENABLED']:
proxy_thread = threading.Thread(target=hotspot_proxy, args=(CONFIG['PROXY_B']['EXTERNAL_PORT'],CONFIG['PROXY_B']['INTERNAL_PORT_START'],CONFIG['PROXY_B']['INTERNAL_PORT_STOP'],))
proxy_thread.daemon = True
proxy_thread.start()
if CONFIG['PROXY_C']['ENABLED']:
proxy_thread = threading.Thread(target=hotspot_proxy, args=(CONFIG['PROXY_C']['EXTERNAL_PORT'],CONFIG['PROXY_C']['INTERNAL_PORT_START'],CONFIG['PROXY_C']['INTERNAL_PORT_STOP'],))
proxy_thread.daemon = True
proxy_thread.start()
logger.info('Unit calls will be bridged to: ' + str(UNIT)) logger.info('Unit calls will be bridged to: ' + str(UNIT))
reactor.run() reactor.run()

59
sms_aprs_config.py
View File

@ -53,7 +53,7 @@ def process_acls(_config):
# System level ACLs # System level ACLs
for system in _config['SYSTEMS']: for system in _config['SYSTEMS']:
# Registration ACLs (which make no sense for peer systems) # Registration ACLs (which make no sense for peer systems)
if _config['SYSTEMS'][system]['MODE'] == 'MASTER': if _config['SYSTEMS'][system]['MODE'] == 'MASTER' or _config['SYSTEMS'][system]['MODE'] == 'PROXY':
_config['SYSTEMS'][system]['REG_ACL'] = acl_build(_config['SYSTEMS'][system]['REG_ACL'], const.PEER_MAX) _config['SYSTEMS'][system]['REG_ACL'] = acl_build(_config['SYSTEMS'][system]['REG_ACL'], const.PEER_MAX)
# Subscriber and TGID ACLs (valid for all system types) # Subscriber and TGID ACLs (valid for all system types)
@ -110,8 +110,9 @@ def build_config(_config_file):
CONFIG['GPS_DATA'] = {} CONFIG['GPS_DATA'] = {}
CONFIG['ALIASES'] = {} CONFIG['ALIASES'] = {}
CONFIG['SYSTEMS'] = {} CONFIG['SYSTEMS'] = {}
CONFIG['PROXY_TEMPLATE'] = {} CONFIG['PROXY_A'] = {}
CONFIG['PROXY_B'] = {}
CONFIG['PROXY_C'] = {}
try: try:
for section in config.sections(): for section in config.sections():
@ -200,8 +201,42 @@ def build_config(_config_file):
'STALE_TIME': config.getint(section, 'STALE_DAYS') * 86400, 'STALE_TIME': config.getint(section, 'STALE_DAYS') * 86400,
}) })
elif section == 'PROXY_TEMPLATE': elif section == 'PROXY_A':
CONFIG['PROXY_TEMPLATE'].update({ CONFIG['PROXY_A'].update({
'ENABLED': config.getboolean(section, 'ENABLED'),
'NAME': config.get(section, 'NAME'),
'REPEAT': config.getboolean(section, 'REPEAT'),
'EXTERNAL_PORT': config.getint(section, 'EXTERNAL_PORT'),
'INTERNAL_PORT_START': config.getint(section, 'INTERNAL_PORT_START'),
'INTERNAL_PORT_STOP': config.getint(section, 'INTERNAL_PORT_STOP'),
'STATIC_APRS_POSITION_ENABLED': config.getboolean(section, 'STATIC_APRS_POSITION_ENABLED'),
'PASSPHRASE': bytes(config.get(section, 'PASSPHRASE'), 'utf-8'),
'GROUP_HANGTIME': config.getint(section, 'GROUP_HANGTIME'),
'USE_ACL': config.getboolean(section, 'USE_ACL'),
'REG_ACL': config.get(section, 'REG_ACL'),
'SUB_ACL': config.get(section, 'SUB_ACL'),
'TGID_TS1_ACL': config.get(section, 'TGID_TS1_ACL'),
'TGID_TS2_ACL': config.get(section, 'TGID_TS2_ACL')
})
elif section == 'PROXY_B':
CONFIG['PROXY_B'].update({
'ENABLED': config.getboolean(section, 'ENABLED'),
'NAME': config.get(section, 'NAME'),
'REPEAT': config.getboolean(section, 'REPEAT'),
'EXTERNAL_PORT': config.getint(section, 'EXTERNAL_PORT'),
'INTERNAL_PORT_START': config.getint(section, 'INTERNAL_PORT_START'),
'INTERNAL_PORT_STOP': config.getint(section, 'INTERNAL_PORT_STOP'),
'STATIC_APRS_POSITION_ENABLED': config.getboolean(section, 'STATIC_APRS_POSITION_ENABLED'),
'PASSPHRASE': bytes(config.get(section, 'PASSPHRASE'), 'utf-8'),
'GROUP_HANGTIME': config.getint(section, 'GROUP_HANGTIME'),
'USE_ACL': config.getboolean(section, 'USE_ACL'),
'REG_ACL': config.get(section, 'REG_ACL'),
'SUB_ACL': config.get(section, 'SUB_ACL'),
'TGID_TS1_ACL': config.get(section, 'TGID_TS1_ACL'),
'TGID_TS2_ACL': config.get(section, 'TGID_TS2_ACL')
})
elif section == 'PROXY_C':
CONFIG['PROXY_C'].update({
'ENABLED': config.getboolean(section, 'ENABLED'), 'ENABLED': config.getboolean(section, 'ENABLED'),
'NAME': config.get(section, 'NAME'), 'NAME': config.get(section, 'NAME'),
'REPEAT': config.getboolean(section, 'REPEAT'), 'REPEAT': config.getboolean(section, 'REPEAT'),
@ -348,20 +383,20 @@ def build_config(_config_file):
## elif config.get(section, 'MODE') == 'PROXY': ## elif config.get(section, 'MODE') == 'PROXY':
## CONFIG['SYSTEMS'].update({section: { ## CONFIG['SYSTEMS'].update({section: {
## 'MODE': 'MASTER', ## 'MODE': config.get(section, 'MODE'),
## 'ENABLED': True, ## 'ENABLED': config.getboolean(section, 'ENABLED'),
## 'STATIC_APRS_POSITION_ENABLED': config.getboolean(section, 'STATIC_APRS_POSITION_ENABLED'), ## 'STATIC_APRS_POSITION_ENABLED': config.getboolean(section, 'STATIC_APRS_POSITION_ENABLED'),
## 'REPEAT': config.getboolean(section, 'REPEAT'), ## 'REPEAT': config.getboolean(section, 'REPEAT'),
## 'MAX_PEERS': config.getint(section, 'MAX_PEERS'),
## 'IP': gethostbyname(config.get(section, 'IP')),
## 'PORT': config.getint(section, 'PORT'),
## 'PASSPHRASE': bytes(config.get(section, 'PASSPHRASE'), 'utf-8'), ## 'PASSPHRASE': bytes(config.get(section, 'PASSPHRASE'), 'utf-8'),
## 'EXTERNAL_PORT': config.getint(section, 'EXTERNAL_PORT'),
## 'INTERNAL_PORT_START': config.getint(section, 'INTERNAL_PORT_START'),
## 'INTERNAL_PORT_STOP': config.getint(section, 'INTERNAL_PORT_STOP'),
## 'GROUP_HANGTIME': config.getint(section, 'GROUP_HANGTIME'), ## 'GROUP_HANGTIME': config.getint(section, 'GROUP_HANGTIME'),
## 'USE_ACL': config.getboolean(section, 'USE_ACL'), ## 'USE_ACL': config.getboolean(section, 'USE_ACL'),
## 'REG_ACL': config.get(section, 'REG_ACL'), ## 'REG_ACL': config.get(section, 'REG_ACL'),
## 'SUB_ACL': config.get(section, 'SUB_ACL'), ## 'SUB_ACL': config.get(section, 'SUB_ACL'),
## 'TG1_ACL': config.get(section, 'TGID_TS1_ACL'), ## 'TG1_ACL': config.get(section, 'TG1_ACL'),
## 'TG2_ACL': config.get(section, 'TGID_TS2_ACL') ## 'TG2_ACL': config.get(section, 'TG2_ACL')
## }}) ## }})
## CONFIG['SYSTEMS'][section].update({'PEERS': {}}) ## CONFIG['SYSTEMS'][section].update({'PEERS': {}})