Also, remove the obsolete protocol versions 2 and 3
and some further tidying up.
Squashed commit of the following:
commit 7b13b9f046
Author: Simon <simon@gb7fr.org.uk>
Date: Sun Jan 29 19:01:33 2023 +0000
SERVER_ID is bytes!
commit cee3bc76fb
Author: Simon <simon@gb7fr.org.uk>
Date: Sun Jan 29 18:50:06 2023 +0000
frog
commit 82432b9c2c
Author: Simon <simon@gb7fr.org.uk>
Date: Sun Jan 29 18:49:53 2023 +0000
fred
commit 6601573c7f
Author: Simon <simon@gb7fr.org.uk>
Date: Sun Jan 29 18:39:08 2023 +0000
Stringly
commit 28fa37f828
Author: Simon <simon@gb7fr.org.uk>
Date: Sun Jan 29 18:30:37 2023 +0000
self
commit 3e6d28d4dd
Author: Simon <simon@gb7fr.org.uk>
Date: Sun Jan 29 18:23:42 2023 +0000
Fix trace
commit a15901dc79
Author: Simon <simon@gb7fr.org.uk>
Date: Sun Jan 29 18:21:30 2023 +0000
Tweak config file used in install script
commit 654ec135ca
Merge: f75ff26d4e3922
Author: Simon <simon@gb7fr.org.uk>
Date: Sun Jan 29 17:48:22 2023 +0000
Merge branch 'master' into testing
commit f75ff26cfa
Merge: c0b521648339d3
Author: Simon <simon@gb7fr.org.uk>
Date: Sun Jan 29 17:46:07 2023 +0000
Merge branch 'master' into testing
commit c0b5216e5a
Author: Simon <simon@gb7fr.org.uk>
Date: Sun Jan 29 11:04:45 2023 +0000
more config work
commit c79ce0551d
Author: Simon <simon@gb7fr.org.uk>
Date: Sun Jan 29 00:54:56 2023 +0000
ib
commit 294a09c8f1
Author: Simon <simon@gb7fr.org.uk>
Date: Sun Jan 29 00:50:36 2023 +0000
Enable minimal config and tidy up global ACL
commit d1dc58d46f
Author: Simon <simon@gb7fr.org.uk>
Date: Sat Jan 28 23:12:41 2023 +0000
Deprecate protocol versions 2 and 3
new config directive:
under [ALIAS]
TOPO_FILE: topography.json
A JSON file is output showing all of the SERVER_IDs seen, at the top level, and where they are bridged to.
Example:
{
"2341" : { #Top-level server ID seen
"7301" : { #Is bridged with server 7301
"hops" : 2, #Hops it took for the topography packet to reach us
"time" : 1660047369.11104, #Timestamp on which the packet was received
"ver" : 5, #Version of FBP this bridge speaks
"uid" : 1820181884 #Unique ID to identify the topography packet. Mostly so we don't duplicate.
}
}
Squashed commit of the following:
commit 950f3e1c3e
Author: Simon <simon@gb7fr.org.uk>
Date: Tue Aug 9 13:16:40 2022 +0100
Topo ready for merge
commit 4dc9f817a7
Author: Simon <simon@gb7fr.org.uk>
Date: Tue Aug 9 02:01:08 2022 +0100
Fix trimmer
commit 48c520c863
Author: Simon <simon@gb7fr.org.uk>
Date: Mon Aug 8 01:35:43 2022 +0100
Think this may be ready :)
commit 8a860bb382
Author: Simon <simon@gb7fr.org.uk>
Date: Mon Aug 8 00:29:14 2022 +0100
Fix back to operational params
commit 3657760112
Author: Simon <simon@gb7fr.org.uk>
Date: Mon Aug 8 00:18:18 2022 +0100
UID typo
commit 047b1df5a4
Author: Simon <simon@gb7fr.org.uk>
Date: Mon Aug 8 00:17:12 2022 +0100
Fix BCTO
commit dfe21bfaa3
Author: Simon <simon@gb7fr.org.uk>
Date: Mon Aug 8 00:12:48 2022 +0100
Testing with 10 sec
commit 8431b4dcf6
Author: Simon <simon@gb7fr.org.uk>
Date: Fri Aug 5 00:10:28 2022 +0100
Use UID in BCTO
commit 620a9818bf
Author: Simon <simon@gb7fr.org.uk>
Date: Thu Aug 4 02:38:59 2022 +0100
dfkldlk
commit 1f92e1b784
Author: Simon <simon@gb7fr.org.uk>
Date: Thu Aug 4 02:16:48 2022 +0100
retrans with correct passphrase
commit 445ae4474c
Author: Simon <simon@gb7fr.org.uk>
Date: Thu Aug 4 01:47:01 2022 +0100
Retransmit to right systems!
commit ba0da271a2
Author: Simon <simon@gb7fr.org.uk>
Date: Thu Aug 4 01:08:56 2022 +0100
my hops
commit 80e42f7837
Author: Simon <simon@gb7fr.org.uk>
Date: Thu Aug 4 00:51:47 2022 +0100
dfdf
commit 0991670323
Author: Simon <simon@gb7fr.org.uk>
Date: Thu Aug 4 00:49:10 2022 +0100
fkjkj
commit 275306af50
Author: Simon <simon@gb7fr.org.uk>
Date: Thu Aug 4 00:48:12 2022 +0100
f
commit c9cb71accd
Author: Simon <simon@gb7fr.org.uk>
Date: Thu Aug 4 00:47:10 2022 +0100
hoppy
commit d01019fa61
Author: Simon <simon@gb7fr.org.uk>
Date: Thu Aug 4 00:23:39 2022 +0100
bctony
commit f3de53d47b
Author: Simon <simon@gb7fr.org.uk>
Date: Thu Aug 4 00:04:50 2022 +0100
fklflk
commit 752b8407a8
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Aug 3 23:59:17 2022 +0100
lkflkk
commit dd92b059ee
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Aug 3 23:58:14 2022 +0100
dlfklk
commit 220d5bc6bb
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Aug 3 23:57:25 2022 +0100
dlkfdlkf
commit d9e46764c1
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Aug 3 23:49:52 2022 +0100
dflklxk
commit 9aba9d2fdc
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Aug 3 23:48:06 2022 +0100
;fl;sl
commit 0d2d6fc5ea
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Aug 3 23:46:20 2022 +0100
lskdlk
commit aad811c080
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Aug 3 23:39:59 2022 +0100
flklk
commit a531b5f2b8
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Aug 3 23:39:00 2022 +0100
hoppy
commit 648bd3d77c
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Aug 3 23:37:27 2022 +0100
slfkdlsk
commit 32f7037973
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Aug 3 23:35:55 2022 +0100
dflkldk
commit e1e58321c1
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Aug 3 23:33:49 2022 +0100
djklk
commit f7985a6119
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Aug 3 23:32:59 2022 +0100
f f
commit dfcf4184f4
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Aug 3 23:31:58 2022 +0100
fix fix
commit dd76e6ce4e
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Aug 3 23:30:35 2022 +0100
fix hmac
commit 5306f36675
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Aug 3 23:28:40 2022 +0100
10 sec test
commit 549f8245e6
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Aug 3 23:23:54 2022 +0100
packet
commit 011db46f47
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Aug 3 23:10:44 2022 +0100
Lets test the TOPO!
commit d1cee872e5
Author: Simon <simon@gb7fr.org.uk>
Date: Tue Aug 2 00:47:15 2022 +0100
Topo first pass
write config and bridge state to disk.
If, when started again, state files are less that 25 seconds old
load these instead of parsing freedmr.cfg and rules.py
This means, it's possible to effect a seamless restart, without causing
systems to have to re-login.
Add this to freedmr.cfg [ALIASES]
SERVER_ID_URL: http://downloads.freedmr.uk/downloads/FreeDMR_Hosts.csv
SERVER_ID_FILE: freedmr_hosts.tsv
Also, if you run docker, you may need to map the file outside:
touch /etc/freedmr/json/freedmr_hosts.tsv
chown 54000:54000 /etc/freedmr/json/freedmr_hosts.tsv
then in docker-compose.yml:
- '/etc/freedmr/json/server_ids.tsv:/opt/freedmr/server_ids.tsv'
Simon
rune