GitHub/dsd-fme
1
0
Fork 0
mirror of https://github.com/lwvmobile/dsd-fme.git synced 2026-11-14 01:37:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

P25: Redo printFrameInfo to make it consistent across Phase 1 and Phase 2;

Browse Source
This commit is contained in:
lwvmobile
2025-04-07 22:40:18 -04:00
parent 177551e081
commit b963b08469
3 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/dsd_frame.c
View File

@@ -26,30 +26,23 @@ void
printFrameInfo (dsd_opts * opts, dsd_state * state)
{
int level;
UNUSED(opts);
level = (int) state->max / 164;
if (opts->verbose > 0)
{
// fprintf (stderr,"inlvl: %2i%% ", level);
UNUSED(level);
}
if (state->nac != 0)
{
fprintf (stderr, "%s", KCYN);
fprintf (stderr,"nac: [%4X] ", state->nac);
fprintf (stderr, "%s", KNRM);
}
fprintf (stderr, "%s", KCYN);
if (state->p2_wacn != 0)
fprintf (stderr, "WACN: %05llX; ", state->p2_wacn);
if (state->p2_sysid != 0)
fprintf (stderr, "SYS: %03llX; ", state->p2_sysid);
if (state->p2_cc != 0)
fprintf (stderr, "NAC/CC: %03llX; ", state->p2_cc);
else fprintf (stderr, "NAC: %03llX; ", state->nac);
if (opts->verbose > 1)
{
fprintf (stderr, "%s", KGRN);
fprintf (stderr,"src: [%8i] ", state->lastsrc);
fprintf (stderr, "%s", KNRM);
}
fprintf (stderr, "%s", KGRN);
fprintf (stderr,"tg: [%5i] ", state->lasttg);
if (state->p2_siteid != 0)
fprintf (stderr, "Site: %03lld; ", state->p2_siteid);
if (state->p2_rfssid != 0)
fprintf (stderr, "RFSS: %03lld; ", state->p2_rfssid);
fprintf (stderr, "%s", KNRM);
}
void

14
src/dsd_frame_sync.c
View File

@@ -432,7 +432,7 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
sprintf (state->ftype, "P25 Phase 1");
if (opts->errorbars == 1)
{
printFrameSync (opts, state, "+P25p1 ", synctest_pos + 1, modulation);
printFrameSync (opts, state, "+P25p1", synctest_pos + 1, modulation);
}
state->lastsynctype = 0;
state->last_cc_sync_time = time(NULL);
@@ -708,13 +708,11 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
state->lastsynctype = 35; //35
if (opts->errorbars == 1)
{
printFrameSync (opts, state, "+P25p2 SISCH", synctest_pos + 1, modulation);
printFrameSync (opts, state, "+P25p2", synctest_pos + 1, modulation);
}
if (state->p2_wacn != 0 && state->p2_cc != 0 && state->p2_sysid != 0)
{
//fprintf (stderr, "%s", KCYN);
fprintf (stderr, " WACN [%05llX] SYS [%03llX] NAC [%03llX] ", state->p2_wacn, state->p2_sysid, state->p2_cc);
//fprintf (stderr, "%s", KNRM);
printFrameInfo(opts, state);
}
else
{
@@ -741,13 +739,11 @@ getFrameSync (dsd_opts * opts, dsd_state * state)
opts->inverted_p2 = 1;
if (opts->errorbars == 1)
{
printFrameSync (opts, state, "-P25p2 SISCH", synctest_pos + 1, modulation);
printFrameSync (opts, state, "-P25p2", synctest_pos + 1, modulation);
}
if (state->p2_wacn != 0 && state->p2_cc != 0 && state->p2_sysid != 0)
{
//fprintf (stderr, "%s", KCYN);
fprintf (stderr, " WACN [%05llX] SYS [%03llX] NAC [%03llX] ", state->p2_wacn, state->p2_sysid, state->p2_cc);
//fprintf (stderr, "%s", KNRM);
printFrameInfo(opts, state);
}
else
{

2
src/p25p1_pdu_data.c
View File

@@ -98,7 +98,7 @@ uint8_t p25_decrypt_pdu(dsd_opts * opts, dsd_state * state, uint8_t * input, uin
uint8_t ks_bytes[3096]; memset (ks_bytes, 0, sizeof(ks_bytes));
//create keystream
if (alg_id == 0x84 || alg_id == 0x89) //AES -- dsd-fme -f1 -i '/SSD_STORAGE/2024_DEV/otar shit/OTAR/SUGARLOAF DATA OUTPUT/CC-DSDPlus-Raw-Input_2024-08-27@134540.wav' -s 96000 -K testaeskeys.csv
if (alg_id == 0x84 || alg_id == 0x89)
{
//aes specific arrays and things
uint8_t aes_iv[16]; memset (aes_iv, 0, sizeof(aes_iv));