6.0.23.26

This commit is contained in:
g8bpq 2022-11-14 14:02:28 +00:00
parent e3db09d255
commit f4bc43f75d
56 changed files with 132 additions and 60 deletions

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.
@ -1285,8 +1285,17 @@ Dll VOID APIENTRY Poll_APRS()
memcpy(Buffer, Orig, Orig->LENGTH);
Buffer->PORT = toPort;
PORT = GetPortTableEntryFromPortNum(toPort);
if (PORT)
{
if (PORT->SmartIDInterval && PORT->SmartIDNeeded == 0)
{
// Using Smart ID, but none scheduled
PORT->SmartIDNeeded = time(NULL) + PORT->SmartIDInterval;
}
PUT_ON_PORT_Q(PORT, Buffer);
}
else
ReleaseBuffer(Buffer);
}

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2015 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.
@ -1119,6 +1119,7 @@ along with LinBPQ/BPQ32. If not, see http://www.gnu.org/licenses
// Fix for application buffer loss (24)
// Add Web Sockets auto-refresh option for Webmail index page (25)
// Fix FREEDATA driver for compatibility with FreeData TNC version 0.6.4-alpha.3 (25)
// Add SmartID for bridged frames - Send ID only if packets sent recently (26)
#define CKernel

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

2
Cmd.c
View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -143,33 +143,43 @@ void main(int argc, char * argv[])
{
if (ptr = strstr(line, "CABLE-A"))
{
printf(line);
*ptr = 0;
sprintf(index, "%d\r\n", IndexA);
strcat(line, index);
printf(line);
}
if (ptr = strstr(line, "CABLE-B"))
{
printf(line);
*ptr = 0;
sprintf(index, "%d\r\n", IndexB);
strcat(line, index);
printf(line);
}
if (ptr = strstr(line, "CABLE-C"))
{
printf(line);
*ptr = 0;
sprintf(index, "%d\r\n", IndexC);
strcat(line, index);
printf(line);
}
if (ptr = strstr(line, "CABLE-D"))
{
printf(line);
*ptr = 0;
sprintf(index, "%d\r\n", IndexD);
strcat(line, index);
printf(line);
}
if (ptr = strstr(line, "SPEAKERS"))
{
printf(line);
*ptr = 0;
sprintf(index, "%d\r\n", SPEAKERS);
strcat(line, index);
printf(line);
}
fprintf(file, line);

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.
@ -18,7 +18,7 @@ along with LinBPQ/BPQ32. If not, see http://www.gnu.org/licenses
*/
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.
@ -97,6 +97,43 @@ VOID TNCTimerProc()
}
}
VOID SendSmartID(struct PORTCONTROL * PORT)
{
struct _MESSAGE * ID = IDMSG;
struct _MESSAGE * Buffer;
PORT->SmartIDNeeded = 0;
Buffer = GetBuff();
if (Buffer)
{
memcpy(Buffer, ID, ID->LENGTH);
Buffer->PORT = PORT->PORTNUMBER;
// IF PORT HAS A CALLSIGN DEFINED, SEND THAT INSTEAD
if (PORT->PORTCALL[0] > 0x40)
{
memcpy(Buffer->ORIGIN, PORT->PORTCALL, 7);
Buffer->ORIGIN[6] |= 1; // SET END OF CALL BIT
}
// If Pactor Style add to UI_Q
if (PORT->PROTOCOL == 10 && PORT->TNC && PORT->TNC->Hardware != H_KISSHF && PORT->UICAPABLE)
{
EXTPORTDATA * EXTPORT = (EXTPORTDATA *) PORT;
C_Q_ADD(&EXTPORT->UI_Q, Buffer);
return;
}
PUT_ON_PORT_Q(PORT, Buffer);
}
}
VOID SENDIDMSG()
{

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

2
V4.c
View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -10,14 +10,14 @@
#endif
#define KVers 6,0,23,25
#define KVerstring "6.0.23.25\0"
#define KVers 6,0,23,26
#define KVerstring "6.0.23.26\0"
#ifdef CKernel
#define Vers KVers
#define Verstring KVerstring
#define Datestring "October 2022"
#define Datestring "November 2022"
#define VerComments "G8BPQ Packet Switch (C Version)" KVerstring
#define VerCopyright "Copyright © 2001-2022 John Wiseman G8BPQ\0"
#define VerDesc "BPQ32 Switch\0"

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

2
adif.c
View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -684,6 +684,9 @@ typedef struct PORTCONTROL
char Hide; // Hide from port display and AGW connect menu
TRANSPORTENTRY * Session; // For Response to KISS command
time_t LastKISSCmdTime;
time_t LastSmartIDTime; // For SmartID - ID only if packets sent recently
time_t SmartIDNeeded; // Time to send next smart ID
time_t SmartIDInterval; // Smart ID Interval (Secs)
} PORTCONTROLX, *PPORTCONTROL;

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

