Change behaviour of NETWORK_ID in OPENBRIDGE config:
This should be the ID of remote system. If traffic received on this bridge is not shown as
from this ID, it will be disgarded.
Fix reporting of PEER so it actually takes the peer from the incoming connection, not NETWORK_ID:
So, in short:
SERVER_ID in [GLOBAL] - the ID you send to other servers via OBP
NETWORK_ID in OPENBRIDGE - the expected ** remote ** ID for the bridge.
default in config file and OPTIONS.
Remove ANNOUNCEMENT_LANGUAGE from [GLOBAL]
Replace with ANNOUNCEMENT_LANGUAGES - Comma Separated list
Current list:
ANNOUNCEMENT_LANGUAGES: en_GB,en_GB_2,en_US,es_ES,es_ES_2,fr_FR,de_DE,dk_DK,it_IT,no_NO,pl_PL,se_SE
Add:
ANNOUNCEMENT_LANGUAGE to MASTER definition. If using GENERATOR, this becomes
the template default.
To change via OPTIONS add LANG=<language code>
take codes from list above
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
Squashed commit of the following:
commit da52307f858da5ef4f23950ff94c3c1dd78650a2
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Mar 24 18:14:42 2021 +0000
Revert "Log UA Timer when logging bridge timer events"
This reverts commit 8e1e96d9202afdbd2d88c73bba2abe7000718d89.
commit 79a2efcd03c736fd8f3a0187fd0b7c0033b43604
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Mar 24 18:14:41 2021 +0000
Revert "Tidy up commented out code"
This reverts commit c54353bddc3cb9f424a1b9087e30308b1da0f083.
commit 5081af43a9ed6a1ff62300876d089f18aeaec09f
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Mar 24 18:14:36 2021 +0000
Revert "No UA timer on STAT bridges"
This reverts commit 97f84c97e583ef45b5eaa57c60da24b2546a537f.
commit b605432e0fa2107928274bf848c094d5ec2bf919
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Mar 24 18:14:31 2021 +0000
Revert "One missing"
This reverts commit a479882017a9637107bb51e971402bf20b55d592.
commit a479882017a9637107bb51e971402bf20b55d592
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Mar 24 18:11:14 2021 +0000
One missing
commit 97f84c97e583ef45b5eaa57c60da24b2546a537f
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Mar 24 18:06:38 2021 +0000
No UA timer on STAT bridges
commit c54353bddc3cb9f424a1b9087e30308b1da0f083
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Mar 24 18:01:21 2021 +0000
Tidy up commented out code
commit 8e1e96d9202afdbd2d88c73bba2abe7000718d89
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Mar 24 17:45:53 2021 +0000
Log UA Timer when logging bridge timer events
commit 869fa90277bb72a104d0e4eb0bf91a54671f55b2
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Mar 24 09:25:05 2021 +0000
RX_STREAM_ID keyerror
commit 6777f5892c0e64899372758a408d240ebae79704
Merge: 4bf055e 415346f
Author: Simon <simon@gb7fr.org.uk>
Date: Wed Mar 24 09:05:27 2021 +0000
Merge branch 'master' into loopy
commit 4bf055ede46b6cf31269def0b59ae6db738d3e8c
Author: Simon <simon@adlem.net>
Date: Mon Feb 22 11:36:22 2021 +0000
Revert "Log packet time"
This reverts commit 59de64990df5cbdaf91d487254e4f0a08c3b7e73.
commit 59de64990df5cbdaf91d487254e4f0a08c3b7e73
Author: Simon <simon@adlem.net>
Date: Mon Feb 22 11:07:26 2021 +0000
Log packet time
commit df4b8ff525f7e6611ed1f1cfc006469695974b5e
Author: Simon <simon@adlem.net>
Date: Mon Feb 22 10:51:53 2021 +0000
Raise KeyError level for streamid to warning
commit 66c82257cf9f795efb6c68f077ade90681dc52cb
Author: Simon <simon@adlem.net>
Date: Sun Feb 21 23:22:11 2021 +0000
Only log once
commit 9989a3d06f106519dbabd4e5b83edd90205cc7ed
Author: Simon <simon@adlem.net>
Date: Sun Feb 21 23:10:10 2021 +0000
L
commit e61255ea761f084e20be3c0d943a8d1385695e1e
Author: Simon <simon@adlem.net>
Date: Sun Feb 21 22:45:32 2021 +0000
Try again
commit 7824304884d075a2ea99b2f56aa8d006b69aa979
Author: Simon <simon@adlem.net>
Date: Sun Feb 21 22:23:48 2021 +0000
compare streamid correctly
commit de23e7a1536306c7523fa1ff0638d84986809b2b
Author: Simon <simon@adlem.net>
Date: Sun Feb 21 22:15:29 2021 +0000
Disgard if stream was sourced from this system via HBP
commit 2a5e51b3c16fabd63b6ec69709ff52b734f025c3
Author: Simon <simon@adlem.net>
Date: Sun Feb 21 19:36:19 2021 +0000
Revert "Tidy up from loop control work"
This reverts commit 3f43d86c71ac30b997c11a0dbd75dbe0a0be699d.
commit 3f43d86c71ac30b997c11a0dbd75dbe0a0be699d
Author: Simon <simon@adlem.net>
Date: Sun Feb 21 19:23:37 2021 +0000
Tidy up from loop control work
commit e7d25b2b1c40ab488d42d57b3bf1abbe10828955
Author: Simon <simon@adlem.net>
Date: Sun Feb 21 18:44:43 2021 +0000
Fix what I broke - voice
commit 01f8620ee5068bc58c7c2e53ecb891cb25648423
Author: Simon <simon@adlem.net>
Date: Sun Feb 21 16:55:39 2021 +0000
lop
commit 234e528547641e017525c5c6d56e79f0a3f74ae1
Merge: d71d7c1 2f1b128
Author: Simon <simon@adlem.net>
Date: Sun Feb 21 16:30:42 2021 +0000
Merge branch 'master' into loopy
commit d71d7c10799706439c9fd32c7e955ef3cbfbc840
Author: Simon <simon@adlem.net>
Date: Sat Feb 20 21:05:02 2021 +0000
Fix speech issue
commit f5f354592e2dc2099db3576a3e93eba0d25c281b
Author: Simon <simon@adlem.net>
Date: Mon Feb 15 10:40:16 2021 +0000
LoopHold should be an integer
commit 5455b3920876bfc41f9e48ef9605fddbbb7772c7
Author: Simon <simon@adlem.net>
Date: Mon Feb 15 10:35:14 2021 +0000
5 packet loophold for rebound packets
commit 7aa8c65cef58bdebb37361fc1ca3ac5198fb3aab
Author: Simon <simon@adlem.net>
Date: Mon Feb 15 10:28:47 2021 +0000
No square brackets in loophold
commit 096fae4dc99ac6f20fa1430fe8cbebc240099a3b
Author: Simon <simon@adlem.net>
Date: Mon Feb 15 10:27:01 2021 +0000
Loophold top stop rebound packets
commit c6284ea4c1d1f301b5112a11f0a71144224d71ad
Author: Simon <simon@adlem.net>
Date: Mon Feb 15 10:10:43 2021 +0000
Further typo in last change
commit 1ef70d4bdd8bc465a101aa2ab46dd275634a75d8
Author: Simon <simon@adlem.net>
Date: Mon Feb 15 10:08:37 2021 +0000
Typo in keyerror string
commit ac76346cbd60ee56c622912fe7addda9751de880
Author: Simon <simon@adlem.net>
Date: Mon Feb 15 01:25:47 2021 +0000
TGID
commit f9a654aa9069dd29e9e921516e81033e1e3b81d8
Author: Simon <simon@adlem.net>
Date: Mon Feb 15 00:18:33 2021 +0000
1st
commit 19060a430d350a16611816bed789246c00c58cd5
Author: Simon <simon@adlem.net>
Date: Mon Feb 15 00:14:24 2021 +0000
Whitespace!
commit e682f6924125242b5846123d0c031f99733b5a30
Author: Simon <simon@adlem.net>
Date: Sun Feb 14 23:37:33 2021 +0000
Revert "Revert "b+""
This reverts commit 312483086181c3f9cd1136e29c6574781e637e60.
commit c6b7863ab34c6aceeaae8c39d00c9ef7a12bd62c
Author: Simon <simon@adlem.net>
Date: Sun Feb 14 23:36:59 2021 +0000
Revert "Revert "TGID2""
This reverts commit d10091ff5e1f09c88da38f2a7fbe4e4e58d85dfa.
commit ecae036c4cb193940137bb157778969986817bf4
Author: Simon <simon@adlem.net>
Date: Sun Feb 14 23:36:46 2021 +0000
Revert "Revert "tgid""
This reverts commit 1059c0c552e2db4bf74de539dd618bd2b4fc3a18.
commit 4466c029d9e04715e879ffb8b82b57c62464bbb6
Author: Simon <simon@adlem.net>
Date: Sun Feb 14 23:36:36 2021 +0000
Revert "Revert "f""
This reverts commit b7c60f4dd3281273aa67d5e6c9e2f8137f6e69cf.
commit b7c60f4dd3281273aa67d5e6c9e2f8137f6e69cf
Author: Simon <simon@adlem.net>
Date: Sun Feb 14 23:32:02 2021 +0000
Revert "f"
This reverts commit 35a10397e92b634b56cd6c4631ee36b12c87d8df.
commit 1059c0c552e2db4bf74de539dd618bd2b4fc3a18
Author: Simon <simon@adlem.net>
Date: Sun Feb 14 23:30:58 2021 +0000
Revert "tgid"
This reverts commit b427a63584d2715900ee8a599181ef7332267bb2.
commit d10091ff5e1f09c88da38f2a7fbe4e4e58d85dfa
Author: Simon <simon@adlem.net>
Date: Sun Feb 14 23:30:38 2021 +0000
Revert "TGID2"
This reverts commit 0da3a895a1c8941f135798a4f8728916ae01a630.
commit 312483086181c3f9cd1136e29c6574781e637e60
Author: Simon <simon@adlem.net>
Date: Sun Feb 14 23:30:19 2021 +0000
Revert "b+"
This reverts commit 3e62cd48d60adb3e9d39960e2e6a54b813e03075.
commit 3e62cd48d60adb3e9d39960e2e6a54b813e03075
Author: Simon <simon@adlem.net>
Date: Sun Feb 14 23:29:04 2021 +0000
b+
commit 0da3a895a1c8941f135798a4f8728916ae01a630
Author: Simon <simon@adlem.net>
Date: Sun Feb 14 23:26:01 2021 +0000
TGID2
commit b427a63584d2715900ee8a599181ef7332267bb2
Author: Simon <simon@adlem.net>
Date: Sun Feb 14 23:24:31 2021 +0000
tgid
commit 35a10397e92b634b56cd6c4631ee36b12c87d8df
Author: Simon <simon@adlem.net>
Date: Sun Feb 14 23:11:23 2021 +0000
f
commit 46c33c1aa92071e364af2f87f5f612bb01513242
Author: Simon <simon@adlem.net>
Date: Sun Feb 14 22:52:02 2021 +0000
lo
If GENERATOR is set to more than 1, the master definiton
is used as a template to generate N systems with sequential ports,
starting at the port listed in the defintion.
For example:
for N = 2:
G7RZU-0 - port 54000
G7RZU-1 - port 54001
Simon
Simon