From f4bc43f75d0ee3bea207e99f745fb5585b192f48 Mon Sep 17 00:00:00 2001
From: g8bpq <john.wiseman@cantab.net>
Date: Mon, 14 Nov 2022 14:02:28 +0000
Subject: [PATCH] 6.0.23.26

---
 AEAPactor.c      |  2 +-
 AGWAPI.c         |  2 +-
 AGWMoncode.c     |  2 +-
 APRSCode.c       | 11 ++++++++++-
 ARDOP.c          |  2 +-
 BPQINP3.c        |  2 +-
 BPQNRR.c         |  2 +-
 BPQtoAGW.c       |  2 +-
 Bpq32.c          |  3 ++-
 CMSAuth.c        |  2 +-
 Cmd.c            |  2 +-
 CommonCode.c     |  2 +-
 ConfigSDR.c      | 10 ++++++++++
 DRATS.c          |  2 +-
 FLDigi.c         |  2 +-
 FreeDATA.c       |  2 +-
 HALDriver.c      |  2 +-
 HFCommon.c       |  2 +-
 HSMODEM.c        |  2 +-
 HTTPcode.c       |  2 +-
 IPCode.c         |  2 +-
 KAMPactor.c      |  2 +-
 KISSHF.c         |  2 +-
 L2Code.c         |  2 +-
 L3Code.c         |  4 ++--
 L4Code.c         |  2 +-
 MULTIPSK.c       |  2 +-
 Moncode.c        |  2 +-
 PortMapper.c     |  2 +-
 RigControl.c     |  2 +-
 SCSPactor.c      |  2 +-
 SCSTrackeMulti.c |  2 +-
 SCSTracker.c     |  2 +-
 SerialPort.c     |  2 +-
 TNCCode.c        | 39 ++++++++++++++++++++++++++++++++++++++-
 TNCEmulators.c   |  2 +-
 TelnetV6.c       |  2 +-
 UIARQ.c          |  2 +-
 UZ7HODrv.c       |  2 +-
 V4.c             |  2 +-
 Versions.h       |  6 +++---
 WINMOR.c         |  2 +-
 WinRPR.c         |  2 +-
 adif.c           |  2 +-
 asmstrucs.h      |  3 +++
 base64.c         |  2 +-
 bpqaxip.c        |  2 +-
 bpqhdlc.c        |  2 +-
 cMain.c          | 12 ++++++++++--
 compatbits.c     |  2 +-
 config.c         | 11 +++++++----
 configstructs.h  |  1 +
 datadefs.c       |  2 +-
 kiss.c           |  2 +-
 md5.c            |  2 +-
 utf8Routines.c   |  2 +-
 56 files changed, 132 insertions(+), 60 deletions(-)

diff --git a/AEAPactor.c b/AEAPactor.c
index 6327548..16f0468 100644
--- a/AEAPactor.c
+++ b/AEAPactor.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/AGWAPI.c b/AGWAPI.c
index 61cb95b..ba406d5 100644
--- a/AGWAPI.c
+++ b/AGWAPI.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/AGWMoncode.c b/AGWMoncode.c
index 5fa9597..418f2df 100644
--- a/AGWMoncode.c
+++ b/AGWMoncode.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/APRSCode.c b/APRSCode.c
index f25ff5f..f98e8fe 100644
--- a/APRSCode.c
+++ b/APRSCode.c
@@ -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);
 				}	
diff --git a/ARDOP.c b/ARDOP.c
index 431196f..f4a0824 100644
--- a/ARDOP.c
+++ b/ARDOP.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/BPQINP3.c b/BPQINP3.c
index 2d5374b..8a1860a 100644
--- a/BPQINP3.c
+++ b/BPQINP3.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/BPQNRR.c b/BPQNRR.c
index 4b4ad75..554b0e5 100644
--- a/BPQNRR.c
+++ b/BPQNRR.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/BPQtoAGW.c b/BPQtoAGW.c
index 6848ee3..9a5f075 100644
--- a/BPQtoAGW.c
+++ b/BPQtoAGW.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/Bpq32.c b/Bpq32.c
index 167d254..7f371b2 100644
--- a/Bpq32.c
+++ b/Bpq32.c
@@ -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
diff --git a/CMSAuth.c b/CMSAuth.c
index 6d1ac04..902714e 100644
--- a/CMSAuth.c
+++ b/CMSAuth.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/Cmd.c b/Cmd.c
index 00e0aa7..71fbd11 100644
--- a/Cmd.c
+++ b/Cmd.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/CommonCode.c b/CommonCode.c
index 4aba2a1..a60f4fe 100644
--- a/CommonCode.c
+++ b/CommonCode.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/ConfigSDR.c b/ConfigSDR.c
index 26d3bd4..5434aac 100644
--- a/ConfigSDR.c
+++ b/ConfigSDR.c
@@ -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);
diff --git a/DRATS.c b/DRATS.c
index c0251be..2615ce6 100644
--- a/DRATS.c
+++ b/DRATS.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/FLDigi.c b/FLDigi.c
index 243c1ce..f7ad646 100644
--- a/FLDigi.c
+++ b/FLDigi.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/FreeDATA.c b/FreeDATA.c
index 7cea9dd..01993b8 100644
--- a/FreeDATA.c
+++ b/FreeDATA.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/HALDriver.c b/HALDriver.c
index 1d03bb3..23196fd 100644
--- a/HALDriver.c
+++ b/HALDriver.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/HFCommon.c b/HFCommon.c
index 7a10fde..6dff2b0 100644
--- a/HFCommon.c
+++ b/HFCommon.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/HSMODEM.c b/HSMODEM.c
index 2c0d336..fe05fed 100644
--- a/HSMODEM.c
+++ b/HSMODEM.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/HTTPcode.c b/HTTPcode.c
index cfca56e..b18b374 100644
--- a/HTTPcode.c
+++ b/HTTPcode.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/IPCode.c b/IPCode.c
index 8ddab32..c95c47e 100644
--- a/IPCode.c
+++ b/IPCode.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/KAMPactor.c b/KAMPactor.c
index 0081075..0806478 100644
--- a/KAMPactor.c
+++ b/KAMPactor.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/KISSHF.c b/KISSHF.c
index 6d84237..0155f0d 100644
--- a/KISSHF.c
+++ b/KISSHF.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/L2Code.c b/L2Code.c
index d145b5f..86c01f4 100644
--- a/L2Code.c
+++ b/L2Code.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/L3Code.c b/L3Code.c
index 9278748..1838f16 100644
--- a/L3Code.c
+++ b/L3Code.c
@@ -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.
 
