Multisite updates and improvements #863
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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 formRRRRssss
, 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:
Manually defining a multisite system with
multiSiteSystemName
ormultiSiteSystemNumber
remains unchanged, but the log message would look as below: