Commit Graph

22 Commits

Author SHA1 Message Date
Simon 32d16b2eb0 Revert "Auto topography discovery system:"
This reverts commit 7eccd3e307.
2022-08-11 12:41:28 +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 c950c45102
Protocol V5 - add support for Source Repeater (or hotspot) in packet. 2022-03-26 00:45:44 +00:00
Simon e25a63c386 auto blacklist for 60 seconds on bad ID 2022-03-06 18:07:38 +00:00
Simon 077b5b6d40 init 2022-03-05 16:54:35 +00:00
Simon 12dafa3c40
first pass - protov4 2022-02-13 01:47:51 +00:00
Simon 6adf6e456b
Emergency fix - unique packets break hashing 2022-02-07 00:53:34 +00:00
Simon 4d8cf76e03 eobp 2022-02-04 23:52:24 +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 656e57be53 blake2 2022-01-16 02:42:02 +00:00
Simon 1858b2c2c3 initial 2022-01-16 01:44:51 +00:00
Simon 4ea19949e1
const 2022-01-12 23:49:35 +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 3bbb970198
tidy up FreeDMR module and class structure 2021-12-27 01:47:15 +00:00
Simon 88334eaaf5 Adds support for new Bridge Control OPCODE - BCSQ
BCSQ is Source Quench or Squelch

When a stream id is received from more than one source on a TG
the system sends a BCSQ to all of the non-first systems to ask them
to stop sending this stream ID. This reduces network and CPU load. Also
packets can't loop of they arent even received!

Squashed commit of the following:

commit e5ba9ece5d84e56096c459139fb39eba16249f96
Author: Simon <simon@gb7fr.org.uk>
Date:   Mon Apr 12 23:16:30 2021 +0100

    Tidy up log handling for streams

commit fc1e4bd91f0e576e8c58e84cf4b96f00ce6ec933
Author: Simon <simon@gb7fr.org.uk>
Date:   Mon Apr 12 22:56:45 2021 +0100

    Fix target port (BCKA)

commit 27e046e5efe744679c7652f65135cf3129481092
Author: Simon <simon@gb7fr.org.uk>
Date:   Mon Apr 12 22:50:35 2021 +0100

    Handle keyerror

commit 99c660fa813a300940b16e55d840218f1868cadb
Author: Simon <simon@gb7fr.org.uk>
Date:   Mon Apr 12 22:45:05 2021 +0100

    Stream trimmer for BCSQ

commit 9d6102be13813b27b752192e29e94d5eafbbb934
Author: Simon <simon@gb7fr.org.uk>
Date:   Mon Apr 12 21:32:54 2021 +0100

    Brack

commit 2f8a8cf620153cb0138e970c0dcd85328a47521c
Merge: f77a68a 17b6968
Author: Simon <simon@gb7fr.org.uk>
Date:   Sun Apr 11 22:16:38 2021 +0100

    Merge branch 'master' into bcsq

commit f77a68a96297fe050609b8ee5fb56b0866ec78f4
Merge: 7f4c6f5 9a3e5fb
Author: Simon <simon@gb7fr.org.uk>
Date:   Fri Apr 9 01:39:54 2021 +0100

    Merge branch 'master' into bcsq

commit 7f4c6f5375b589aa78e74f0002448afe95a625a2
Author: Simon <simon@gb7fr.org.uk>
Date:   Thu Apr 8 18:35:08 2021 +0100

    c

commit c0904242e0f532c26e33bdd9cba8d1bea5329abc
Author: Simon <simon@gb7fr.org.uk>
Date:   Tue Apr 6 19:05:40 2021 +0100

    only try to quench the source once

commit 2748d0cf7c5557522a5b2d0d9e3b37e294711910
Author: Simon <simon@gb7fr.org.uk>
Date:   Tue Apr 6 18:56:05 2021 +0100

    Comment out check for enahnced to tes

commit fa43a09db73862343f0f70a367786c4d77aaf9b9
Author: Simon <simon@gb7fr.org.uk>
Date:   Tue Apr 6 18:51:19 2021 +0100

    Dst id not tgid

commit f02df6edf10cfa936147b0862671ed949a820785
Author: Simon <simon@gb7fr.org.uk>
Date:   Tue Apr 6 18:48:44 2021 +0100

    More BCSQ

commit adf3bb4059f0710848f8e3349722141836889c41
Author: Simon <simon@gb7fr.org.uk>
Date:   Tue Apr 6 18:44:15 2021 +0100

    more BCKA fixes

commit b4dc518d9b74a0d8c83b3b1bb17d7de4d04b9915
Author: Simon <simon@gb7fr.org.uk>
Date:   Tue Apr 6 18:42:13 2021 +0100

    Fix broken BKCA

commit 637d772dbadb346ad49d5b80d8299c13b0fbfc79
Author: Simon <simon@gb7fr.org.uk>
Date:   Tue Apr 6 18:38:17 2021 +0100

    More work on BCSQ
2021-04-12 23:28:01 +01:00
Simon b096d5dfa5 Fix bcka 2021-04-04 17:44:29 +01:00
Simon 90f01a7751 Report package ID in logs 2021-04-03 16:59:44 +01:00
Simon f671a9bc51 Gracefuly acknowledge DMRA packets 2021-01-18 14:28:37 +00:00
Steve Zingman 9291ff175a
Fix typo 2019-07-17 22:26:35 -04:00
n0mjs710 77d19f65ed Mostly kinda works now 2019-01-04 15:32:13 -06:00
Cort Buffington 8585b75dc0 change how constants are imported 2018-12-27 14:36:32 -06:00
Cort Buffington c3eee1b9b1 push changes 2018-12-27 14:31:08 -06:00