Various Trunking Tweaks;

This commit is contained in:
lwvmobile
2022-12-06 08:47:46 -05:00
parent 2fceee5a2f
commit 2f2eecddfc
2 changed files with 19 additions and 5 deletions

View File

@@ -147,9 +147,18 @@ noCarrier (dsd_opts * opts, dsd_state * state)
state->lastsrc = 0;
state->lasttgR = 0;
state->lastsrcR = 0;
//zero out vc frequencies?
state->p25_vc_freq[0] = 0;
state->p25_vc_freq[1] = 0;
//only reset cap+ rest channel if not trunking
state->dmr_rest_channel = -1;
//zero out nxdn site/srv/cch info if not trunking
state->nxdn_location_site_code = 0;
state->nxdn_location_sys_code = 0;
sprintf (state->nxdn_location_category, "%s", " ");
}
//zero out after x second hangtime when trunking to prevent premature zeroing on these variables
@@ -266,7 +275,6 @@ noCarrier (dsd_opts * opts, dsd_state * state)
memset (state->nxdn_alias_block_segment, 0, sizeof(state->nxdn_alias_block_segment));
sprintf (state->nxdn_call_type, "%s", "");
state->dmr_rest_channel = -1; //init on -1
sprintf(state->dmr_branding_sub, "%s", "");
sprintf(state->dmr_branding, "%s", "");
sprintf (state->dmr_site_parms, "%s", ""); //may not zero this out