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

Configs and tabs

Browse Source
pull/2/head
Rodrigo Pérez 2 years ago
parent eed7b8df5f
commit 66bd5f8420
No known key found for this signature in database
GPG Key ID: CF3FCD2E39162965
13 changed files with 75 additions and 89 deletions
Show Stats Download Patch File Download Diff File

6
bridge_master.py
Unescape View File

@ -149,7 +149,7 @@ def config_API(_config, _bridges):
application = Application([FD_API],
tns='freedmr.api',
tns='adn.api',
in_protocol=HttpRpc(validator='soft'),
out_protocol=JsonDocument()
)
@ -1963,7 +1963,7 @@ class routerHBP(HBSYSTEM):
systems[_d_system]._report.send_bridgeEvent('UNIT DATA,DATA,TX,{},{},{},{},{},{}'.format(_d_system, int_id(_stream_id), int_id(_peer_id), int_id(_rf_src), 1, _int_dst_id).encode(encoding='utf-8', errors='ignore'))
def sendDataToOBP(self,_target,_data,dmrpkt,pkt_time,_stream_id,_dst_id,_peer_id,_rf_src,_bits,_slot,_hops = b'',_ber = b'\x00', _rssi = b'\x00',_source_server = b'\x00\x00\x00\x00', _source_rptr = b'\x00\x00\x00\x00'):
# _sysIgnore = sysIgnore
# _sysIgnore = sysIgnore
_source_server = self._CONFIG['GLOBAL']['SERVER_ID']
_source_rptr = _peer_id
_int_dst_id = int_id(_dst_id)
@ -2904,7 +2904,7 @@ if __name__ == '__main__':
words[lang][_mapword] = words[lang][_map[_mapword]]
# HBlink instance creation
logger.info('(GLOBAL) FreeDMR \'bridge_master.py\' -- SYSTEM STARTING...')
logger.info('(GLOBAL) ADN \'bridge_master.py\' -- SYSTEM STARTING...')
listeningPorts = {}

4
config.py
Unescape View File

@ -169,7 +169,7 @@ def build_config(_config_file):
'LOG_FILE': config.get(section, 'LOG_FILE', fallback='/dev/null'),
'LOG_HANDLERS': config.get(section, 'LOG_HANDLERS', fallback='console-timed'),
'LOG_LEVEL': config.get(section, 'LOG_LEVEL', fallback='INFO'),
'LOG_NAME': config.get(section, 'LOG_NAME', fallback='FreeDMR')
'LOG_NAME': config.get(section, 'LOG_NAME', fallback='ADN')
})
@ -406,7 +406,7 @@ if __name__ == '__main__':
# CLI argument parser - handles picking up the config file from the command line, and sending a "help" message
parser = argparse.ArgumentParser()
parser.add_argument('-c', '--config', action='store', dest='CONFIG_FILE', help='/full/path/to/config.file (usually freedmr.cfg)')
parser.add_argument('-c', '--config', action='store', dest='CONFIG_FILE', help='/full/path/to/config.file (usually adn.cfg)')
cli_args = parser.parse_args()

4
hotspot_proxy_self_service.py
Unescape View File

@ -329,7 +329,7 @@ class Proxy(DatagramProtocol):
if data[8:].upper().startswith(b"PASS="):
_psswd = data[13:]
if len(_psswd) >= 6:
dk = pbkdf2_hmac("sha256", _psswd, b"FreeDMR", 2000).hex()
dk = pbkdf2_hmac("sha256", _psswd, b"ADN", 2000).hex()
self.db_proxy.updt_tbl("psswd", _peer_id, psswd=dk)
self.transport.write(b"".join([RPTACK, _peer_id]), addr)
print(f"Password stored for: {int_id(_peer_id)}")
@ -454,7 +454,7 @@ if __name__ == "__main__":
"--config",
action="store",
dest="CONFIG_FILE",
help="/full/path/to/config.file (usually freedmr.cfg)",
help="/full/path/to/config.file (usually adn.cfg)",
)
cli_args = parser.parse_args()

2
hotspot_proxy_v2.py
Unescape View File

@ -301,7 +301,7 @@ if __name__ == '__main__':
# CLI argument parser - handles picking up the config file from the command line, and sending a "help" message
parser = argparse.ArgumentParser()
parser.add_argument('-c', '--config', action='store', dest='CONFIG_FILE', help='/full/path/to/config.file (usually freedmr.cfg)')
parser.add_argument('-c', '--config', action='store', dest='CONFIG_FILE', help='/full/path/to/config.file (usually adn.cfg)')
cli_args = parser.parse_args()