diff --git a/L4Code.c b/L4Code.c
index 61c5f3b..21db8a7 100644
--- a/L4Code.c
+++ b/L4Code.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/MULTIPSK.c b/MULTIPSK.c
index 2781141..84dbbab 100644
--- a/MULTIPSK.c
+++ b/MULTIPSK.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/Moncode.c b/Moncode.c
index 7afcf48..9781498 100644
--- a/Moncode.c
+++ b/Moncode.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/PortMapper.c b/PortMapper.c
index 3edd597..65bc269 100644
--- a/PortMapper.c
+++ b/PortMapper.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/RigControl.c b/RigControl.c
index d16455d..8e64497 100644
--- a/RigControl.c
+++ b/RigControl.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/SCSPactor.c b/SCSPactor.c
index cecb597..72de66c 100644
--- a/SCSPactor.c
+++ b/SCSPactor.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/SCSTrackeMulti.c b/SCSTrackeMulti.c
index 97bff75..4872ead 100644
--- a/SCSTrackeMulti.c
+++ b/SCSTrackeMulti.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/SCSTracker.c b/SCSTracker.c
index 907a7fb..a36d29f 100644
--- a/SCSTracker.c
+++ b/SCSTracker.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/SerialPort.c b/SerialPort.c
index 490c550..6de9d05 100644
--- a/SerialPort.c
+++ b/SerialPort.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/TNCCode.c b/TNCCode.c
index 96b6851..8b73e91 100644
--- a/TNCCode.c
+++ b/TNCCode.c
@@ -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()
 {
diff --git a/TNCEmulators.c b/TNCEmulators.c
index a6e0f04..7497419 100644
--- a/TNCEmulators.c
+++ b/TNCEmulators.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/TelnetV6.c b/TelnetV6.c
index 886a26c..0e765f2 100644
--- a/TelnetV6.c
+++ b/TelnetV6.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/UIARQ.c b/UIARQ.c
index 8b7fae6..d6671ab 100644
--- a/UIARQ.c
+++ b/UIARQ.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/UZ7HODrv.c b/UZ7HODrv.c
index 9e72c45..3710126 100644
--- a/UZ7HODrv.c
+++ b/UZ7HODrv.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/V4.c b/V4.c
index 8592734..d8df3f9 100644
--- a/V4.c
+++ b/V4.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/Versions.h b/Versions.h
index 3dd5a17..d0cc103 100644
--- a/Versions.h
+++ b/Versions.h
@@ -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"
diff --git a/WINMOR.c b/WINMOR.c
index 962226b..12078f3 100644
--- a/WINMOR.c
+++ b/WINMOR.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/WinRPR.c b/WinRPR.c
index 9ff509b..c0ab501 100644
--- a/WinRPR.c
+++ b/WinRPR.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/adif.c b/adif.c
index 71fe68b..4e221e6 100644
--- a/adif.c
+++ b/adif.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/asmstrucs.h b/asmstrucs.h
index 6207bae..2bf6a7e 100644
--- a/asmstrucs.h
+++ b/asmstrucs.h
@@ -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;
 
diff --git a/base64.c b/base64.c
index 91409a6..2ca5541 100644
--- a/base64.c
+++ b/base64.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/bpqaxip.c b/bpqaxip.c
index 12c7b22..785338a 100644
--- a/bpqaxip.c
+++ b/bpqaxip.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/bpqhdlc.c b/bpqhdlc.c
index 4ac30d4..83765e2 100644
--- a/bpqhdlc.c
+++ b/bpqhdlc.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/cMain.c b/cMain.c
index 9eca342..72b529a 100644
--- a/cMain.c
+++ b/cMain.c
@@ -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;
 	}
 
diff --git a/compatbits.c b/compatbits.c
index 913e130..ea8a913 100644
--- a/compatbits.c
+++ b/compatbits.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/config.c b/config.c
index a5e11dc..c825a50 100644
--- a/config.c
+++ b/config.c
@@ -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);
 
diff --git a/configstructs.h b/configstructs.h
index 4743b99..c7aa827 100644
--- a/configstructs.h
+++ b/configstructs.h
@@ -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
diff --git a/datadefs.c b/datadefs.c
index 89c94c6..0507bd6 100644
--- a/datadefs.c
+++ b/datadefs.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/kiss.c b/kiss.c
index fd1a105..55c8f98 100644
--- a/kiss.c
+++ b/kiss.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/md5.c b/md5.c
index 5c0fc23..e3927e6 100644
--- a/md5.c
+++ b/md5.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
diff --git a/utf8Routines.c b/utf8Routines.c
index 9383a24..6e0d17e 100644
--- a/utf8Routines.c
+++ b/utf8Routines.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2001-2018 John Wiseman G8BPQ
+Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.