Merge pull request #3 from hp3icc/develop

fix port parot
2 years ago · 48d76c31de
parent 390af451d2 ce8465aa09
commit 48d76c31de
4 changed files with 109 additions and 25 deletions
--- a/config/ADN-MINIMAL.cfg
+++ b/config/ADN-MINIMAL.cfg
@ -1,10 +1,12 @@
 #This empty config file will use defaults for everything apart from OBP and HBP config
 #This is usually a sensible choice. 

+#I have moved to a config like this to encourage servers to use the accepted defaults 
+#unless you really know what you are doing.

 [GLOBAL]
-SERVER_ID: 0000
-DEBUG_BRIDGES: True
+#If you join the ADN-Systems network, you need to add your ServerID Here.
+SERVER_ID: 0

 [REPORTS]

@ -14,6 +16,32 @@ DEBUG_BRIDGES: True

 [ALLSTAR]

+#This is an example OpenBridgeProtocol (OBP) or FreeBridgeProtocol (FBP) configuration
+#If you joing ADN-Systems, you will be given a config like this to paste in
+[OBP-TEST]
+MODE: OPENBRIDGE
+ENABLED: False
+IP:
+PORT: 62044
+#The ID which you expect to see sent from the other end of the link. 
+NETWORK_ID: 1
+PASSPHRASE: mypass
+TARGET_IP: 
+TARGET_PORT: 62044
+USE_ACL: True
+SUB_ACL: DENY:1
+TGID_ACL: PERMIT:ALL
+#Should always be true if using docker. 
+RELAX_CHECKS: True
+#True for FBP, False for OBP
+ENHANCED_OBP: True
+#PROTO_VER should be 5 for ADN-Systems servers using FBP
+#1 for other servers using OBP
+PROTO_VER: 5
+
+#This defines parameters for repeater/hotspot connections 
+#via HomeBrewProtocol (HBP)
+#I don't recommend changing most of this unless you know what you are doing
 [SYSTEM]
 MODE: MASTER
 ENABLED: True
@ -22,7 +50,7 @@ MAX_PEERS: 1
 EXPORT_AMBE: False
 IP: 127.0.0.1
 PORT: 56400
-PASSPHRASE:
+PASSPHRASE: passw0rd
 GROUP_HANGTIME: 5
 USE_ACL: True
 REG_ACL: DENY:1
@ -30,17 +58,18 @@ SUB_ACL: DENY:1
 TGID_TS1_ACL: PERMIT:ALL
 TGID_TS2_ACL: PERMIT:ALL
 DEFAULT_UA_TIMER: 60
+SINGLE_MODE: False
+VOICE_IDENT: False
 TS1_STATIC:
 TS2_STATIC:
 DEFAULT_REFLECTOR: 0
-SINGLE_MODE: False
-VOICE_IDENT: False
 ANNOUNCEMENT_LANGUAGE: en_GB
 GENERATOR: 100
 ALLOW_UNREG_ID: False
 PROXY_CONTROL: False
 OVERRIDE_IDENT_TG:

+#Echo (Loro / Parrot) server
 [ECHO]
 MODE: PEER
 ENABLED: True
@ -73,3 +102,4 @@ SUB_ACL: DENY:1
 TGID_TS1_ACL: PERMIT:ALL
 TGID_TS2_ACL: PERMIT:ALL
 ANNOUNCEMENT_LANGUAGE: en_GB
+
--- a/config/ADN-SAMPLE-commented.cfg
+++ b/config/ADN-SAMPLE-commented.cfg
@ -156,11 +156,14 @@ TABLE: repeaters
 # OpenBridge does not 'register', so registration ACL is meaningless.
 # OpenBridge passes all traffic on TS1, so there is only 1 TGID ACL.
 # Otherwise ACLs work as described in the global stanza