14
i8n_voice_map.py
Unescape View File

@ -115,7 +115,7 @@ voiceMap = {
'en_US': {
'to': '2',
'freedmr': 'silence',
'adn': 'silence',
'this-is': 'silence',
'allstar-link-mode': 'alpha'
},
@ -269,7 +269,7 @@ voiceMap = {
'dk_DK': {
'to': 'silence',
'freedmr': 'silence',
'adn': 'silence',
'this-is': 'silence',
'allstar-link-mode': 'A'
@ -277,35 +277,35 @@ voiceMap = {
'it_IT': {
'to': 'silence',
'freedmr': 'silence',
'adn': 'silence',
'this-is': 'silence',
'allstar-link-mode': 'A'
},
'no_NO': {
'to': 'silence',
'freedmr': 'silence',
'adn': 'silence',
'this-is': 'silence',
'allstar-link-mode': 'A'
},
'pl_PL': {
'to': 'silence',
'freedmr': 'silence',
'adn': 'silence',
'this-is': 'silence',
'allstar-link-mode': 'A'
},
'se_SE': {
'to': 'silence',
'freedmr': 'silence',
'adn': 'silence',
'this-is': 'silence',
'allstar-link-mode': 'A'
},
'CW': {
'to': 'silence',
'freedmr': 'silence',
'adn': 'silence',
'this-is': 'silence',
'linkedto': 'silence',
'allstar-link-mode': 'T'

2
playback_file.py
Unescape View File

@ -270,7 +270,7 @@ if __name__ == '__main__':
report_server = config_reports(CONFIG, reportFactory)
# HBlink instance creation
logger.info('FreeDMR \'playback_file.py\' (c) 2022 Simon Adlem based on work from 2017-2019 Cort Buffington, N0MJS & Mike Zingman, N4IRR -- SYSTEM STARTING...')
logger.info('ADN \'playback_file.py\' (c) 2022 Simon Adlem based on work from 2017-2019 Cort Buffington, N0MJS & Mike Zingman, N4IRR -- SYSTEM STARTING...')
for system in CONFIG['SYSTEMS']:
if CONFIG['SYSTEMS'][system]['ENABLED']:
if CONFIG['SYSTEMS'][system]['MODE'] == 'OPENBRIDGE':

2
report_receiver.py
Unescape View File

@ -16,7 +16,7 @@
# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
###############################################################################
#This is example code to connect to the report service in FreeDMR / HBLink3
#This is example code to connect to the report service in ADN / HBLink3
#It can be used as a skeleton to build logging and monitoring tools.
import pickle

2
report_sql.py
Unescape View File

@ -24,7 +24,7 @@ __license__ = 'GNU GPLv3'
__maintainer__ = 'Simon Adlem G7RZU'
__email__ = 'simon@gb7fr.org.uk'
#This is example code to connect to the report service in FreeDMR / HBLink3
#This is example code to connect to the report service in ADN / HBLink3
#It can be used as a skeleton to build logging and monitoring tools.
import pickle

2
rules_SAMPLE.py
Unescape View File

@ -1,7 +1,7 @@
'''
THIS EXAMPLE WILL NOT WORK AS IT IS - YOU MUST SPECIFY YOUR OWN VALUES!!!
In FreeDMR, the rules file should be *empty* unless you have static routing required. Please see the
In ADN, the rules file should be *empty* unless you have static routing required. Please see the
documentation for more details.
This file is organized around the "Conference Bridges" that you wish to use. If you're a c-Bridge

11
systemd-scripts/adn.service
Unescape View File

@ -0,0 +1,11 @@
[Unit]
Description= ADN DMR Repeaters Service
After=syslog.target network.target
[Service]
User=root
WorkingDirectory=/opt/adn
ExecStart=/usr/bin/python3 bridge_master.py -c ./config/adn.cfg -r ./config/rules.py
[Install]
WantedBy=multi-user.target

25
systemd-scripts/freedmrrepeater.service
Unescape View File

@ -1,25 +0,0 @@
[Unit]
Description= FreeDMR Repeaters Service
After=syslog.target network.target
[Service]
User=root
WorkingDirectory=/opt/FreeDMR
ExecStart=/usr/bin/python3 bridge_master.py -c ./config/hblink.cfg -r ./config/rules.py
[Install]
WantedBy=multi-user.target

2
utils.py
Unescape View File

@ -20,7 +20,7 @@
#Some utilty functions from dmr_utils3 have been modified. These live here.
# Also new FreeDMR specific functions.
# Also new ADN specific functions.
import ssl
from time import time

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.