mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-17 03:07:24 -05:00
Fix LimaZulu NXDN Tweaks #123
This commit is contained in:
@@ -1,8 +1,6 @@
|
|||||||
#Ubuntu 18.04 uses 3.10.2 currently -- almost EOL
|
|
||||||
#Ubuntu 20.04 uses 3.16.3
|
#Ubuntu 20.04 uses 3.16.3
|
||||||
#Ubuntu 22.04 uses 3.22.1
|
#Ubuntu 22.04 uses 3.22.1
|
||||||
#Arch currently on 3.26.1 -- new nag warning starts on this one, see below
|
#Arch currently on 3.26.3
|
||||||
#cmake_minimum_required() should be called prior to this top-level project()
|
|
||||||
#Cygwin currently using 3.23.2 (or newer)
|
#Cygwin currently using 3.23.2 (or newer)
|
||||||
cmake_minimum_required(VERSION 3.10.2)
|
cmake_minimum_required(VERSION 3.10.2)
|
||||||
project(dsd-fme)
|
project(dsd-fme)
|
||||||
@@ -36,7 +34,7 @@ endif ()
|
|||||||
#use cmake option -DLZ=ON to enable LimaZulu Requested NXDN Tweaks
|
#use cmake option -DLZ=ON to enable LimaZulu Requested NXDN Tweaks
|
||||||
option(LZ
|
option(LZ
|
||||||
"Build with new LimaZulu Requested NXDN Tweaks Enabled" OFF)
|
"Build with new LimaZulu Requested NXDN Tweaks Enabled" OFF)
|
||||||
if (NXDN)
|
if (LZ)
|
||||||
add_definitions(-DLIMAZULUTWEAKS)
|
add_definitions(-DLIMAZULUTWEAKS)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
|||||||
@@ -1114,36 +1114,43 @@ void NXDN_decode_VCALL(dsd_opts * opts, dsd_state * state, uint8_t * Message)
|
|||||||
if (state->rkey_array[KeyID] != 0) state->R = state->rkey_array[KeyID];
|
if (state->rkey_array[KeyID] != 0) state->R = state->rkey_array[KeyID];
|
||||||
else if (state->rkey_array[DestinationID] != 0) state->R = state->rkey_array[DestinationID];
|
else if (state->rkey_array[DestinationID] != 0) state->R = state->rkey_array[DestinationID];
|
||||||
|
|
||||||
#ifdef LIMAZULUTWEAKS
|
// #ifdef LIMAZULUTWEAKS
|
||||||
|
|
||||||
//LimaZulu specific tweak, load keys from frequency value, if avalable -- untested
|
// //LimaZulu specific tweak, load keys from frequency value, if avalable -- untested
|
||||||
|
|
||||||
long int freq = 0;
|
// long int freq = 0;
|
||||||
uint8_t hash_bits[24];
|
// uint8_t hash_bits[24];
|
||||||
memset (hash_bits, 0, sizeof(hash_bits));
|
// memset (hash_bits, 0, sizeof(hash_bits));
|
||||||
uint16_t limazulu = 0;
|
// uint16_t limazulu = 0;
|
||||||
|
|
||||||
//if not available, then poll rigctl if its available
|
// //if not available, then poll rigctl if its available
|
||||||
if (opts->use_rigctl == 1)
|
// if (opts->use_rigctl == 1)
|
||||||
freq = GetCurrentFreq (opts->rigctl_sockfd);
|
// freq = GetCurrentFreq (opts->rigctl_sockfd);
|
||||||
|
|
||||||
//if using rtl input, we can ask for the current frequency tuned
|
// //if using rtl input, we can ask for the current frequency tuned
|
||||||
else if (opts->audio_in_type == 3)
|
// else if (opts->audio_in_type == 3)
|
||||||
freq = (long int)opts->rtlsdr_center_freq;
|
// freq = (long int)opts->rtlsdr_center_freq;
|
||||||
|
|
||||||
//since a frequency value will be larger than the 16-bit max, we need to hash it first
|
// //freq = 167831250; //hardset for testing
|
||||||
//the hash has to be run the same way as the import, so at a 24-bit depth, which hopefully
|
|
||||||
//will not lead to any duplicate key loads due to multiple CRC16 collisions on a larger value?
|
|
||||||
for (int i = 0; i < 24; i++)
|
|
||||||
hash_bits[i] = ((freq << i) & 0x800000) >> 23; //load into array for CRC16
|
|
||||||
|
|
||||||
if (freq) limazulu = ComputeCrcCCITT16d (hash_bits, 24);
|
// //since a frequency value will be larger than the 16-bit max, we need to hash it first
|
||||||
limazulu = limazulu & 0xFFFF; //make sure no larger than 16-bits
|
// //the hash has to be run the same way as the import, so at a 24-bit depth, which hopefully
|
||||||
|
// //will not lead to any duplicate key loads due to multiple CRC16 collisions on a larger value?
|
||||||
|
// for (int i = 0; i < 24; i++)
|
||||||
|
// hash_bits[i] = ((freq << i) & 0x800000) >> 23; //load into array for CRC16
|
||||||
|
|
||||||
if (state->rkey_array[limazulu] != 0)
|
// if (freq) limazulu = ComputeCrcCCITT16d (hash_bits, 24);
|
||||||
state->R = state->rkey_array[limazulu];
|
// limazulu = limazulu & 0xFFFF; //make sure no larger than 16-bits
|
||||||
|
|
||||||
#endif //end LIMAZULUTWEAKS
|
// fprintf (stderr, "%s", KCYN);
|
||||||
|
// if (freq) fprintf (stderr, "\n Freq: %ld - Freq Hash: %0ld", freq, limazulu);
|
||||||
|
// if (state->rkey_array[limazulu] != 0) fprintf (stderr, " - Key Loaded: %lld", state->rkey_array[limazulu]);
|
||||||
|
// fprintf (stderr, "%s", KNRM);
|
||||||
|
|
||||||
|
// if (state->rkey_array[limazulu] != 0)
|
||||||
|
// state->R = state->rkey_array[limazulu];
|
||||||
|
|
||||||
|
// #endif //end LIMAZULUTWEAKS
|
||||||
|
|
||||||
//Don't zero key if no keyloader
|
//Don't zero key if no keyloader
|
||||||
if (CipherType != 0x1 && state->keyloader == 1) state->R = 0;
|
if (CipherType != 0x1 && state->keyloader == 1) state->R = 0;
|
||||||
|
|||||||
@@ -348,6 +348,54 @@ void nxdn_frame (dsd_opts * opts, dsd_state * state)
|
|||||||
// else if (lich_fc == 3) fprintf (stderr, "SF SACCH/IDLE ");
|
// else if (lich_fc == 3) fprintf (stderr, "SF SACCH/IDLE ");
|
||||||
// }
|
// }
|
||||||
|
|
||||||
|
#ifdef LIMAZULUTWEAKS
|
||||||
|
|
||||||
|
//LimaZulu specific tweak, load keys from frequency value, if avalable -- test before VCALL
|
||||||
|
//needs to be loaded here, if superframe data pair, then we need to run the LFSR on it as well
|
||||||
|
|
||||||
|
if (voice) //can this run TOO frequently?
|
||||||
|
{
|
||||||
|
long int freq = 0;
|
||||||
|
uint8_t hash_bits[24];
|
||||||
|
memset (hash_bits, 0, sizeof(hash_bits));
|
||||||
|
uint16_t limazulu = 0;
|
||||||
|
|
||||||
|
//if not available, then poll rigctl if its available
|
||||||
|
if (opts->use_rigctl == 1)
|
||||||
|
freq = GetCurrentFreq (opts->rigctl_sockfd);
|
||||||
|
|
||||||
|
//if using rtl input, we can ask for the current frequency tuned
|
||||||
|
else if (opts->audio_in_type == 3)
|
||||||
|
freq = (long int)opts->rtlsdr_center_freq;
|
||||||
|
|
||||||
|
// freq = 167831250; //hardset for testing
|
||||||
|
|
||||||
|
//since a frequency value will be larger than the 16-bit max, we need to hash it first
|
||||||
|
//the hash has to be run the same way as the import, so at a 24-bit depth, which hopefully
|
||||||
|
//will not lead to any duplicate key loads due to multiple CRC16 collisions on a larger value?
|
||||||
|
for (int i = 0; i < 24; i++)
|
||||||
|
hash_bits[i] = ((freq << i) & 0x800000) >> 23; //load into array for CRC16
|
||||||
|
|
||||||
|
if (freq) limazulu = ComputeCrcCCITT16d (hash_bits, 24);
|
||||||
|
limazulu = limazulu & 0xFFFF; //make sure no larger than 16-bits
|
||||||
|
|
||||||
|
fprintf (stderr, "%s", KYEL);
|
||||||
|
if (freq) fprintf (stderr, "\n Freq: %ld - Freq Hash: %0ld", freq, limazulu);
|
||||||
|
if (state->rkey_array[limazulu] != 0) fprintf (stderr, " - Key Loaded: %lld", state->rkey_array[limazulu]);
|
||||||
|
fprintf (stderr, "%s", KNRM);
|
||||||
|
|
||||||
|
if (state->rkey_array[limazulu] != 0)
|
||||||
|
state->R = state->rkey_array[limazulu];
|
||||||
|
|
||||||
|
if (state->R != 0 && state->M == 1) state->nxdn_cipher_type = 0x1;
|
||||||
|
|
||||||
|
//add additional time to last_sync_time for LimaZulu to hold on current frequency
|
||||||
|
//a little longer without affecting normal scan time on trunk_hangtime variable
|
||||||
|
state->last_cc_sync_time = time(NULL) + 2; //ask him for an ideal wait timer
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif //end LIMAZULUTWEAKS
|
||||||
|
|
||||||
//Option/Steal Flags echoed in Voice, V+F, or Data
|
//Option/Steal Flags echoed in Voice, V+F, or Data
|
||||||
if (voice && !facch) //voice only, no facch steal
|
if (voice && !facch) //voice only, no facch steal
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user