Commit Graph

79 Commits

Author SHA1 Message Date
Simon 47ad817d3b flip debug back to true. Add timer reset as well to bridge debug 2023-06-19 18:14:13 +01:00
Simon 7fb03aa839 Switch default for DEBUG_BRIDGES from True to False 2023-06-19 17:37:40 +01:00
Simon 5b18073e3a Make bridge debugging and fixing the default 2023-03-22 17:39:08 +00:00
Simon 26cb33910c Fix bad report_clients setting in config defaults 2023-02-06 13:58:44 +00:00
Simon 4a504468d3 Debug when systems have no bridges.
Only enable when debugging.
2023-01-31 10:19:48 +00:00
Simon 2517d3ac21 Updates to tidy up handling of low-level TG filter.
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: f75ff26 d4e3922
Author: Simon <simon@gb7fr.org.uk>
Date:   Sun Jan 29 17:48:22 2023 +0000

    Merge branch 'master' into testing

commit f75ff26cfa
Merge: c0b5216 48339d3
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
2023-01-29 19:27:56 +00:00
Simon f1012c8b93 Sane defaults when values are missing in the config file 2023-01-15 19:20:02 +00:00
Simon 3fcd75e711 Better handling if downloaded files - including checksum checking. 2023-01-15 18:35:31 +00:00
Simon 58658cb679 Add stats option 2022-08-25 16:10:24 +01:00
Simon f99486609a Remove legacy MySQL support completely. 2022-08-25 13:40:27 +01:00
Simon 32d16b2eb0 Revert "Auto topography discovery system:"
This reverts commit 7eccd3e307.
2022-08-11 12:41:28 +01:00
Simon 685d7cc38d Revert "no need for country code"
This reverts commit d02e9cec59.
2022-08-11 12:38:42 +01:00
Simon d02e9cec59 no need for country code 2022-08-09 14:10:32 +01:00
Simon 7eccd3e307 Auto topography discovery system:
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
2022-08-09 13:17:13 +01:00
Simon 236104813b fix conflict with stash 2022-06-19 14:53:37 +01:00
Simon 2baabdbd79
Add switch for server ID validation:
You should add this to [GLOBAL]:

VALIDATE_SERVER_IDS: True

Please set to True if you are part of FreeDMR network.
If you are standalone or private network, You can set it to False if you want.
2022-05-24 18:20:03 +01:00
Simon 33f7064e66
Check top-level server IDs for validity:
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'
2022-05-24 12:10:46 +01:00
Simon b0d6dd4a52
Send all data packets to DATA-GATEWAY if configured and enabled 2022-03-27 23:25:01 +01:00
Simon 09560c17e4 Pass over PROXY stanza in freedmr startup 2022-03-10 22:05:31 +00:00
Simon df07cb7da6 add config option for PROXY_CONTROL 2022-03-07 00:08:33 +00:00
Simon 1e23f60fbc
add local_subscriber_file. Fix parrot config in Docker 2022-02-26 16:26:35 +00:00
Simon 3ea552e2db OPtionally, enforce registered DMR IDs.
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
2022-02-26 01:43:28 +00:00
Simon 8f3c0715cb Remove gethostbyname from ALLSTAR config 2022-02-19 19:05:28 +00:00
Simon 84e0978577 Merge branch AMI
Add All Star Link control
2022-02-19 16:19:47 +00:00
Simon 60be554a7d
Add PROTO_VER to config file.
1 : Standard Open Bridge Protocol
2 : Free Bridge Protocol

This is taken as a minimum ver, so if you set "2", ver 1 traffic will not be accepted.

Protocol can be on-the-fly upgraded using BCVE packet
Downgrade is not allowed
2022-01-19 10:44:09 +00:00
Simon c25e1b95a6 Revert "tidy up FreeDMR module and class structure"
This reverts commit 3bbb970198.
2021-12-27 18:12:02 +00:00
Simon 011219ad41 Revert "more tidying up"
This reverts commit 7280f835d7.
2021-12-27 18:11:17 +00:00
Simon 7280f835d7
more tidying up 2021-12-27 14:10:17 +00:00
Simon 3bbb970198
tidy up FreeDMR module and class structure 2021-12-27 01:47:15 +00:00
Simon cdef086995
write subscriber map to/ read subscriber map from disk 2021-12-20 17:22:52 +00:00
Simon 37240c1d52
remove data gateay 2021-11-13 19:38:24 +00:00
Simon 19f49d4e7a
Send inbound unit data to DATA_GATEWAY 2021-11-03 01:51:21 +00:00
Simon 966ea7c5b7 Revert config.py 2021-10-31 12:31:31 +00:00
KF7EEL 8d8ed3ae7d save progress 2021-10-31 10:39:21 +00:00
Eric ecc4a8eb46 testing data routing for GPS 2021-10-31 10:33:01 +00:00
Simon 61013584a2 Add _MASTER_IP to XLXPEER 2021-08-30 17:13:53 +01:00
Simon a8633090e4 Re-resolve DNS on failed peer ready for testing 2021-08-30 17:02:29 +01:00
Simon 89a19ba107 If ANNOUNCEMENT_LANGUAGES is empty, use provided list instead.
Update default configs to reflect this as new default
2021-08-23 01:25:52 +01:00
Simon 422bfd5f53 replace master with corrected merge from hrt 2021-07-23 17:01:16 +01:00
Simon 732942d7c4 Revert "Merge branch 'hrt'"
This reverts commit de9892a1c2, reversing
changes made to dff06fff62.
2021-07-22 21:58:08 +01:00
Simon 10757f52a7 Revert "Need to remove merge marks"
This reverts commit 9cccfca70a.
2021-07-22 21:56:47 +01:00
Simon 9cccfca70a Need to remove merge marks 2021-07-22 16:35:32 +01:00
Simon de9892a1c2 Merge branch 'hrt' 2021-07-22 15:59:49 +01:00
Simon 75ccf3fe3c Clearer logging of BCSQ 2021-07-22 01:26:09 +01:00
Simon dff06fff62 Revert "Use hi-res timer for loop control"
This reverts commit cbd25b924d.
2021-07-21 23:38:10 +01:00
Simon cbd25b924d Use hi-res timer for loop control 2021-07-21 23:37:30 +01:00
Simon 075064a888 Revert "Default IPv6 by environment variable"
This reverts commit fb1032e116.
2021-07-10 00:51:01 +01:00
Simon fb1032e116 Default IPv6 by environment variable 2021-07-09 01:39:52 +01:00
Simon 497fa3143a Make preference for IPv6 when IP: :: more explicit for OBP 2021-07-06 01:12:19 +01:00
Simon 48354372f4 Further support for IPv6 and Dual-Stack in OpenBridge
To enable IPv6 only - put an IPv6 address in IP (bind specific address)
To enable IPv4 only - put IPv4 address in IP or leave blank (default - binds all IPv4)
To enable dual-stack put '::' in IP (Binds all IPv4 and IPv6 address)
2021-06-19 00:47:21 +01:00