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'
Just report % loss on streams, instead of the missing packet
reporting at INFO level. Missing packet reporting still available
at DEBUG level.
Also report STREAM LOST properly.
Also, check peridically (STALE_TIME setting) for new files.
New config option:
ALLOW_UNREG_ID=[True|False] - in MASTER definition
Squashed commit of the following:
commit 082fd63b96c272415a01d5dadc8d38bf0842737d
Author: Simon <simon@gb7fr.org.uk>
Date: Sat Feb 26 01:40:11 2022 +0000
Periodic download of alias files
commit cb33388509978686ee6bfc19cddb863379872c7b
Author: Simon <simon@gb7fr.org.uk>
Date: Thu Feb 24 00:17:38 2022 +0000
server check id
commit 5428503e17ae32234a58c997037e70abe2a784c7
Author: Simon <simon@gb7fr.org.uk>
Date: Thu Feb 24 00:16:46 2022 +0000
server check id
commit 65fcf2eddffa426caacdbf1a59f529c995045fb5
Author: Simon <simon@gb7fr.org.uk>
Date: Thu Feb 24 00:06:24 2022 +0000
server check id
commit ea0ea8d6b13ba7e20492f11226de854cecbccc46
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Feb 23 23:49:07 2022 +0000
reverse logic
commit 9815210d5adb2ee92d1b9914753d4799988b3415
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Feb 23 23:24:34 2022 +0000
reverse logic
commit 0d9945d23fcce62378cace97cdc012c3fdd04276
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Feb 23 23:23:26 2022 +0000
reverse logic
commit 54cc752c4cac52e903422b9aae38e61f722c23f1
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Feb 23 23:20:16 2022 +0000
reverse logic
commit 182a0e99829ee7383ae72b52d8514aa826e31260
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Feb 23 23:17:16 2022 +0000
typo
commit e244c1b20b9c927efb1a95e30ff08d3120a83b7e
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Feb 23 23:16:28 2022 +0000
typo
commit ba822143bd97261f1a65fc9d489bc570dea3749d
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Feb 23 23:12:54 2022 +0000
further updates to validate_id
commit 8266db1820ee09b3bb3d4731e0cf019df40c638e
Author: Simon <simon@gb7fr.org.uk>
Date: Tue Feb 22 00:48:31 2022 +0000
mike
commit 2658e5842c24a4d72d17a46d1792811f2b01bbbc
Author: Simon <simon@gb7fr.org.uk>
Date: Tue Feb 22 00:46:07 2022 +0000
int - string trickey
commit 51479c0c572c75b9a8c9ea19e1aa6c5e3692d5a4
Author: Simon <simon@gb7fr.org.uk>
Date: Tue Feb 22 00:41:30 2022 +0000
validate_id
commit 012ea165cebe414800815362d4f9da1b7399bcad
Author: Simon <simon@gb7fr.org.uk>
Date: Tue Feb 22 00:40:00 2022 +0000
validate_id
commit eff8b31bb5cadc08093f333afc7cb6a423e05675
Author: Simon <simon@gb7fr.org.uk>
Date: Tue Feb 22 00:36:46 2022 +0000
validate_id
commit fb3158c4d0d44663c4e511163b60b5a04f392123
Author: Simon <simon@gb7fr.org.uk>
Date: Tue Feb 22 00:05:01 2022 +0000
make sure hblink.py can see sub ids
commit 17111430fd561ebf2a431c615cd7521884a55ccd
Author: Simon <simon@gb7fr.org.uk>
Date: Mon Feb 21 23:35:32 2022 +0000
add get_alias
commit e98ea4c7f3d27c7539607a31948249ad1e6feb85
Author: Simon <simon@gb7fr.org.uk>
Date: Mon Feb 21 23:28:29 2022 +0000
fix line
commit d027373fb944ea3fa60c5993bd91d114bb935721
Author: Simon <simon@gb7fr.org.uk>
Date: Mon Feb 21 23:27:01 2022 +0000
fix isinstance
commit 106e2bcda6bc87f5a00ee9b99dbafdacb79d3d8d
Author: Simon <simon@gb7fr.org.uk>
Date: Mon Feb 21 23:22:47 2022 +0000
don't allow login if ID and callsign don't match database
Simon
rune