master
John Wiseman 2 years ago
parent 84b3067c72
commit f54323e3ce

@ -1187,6 +1187,7 @@ along with LinBPQ/BPQ32. If not, see http://www.gnu.org/licenses
// Fix NC to Application Call (6) // Fix NC to Application Call (6)
// Fix INP3 L3RTT messages on Linux and correct RTT calculation (9) // Fix INP3 L3RTT messages on Linux and correct RTT calculation (9)
// Get Beacon config from config file on windows (9) // Get Beacon config from config file on windows (9)
// fix processing DED TNC Emulator M command with space between M and params (10)
#define CKernel #define CKernel

@ -2223,7 +2223,7 @@ void CheckForDataFromTerminal(struct TNCDATA * TNC)
resp = GetDataFromTNC(TNC, rxbuffer, 1000, &Read); resp = GetDataFromTNC(TNC, rxbuffer, 1000, &Read);
if (Read) if (Read)
{ {
if (TNC->Mode == TNC2) if (TNC->Mode == TNC2)
{ {
for (n = 0; n < Read; n++) for (n = 0; n < Read; n++)
@ -3368,7 +3368,7 @@ int DEDPROCESSHOSTPACKET(struct StreamInfo * Channel, struct TNCDATA * TNC)
TRANSPORTENTRY * L4 = NULL; TRANSPORTENTRY * L4 = NULL;
unsigned char * MONCURSOR=0; unsigned char * MONCURSOR=0;
int SaveAuthProg = 0; int SaveAuthProg = 0;
unsigned char * mcmdptr = &TNC->DEDTXBUFFER[1];
TXBUFFERPTR = &TNC->DEDTXBUFFER[0]; TXBUFFERPTR = &TNC->DEDTXBUFFER[0];
if (Channel->Chan_TXQ == (UCHAR *)(ptrdiff_t) -1) if (Channel->Chan_TXQ == (UCHAR *)(ptrdiff_t) -1)
@ -3522,10 +3522,8 @@ NOTDATA:
Work = 0x31; Work = 0x31;
else else
Work = 0x30; Work = 0x30;
} }
PUTCHARx(TNC, '0'); PUTCHARx(TNC, '0');
PUTCHARx(TNC, ' '); PUTCHARx(TNC, ' ');
PUTCHARx(TNC, Work); PUTCHARx(TNC, Work);
@ -3546,7 +3544,12 @@ NOTDATA:
// Support BPQ Extensions IUSC followed by optional port list // Support BPQ Extensions IUSC followed by optional port list
if (TNC->DEDTXBUFFER[1] == 'N') TNC->DEDTXBUFFER[TNC->MSGLENGTH] = 0;
if (*mcmdptr == ' ')
mcmdptr++;
if (mcmdptr[0] == 'N')
TNC->TRACEFLAG = 0; TNC->TRACEFLAG = 0;
else else
{ {
@ -3555,12 +3558,11 @@ NOTDATA:
uint64_t mask = 0; uint64_t mask = 0;
TNC->DEDTXBUFFER[TNC->MSGLENGTH] = 0; ptr = strlop(mcmdptr, ' ');
ptr = strlop(TNC->DEDTXBUFFER, ' ');
_strupr(TNC->DEDTXBUFFER); _strupr(mcmdptr);
if (strchr(TNC->DEDTXBUFFER, 'U')) if (strchr(mcmdptr, 'U'))
TNC->MUIONLY = 1; TNC->MUIONLY = 1;
@ -3574,8 +3576,9 @@ NOTDATA:
if (port) if (port)
{ {
mask |= ((uint64_t)1 << (port - 1)); mask |= ((uint64_t)1 << (port - 1));
ptr = ptr2;
} }
ptr = ptr2;
} }
if (mask) if (mask)

@ -10,8 +10,8 @@
#endif #endif
#define KVers 6,0,24,9 #define KVers 6,0,24,10
#define KVerstring "6.0.24.9\0" #define KVerstring "6.0.24.10\0"
#ifdef CKernel #ifdef CKernel

Loading…
Cancel
Save

Powered by TurnKey Linux.