+#This is an example OpenBridgeProtocol (OBP) or FreeBridgeProtocol (FBP) configuration
+#If you joing ADN-Systems, you will be given a config like this to paste in
 [OBP-TEST]
 MODE: OPENBRIDGE
 ENABLED: False
 IP:
 PORT: 62044
+#The ID which you expect to see sent from the other end of the link. 
 NETWORK_ID: 1
 PASSPHRASE: mypass
 TARGET_IP: 
@ -168,9 +171,13 @@ TARGET_PORT: 62044
 USE_ACL: True
 SUB_ACL: DENY:1
 TGID_ACL: PERMIT:ALL
-RELAX_CHECKS: False
-ENHANCED_OBP: False
-PROTO_VER: 2 
+#Should always be true if using docker. 
+RELAX_CHECKS: True
+#True for FBP, False for OBP
+ENHANCED_OBP: True
+#PROTO_VER should be 5 for ADN-Systems servers using FBP
+#1 for other servers using OBP
+PROTO_VER: 5

 # MASTER INSTANCES - DUPLICATE SECTION FOR MULTIPLE MASTERS
 # HomeBrew Protocol Master instances go here.
@ -185,29 +192,66 @@ PROTO_VER: 2
 #
 # ACLs:
 # See comments in the GLOBAL stanza
-[G9XYZ]
+#This defines parameters for repeater/hotspot connections 
+#via HomeBrewProtocol (HBP)
+#I don't recommend changing most of this unless you know what you are doing
+[SYSTEM]
 MODE: MASTER
-ENABLED: False
+ENABLED: True
 REPEAT: True
 MAX_PEERS: 1
 EXPORT_AMBE: False
-IP:
-PORT: 54001
-PASSPHRASE: passw0rd
+IP: 127.0.0.1
+PORT: 56400
+PASSPHRASE:
 GROUP_HANGTIME: 5
 USE_ACL: True
 REG_ACL: DENY:1
 SUB_ACL: DENY:1
 TGID_TS1_ACL: PERMIT:ALL
 TGID_TS2_ACL: PERMIT:ALL
-DEFAULT_UA_TIMER: 10
+DEFAULT_UA_TIMER: 60
 SINGLE_MODE: False
 VOICE_IDENT: False
-#the next three lines no longer have any effect 
 TS1_STATIC:
 TS2_STATIC:
 DEFAULT_REFLECTOR: 0
 ANNOUNCEMENT_LANGUAGE: en_GB
-GENERATOR: 1
+GENERATOR: 100
 ALLOW_UNREG_ID: False
 PROXY_CONTROL: False
+OVERRIDE_IDENT_TG:
+
+#Echo (Loro / Parrot) server
+[ECHO]
+MODE: PEER
+ENABLED: True
+LOOSE: False
+EXPORT_AMBE: False
+IP: 127.0.0.1
+PORT: 54916
+MASTER_IP: 127.0.0.1
+MASTER_PORT: 54915
+PASSPHRASE: passw0rd
+CALLSIGN: ECHO
+RADIO_ID: 1000001
+RX_FREQ: 449000000
+TX_FREQ: 444000000
+TX_POWER: 25
+COLORCODE: 1
+SLOTS: 1
+LATITUDE: 00.0000
+LONGITUDE: 000.0000
+HEIGHT: 0
+LOCATION: 9990 Parrot
+DESCRIPTION: ECHO
+URL: adn.systems
+SOFTWARE_ID: 20170620
+PACKAGE_ID: MMDVM_ADN-Systems
+GROUP_HANGTIME: 5
+OPTIONS:
+USE_ACL: True
+SUB_ACL: DENY:1
+TGID_TS1_ACL: PERMIT:ALL
+TGID_TS2_ACL: PERMIT:ALL
+ANNOUNCEMENT_LANGUAGE: en_GB
--- a/config/ADN-SAMPLE.cfg
+++ b/config/ADN-SAMPLE.cfg
@ -54,11 +54,14 @@ SERVER: my.asl.server
 PORT: 5038
 NODE: 0000

