Commit Graph

289 Commits

Author SHA1 Message Date
Simon
9d398ee6f7 frog 2021-04-17 15:46:46 +01:00
Simon
fa7ccf6fd7 ged 2021-04-17 15:46:28 +01:00
Simon
f3c0d084bd ok 2021-04-17 15:45:40 +01:00
Simon
1da0b97314 Revert "_seq does not appear to be an integer for peers"
This reverts commit ad1906f5e2.
2021-04-17 15:44:20 +01:00
Simon
6e970c28b4 Revert "Fix"
This reverts commit ba77eb5af8.
2021-04-17 15:44:19 +01:00
Simon
ba77eb5af8 Fix 2021-04-17 15:25:54 +01:00
Simon
ad1906f5e2 _seq does not appear to be an integer for peers 2021-04-17 15:12:15 +01:00
Simon
7632384d5c Remove rogue print(() statement that was used for testing 2021-04-17 11:05:18 +01:00
Simon
eb4028d7d0 LoopControl on PEER, XLXPEER and MASTER connections 2021-04-16 23:13:19 +01:00
Simon
090500d327 Duplicate detection for HBP 2021-04-16 20:48:14 +01:00
Simon
4c998ccccf re-enable PEER 2021-04-16 19:07:40 +01:00
Simon
e985951d2c Further enhance dup logging. 2021-04-16 18:31:13 +01:00
Simon
4331bb4e51 Enhance logging for dup detection 2021-04-16 18:29:22 +01:00
Simon
5bcc375792 More work to fix duplicate detection 2021-04-16 18:15:41 +01:00
Simon
5586c438b2 a 2021-04-16 11:04:33 +01:00
Simon
cebdffaf9f sq 2021-04-16 11:03:54 +01:00
Simon
10bff82d6b Seq 2021-04-16 11:02:44 +01:00
Simon
fa3dda2c2f Handle false lastSeq 2021-04-16 10:59:46 +01:00
Simon
4de29e3c77 self.lastData 2021-04-16 10:56:28 +01:00
Simon
51e7d50d1e Only compare whole packet is seq > 1 2021-04-16 10:53:53 +01:00
Simon
250b0789b6 Revert "Make sure we always record last time, even if packet rejected by LoopControl"
This reverts commit 94418256ec.
2021-04-16 10:49:02 +01:00
Simon
8749a457c3 Revert "lastdata"
This reverts commit 0503e72607.
2021-04-16 10:49:01 +01:00
Simon
0503e72607 lastdata 2021-04-16 02:18:50 +01:00
Simon
94418256ec Make sure we always record last time, even if packet rejected by LoopControl 2021-04-16 02:09:45 +01:00
Simon
84a92d8963 Compare whole packet for duplicates 2021-04-16 01:57:08 +01:00
Simon
9084eacc23 Sequence number logging at warning level 2021-04-16 01:47:32 +01:00
Simon
b44be39a16 Move where dup seq. is recorded 2021-04-16 01:46:28 +01:00
Simon
c3f438ae31 Fix my mess 2021-04-15 18:59:24 +01:00
Simon
3a1626fde7 Revert "bcka test"
This reverts commit d7bf07c23a.
2021-04-15 18:57:51 +01:00
Simon
ba5900eb07 Hmm 2021-04-15 18:56:47 +01:00
Simon
a27801e399 type 2021-04-15 18:49:19 +01:00
Simon
d7bf07c23a bcka test 2021-04-15 18:45:36 +01:00
Simon
cc5178faab Don't send to system if more than 6 (1 min) BCKA missed 2021-04-15 18:33:38 +01:00
Simon
33ce153a4b Missing ] 2021-04-14 22:37:45 +01:00
Simon
1cf2415321 Handle BCSQ when coming from a HBP source also 2021-04-14 22:36:28 +01:00
Simon
8266467564 Fix in fin log 2021-04-14 20:27:48 +01:00
Simon
f02b5ff22e Disable PEER and XLXPEER connections for testing 2021-04-14 20:17:38 +01:00
Simon
c41b2b9131 Timeout ot streamIDs should match standard DMR radio, repeater and network timeout
180 secs
2021-04-14 11:42:31 +01:00
Simon
dec08d6e33 Stream 2021-04-13 16:55:45 +01:00
Simon
2464818f03 test 2 2021-04-13 16:54:20 +01:00
Simon
a3d6d660c4 testing 2021-04-13 16:51:12 +01:00
Simon
13ac1a4045 Change timeout of streams to make dash more responsive 2021-04-13 16:46:56 +01:00
Simon
eab8c03cce Tidy up BCSQ logging 2021-04-13 12:12:44 +01:00
Simon
ed3f266761 typo again 2021-04-13 11:57:30 +01:00
Simon
3267e2bb21 Fix exceptrion - changed while being iterated 2021-04-13 11:25:35 +01:00
Simon
3912e529f9 A 2021-04-13 01:39:20 +01:00
Simon
b960427f2a typo - _sysconfig 2021-04-13 00:05:23 +01: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
17b6968930 Comment extra loop (load inducing?) 2021-04-11 21:18:37 +01:00
Simon
1bd776dfd9 missing _ 2021-04-09 02:47:47 +01:00