GitHub/dsd-fme
1
0
Fork 0
mirror of https://github.com/lwvmobile/dsd-fme.git synced 2026-11-15 02:07:24 -05:00
Code Issues Packages Projects Releases Wiki Activity

NXDN Trunking Tweaks and Misc Tweaks;

Browse Source
This commit is contained in:
lwvmobile
2023-03-02 22:13:49 -05:00
parent 1ce487dc13
commit 44ad75ec17
4 changed files with 147 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/dsd_ncurses.c
View File

@@ -2284,8 +2284,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
printw ("\n");
printw ("| ");
printw ("TGT: [%05d] ", tgn);
printw ("SRC: [%05d] ", src);
printw ("TGT: [%5d] ", tgn);
printw ("SRC: [%5d] ", src);
if (state->nxdn_alias_block_segment[0][0] > 0)
{
printw ("ALIAS: [");
@@ -2323,6 +2323,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
}
if (state->nxdn_cipher_type == 0x2 && state->carrier == 1)
{
attron(COLOR_PAIR(1));
printw ("IV: [%016llX] ", state->payload_miN);
attron(COLOR_PAIR(2));
printw ("DES-OFB ");
@@ -2331,6 +2332,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
}
if (state->nxdn_cipher_type == 0x3 && state->carrier == 1)
{
attron(COLOR_PAIR(1));
printw ("IV: [%016llX] ", state->payload_miN);
attron(COLOR_PAIR(2));
printw ("AES-256 ");
@@ -2929,8 +2931,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state)
if (lls == 28 || lls == 29)
{
printw ("RAN [%02lld] ", call_matrix[9-j][1]);
printw ("TG [%05lld] ", call_matrix[9-j][4]);
printw ("RID [%05lld] ", call_matrix[9-j][2]);
printw ("TG [%5lld] ", call_matrix[9-j][4]);
printw ("RID [%5lld] ", call_matrix[9-j][2]);
}
//dPMR
if (lls == 20 || lls == 21 || lls == 22 || lls == 23 ||lls == 24 || lls == 25 || lls == 26 || lls == 27)