+#This is an example OpenBridgeProtocol (OBP) or FreeBridgeProtocol (FBP) configuration
+#If you joing ADN-Systems, you will be given a config like this to paste in
 [OBP-TEST]
 MODE: OPENBRIDGE
 ENABLED: False
 IP:
 PORT: 62044
+#The ID which you expect to see sent from the other end of the link. 
 NETWORK_ID: 1
 PASSPHRASE: mypass
 TARGET_IP: 
@ -66,10 +69,17 @@ TARGET_PORT: 62044
 USE_ACL: True
 SUB_ACL: DENY:1
 TGID_ACL: PERMIT:ALL
+#Should always be true if using docker. 
 RELAX_CHECKS: True
+#True for FBP, False for OBP
 ENHANCED_OBP: True
+#PROTO_VER should be 5 for ADN-Systems servers using FBP
+#1 for other servers using OBP
 PROTO_VER: 5

+#This defines parameters for repeater/hotspot connections 
+#via HomeBrewProtocol (HBP)
+#I don't recommend changing most of this unless you know what you are doing
 [SYSTEM]
 MODE: MASTER
 ENABLED: True
@ -97,6 +107,7 @@ ALLOW_UNREG_ID: False
 PROXY_CONTROL: False
 OVERRIDE_IDENT_TG:

+#Echo (Loro / Parrot) server
 [ECHO]
 MODE: PEER
 ENABLED: True
--- a/config/parrot.cfg
+++ b/config/parrot.cfg
@ -104,20 +104,18 @@ LOG_NAME: ADN
 # download again. Don't be an ass and change this to less than a few days.
 [ALIASES]
 TRY_DOWNLOAD: False
-PATH: ./data
+PATH: ./
 PEER_FILE: peer_ids.json
 SUBSCRIBER_FILE: subscriber_ids.json
 TGID_FILE: talkgroup_ids.json
 PEER_URL: https://adn.systems/files/peer_ids.json
 SUBSCRIBER_URL: https://adn.systems/files/subscriber_ids.json
 TGID_URL: https://adn.systems/files/talkgroup_ids.json
-LOCAL_SUBSCRIBER_FILE: local_subcriber_ids.json
-STALE_DAYS: 1
+LOCAL_SUBSCRIBER_FILE: local_subscriber_ids.json
+STALE_DAYS: 7
 SUB_MAP_FILE:
 SERVER_ID_URL: https://adn.systems/files/server_ids.tsv
 SERVER_ID_FILE: server_ids.tsv
-CHECKSUM_URL: https://adn.systems/files/file_checksums.json
-CHECKSUM_FILE: file_checksums.json


 # OPENBRIDGE INSTANCES - DUPLICATE SECTION FOR MULTIPLE CONNECTIONS
@ -144,7 +142,7 @@ IP:
 PORT: 62044
 NETWORK_ID: 1
 PASSPHRASE: mypass
-TARGET_IP:
+TARGET_IP: 
 TARGET_PORT: 62044
 USE_ACL: True
 SUB_ACL: DENY:1
@ -171,7 +169,7 @@ REPEAT: True
 MAX_PEERS: 1
 EXPORT_AMBE: False
 IP: 127.0.0.1
-PORT: 54916
+PORT: 54915
 PASSPHRASE: passw0rd
 GROUP_HANGTIME: 5
 USE_ACL: True
@ -183,10 +181,11 @@ DEFAULT_UA_TIMER: 10
 SINGLE_MODE: True
 VOICE_IDENT: False
 TS1_STATIC:
-TS2_STATIC:
+TS2_STATIC: 
 DEFAULT_REFLECTOR: 0
 GENERATOR: 1
-ANNOUNCEMENT_LANGUAGE: en_GB
+ANNOUNCEMENT_LANGUAGE:en_GB
 ALLOW_UNREG_ID: True
 PROXY_CONTROL: False
 OVERRIDE_IDENT_TG:
+