12
cMain.c
View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.
@ -45,7 +45,7 @@ void GetPortCTEXT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CM
int upnpInit();
void AISTimer();
void ADSBTimer();
VOID SendSmartID(struct PORTCONTROL * PORT);
#include "configstructs.h"
@ -1019,6 +1019,8 @@ BOOL Start()
PORT->Hide = PortRec->Hide;
PORT->SmartIDInterval = PortRec->SmartID;
if (PortRec->BBSFLAG) // Appl 1 no permitted - BBSFLAG=NOBBS
PORT->PERMITTEDAPPLS &= 0xfffffffe; // Clear bottom bit
@ -1942,6 +1944,12 @@ VOID TIMERINTERRUPT()
for (i = 0; i < NUMBEROFPORTS; i++)
{
PORT->PORTTIMERCODE(PORT);
// Check Smart ID timer
if (PORT->SmartIDNeeded && PORT->SmartIDNeeded < time(NULL))
SendSmartID(PORT);
PORT = PORT->PORTPOINTER;
}

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.
@ -359,7 +359,8 @@ static char *pkeywords[] =
"TXPORT", "MHEARD", "CWIDTYPE", "MINQUAL", "MAXDIGIS", "PORTALIAS2", "DLLNAME",
"BCALL", "DIGIMASK", "NOKEEPALIVES", "COMPORT", "DRIVER", "WL2KREPORT", "UIONLY",
"UDPPORT", "IPADDR", "I2CBUS", "I2CDEVICE", "UDPTXPORT", "UDPRXPORT", "NONORMALIZE",
"IGNOREUNLOCKEDROUTES", "INP3ONLY", "TCPPORT", "RIGPORT", "PERMITTEDAPPLS", "HIDE"}; /* parameter keywords */
"IGNOREUNLOCKEDROUTES", "INP3ONLY", "TCPPORT", "RIGPORT", "PERMITTEDAPPLS", "HIDE",
"SMARTID"}; /* parameter keywords */
static void * poffset[] =
{
@ -372,7 +373,8 @@ static void * poffset[] =
&xxp.TXPORT, &xxp.MHEARD, &xxp.CWIDTYPE, &xxp.MINQUAL, &xxp.MAXDIGIS, &xxp.PORTALIAS2, &xxp.DLLNAME,
&xxp.BCALL, &xxp.DIGIMASK, &xxp.DefaultNoKeepAlives, &xxp.IOADDR, &xxp.DLLNAME, &xxp.WL2K, &xxp.UIONLY,
&xxp.IOADDR, &xxp.IPADDR, &xxp.INTLEVEL, &xxp.IOADDR, &xxp.IOADDR, &xxp.ListenPort, &xxp.NoNormalize,
&xxp.IGNOREUNLOCKED, &xxp.INP3ONLY, &xxp.TCPPORT, &xxp.RIGPORT, &xxp.PERMITTEDAPPLS, &xxp.Hide}; /* offset for corresponding data in config file */
&xxp.IGNOREUNLOCKED, &xxp.INP3ONLY, &xxp.TCPPORT, &xxp.RIGPORT, &xxp.PERMITTEDAPPLS, &xxp.Hide,
&xxp.SmartID}; /* offset for corresponding data in config file */
static int proutine[] =
{
@ -385,7 +387,8 @@ static int proutine[] =
1, 7, 7, 13, 13, 0, 14,
0, 1, 2, 18, 15, 16, 2,
1, 17, 1, 1, 1, 1, 2,
2, 2, 1, 1, 19, 2}; /* routine to process parameter */
2, 2, 1, 1, 19, 2,
1}; /* routine to process parameter */
int PPARAMLIM = sizeof(proutine)/sizeof(int);

View File

@ -72,6 +72,7 @@ struct PORTCONFIG
int Hide; // Don't show on Ports display or AGW Connect Menu
long long txOffset; // Transverter tx offset
long long rxOffset; // Transverter rx offset ppa
int SmartID;
};
struct ROUTECONFIG

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

2
kiss.c
View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

2
md5.c
View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.

View File

@ -1,5 +1,5 @@
/*
Copyright 2001-2018 John Wiseman G8BPQ
Copyright 2001-2022 John Wiseman G8BPQ
This file is part of LinBPQ/BPQ32.