Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multisite updates and improvements #863

Merged
merged 4 commits into from
Nov 14, 2023

Conversation

taclane
Copy link
Contributor

@taclane taclane commented Nov 13, 2023

Building on the improvements in #846, trunk-recorder should use RFSS and Site ID as the default discriminators when multisite is enabled for P25 systems. This overcomes an issue where multiple P25 sites broadcasting the same NAC can circumvent de-duplication logic.

Prior to this, some P25 systems required manual setup using a multiSiteSystemName, and it may not have been apparent why it did not appear to be working using the default settings.

The existing "Preferred NAC" or multiSiteSystemNumber functionality has not changed, but users may additionally use a decimal RFSS/SiteID (in the form RRRRssss, e.g. 00030013) to match talkgroups to preferred sites.

The console message has been updated to better show the "WACN/RFSS-Site" match when it occurs:

Duplicate Grant - 20C: BEE00/3-13 23C: BEE00/3-14  Source: 1819332 Call: 20C State: recording

Manually defining a multisite system with multiSiteSystemNameor multiSiteSystemNumber remains unchanged, but the log message would look as below:

Duplicate Grant - 66C: CLMRN/0 67C: CLMRN/1  Source: 1849171 Call: 66C State: recording

@robotastic
Copy link
Owner

This all sort of makes sense to me... but the code looks good, let's ship it!

@robotastic robotastic merged commit 81479af into robotastic:master Nov 14, 2023
1 check passed
@taclane taclane deleted the multisite-v2 branch November 14, 2023 02:19
@taclane taclane restored the multisite-v2 branch November 14, 2023 14:53
@taclane taclane deleted the multisite-v2 branch November 14, 2023 14:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants