Release, try out some MINI_BUILDD_OPTIONS

Update to upstream version '6.0.24.66+repack'
with Debian dir 0a1e01b2c4

6pack.c

@@ -72,7 +72,7 @@ Using code from 6pack Linux Kernel driver with the following licence and credits
 
 #include "compatbits.h"
 #include <string.h>
-#include "CHeaders.h"
+#include "cheaders.h"
 
 #include "bpq32.h"
 
@@ -970,7 +970,7 @@ ok:
 				UCHAR * data = &buffptr->Data[0];
 				STREAM->FramesQueued--;
 				txlen = (int)buffptr->Len;
-				STREAM->BytesTXed += txlen;
+				STREAM->bytesTXed += txlen;
 
 				bytes=SerialSendData(TNC, data, txlen);
 				WritetoTrace(TNC, data, txlen);
@@ -1412,10 +1412,11 @@ VOID * SIXPACKExtInit(EXTPORTDATA * PortEntry)
 	TNC->sixPack = zalloc(sizeof(struct sixPackTNCInfo));
 
 	TNC->Port = port;
-	TNC->Hardware = H_SIXPACK;
+	TNC->PortRecord = PortEntry;
+	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_SIXPACK;
+
 	TNC->ARDOPBuffer = malloc(8192);
 
-	TNC->PortRecord = PortEntry;
 
 	if (PortEntry->PORTCONTROL.PORTCALL[0] == 0)
 		memcpy(TNC->NodeCall, MYNODECALL, 10);

AEAPactor.c

@@ -45,7 +45,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 //#include <process.h>
 //#include <time.h>
 
-#include "CHeaders.h"
+#include "cheaders.h"
 #include "tncinfo.h"
 
 #include "bpq32.h"
@@ -292,8 +292,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 		{
 			// Send Error Response
 
-			buffptr->Len = 36;
+			buffptr->Len = sprintf(buffptr->Data, "No Connection to PACTOR TNC\r");
-			memcpy(buffptr->Data, "No Connection to PACTOR TNC\r", 36);
 
 			C_Q_ADD(&TNC->Streams[Stream].PACTORtoBPQ_Q, buffptr);
 			
@@ -383,7 +382,8 @@ VOID * AEAExtInit(EXTPORTDATA *  PortEntry)
 
 	TNC->Port = port;
 
-	TNC->Hardware = H_AEA;
+	TNC->PortRecord = PortEntry;
+	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_AEA;
 
 	TNC->TEXTMODE = FALSE;
 
@@ -391,8 +391,6 @@ VOID * AEAExtInit(EXTPORTDATA *  PortEntry)
 
 	TNC->InitScript = _strupr(TNC->InitScript);
 
-	TNC->PortRecord = PortEntry;
-
 	if (PortEntry->PORTCONTROL.PORTCALL[0] == 0)
 	{
 		memcpy(TNC->NodeCall, MYNODECALL, 10);
@@ -812,7 +810,7 @@ VOID AEAPoll(int Port)
 				{
 					// Limit amount in TX
 
-					if (TNC->Streams[0].BytesTXed - TNC->Streams[0].BytesAcked > 200)
+					if (TNC->Streams[0].bytesTXed - TNC->Streams[0].BytesAcked > 200)
 						continue;
 
 					// If in IRS state for too long, force turnround
@@ -877,8 +875,8 @@ VOID AEAPoll(int Port)
 				
 				EncodeAndSend(TNC, TXMsg, datalen + 1);
 				ReleaseBuffer(buffptr);
-				TNC->Streams[Stream].BytesTXed += datalen; 
+				TNC->Streams[Stream].bytesTXed += datalen; 
-				Debugprintf("Stream %d Sending %d, BytesTXED now %d", Stream, datalen, TNC->Streams[Stream].BytesTXed);
+				Debugprintf("Stream %d Sending %d, BytesTXED now %d", Stream, datalen, TNC->Streams[Stream].bytesTXed);
 				TNC->Timeout = 0;
 				TNC->DataBusy = TRUE;
 
@@ -1212,7 +1210,7 @@ static VOID ProcessAEAPacket(struct TNCINFO * TNC, UCHAR * Msg, size_t Len)
 		// If nothing more to send, turn round link
 						
 		if ((TNC->Streams[0].BPQtoPACTOR_Q == 0) && TNC->NeedTurnRound &&
-			(TNC->Streams[0].BytesAcked >= TNC->Streams[0].BytesTXed))		// Nothing following and all acked
+			(TNC->Streams[0].BytesAcked >= TNC->Streams[0].bytesTXed))		// Nothing following and all acked
 			{
 				Debugprintf("AEA Sent = Acked - sending Turnround");
 						
@@ -1247,7 +1245,7 @@ static VOID ProcessAEAPacket(struct TNCINFO * TNC, UCHAR * Msg, size_t Len)
 		Len--;							// Remove Header
 
 		buffptr->Len = Len;				// Length
-		TNC->Streams[Stream].BytesRXed += (int)Len;
+		TNC->Streams[Stream].bytesRXed += (int)Len;
 		memcpy(&buffptr->Data[0], Buffer, Len);
 		C_Q_ADD(&TNC->Streams[Stream].PACTORtoBPQ_Q, buffptr);
 
@@ -1418,7 +1416,7 @@ static VOID ProcessAEAPacket(struct TNCINFO * TNC, UCHAR * Msg, size_t Len)
 				Buffer[Len-2] = 0;
 			}
 
-			TNC->Streams[Stream].BytesRXed = TNC->Streams[Stream].BytesTXed = TNC->Streams[Stream].BytesAcked = 0;
+			TNC->Streams[Stream].bytesRXed = TNC->Streams[Stream].bytesTXed = TNC->Streams[Stream].BytesAcked = 0;
 			TNC->Streams[Stream].ConnectTime = time(NULL); 
 
 			if (Stream == 0)

AGWAPI.c

@@ -26,7 +26,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 */
 #define _CRT_SECURE_NO_DEPRECATE
 
-#include "CHeaders.h"
+#include "cheaders.h"
 
 #include "bpq32.h"
 
@@ -36,14 +36,14 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 struct AGWHeader
 {
-    int Port;
+    unsigned int Port;
 	unsigned char DataKind;
     unsigned char filler2;
 	unsigned char PID;
     unsigned char filler3;
     unsigned char callfrom[10];
     unsigned char callto[10];
-    int DataLength;
+    unsigned int DataLength;
     int reserved;
 };
 
@@ -128,7 +128,7 @@ int DataSocket_Write(struct AGWSocketConnectionInfo * sockptr, SOCKET sock);
 int AGWGetSessionKey(char * key, struct AGWSocketConnectionInfo * sockptr);
 int ProcessAGWCommand(struct AGWSocketConnectionInfo * sockptr);
 int SendDataToAppl(int Stream, byte * Buffer, int Length);
-int InternalAGWDecodeFrame(char * msg, char * buffer, int Stamp, int * FrameType, int useLocalTime, int doNodes);
+int InternalAGWDecodeFrame(char * msg, char * buffer, time_t Stamp, int * FrameType, int useLocalTime, int doNodes);
 int AGWDataSocket_Disconnect( struct AGWSocketConnectionInfo * sockptr);
 int SendRawPacket(struct AGWSocketConnectionInfo * sockptr, char *txmsg, int Length);
 int ShowApps();
@@ -402,7 +402,7 @@ int SetUpHostSessions()
 extern struct DATAMESSAGE * REPLYBUFFER;
 extern BOOL AGWActive;
 
-VOID SHOWAGW(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID SHOWAGW(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	//	DISPLAY AGW Session Status
 	
@@ -564,9 +564,27 @@ int AGWConnected(struct BPQConnectionInfo * Con, int Stream)
 			{
 				// Create Key
 
+				char callsign[10];
+				int port;
+				int sesstype;
+				int paclen;
+				int maxframe;
+				int l4window;
+
+           
 				keyptr=(byte *)&Con->CallKey;
 
-				*(keyptr++)='1';
+				// Try using the BPQ Port Number if a L2 connect, first free port number if not
+
+				GetConnectionInfo(Stream, callsign,
+										 &port, &sesstype, &paclen,
+										 &maxframe, &l4window);
+
+
+				if (port == 0)
+					port = 64;
+
+				*(keyptr++)='0' + port;
 				memcpy(keyptr, ApplCall, 10);
 				keyptr+=10;
 				memcpy(keyptr,ConnectingCall, 10);
@@ -686,8 +704,9 @@ int AGWDoMonitorData()
 	struct AGWSocketConnectionInfo * sockptr;	
 	byte AGWBuffer[1000];
 	int n;
-	int Stamp, Frametype;
+	int Frametype;
 	BOOL RXFlag;
+	time_t Stamp;
 
 	// Look for Monitor Data
 
@@ -708,7 +727,7 @@ int AGWDoMonitorData()
 			return 0;
 		}
 
-		Stamp = (UINT)monbuff->Timestamp;
+		Stamp = monbuff->Timestamp;
 
 		memcpy(Buffer, monbuff, RawLen);
 
@@ -998,6 +1017,7 @@ int AGWDataSocket_Read(struct AGWSocketConnectionInfo * sockptr, SOCKET sock)
 {
 	int i;
 	int DataLength;
+	struct AGWHeader * AGW = &sockptr->AGWRXHeader;
 
 	ioctlsocket(sock,FIONREAD,&DataLength);
 
@@ -1009,6 +1029,56 @@ int AGWDataSocket_Read(struct AGWSocketConnectionInfo * sockptr, SOCKET sock)
 		return 0;
 	}
 
+	if (DataLength < 36)		//         A header
+	{
+		// If we don't get a header within a few ms assume a rogue connection and close it
+
+		int n = 50;
+
+		while (n--)
+		{
+			Sleep(10);
+			ioctlsocket(sock,FIONREAD,&DataLength);
+			
+			if (DataLength >= 36)
+				break;
+		}
+
+		if (n < 1)
+		{
+			Debugprintf("Corrupt AGW Packet Received");
+			AGWDataSocket_Disconnect(sockptr);
+			return 0;			
+		}
+	}
+
+	// Have a header
+
+	i=recv(sock,(char *)&sockptr->AGWRXHeader, 36, 0);
+            
+	if (i == SOCKET_ERROR)
+	{
+		i=WSAGetLastError();
+		AGWDataSocket_Disconnect(sockptr);
+	}
+	
+	sockptr->MsgDataLength = sockptr->AGWRXHeader.DataLength;
+
+	// Validate packet to protect against accidental (or malicious!) connects from a non-agw application
+
+	if (AGW->Port > 64 || AGW->filler2 != 0 || AGW->filler3 != 0 || AGW->DataLength > 400)
+	{
+		Debugprintf("Corrupt AGW Packet Received");
+		AGWDataSocket_Disconnect(sockptr);
+		return 0;
+	}
+	
+	if (sockptr->MsgDataLength == 0)
+	   ProcessAGWCommand (sockptr);
+	else
+		sockptr->GotHeader = TRUE;			// Wait for data
+
+	ioctlsocket(sock,FIONREAD,&DataLength);	// See if more data
 			
 	if (sockptr->GotHeader)
 	{
@@ -1016,11 +1086,26 @@ int AGWDataSocket_Read(struct AGWSocketConnectionInfo * sockptr, SOCKET sock)
    
 		if (DataLength < sockptr->MsgDataLength)
 		{
-			// Fiddle - seem to be problems somtimes with un-Neagled hosts
+			// Fiddle - seem to be problems somtimes with un-Neagled hosts so wait a few ms
+			// if we don't get a full packet assume a rogue connection and close it
 
-			Sleep(500);
+			int n = 50;
 
+			while (n--)
+			{
+				Sleep(10);
 				ioctlsocket(sock,FIONREAD,&DataLength);
+			
+				if (DataLength >= sockptr->MsgDataLength)
+					break;
+			}
+
+			if (n < 1)
+			{
+				Debugprintf("Corrupt AGW Packet Received");
+				AGWDataSocket_Disconnect(sockptr);
+				return 0;			
+			}
 		}
 		
 		if (DataLength >= sockptr->MsgDataLength)
@@ -1033,48 +1118,9 @@ int AGWDataSocket_Read(struct AGWSocketConnectionInfo * sockptr, SOCKET sock)
 
 			ProcessAGWCommand (sockptr);
 			free(sockptr->MsgData);
-        
 			sockptr->GotHeader = FALSE;
 		}
-
-		// Not Enough Data - wait
-
 	}
-	else	// Not got header
-	{
-		if (DataLength > 35)//         A header
-		{
-			i=recv(sock,(char *)&sockptr->AGWRXHeader, 36, 0);
-            
-			if (i == SOCKET_ERROR)
-			{
-				i=WSAGetLastError();
-
-				AGWDataSocket_Disconnect(sockptr);
-			}
-
-			
-			sockptr->MsgDataLength = sockptr->AGWRXHeader.DataLength;
-
-			if (sockptr->MsgDataLength > 500)
-				OutputDebugString("Corrupt AGW message");
-
-            
-		    if (sockptr->MsgDataLength == 0)
-			{
-				ProcessAGWCommand (sockptr);
-			}
-			else
-			{
-				sockptr->GotHeader = TRUE;            // Wait for data
-			}
-
-		} 
-		
-		// not got 36 bytes
-
-	}
-	
 	return 0;
 }
 
@@ -1096,6 +1142,7 @@ int ProcessAGWCommand(struct AGWSocketConnectionInfo * sockptr)
 	int con,conport;
 	int AGWYReply = 0;
 	int state, change;
+	int n;
 
 	// if we have hidden some ports then the port in the AGW packet will be an index into the visible ports,
 	// not the real port number
@@ -1150,7 +1197,7 @@ int ProcessAGWCommand(struct AGWSocketConnectionInfo * sockptr)
 
 			conport=GetPortNumber(VisiblePortToRealPort[key[0]-48]);
 
-			sprintf(ConnectMsg,"C %d %s",conport,ToCall);
+			n = sprintf(ConnectMsg,"C %d %s",conport,ToCall);
 
 			// if 'v' command add digis
 
@@ -1165,7 +1212,7 @@ int ProcessAGWCommand(struct AGWSocketConnectionInfo * sockptr)
 
 				while(nDigis--)
 				{
-					sprintf(ConnectMsg, "%s, %s", ConnectMsg, Digis);
+					n += sprintf(&ConnectMsg[n], " %s", Digis);
 					Digis += 10;
 				}
 			}

AGWMoncode.c

@@ -33,7 +33,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #pragma data_seg("_BPQDATA")
 				
-#include "CHeaders.h"
+#include "cheaders.h"
 #include "tncinfo.h"
 
 //	MSGFLAG contains CMD/RESPONSE BITS
@@ -61,7 +61,6 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #define	NODES_SIG	0xFF
 
-char * strlop(char * buf, char delim);
 UCHAR * DisplayINP3RIF(UCHAR * ptr1, UCHAR * ptr2, int msglen);
 
 static UCHAR * DISPLAY_NETROM(MESSAGE * ADJBUFFER, UCHAR * Output, int MsgLen, int DoNodes);
@@ -69,7 +68,7 @@ static UCHAR * DISPLAYIPDATAGRAM(IPMSG * IP, UCHAR * Output, int MsgLen);
 static UCHAR * DISPLAYARPDATAGRAM(UCHAR * Datagram, UCHAR * Output);
 
 
-int InternalAGWDecodeFrame(MESSAGE * msg, char * buffer, int Stamp, int * FrameType, int useLocalTime, int DoNodes)
+int InternalAGWDecodeFrame(MESSAGE * msg, char * buffer, time_t Stamp, int * FrameType, int useLocalTime, int DoNodes)
 {
 	UCHAR * ptr;
 	int n;
@@ -365,7 +364,7 @@ int InternalAGWDecodeFrame(MESSAGE * msg, char * buffer, int Stamp, int * FrameT
 	}
 
 	if (Output == NULL)
-		return NULL;
+		return 0;
 
 	if (Output[-1] != 13)
 		Output += sprintf((char *)Output, "\r");

AISCommon.c

@@ -7,7 +7,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include "time.h"
-#include "CHeaders.h"
+#include "cheaders.h"
 //#include "tncinfo.h"
 //#include "adif.h"
 //#include "telnetserver.h"
@@ -760,7 +760,7 @@ void SaveVesselDataBase()
 
 void LoadNavAidDataBase()
 {
-	int i;
+	int i, n, count;
 
 	FILE *file;
 	char buf[256];
@@ -793,10 +793,12 @@ void LoadNavAidDataBase()
 
 	NavRecords = (struct NAVAIDRECORD **)malloc(NavAidCount * sizeof(void *));
 
+	count = 0;
+
 	for (i = 0; i < NavAidCount; i++)
 	{
 		navptr = (struct NAVAIDRECORD *)malloc(sizeof(struct NAVAIDRECORD));
-		NavRecords[i] = navptr;
+		NavRecords[count] = navptr;
 		memset(navptr, 0, sizeof(struct NAVAIDRECORD));
 
 		fgets(buf, 255, file);
@@ -807,6 +809,19 @@ void LoadNavAidDataBase()
 		token = strtok(NULL,  "|\n" );
 		strcpy(&navptr->name[0],token);
 
+		for (n = 0; n < 20; n++)
+		{
+			char c = navptr->name[n];
+
+			if (!isalpha(c) && !isdigit(c) && c != ' ' && c != '_')
+			{
+				count--;
+				break;
+			}
+		}
+
+		count++;
+
 		token = strtok(NULL, "|\n" );
 		navptr->lat = atof(token);
 
@@ -820,6 +835,7 @@ void LoadNavAidDataBase()
 		navptr->TimeLastUpdated = atoi(token);
 	}
 
+	NavAidCount = count;
 	fclose(file);
 }
 
@@ -832,6 +848,7 @@ void SaveNavAidDataBase()
 	char FN[256];
 	struct NAVAIDRECORD * navptr;
 
+
 	if (BPQDirectory[0] == 0)
 	{
 		strcpy(FN, "AIS_NavAids.txt");
@@ -2372,6 +2389,8 @@ void ProcessAISNavAidMessage()
 	NavAidCount++;
 
 	ProcessAISNavAidMessage();
+	NavAidDBChanged = 1;
+	
 	
 	return;
 	

APRSCode.c

@@ -22,11 +22,10 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 // First Version, November 2011
 
 #pragma data_seg("_BPQDATA")
-
 #define _CRT_SECURE_NO_DEPRECATE 
 
 #include <stdio.h>
-#include "CHeaders.h"
+#include "cheaders.h"
 #include "bpq32.h"
 #include <time.h>
 #include "kernelresource.h"
@@ -63,7 +62,6 @@ VOID __cdecl Debugprintf(const char * format, ...);
 VOID __cdecl Consoleprintf(const char * format, ...);
 BOOL APIENTRY  Send_AX(PMESSAGE Block, DWORD Len, UCHAR Port);
 VOID Send_AX_Datagram(PDIGIMESSAGE Block, DWORD Len, UCHAR Port);
-char * strlop(char * buf, char delim);
 int APRSDecodeFrame(char * msg, char * buffer, time_t Stamp, uint64_t Mask);		// Unsemaphored DecodeFrame
 APRSHEARDRECORD * UpdateHeard(UCHAR * Call, int Port);
 BOOL CheckforDups(char * Call, char * Msg, int Len);
@@ -88,7 +86,7 @@ double myDistance(double laa, double loa, BOOL KM);
 struct STATIONRECORD * FindStation(char * Call, BOOL AddIfNotFound);
 int DecodeAPRSPayload(char * Payload, struct STATIONRECORD * Station);
 BOOL KillOldTNC(char * Path);
-int FromLOC(char * Locator, double * pLat, double * pLon);
+
 BOOL ToLOC(double Lat, double Lon , char * Locator);
 BOOL InternalSendAPRSMessage(char * Text, char * Call);
 void UndoTransparency(char * input);
@@ -104,6 +102,7 @@ void ClearSavedMessages();
 void GetSavedAPRSMessages();
 static VOID GPSDConnect(void * unused);
 int CanPortDigi(int Port);
+int FromLOC(char * Locator, double * pLat, double * pLon);
 
 extern int SemHeldByAPI;
 extern int APRSMONDECODE();
@@ -348,7 +347,7 @@ APRSHEARDRECORD MHTABLE[MAXHEARD] = {0};
 
 APRSHEARDRECORD * MHDATA = &MHTABLE[0];
 
-static SOCKET sock = (SOCKET) NULL;
+static SOCKET sock = 0;
 
 //Duplicate suppression Code
 
@@ -554,6 +553,8 @@ int APRSWriteLog(char * msg)
 	UCHAR Value[MAX_PATH];
 	time_t T;
 	struct tm * tm;
+	int n;
+
 
 	if (LogAPRSIS == 0)
 		return 0;
@@ -575,8 +576,9 @@ int APRSWriteLog(char * msg)
 		strcat(Value, "logs/APRS_");
 	}
 
-	sprintf(Value, "%s%02d%02d%02d.log", Value,
+	n = strlen(Value);
-				tm->tm_year - 100, tm->tm_mon+1, tm->tm_mday);
+
+	sprintf(&Value[n], "%02d%02d%02d.log", tm->tm_year - 100, tm->tm_mon+1, tm->tm_mday);
 
 	if ((file = fopen(Value, "ab")) == NULL)
 		return FALSE;
@@ -3113,7 +3115,7 @@ VOID APRSISThread(void * Report)
 	BOOL bcopt=TRUE;
 	char Buffer[1000];
 	int InputLen = 1;		// Non-zero
-	char errmsg[100];
+	char errmsg[300];
 	char * ptr;
 	size_t inptr = 0;
 	char APRSinMsg[1000];
@@ -3674,7 +3676,7 @@ BOOL CheckforDups(char * Call, char * Msg, int Len)
 			if (ptr1)
 				*ptr1 = 0;
 
-//			Debugprintf("Duplicate Message supressed %s", Msg);
+//			Debugprintf("Duplicate Message suppressed %s", Msg);
 			return TRUE;					// Duplicate
 		}
 	}
@@ -7666,7 +7668,7 @@ VOID APRSProcessHTTPMessage(SOCKET sock, char * MsgPtr,	BOOL LOCAL, BOOL COOKIE)
 
 			}
 
-			OutputLen += sprintf(&OutBuffer[OutputLen], WebTrailer);
+			OutputLen += sprintf(&OutBuffer[OutputLen], "%s", WebTrailer);
 
 			HeaderLen = sprintf(Header, "HTTP/1.0 200 OK\r\nContent-Length: %d\r\nContent-Type: text/html\r\n\r\n", OutputLen);
 			sendandcheck(sock, Header, HeaderLen);
@@ -7711,7 +7713,7 @@ VOID APRSProcessHTTPMessage(SOCKET sock, char * MsgPtr,	BOOL LOCAL, BOOL COOKIE)
 
 			}
 
-			OutputLen += sprintf(&OutBuffer[OutputLen], WebTrailer);
+			OutputLen += sprintf(&OutBuffer[OutputLen], "%s", WebTrailer);
 
 			HeaderLen = sprintf(Header, "HTTP/1.0 200 OK\r\nContent-Length: %d\r\nContent-Type: text/html\r\n\r\n", OutputLen);
 			sendandcheck(sock, Header, HeaderLen);
@@ -8113,7 +8115,7 @@ extern char OrigCmdBuffer[81];
 
 BOOL isSYSOP(TRANSPORTENTRY * Session, char * Bufferptr);
 
-VOID APRSCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID APRSCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	// APRS Subcommands. Default for compatibility is APRSMH
 
@@ -9154,7 +9156,7 @@ void GetSavedAPRSMessages()
 	FILE *file;
 	struct APRSMESSAGE * Message;
 	struct APRSMESSAGE * ptr;
-	char Line[256];
+	char Line[512];
 	char * Stamp = 0;
 	char * From = 0;
 	char * To = 0;
@@ -9178,7 +9180,7 @@ void GetSavedAPRSMessages()
 	if ((file = fopen(FN, "r")) == NULL)
 		return ;
 
-	while (fgets(Line, 512, file))
+	while (fgets(Line, sizeof(Line), file))
 	{
 		Stamp = Line;
 		From = strlop(Stamp, ' ');

APRSStdPages.c

@@ -3225,6 +3225,170 @@ char * get_plane(int * Len)
 	return ptr;
 }
 
+char * get_portstats()
+{
+	char Msg[] =
+		"<!DOCTYPE html>\n"
+		"<html>\n"
+		"\n"
+		"<head>\n"
+		"<script src=\"https://code.jquery.com/jquery-3.6.0.min.js\"> </script>\n"
+		"</head>\n"
+		"\n"
+		"\n"
+		"<body>\n"
+		"<H2 id=\"h1\"> Last hour's stats for Port </h2>\n"
+		"<p>\n"
+		"<canvas id=\"myCanvas\" width=\"600\" height=\"250\" style=\"border:1px solid #d3d3d3;\">\n"
+		"Your browser does not support the HTML canvas tag.</canvas>\n"
+		"<br>\n"
+		"<canvas id=\"myCanvas2\" width=\"600\" height=\"250\" style=\"border:1px solid #d3d3d3;\">\n"
+		"Your browser does not support the HTML canvas tag.</canvas>\n"
+		"\n"
+		"<script>\n"
+		"var c = document.getElementById(\"myCanvas\");\n"
+		"var ctx = c.getContext(\"2d\");\n"
+		"\n"
+		"var port = window.location.search.slice(1);\n"
+		"\n"
+		"document.getElementById(\"h1\").innerHTML = \"Last hour's stats for Port \" + port;;\n"
+		"\n"
+		"var oReq = new XMLHttpRequest();\n"
+		"oReq.open(\"GET\", \"/portstats.txt?\" + port, true);\n"
+		"oReq.responseType = \"arraybuffer\";\n"
+		"\n"
+		"oReq.onload = function(oEvent)\n"
+		" {\n"
+		"  var arrayBuffer = oReq.response;\n"
+		"\n"
+		"  var byteArray = new Uint8Array(arrayBuffer);\n"
+		"  \n"
+		" \n"
+		"  // Draw it. Do last hour for testing. Plot each value for 10 pixels\n"
+		"  \n"
+		"\tctx.strokeStyle = \"green\";\n"
+		"\tctx.beginPath();\n"
+		"\t\n"
+		"\tctx.moveTo(0,200);\n"
+		"\tvar y = 2880 - 60;\n"
+		"\tvar val;\n"
+		"\t\n"
+		"\tfor (i = 0; i < 600; i+=10)\n"
+		"\t{\n"
+		"\t\tval = byteArray[y] * 2;\n"
+		"\t\t\n"
+		"\t\tctx.lineTo(i, 200 - val);\n"
+		"\t\tctx.lineTo(i+10, 200 - val);\n"
+		"\t\ty++;\n"
+		"\t}\n"
+		"\t\n"
+		"\tctx.stroke();\n"
+		"\t\n"
+		"\tctx.strokeStyle = \"gray\";\n"
+		"\tctx.setLineDash([5, 3]);\n"
+		"\t\n"
+		"\tctx.beginPath();\n"
+		"  \tctx.moveTo(0,100);\n"
+		"\tctx.lineTo(600,100);\n"
+		" \tctx.moveTo(0,50);\n"
+		"\tctx.lineTo(600,50);\n"
+		" \tctx.moveTo(0,150);\n"
+		"\tctx.lineTo(600,150);\n"
+		"\tctx.stroke();\n"
+		"\n"
+		"\n"
+		"\t\n"
+		"\tctx.fillText(\"100%\",0,10);\n"
+		"\tctx.fillText(\"50%\",0,100);\n"
+		"\tctx.fillText(\"0%\",0,200);\t\n"
+		"\tctx.fillText(\"-60 mins\",0,220);\t\n"
+		"\tctx.fillText(\"-30 mins\",300,220);\t\n"
+		"\tctx.fillText(\"Now\",580,220);\t\n"
+		"\n"
+		"\t\n"
+		"\t// Do TX\n"
+		"\t\n"
+		"\t\n"
+		"\tc = document.getElementById(\"myCanvas2\");\n"
+		"\tctx = c.getContext(\"2d\");\n"
+		"\n"
+		"\tctx.fillText(\"100%\",0,10);\n"
+		"\tctx.fillText(\"50%\",0,100);\n"
+		"\tctx.fillText(\"0%\",0,200);\t\n"
+		"\tctx.fillText(\"-60 mins\",0,220);\t\n"
+		"\tctx.fillText(\"-30 mins\",300,220);\t\n"
+		"\tctx.fillText(\"Now\",580,220);\t\n"
+		"\n"
+		"\n"
+		"\tctx.strokeStyle = \"red\";\n"
+		"\tctx.beginPath();\n"
+		"\t\n"
+		"\tctx.moveTo(0,200);\n"
+		"\tvar y = 1440 - 60;\n"
+		"\tvar val;\n"
+		"\t\n"
+		"\tfor (i = 0; i < 600; i+=10)\n"
+		"\t\n"
+		"\t{\n"
+		"\t\tval = byteArray[y] * 2;\n"
+		"\t\t\n"
+		"\t\tctx.lineTo(i, 200 - val);\n"
+		"\t\tctx.lineTo(i+10, 200 - val);\n"
+		"\t\ty++;\n"
+		"\t}\n"
+		"\t\n"
+		"\tctx.stroke();\n"
+		"\n"
+		"\tctx.strokeStyle = \"gray\";\n"
+		"\tctx.setLineDash([5, 3]);\n"
+		"\t\n"
+		"\tctx.beginPath();\n"
+		"  \tctx.moveTo(0,100);\n"
+		"\tctx.lineTo(600,100);\n"
+		" \tctx.moveTo(0,50);\n"
+		"\tctx.lineTo(600,50);\n"
+		" \tctx.moveTo(0,150);\n"
+		"\tctx.lineTo(600,150);\n"
+		"\tctx.stroke();\n"
+		"\n"
+		"\n"
+		"};\n"
+		"\n"
+		"oReq.send();\n"
+		"\n"
+		"\n"
+		"function draw(Data)\n"
+		"{\n"
+		"\n"
+		"\t// Data has 4 bytes of index to current position the 1440 bytes of load info\n"
+		"\t\n"
+		"\n"
+		"\tview = new Int8Array(Data);\n"
+		"\t\n"
+		"alert(view[3]);\n"
+		"\n"
+		"ctx.moveTo(0,200);\n"
+		"var y = 0;\n"
+		"for (i = 0; i < 720; i+=30)\n"
+		"{\n"
+		"\tctx.lineTo(i, 200 - y);\n"
+		"\tctx.lineTo(i+30, 200 - y);\n"
+		"\ty += 10;\n"
+		"}\n"
+		"\n"
+		"\n"
+		"ctx.stroke();\n"
+		"}\n"
+		"\n"
+		"</script>\n"
+		"\n"
+		"</body>\n"
+		"</html>\n"
+		"\n"
+		"";
+
+	return _strdup(Msg);;
+}
 
 char * get_aprs()
 {
@@ -3638,6 +3802,10 @@ char * GetStandardPage(char * FN, int * Len)
 	if (_stricmp(FN, "leaflet.rotatedMarker.js") == 0)
 		return get_rotatedMarker();
 
+	if (_stricmp(FN, "PortStats.html") == 0)
+		return get_portstats();
+	
+
 	if (_stricmp(FN, "info_call.html") == 0)
 		return get_info_call();
 

ARDOP.c

@@ -45,7 +45,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #endif
 #endif
 
-#include "CHeaders.h"
+#include "cheaders.h"
 
 
 int (WINAPI FAR *GetModuleFileNameExPtr)();
@@ -136,6 +136,10 @@ BOOL ARDOPStopPort(struct PORTCONTROL * PORT)
 	if (TNC->Streams[0].Attached)
 		TNC->Streams[0].ReportDISC = TRUE;
 
+	TNC->Streams[0].Connecting = 0;
+	TNC->Streams[0].Connected = 0;
+	TNC->Streams[0].Attached = 0;
+
 	if (TNC->TCPSock)
 	{
 		shutdown(TNC->TCPSock, SD_BOTH);
@@ -162,6 +166,9 @@ BOOL ARDOPStopPort(struct PORTCONTROL * PORT)
 	sprintf(PORT->TNC->WEB_COMMSSTATE, "%s", "Port Stopped");
 	MySetWindowText(PORT->TNC->xIDC_COMMSSTATE, PORT->TNC->WEB_COMMSSTATE);
 
+	strcpy(TNC->WEB_TNCSTATE, "Free");
+	MySetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
+
 	return TRUE;
 }
 
@@ -314,7 +321,7 @@ void SendARDOPorPacketData(struct TNCINFO * TNC, int Stream, UCHAR * Buff, int t
 	if (Stream == 0)
 	{
 		ARDOPSendData(TNC, Buff, txlen);
-		STREAM->BytesTXed += txlen;
+		STREAM->bytesTXed += txlen;
 		WritetoTrace(TNC, Buff, txlen);
 	}
 	else
@@ -562,7 +569,7 @@ static int ProcessLine(char * buf, int Port)
 
 void ARDOPThread(struct TNCINFO * TNC);
 VOID ARDOPProcessDataSocketData(int port);
-int ConnecttoARDOP();
+int ConnecttoARDOP(struct TNCINFO * TNC);
 static VOID ARDOPProcessReceivedData(struct TNCINFO * TNC);
 static VOID ARDOPProcessReceivedControl(struct TNCINFO * TNC);
 int V4ProcessReceivedData(struct TNCINFO * TNC);
@@ -643,6 +650,12 @@ VOID ARDOPSendCommand(struct TNCINFO * TNC, char * Buff, BOOL Queue)
 	if (Buff[0] == 0)		// Terminal Keepalive?
 		return;
 
+	if (memcmp(Buff, "LISTEN ", 7) == 0)
+	{
+		strcpy(TNC->WEB_MODE, &Buff[7]);
+		MySetWindowText(TNC->xIDC_MODE, &Buff[7]);
+	}
+
 	EncLen = sprintf(Encoded, "%s\r", Buff);
 
 	// it is possible for binary data to be dumped into the command
@@ -876,7 +889,8 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 			if (TNC->SessionTimeLimit && STREAM->ConnectTime && time(NULL) > (TNC->SessionTimeLimit + STREAM->ConnectTime))
 			{
 				ARDOPSendCommand(TNC, "DISCONNECT", TRUE);
-				STREAM->Disconnecting = TRUE;
+				STREAM->ReportDISC = 1;
+				STREAM->AttachTime = 0;
 			}
 		}
 
@@ -958,7 +972,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 				TNC->Streams[0].Connecting ||
 				TNC->Streams[0].Connected)
 			{
-				// discard if TNC not connected or sesison active
+				// discard if TNC not connected or session active
 
 				ReleaseBuffer(buffptr);
 				continue;
@@ -1274,7 +1288,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 					UCHAR * data = &buffptr->Data[0];
 					STREAM->FramesQueued--;
 					txlen = (int)buffptr->Len;
-					STREAM->BytesTXed += txlen;
+					STREAM->bytesTXed += txlen;
 
 					if (Stream == 0)
 					{
@@ -1381,7 +1395,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 			{
 				bytes=ARDOPSendData(TNC, &buff->L2DATA[0], txlen);
 				TNC->Streams[Stream].BytesOutstanding += bytes;		// So flow control works - will be updated by BUFFER response
-				STREAM->BytesTXed += bytes;
+				STREAM->bytesTXed += bytes;
 				WritetoTrace(TNC, &buff->L2DATA[0], txlen);
 			}
 			else
@@ -1480,7 +1494,10 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 
 			if (_memicmp(&buff->L2DATA[0], "RADIO ", 6) == 0)
 			{
-				sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &buff->L2DATA[6]);
+				char cmd[56];
+
+				strcpy(cmd, &buff->L2DATA[6]);
+				sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, cmd);
 
 				if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, &buff->L2DATA[0]))
 				{
@@ -1627,6 +1644,8 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 
 					ARDOPChangeMYC(TNC, TNC->Streams[0].MyCall);
 
+					hookL4SessionAttempt(STREAM, &buff->L2DATA[2], TNC->Streams[0].MyCall);
+
 					// See if Busy
 
 					if (InterlockedCheckBusy(TNC))
@@ -1865,12 +1884,10 @@ VOID ARDOPReleaseTNC(struct TNCINFO * TNC)
 
 	ARDOPChangeMYC(TNC, TNC->NodeCall);
 
-	ARDOPSendCommand(TNC, "LISTEN TRUE", TRUE);
-
 	strcpy(TNC->WEB_TNCSTATE, "Free");
 	MySetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
 
-	//	Start Scanner
+	ARDOPSendCommand(TNC, "LISTEN TRUE", TRUE);
 	
 	//	Start Scanner
 
@@ -1889,12 +1906,19 @@ VOID ARDOPReleaseTNC(struct TNCINFO * TNC)
 
 VOID ARDOPSuspendPort(struct TNCINFO * TNC, struct TNCINFO * ThisTNC)
 {
+	TNC->PortRecord->PORTCONTROL.PortSuspended = TRUE;
 	ARDOPSendCommand(TNC, "LISTEN FALSE", TRUE);
+	strcpy(TNC->WEB_TNCSTATE, "Interlocked");
+	MySetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
+
 }
 
 VOID ARDOPReleasePort(struct TNCINFO * TNC)
 {
+	TNC->PortRecord->PORTCONTROL.PortSuspended = FALSE;
 	ARDOPSendCommand(TNC, "LISTEN TRUE", TRUE);
+	strcpy(TNC->WEB_TNCSTATE, "Free");
+	MySetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
 }
 
 extern char WebProcTemplate[];
@@ -1911,7 +1935,7 @@ static int WebProc(struct TNCINFO * TNC, char * Buff, BOOL LOCAL)
 
 	Len += sprintf(&Buff[Len], "<tr><td width=110px>Comms State</td><td>%s</td></tr>", TNC->WEB_COMMSSTATE);
 	Len += sprintf(&Buff[Len], "<tr><td>TNC State</td><td>%s</td></tr>", TNC->WEB_TNCSTATE);
-	Len += sprintf(&Buff[Len], "<tr><td>Mode</td><td>%s</td></tr>", TNC->WEB_MODE);
+	Len += sprintf(&Buff[Len], "<tr><td>Listen</td><td>%s</td></tr>", TNC->WEB_MODE);
 	Len += sprintf(&Buff[Len], "<tr><td>Channel State</td><td>%s &nbsp; %s</td></tr>", TNC->WEB_CHANSTATE, TNC->WEB_LEVELS);
 	Len += sprintf(&Buff[Len], "<tr><td>Proto State</td><td>%s</td></tr>", TNC->WEB_PROTOSTATE);
 	Len += sprintf(&Buff[Len], "<tr><td>Traffic</td><td>%s</td></tr>", TNC->WEB_TRAFFIC);
@@ -1960,6 +1984,7 @@ VOID * ARDOPExtInit(EXTPORTDATA * PortEntry)
 	}
 
 	TNC->Port = port;
+	TNC->PortRecord = PortEntry;
 
 	if (TNC->LogPath)
 		ARDOPOpenLogFiles(TNC); 
@@ -1972,7 +1997,7 @@ VOID * ARDOPExtInit(EXTPORTDATA * PortEntry)
 	if (TNC->ProgramPath)
 		TNC->WeStartedTNC = RestartTNC(TNC);
 
-	TNC->Hardware = H_ARDOP;
+	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_ARDOP;
 
 	if (TNC->BusyWait == 0)
 		TNC->BusyWait = 10;
@@ -1980,7 +2005,6 @@ VOID * ARDOPExtInit(EXTPORTDATA * PortEntry)
 	if (TNC->BusyHold == 0)
 		TNC->BusyHold = 1;
 
-	TNC->PortRecord = PortEntry;
 
 	if (PortEntry->PORTCONTROL.PORTCALL[0] == 0)
 		memcpy(TNC->NodeCall, MYNODECALL, 10);
@@ -2127,7 +2151,7 @@ VOID * ARDOPExtInit(EXTPORTDATA * PortEntry)
 	CreateWindowEx(0, "STATIC", "TNC State", WS_CHILD | WS_VISIBLE, 10,28,106,20, TNC->hDlg, NULL, hInstance, NULL);
 	TNC->xIDC_TNCSTATE = CreateWindowEx(0, "STATIC", "", WS_CHILD | WS_VISIBLE, 120,28,520,20, TNC->hDlg, NULL, hInstance, NULL);
 
-	CreateWindowEx(0, "STATIC", "Mode", WS_CHILD | WS_VISIBLE, 10,50,80,20, TNC->hDlg, NULL, hInstance, NULL);
+	CreateWindowEx(0, "STATIC", "Listen", WS_CHILD | WS_VISIBLE, 10,50,80,20, TNC->hDlg, NULL, hInstance, NULL);
 	TNC->xIDC_MODE = CreateWindowEx(0, "STATIC", "", WS_CHILD | WS_VISIBLE, 120,50,200,20, TNC->hDlg, NULL, hInstance, NULL);
  
 	CreateWindowEx(0, "STATIC", "Channel State", WS_CHILD | WS_VISIBLE, 10,72,110,20, TNC->hDlg, NULL, hInstance, NULL);
@@ -2258,16 +2282,16 @@ VOID TNCLost(struct TNCINFO * TNC)
 		if (Stream == 0)
 		{
 			sprintf(TNC->WEB_TRAFFIC, "Sent %d RXed %d Queued %d",
-			STREAM->BytesTXed - STREAM->BytesOutstanding, STREAM->BytesRXed, STREAM->BytesOutstanding);
+			STREAM->bytesTXed - STREAM->BytesOutstanding, STREAM->bytesRXed, STREAM->BytesOutstanding);
 			MySetWindowText(TNC->xIDC_TRAFFIC, TNC->WEB_TRAFFIC);
 		}
 
 		if (STREAM->Attached)
-		{
+			STREAM->ReportDISC = TRUE;
+
 		STREAM->Connected = FALSE;
 		STREAM->Connecting = FALSE;
-			STREAM->ReportDISC = TRUE;
+
-		}
 	}
 }
 
@@ -2593,6 +2617,8 @@ VOID ARDOPThread(struct TNCINFO * TNC)
 	
 	TNC->Alerted = TRUE;
 
+	ARDOPSendCommand(TNC, "LISTEN TRUE", TRUE);
+	
 	sprintf(TNC->WEB_COMMSSTATE, "Connected to ARDOP TNC");		
 	MySetWindowText(TNC->xIDC_COMMSSTATE, TNC->WEB_COMMSSTATE);
 
@@ -2672,6 +2698,10 @@ VOID ARDOPThread(struct TNCINFO * TNC)
 					sprintf(TNC->WEB_COMMSSTATE, "Connection to TNC lost");
 					MySetWindowText(TNC->xIDC_COMMSSTATE, TNC->WEB_COMMSSTATE);
 
+					strcpy(TNC->WEB_TNCSTATE, "Free");
+					MySetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
+
+
 					TNC->CONNECTED = FALSE;
 					TNC->Alerted = FALSE;
 
@@ -2953,6 +2983,15 @@ VOID ARDOPProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
 		if (TNC->PTTMode)
 			Rig_PTT(TNC, TRUE);
 
+		TNC->PTTonTime = GetTickCount();
+
+		// Cancel Busy timer (stats include ptt on time in port active
+
+		if (TNC->BusyonTime)
+		{
+			TNC->BusyActivemS += (GetTickCount() - TNC->BusyonTime);
+			TNC->BusyonTime = 0;
+		}
 		return;
 	}
 	if (_memicmp(Buffer, "PTT F", 5) == 0)
@@ -2961,6 +3000,12 @@ VOID ARDOPProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
 		if (TNC->PTTMode)
 			Rig_PTT(TNC, FALSE);
 
+		if (TNC->PTTonTime)
+		{
+			TNC->PTTActivemS += (GetTickCount() - TNC->PTTonTime);
+			TNC->PTTonTime = 0;
+		}
+
 		return;
 	}
 
@@ -2969,6 +3014,8 @@ VOID ARDOPProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
 		TNC->BusyFlags |= CDBusy;
 		TNC->Busy = TNC->BusyHold * 10;				// BusyHold  delay
 
+		TNC->BusyonTime = GetTickCount();
+
 		MySetWindowText(TNC->xIDC_CHANSTATE, "Busy");
 		strcpy(TNC->WEB_CHANSTATE, "Busy");
 
@@ -2985,6 +3032,12 @@ VOID ARDOPProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
 		else
 			strcpy(TNC->WEB_CHANSTATE, "Clear");
 
+		if (TNC->BusyonTime)
+		{
+			TNC->BusyActivemS += (GetTickCount() - TNC->BusyonTime);
+			TNC->BusyonTime = 0;
+		}
+
 		MySetWindowText(TNC->xIDC_CHANSTATE, TNC->WEB_CHANSTATE);
 		TNC->WinmorRestartCodecTimer = time(NULL);
 		return;
@@ -3035,7 +3088,7 @@ VOID ARDOPProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
 		}
 
 		sprintf(TNC->WEB_TRAFFIC, "Sent %d RXed %d Queued %d",
-			STREAM->BytesTXed - STREAM->BytesOutstanding, STREAM->BytesRXed, STREAM->BytesOutstanding);
+			STREAM->bytesTXed - STREAM->BytesOutstanding, STREAM->bytesRXed, STREAM->BytesOutstanding);
 		MySetWindowText(TNC->xIDC_TRAFFIC, TNC->WEB_TRAFFIC);
 		return;
 	}
@@ -3055,7 +3108,7 @@ VOID ARDOPProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
 		WritetoTrace(TNC, Buffer, MsgLen - 1);
 
 		STREAM->ConnectTime = time(NULL); 
-		STREAM->BytesRXed = STREAM->BytesTXed = STREAM->PacketsSent = 0;
+		STREAM->bytesRXed = STREAM->bytesTXed = STREAM->PacketsSent = 0;
 
 		memcpy(Call, &Buffer[10], 10);
 
@@ -3182,7 +3235,7 @@ VOID ARDOPProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
 			{
 				char AppName[13];
 
-				memcpy(AppName, &ApplPtr[App * sizeof(CMDX)], 12);
+				memcpy(AppName, &ApplPtr[App * sizeof(struct CMDX)], 12);
 				AppName[12] = 0;
 
 				if (TNC->SendTandRtoRelay && memcmp(AppName, "RMS ", 4) == 0
@@ -3232,7 +3285,7 @@ VOID ARDOPProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
 					STREAM->NeedDisc = 100;	// 10 secs
 				}
 			}
-		
+			strcpy(STREAM->MyCall, TNC->TargetCall);
 			return;
 		}
 		else
@@ -3270,9 +3323,9 @@ VOID ARDOPProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
 		}
 	}
 
-
 	if (_memicmp(Buffer, "DISCONNECTED", 12) == 0
 		|| _memicmp(Buffer, "STATUS CONNECT TO", 17) == 0  
+		|| _memicmp(Buffer, "STATUS END ARQ CALL", 19) == 0  
 		|| _memicmp(Buffer, "STATUS ARQ TIMEOUT FROM PROTOCOL STATE", 24) == 0
 //		|| _memicmp(Buffer, "NEWSTATE DISC", 13) == 0
 		|| _memicmp(Buffer, "ABORT", 5) == 0)
@@ -3314,34 +3367,21 @@ VOID ARDOPProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
 				RestartTNC(TNC);
 			}
 
+			sprintf(TNC->WEB_TNCSTATE, "In Use by %s", TNC->Streams[0].MyCall);
+			MySetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
+
 			return;
 		}
 
 		WritetoTrace(TNC, Buffer, MsgLen - 1);
 
-		// Release Session3
+		// Release Session
 
 		if (TNC->Streams[0].Connected)
 		{
 			// Create a traffic record
 		
-			char logmsg[120];	
+			hookL4SessionDeleted(TNC, STREAM);
-			time_t Duration;
-
-			Duration = time(NULL) - STREAM->ConnectTime;
-
-			if (Duration == 0)
-				Duration = 1;
-				
-			sprintf(logmsg,"Port %2d %9s Bytes Sent %d  BPS %d Bytes Received %d BPS %d Time %d Seconds",
-				TNC->Port, STREAM->RemoteCall,
-				STREAM->BytesTXed, (int)(STREAM->BytesTXed/Duration),
-				STREAM->BytesRXed, (int)(STREAM->BytesRXed/Duration), (int)Duration);
-
-			Debugprintf(logmsg);
-
-			STREAM->ConnectTime = 0;		// Prevent retrigger
-
 
 		}
 
@@ -3822,13 +3862,12 @@ VOID ARDOPProcessDataPacket(struct TNCINFO * TNC, UCHAR * Type, UCHAR * Data, in
 		return;
 	}
 
-	STREAM->BytesRXed += Length;
+	STREAM->bytesRXed += Length;
 
 	Data[Length] = 0;	
-	Debugprintf("ARDOP: RXD %d bytes", Length);
 
 	sprintf(TNC->WEB_TRAFFIC, "Sent %d RXed %d Queued %d",
-			STREAM->BytesTXed - STREAM->BytesOutstanding, STREAM->BytesRXed, STREAM->BytesOutstanding);
+			STREAM->bytesTXed - STREAM->BytesOutstanding, STREAM->bytesRXed, STREAM->BytesOutstanding);
 	MySetWindowText(TNC->xIDC_TRAFFIC, TNC->WEB_TRAFFIC);
 
 	
@@ -3852,6 +3891,7 @@ VOID ARDOPProcessDataPacket(struct TNCINFO * TNC, UCHAR * Type, UCHAR * Data, in
 		char * ptr2;
 		char c;
 		int Len = Length;
+		char Call[10] = "";
 
 		Debugprintf(Data);
 
@@ -3924,7 +3964,14 @@ VOID ARDOPProcessDataPacket(struct TNCINFO * TNC, UCHAR * Type, UCHAR * Data, in
 							buffptr->LENGTH  = 16 + MSGHDDRLEN + APLen;
 							time(&buffptr->Timestamp);
 
+							memcpy(Call,ptr1, 9);
+							strlop(Call, '>');
+							UpdateMH(TNC, Call, '!', 'I');
+
 							BPQTRACE((MESSAGE *)buffptr, TRUE);
+
+							ReleaseBuffer(buffptr);
+
 						}
 						else
 						{
@@ -4969,7 +5016,7 @@ tcpHostFrame:
 				WritetoTrace(TNC, Buffer, len);
 
 				STREAM->ConnectTime = time(NULL); 
-				STREAM->BytesRXed = STREAM->BytesTXed = STREAM->PacketsSent = 0;
+				STREAM->bytesRXed = STREAM->bytesTXed = STREAM->PacketsSent = 0;
 
 				memcpy(Call, &Buffer[19], 10);
 				ptr = strchr(Call, ' ');	
@@ -5042,7 +5089,7 @@ tcpHostFrame:
 				{
 					char AppName[13];
 
-					memcpy(AppName, &ApplPtr[App * sizeof(CMDX)], 12);
+					memcpy(AppName, &ApplPtr[App * sizeof(struct CMDX)], 12);
 					AppName[12] = 0;
 
 				// Make sure app is available
@@ -5911,7 +5958,7 @@ VOID ARAXINIT(struct PORTCONTROL * PORT)
 	char Msg[80] = "";
 	
 	memcpy(Msg, PORT->PORTDESCRIPTION, 30);
-	sprintf(Msg, "%s\n", Msg);
+	strcat(Msg, "\n);
 	
 	WritetoConsoleLocal(Msg);
 }

BBSHTMLConfig.c

@@ -19,7 +19,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #define _CRT_SECURE_NO_DEPRECATE
 
-#include "CHeaders.h"
+#include "cheaders.h"
 #include "bpqmail.h"
 
 #ifdef WIN32
@@ -116,7 +116,7 @@ int SendWebMailHeader(char * Reply, char * Key, struct HTTPConnectionInfo * Sess
 struct UserInfo * FindBBS(char * Name);
 void ReleaseWebMailStruct(WebMailInfo * WebMail);
 VOID TidyWelcomeMsg(char ** pPrompt);
-int MailAPIProcessHTTPMessage(char * response, char * Method, char * URL, char * request, BOOL LOCAL, char * Param);
+int MailAPIProcessHTTPMessage(struct HTTPConnectionInfo * Session, char * response, char * Method, char * URL, char * request, BOOL LOCAL, char * Param, char * Token);
 
 char UNC[] = "";
 char CHKD[] = "checked=checked ";
@@ -405,41 +405,20 @@ int SendHeader(char * Reply, char * Key)
 
 void ConvertTitletoUTF8(WebMailInfo * WebMail, char * Title, char * UTF8Title, int Len)
 {
-	if (WebIsUTF8(Title, (int)strlen(Title)) == FALSE)
+	Len = strlen(Title);
+
+	if (WebIsUTF8(Title, Len) == FALSE)
 	{
-		// With Windows it is simple - convert using current codepage
+		int code = TrytoGuessCode(Title, Len);
-		// I think the only reliable way is to convert to unicode and back
 
-		int origlen = (int)strlen(Title) + 1;
+		if (code == 437)
-#ifdef WIN32
+			Len = Convert437toUTF8(Title, Len, UTF8Title);
-		WCHAR BufferW[128];
+		else if (code == 1251)
-		int wlen;
+			Len = Convert1251toUTF8(Title, Len, UTF8Title);
-		int len = origlen;
+		else
+			Len = Convert1252toUTF8(Title, Len, UTF8Title);
 
-		wlen = MultiByteToWideChar(CP_ACP, 0, Title, len, BufferW, origlen * 2); 
+		UTF8Title[Len] = 0;
-		len = WideCharToMultiByte(CP_UTF8, 0, BufferW, wlen, UTF8Title, origlen * 2, NULL, NULL); 
-#else
-		size_t left = Len - 1;
-		size_t len = origlen;
-
-		iconv_t * icu = WebMail->iconv_toUTF8;
-
-		if (WebMail->iconv_toUTF8 == NULL)
-			icu = WebMail->iconv_toUTF8 = iconv_open("UTF-8//IGNORE", "CP1252");
-
-		if (icu == (iconv_t)-1)
-		{
-			strcpy(UTF8Title, Title);
-			WebMail->iconv_toUTF8 = NULL;
-			return;
-		}
-
-		char * orig = UTF8Title;
-
-		iconv(icu, NULL, NULL, NULL, NULL);		// Reset State Machine
-		iconv(icu, &Title, &len, (char ** __restrict__)&UTF8Title, &left);
-
-#endif
 	}
 	else
 		strcpy(UTF8Title, Title);
@@ -447,7 +426,7 @@ void ConvertTitletoUTF8(WebMailInfo * WebMail, char * Title, char * UTF8Title, i
 
 BOOL GotFirstMessage = 0;
 
-void ProcessMailHTTPMessage(struct HTTPConnectionInfo * Session, char * Method, char * URL, char * input, char * Reply, int * RLen, int InputLen)
+void ProcessMailHTTPMessage(struct HTTPConnectionInfo * Session, char * Method, char * URL, char * input, char * Reply, int * RLen, int InputLen, char * Token)
 {
 	char * Context = 0, * NodeURL;
 	int ReplyLen;
@@ -477,6 +456,13 @@ void ProcessMailHTTPMessage(struct HTTPConnectionInfo * Session, char * Method,
 
 	}
 
+
+	if (_memicmp(URL, "/Mail/API/v1/", 13) == 0)
+	{
+		*RLen = MailAPIProcessHTTPMessage(Session, Reply, Method, URL, input, LOCAL, Context, Token);
+		return;
+	}
+
 	// There is a problem if Mail is reloaded without reloading the node
 
 	if (GotFirstMessage == 0)
@@ -494,12 +480,6 @@ void ProcessMailHTTPMessage(struct HTTPConnectionInfo * Session, char * Method,
 		return;
 	}
 
-	if (_memicmp(URL, "/Mail/API/", 10) == 0)
-	{
-		*RLen = MailAPIProcessHTTPMessage(Reply, Method, URL, input, LOCAL, Context);
-		return;
-	}
-
 	
 	if (strcmp(Method, "POST") == 0)
 	{	
@@ -2239,21 +2219,21 @@ VOID ProcessUserUpdate(struct HTTPConnectionInfo * Session, char * MsgPtr, char
 		ptr1 = GetNextParam(&ptr2);		// Last Listed
 		USER->lastmsg = atoi(ptr1);
 		ptr1 = GetNextParam(&ptr2);		// Name
-		strcpy(USER->Name, ptr1);
+		memcpy(USER->Name, ptr1, 17);
 		ptr1 = GetNextParam(&ptr2);		// Pass
-		strcpy(USER->pass, ptr1);		
+		memcpy(USER->pass, ptr1, 12);		
 		ptr1 = GetNextParam(&ptr2);		// CMS Pass
 		if (memcmp("****************", ptr1, strlen(ptr1) != 0))
 		{
-			strcpy(USER->CMSPass, ptr1);
+			memcpy(USER->CMSPass, ptr1, 15);
 		}
 		
 		ptr1 = GetNextParam(&ptr2);		// QTH
-		strcpy(USER->Address, ptr1);
+		memcpy(USER->Address, ptr1, 60);
 		ptr1 = GetNextParam(&ptr2);		// ZIP
-		strcpy(USER->ZIP, ptr1);
+		memcpy(USER->ZIP, ptr1, 8);
 		ptr1 = GetNextParam(&ptr2);		// HomeBBS
-		strcpy(USER->HomeBBS, ptr1);
+		memcpy(USER->HomeBBS, ptr1, 40);
 		_strupr(USER->HomeBBS);
 
 		SaveUserDatabase();
@@ -2996,6 +2976,8 @@ int ProcessWebmailWebSock(char * MsgPtr, char * OutBuffer);
 
 static char PipeFileName[] = "\\\\.\\pipe\\BPQMailWebPipe";
 
+// Constants
+
 static DWORD WINAPI InstanceThread(LPVOID lpvParam)
 
 // This routine is a thread processing function to read from and reply to a client
@@ -3016,6 +2998,7 @@ static DWORD WINAPI InstanceThread(LPVOID lpvParam)
 	char URL[100001];
 	char * Context, * Method;
 	int n;
+	char token[16]= "";
 
 	char * ptr;
 
@@ -3051,8 +3034,30 @@ static DWORD WINAPI InstanceThread(LPVOID lpvParam)
 	}
 	else
 	{
+		// look for auth header	
+		
+		const char * auth_header = "Authorization: Bearer ";
+		char * token_begin = strstr(MsgPtr, auth_header);
+		int Flags = 0;
+
+		// Node Flags isn't currently used
+
+		if (token_begin)
+		{
+			// Using Auth Header
+
+			// Extract the token from the request (assuming it's present in the request headers)
+
+			token_begin += strlen(auth_header); // Move to the beginning of the token
+			strncpy(token, token_begin, 13);
+			token[13] = '\0'; // Null-terminate the token
+		}
+	}
+
 	strcpy(URL, MsgPtr);
 
+
+
 	ptr = strstr(URL, " HTTP");
 
 	if (ptr)
@@ -3060,8 +3065,8 @@ static DWORD WINAPI InstanceThread(LPVOID lpvParam)
 
 	Method = strtok_s(URL, " ", &Context);
 
-		ProcessMailHTTPMessage(&Session, Method, Context, MsgPtr, OutBuffer, &OutputLen, InputLen);
+	ProcessMailHTTPMessage(&Session, Method, Context, MsgPtr, OutBuffer, &OutputLen, InputLen, token);
-	}
+
 
 	WriteFile(hPipe, &Session, sizeof (struct HTTPConnectionInfo), &n, NULL);
 	WriteFile(hPipe, OutBuffer, OutputLen, &cbWritten, NULL); 

BBSUtilities.c

@@ -28,6 +28,10 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #include <sys/time.h>
 #endif
 
+#define GetSemaphore(Semaphore,ID) _GetSemaphore(Semaphore, ID, __FILE__, __LINE__)
+void _GetSemaphore(struct SEM * Semaphore, int ID, char * File, int Line);
+
+BOOL GetStringValue(config_setting_t * group, char * name, char * value, int maxlen);
 
 BOOL Bells;
 BOOL FlashOnBell;		// Flash instead of Beep
@@ -51,6 +55,8 @@ extern struct ConsoleInfo BBSConsole;
 
 extern char LOC[7];
 
+extern BOOL MQTT;
+
 //#define BBSIDLETIME 120
 //#define USERIDLETIME 300
 
@@ -75,7 +81,7 @@ FARPROCX pRefreshWebMailIndex;
 Dll BOOL APIENTRY APISendAPRSMessage(char * Text, char * ToCall);
 VOID APIENTRY md5 (char *arg, unsigned char * checksum);
 int APIENTRY GetRaw(int stream, char * msg, int * len, int * count);
-void GetSemaphore(struct SEM * Semaphore, int ID);
+void _GetSemaphore(struct SEM * Semaphore, int ID, char * File, int Line);
 void FreeSemaphore(struct SEM * Semaphore);
 int EncryptPass(char * Pass, char * Encrypt);
 VOID DecryptPass(char * Encrypt, unsigned char * Pass, unsigned int len);
@@ -124,8 +130,9 @@ void decodeblock( unsigned char in[4], unsigned char out[3]);
 int encode_quoted_printable(char *s, char * out, int Len);
 int32_t Encode(char * in, char * out, int32_t inlen, BOOL B1Protocol, int Compress);
 int APIENTRY ChangeSessionCallsign(int Stream, unsigned char * AXCall);
-void SendMessageReadEvent(char * user, struct MsgInfo * Msg);
+void SendMessageReadEvent(char * call, struct MsgInfo * Msg);
 void SendNewMessageEvent(char * call, struct MsgInfo * Msg);
+void MQTTMessageEvent(struct MsgInfo * message);
 
 config_t cfg;
 config_setting_t * group;
@@ -269,6 +276,8 @@ char FilesNames[4][100] = {"", "", "", ""};
 
 char * Logs[4] = {"BBS", "CHAT", "TCP", "DEBUG"};
 
+extern struct SEM ConfigSEM;
+
 
 BOOL OpenLogfile(int Flags)
 {
@@ -2209,7 +2218,7 @@ BOOL CheckValidCall(char * From)
 	if (DontCheckFromCall)
 		return TRUE;
 	
-	if (strcmp(From, "SYSOP") == 0 || strcmp(From, "SYSTEM") == 0 || 
+	if (strcmp(From, "SYSOP") == 0 || strcmp(From, "SYSTEM") == 0 || strcmp(From, "SERVIC") == 0 || 
 		strcmp(From, "IMPORT") == 0 || strcmp(From, "SMTP:") == 0 || strcmp(From, "RMS:") == 0)
 		return TRUE;
 
@@ -3450,6 +3459,11 @@ VOID FlagAsKilled(struct MsgInfo * Msg, BOOL SaveDB)
 	if (SaveDB)
 		SaveMessageDatabase();
 	RebuildNNTPList();
+#ifndef NOMQTT
+	if (MQTT)
+		MQTTMessageEvent(Msg);
+#endif
+
 }
 
 void DoDeliveredCommand(CIRCUIT * conn, struct UserInfo * user, char * Cmd, char * Arg1, char * Context)
@@ -4894,6 +4908,10 @@ sendEOM:
 					Msg->datechanged=time(NULL);
 					SaveMessageDatabase();
 					SendMessageReadEvent(user->Call, Msg);
+#ifndef NOMQTT
+					if (MQTT)
+						MQTTMessageEvent(Msg);
+#endif
 				}
 			}
 		}
@@ -5563,15 +5581,20 @@ BOOL CreateMessage(CIRCUIT * conn, char * From, char * ToCall, char * ATBBS, cha
 	else
 	{
 		if (_memicmp(ToCall, "rms:", 4) == 0)
+		{
+			// Could be ampr.org message 
+
+			if (!isAMPRMsg(ToCall))
 			{
 				if (!FindRMS())
 				{
 					nodeprintf(conn, "*** Error - Forwarding via RMS is not configured on this BBS\r");
 					return FALSE;
 				}
-
+			}
 			via=strlop(ToCall, ':');
 			_strupr(ToCall);
+
 		}
 		else if (_memicmp(ToCall, "rms/", 4) == 0)
 		{
@@ -5787,12 +5810,12 @@ VOID ProcessMsgLine(CIRCUIT * conn, struct UserInfo * user, char* Buffer, int ms
 						}
 						else
 						{
-							ToLen = sprintf(ToString, "%sTo: %s\r\n", ToString, Addr);
+							ToLen = sprintf(&ToString[strlen(ToString)], "To: %s\r\n", Addr);
 							continue;
 						}
 					}
 
-					ToLen = sprintf(ToString, "%sTo: %s@%s\r\n", ToString, Addr, Via);
+					ToLen = sprintf(&ToString[strlen(ToString)], "To: %s@%s\r\n", Addr, Via);
 					continue;
 				}
 
@@ -5810,7 +5833,7 @@ VOID ProcessMsgLine(CIRCUIT * conn, struct UserInfo * user, char* Buffer, int ms
 					}
 					else
 					{
-						ToLen = sprintf(ToString, "%sTo: %s\r\n", ToString, Addr);
+						ToLen = sprintf(&ToString[strlen(ToString)], "To: %s\r\n", Addr);
 
 						// Add to B2 Message for RMS
 
@@ -6450,6 +6473,10 @@ nextline:
 	user = LookupCall(Msg->to);
 
 	SendNewMessageEvent(user->Call, Msg);
+#ifndef NOMQTT
+	if (MQTT)
+		MQTTMessageEvent(Msg);
+#endif
 
 	if (EnableUI)
 #ifdef LINBPQ
@@ -6551,8 +6578,6 @@ VOID CreateMessageFile(ConnectionInfo * conn, struct MsgInfo * Msg)
 }
 
 
-
-
 VOID SendUnbuffered(int stream, char * msg, int len)
 {
 #ifndef LINBPQ
@@ -6875,7 +6900,7 @@ int CountMessagestoForward (struct UserInfo * user)
 		if ((Msg->status != 'H') && (Msg->status != 'D') && Msg->type && check_fwd_bit(Msg->fbbs, BBSNumber))
 		{
 			n++;
-			continue;			// So we dont count twice in Flag set and NTS MPS
+			continue;			// So we dont count twice if Flag set and NTS MPS
 		}
 
 		// if an NTS MPS, also check for any matches
@@ -6916,6 +6941,66 @@ int CountMessagestoForward (struct UserInfo * user)
 	return n;
 }
 
+int CountBytestoForward (struct UserInfo * user)
+{
+	// See if any messages are queued for this BBS. If so return total bytes queued
+
+	int m, n=0;
+	struct MsgInfo * Msg;
+	int BBSNumber = user->BBSNumber;
+	int FirstMessage = FirstMessageIndextoForward;
+
+	if ((user->flags & F_NTSMPS))
+		FirstMessage = 1;
+
+	for (m = FirstMessage; m <= NumberofMessages; m++)
+	{
+		Msg=MsgHddrPtr[m];
+
+		if ((Msg->status != 'H') && (Msg->status != 'D') && Msg->type && check_fwd_bit(Msg->fbbs, BBSNumber))
+		{
+			n += Msg->length;
+			continue;			// So we dont count twice if Flag set and NTS MPS
+		}
+
+		// if an NTS MPS, also check for any matches
+
+		if (Msg->type == 'T' && (user->flags & F_NTSMPS))
+		{
+			struct BBSForwardingInfo * ForwardingInfo = user->ForwardingInfo;
+			int depth;
+				
+			if (Msg->status == 'N' && ForwardingInfo)
+			{
+				depth = CheckBBSToForNTS(Msg, ForwardingInfo);
+
+				if (depth > -1 && Msg->Locked == 0)
+				{
+					n += Msg->length;
+					continue;
+				}						
+				depth = CheckBBSAtList(Msg, ForwardingInfo, Msg->via);
+
+				if (depth && Msg->Locked == 0)
+				{
+					n += Msg->length;
+					continue;
+				}						
+
+				depth = CheckBBSATListWildCarded(Msg, ForwardingInfo, Msg->via);
+
+				if (depth > -1 && Msg->Locked == 0)
+				{
+					n += Msg->length;
+					continue;
+				}
+			}
+		}
+	}
+
+	return n;
+}
+
 int ListMessagestoForward(CIRCUIT * conn, struct UserInfo * user)
 {
 	// See if any messages are queued for this BBS
@@ -7219,7 +7304,7 @@ VOID SetupForwardingStruct(struct UserInfo * user)
 			if (ForwardingInfo->ConTimeout == 0)
 				ForwardingInfo->ConTimeout = 120;
 
-			GetStringValue(group, "BBSHA", Temp);
+			GetStringValue(group, "BBSHA", Temp, 100);
 		
 			if (Temp[0])
 				ForwardingInfo->BBSHA = _strdup(Temp);
@@ -8136,6 +8221,15 @@ BOOL ProcessBBSConnectScript(CIRCUIT * conn, char * Buffer, int len)
 			Line = Scripts[n];
 		}
 
+		if (Line == NULL)
+		{
+			// No more lines - Disconnect
+
+			conn->BBSFlags &= ~RunningConnectScript;	// so it doesn't get reentered
+			Disconnect(conn->BPQStream);
+			return FALSE;
+		}
+
 		if (_memicmp(Line, "TIMES", 5) == 0)
 		{
 		NextBand:
@@ -9523,6 +9617,8 @@ VOID SaveConfig(char * ConfigName)
 	FBBFilter * p = Filters;
 	char * ptr = FBBString;
 	
+	GetSemaphore(&ConfigSEM, 60);
+
 	if (configSaved == 0)
 	{
 		// only create backup once per run
@@ -9945,10 +10041,11 @@ VOID SaveConfig(char * ConfigName)
 
 #ifdef LINBPQ
 
-	if(! config_write_file(&cfg,"/dev/shm/linmail.cfg.temp" ))
+	if(!config_write_file(&cfg,"/dev/shm/linmail.cfg.temp" ))
 	{
 		print("Error while writing file.\n");
 		config_destroy(&cfg);
+		FreeSemaphore(&ConfigSEM);
 		return;
 	}
 
@@ -9960,6 +10057,8 @@ VOID SaveConfig(char * ConfigName)
 	{
 		fprintf(stderr, "Error while writing file.\n");
 		config_destroy(&cfg);
+		FreeSemaphore(&ConfigSEM);
+
 		return;
 	}
 
@@ -9988,6 +10087,8 @@ VOID SaveConfig(char * ConfigName)
 	}
 #endif
 */
+
+	FreeSemaphore(&ConfigSEM);
 }
 
 int GetIntValue(config_setting_t * group, char * name)
@@ -10037,15 +10138,20 @@ int GetIntValueWithDefault(config_setting_t * group, char * name, int Default)
 }
 
 
-BOOL GetStringValue(config_setting_t * group, char * name, char * value)
+BOOL GetStringValue(config_setting_t * group, char * name, char * value, int maxlen)
 {
-	const char * str;
+	char * str;
 	config_setting_t *setting;
 
 	setting = config_setting_get_member (group, name);
 	if (setting)
 	{
-		str =  config_setting_get_string (setting);
+		str =  (char *)config_setting_get_string (setting);
+		if (strlen(str) > maxlen)
+		{
+			Debugprintf("Suspect config record %s", str);
+			str[maxlen] = 0;
+		}
 		strcpy(value, str);
 		return TRUE;
 	}
@@ -10058,7 +10164,7 @@ BOOL GetConfig(char * ConfigName)
 	int i;
 	char Size[80];
 	config_setting_t *setting;
-	const char * ptr;
+	char * ptr1;
 	char FBBString[8192]= "";
 	FBBFilter f;
 	config_init(&cfg);
@@ -10122,25 +10228,24 @@ BOOL GetConfig(char * ConfigName)
 
 	Localtime =  GetIntValue(group, "Localtime");
 	AliasText = GetMultiStringValue(group, "FWDAliases");
-	GetStringValue(group, "BBSName", BBSName);
+	GetStringValue(group, "BBSName", BBSName, 100);
-	GetStringValue(group, "MailForText", MailForText);
+	GetStringValue(group, "MailForText", MailForText, 100);
-	GetStringValue(group, "SYSOPCall", SYSOPCall);
+	GetStringValue(group, "SYSOPCall", SYSOPCall, 100);
-	GetStringValue(group, "H-Route", HRoute);
+	GetStringValue(group, "H-Route", HRoute, 100);
-	GetStringValue(group, "AMPRDomain", AMPRDomain);
+	GetStringValue(group, "AMPRDomain", AMPRDomain, 100);
 	SendAMPRDirect = GetIntValue(group, "SendAMPRDirect");
 	ISP_Gateway_Enabled =  GetIntValue(group, "SMTPGatewayEnabled");
 	ISPPOP3Interval =  GetIntValue(group, "POP3PollingInterval");
-	GetStringValue(group, "MyDomain", MyDomain);
+	GetStringValue(group, "MyDomain", MyDomain, 50);
-	GetStringValue(group, "ISPSMTPName", ISPSMTPName);
+	GetStringValue(group, "ISPSMTPName", ISPSMTPName, 50);
-	GetStringValue(group, "ISPPOP3Name", ISPPOP3Name);
+	GetStringValue(group, "ISPPOP3Name", ISPPOP3Name, 50);
 	ISPSMTPPort = GetIntValue(group, "ISPSMTPPort");
 	ISPPOP3Port = GetIntValue(group, "ISPPOP3Port");
-	GetStringValue(group, "ISPAccountName", ISPAccountName);
+	GetStringValue(group, "ISPAccountName", ISPAccountName, 50);
-	GetStringValue(group, "ISPAccountPass", EncryptedISPAccountPass);
+	GetStringValue(group, "ISPAccountPass", EncryptedISPAccountPass, 100);
-	GetStringValue(group, "ISPAccountName", ISPAccountName);
 
 	sprintf(SignoffMsg, "73 de %s\r", BBSName);					// Default
-	GetStringValue(group, "SignoffMsg", SignoffMsg);
+	GetStringValue(group, "SignoffMsg", ISPAccountName, 50);
 
 	DecryptPass(EncryptedISPAccountPass, ISPAccountPass, (int)strlen(EncryptedISPAccountPass));
 
@@ -10152,10 +10257,10 @@ BOOL GetConfig(char * ConfigName)
 
 #ifndef LINBPQ
 
-	GetStringValue(group, "MonitorSize", Size);
+	GetStringValue(group, "MonitorSize", Size, sizeof(Size));
 	sscanf(Size,"%d,%d,%d,%d,%d",&MonitorRect.left,&MonitorRect.right,&MonitorRect.top,&MonitorRect.bottom,&OpenMon);
 	
-	GetStringValue(group, "WindowSize", Size);
+	GetStringValue(group, "WindowSize", Size, sizeof(Size));
 	sscanf(Size,"%d,%d,%d,%d",&MainRect.left,&MainRect.right,&MainRect.top,&MainRect.bottom);
 
 	Bells = GetIntValue(group, "Bells");
@@ -10168,7 +10273,7 @@ BOOL GetConfig(char * ConfigName)
 	WrapInput = GetIntValue(group, "WrapInput");			
 	FlashOnConnect = GetIntValue(group, "FlashOnConnect");			
 	
-	GetStringValue(group, "ConsoleSize", Size);
+	GetStringValue(group, "ConsoleSize", Size, 80);
 	sscanf(Size,"%d,%d,%d,%d,%d", &ConsoleRect.left, &ConsoleRect.right,
 			&ConsoleRect.top, &ConsoleRect.bottom,&OpenConsole);
 
@@ -10180,8 +10285,7 @@ BOOL GetConfig(char * ConfigName)
 
 	if (setting && setting->value.sval[0])
 	{
-		ptr =  config_setting_get_string (setting);
+		WelcomeMsg = _strdup(config_setting_get_string (setting));
-		WelcomeMsg = _strdup(ptr);
 	}
 	else
 		WelcomeMsg = _strdup("Hello $I. Latest Message is $L, Last listed is $Z\r\n");
@@ -10190,10 +10294,7 @@ BOOL GetConfig(char * ConfigName)
 	setting = config_setting_get_member (group, "NewUserWelcomeMsg");
 	
 	if (setting && setting->value.sval[0])
-	{
+		NewWelcomeMsg = _strdup(config_setting_get_string (setting));
-		ptr =  config_setting_get_string (setting);
-		NewWelcomeMsg = _strdup(ptr);
-	}
 	else
 		NewWelcomeMsg = _strdup("Hello $I. Latest Message is $L, Last listed is $Z\r\n");
 
@@ -10201,10 +10302,7 @@ BOOL GetConfig(char * ConfigName)
 	setting = config_setting_get_member (group, "ExpertWelcomeMsg");
 	
 	if (setting && setting->value.sval[0])
-	{
+		ExpertWelcomeMsg = _strdup(config_setting_get_string (setting));
-		ptr =  config_setting_get_string (setting);
-		ExpertWelcomeMsg = _strdup(ptr);
-	}
 	else
 		ExpertWelcomeMsg = _strdup("");
 
@@ -10213,10 +10311,7 @@ BOOL GetConfig(char * ConfigName)
 	setting = config_setting_get_member (group, "Prompt");
 	
 	if (setting && setting->value.sval[0])
-	{
+		Prompt = _strdup(config_setting_get_string (setting));
-		ptr =  config_setting_get_string (setting);
-		Prompt = _strdup(ptr);
-	}
 	else
 	{
 		Prompt = malloc(20);
@@ -10226,10 +10321,7 @@ BOOL GetConfig(char * ConfigName)
 	setting = config_setting_get_member (group, "NewUserPrompt");
 	
 	if (setting && setting->value.sval[0])
-	{
+		NewPrompt = _strdup(config_setting_get_string (setting));
-		ptr =  config_setting_get_string (setting);
-		NewPrompt = _strdup(ptr);
-	}
 	else
 	{
 		NewPrompt = malloc(20);
@@ -10239,10 +10331,7 @@ BOOL GetConfig(char * ConfigName)
 	setting = config_setting_get_member (group, "ExpertPrompt");
 	
 	if (setting && setting->value.sval[0])
-	{
+		ExpertPrompt = _strdup(config_setting_get_string (setting));
-		ptr =  config_setting_get_string (setting);
-		ExpertPrompt = _strdup(ptr);
-	}
 	else
 	{
 		ExpertPrompt = malloc(20);
@@ -10263,9 +10352,9 @@ BOOL GetConfig(char * ConfigName)
 
 		// Get FBB Filters
 
-	GetStringValue(group, "FBBFilters", FBBString);
+	GetStringValue(group, "FBBFilters", FBBString, sizeof(FBBString));
 
-	ptr = FBBString;
+	ptr1 = FBBString;
 
 	// delete old list
 
@@ -10279,31 +10368,31 @@ BOOL GetConfig(char * ConfigName)
 	free(Filters);
 	Filters = NULL;
 
-	while (ptr && ptr[0])
+	while (ptr1 && ptr1[0])
 	{
 		FBBFilter * PFilter;
 
-		f.Action = ptr[0];
+		f.Action = ptr1[0];
-		f.Type = ptr[2];
+		f.Type = ptr1[2];
-		ptr = &ptr[4];
+		ptr1 = &ptr1[4];
 
-		memcpy(f.From, ptr, 10);
+		memcpy(f.From, ptr1, 10);
 		strlop(f.From, '|');
-		ptr = strlop(ptr, '|');
+		ptr1 = strlop(ptr1, '|');
 
-		memcpy(f.TO, ptr, 10);
+		memcpy(f.TO, ptr1, 10);
 		strlop(f.TO, '|');
-		ptr = strlop(ptr, '|');
+		ptr1 = strlop(ptr1, '|');
 
-		memcpy(f.AT, ptr, 10);
+		memcpy(f.AT, ptr1, 10);
 		strlop(f.AT, '|');
-		ptr = strlop(ptr, '|');
+		ptr1 = strlop(ptr1, '|');
 
-		memcpy(f.BID, ptr, 10);
+		memcpy(f.BID, ptr1, 10);
 		strlop(f.BID, '|');
-		ptr = strlop(ptr, '|');
+		ptr1 = strlop(ptr1, '|');
 
-		f.MaxLen = atoi(ptr);
+		f.MaxLen = atoi(ptr1);
 
 		// add to list
 
@@ -10325,7 +10414,7 @@ BOOL GetConfig(char * ConfigName)
 			p->Next = PFilter;
 		}
 
-		ptr = strlop(ptr, '|');
+		ptr1 = strlop(ptr1, '|');
 	}
 
 
@@ -10349,8 +10438,8 @@ BOOL GetConfig(char * ConfigName)
 	SendWP = GetIntValue(group, "SendWP");
 	SendWPType = GetIntValue(group, "SendWPType");
 
-	GetStringValue(group, "SendWPTO", SendWPTO);
+	GetStringValue(group, "SendWPTO", SendWPTO, sizeof(SendWPTO));
-	GetStringValue(group, "SendWPVIA", SendWPVIA);
+	GetStringValue(group, "SendWPVIA", SendWPVIA, sizeof(SendWPVIA));
 
 	SendWPAddrs = GetMultiStringValue(group,  "SendWPAddrs"); 
 
@@ -10380,7 +10469,7 @@ BOOL GetConfig(char * ConfigName)
 		SendWPVIA[0] = 0;
 	}
 
-	GetStringValue(group, "Version", Size);
+	GetStringValue(group, "Version", Size, sizeof(Size));
 	sscanf(Size,"%d,%d,%d,%d", &LastVer[0], &LastVer[1], &LastVer[2], &LastVer[3]);
 
 	for (i =1 ; i <= GetNumberofPorts(); i++)
@@ -10398,7 +10487,7 @@ BOOL GetConfig(char * ConfigName)
 			UIHDDR[i] = GetIntValueWithDefault(group, "SendHDDR", UIEnabled[i]);
 			UINull[i] = GetIntValue(group, "SendNull");
 			Size[0] = 0;
-			GetStringValue(group, "Digis", Size);
+			GetStringValue(group, "Digis", Size, sizeof(Size));
 			if (Size[0])
 				UIDigi[i] = _strdup(Size);
 		}
@@ -10463,7 +10552,7 @@ int Connected(int Stream)
 	char ConnectedMsg[] = "*** CONNECTED    ";
 	char Msg[100];
 	char Title[100];
-	int Freq = 0;
+	int64_t Freq = 0;
 	int Mode = 0;
 	BPQVECSTRUC * SESS;
 	TRANSPORTENTRY * Sess1 = NULL, * Sess2;	
@@ -11697,6 +11786,11 @@ VOID ProcessTextFwdLine(ConnectionInfo * conn, struct UserInfo * user, char * Bu
 
 		SaveMessageDatabase();
 
+#ifndef NOMQTT
+		if (MQTT)
+			MQTTMessageEvent(conn->FwdMsg);
+#endif
+	
 		conn->UserPointer->ForwardingInfo->MsgCount--;
 
 		// See if any more to forward
@@ -15804,6 +15898,11 @@ void SendMessageReadEvent(char * call, struct MsgInfo * Msg)
 	}
 }
 
+void SendMessageForwardedToM0LTE(char * call, struct MsgInfo * Msg)
+{
+}
+
+
 void SendNewMessageEvent(char * call, struct MsgInfo * Msg)
 {
 	if (reportMailEvents)

BPQChat.rc

@@ -162,7 +162,7 @@ BEGIN
                     WS_VSCROLL
     DEFPUSHBUTTON   "Save Welcome Message",SAVEWELCOME,140,296,91,14,
                     BS_CENTER | BS_VCENTER
-    LTEXT           " If the node is not directly  connectable (ie is not in your NODES table)  you can add a connect script. This consists of a series of commands seperared by |, eg NOTCHT:G8BPQ-4|C 3 GM8BPQ-9|CHAT",
+    LTEXT           " If the node is not directly  connectable (ie is not in your NODES table)  you can add a connect script. This consists of a series of commands separared by |, eg NOTCHT:G8BPQ-4|C 3 GM8BPQ-9|CHAT",
                     IDC_STATIC,9,52,355,24
 END
 

BPQChat.vcproj

@@ -1,374 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="BPQChat"
-	ProjectGUID="{2BDD2C8A-2B4A-496C-A2EA-6B49AA0670B1}"
-	RootNamespace="BPQChat"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="C:\Dev\Msdev2005\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine=""
-				Outputs=""
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\CInclude;..\CommonSource;..\BPQChat"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\bpq32.lib wsock32.lib comctl32.lib winmm.lib ..\lib\libconfig.lib DbgHelp.lib"
-				OutputFile="c:\DevProgs\bpq32\BPQChat.exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
-				GenerateMapFile="true"
-				MapFileName="$(IntDir)\BBSListings\BPQChat.map"
-				MapExports="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="C:\Dev\Msdev2005\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="..\CInclude;..\CommonSource;..\BPQChat"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USE_32BIT_TIME_T"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				AssemblerOutput="2"
-				AssemblerListingLocation="$(IntDir)\BBSListings\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="0"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\bpq32.lib wsock32.lib comctl32.lib winmm.lib ..\lib\libconfig.lib DbgHelp.lib"
-				OutputFile="c:\DevProgs\bpq32\BPQChat.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="false"
-				ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
-				GenerateMapFile="true"
-				MapFileName="$(IntDir)\BBSListings\BPQChat.map"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\bpqchat.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerListingLocation="$(IntDir)\"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\ChatDebug.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerListingLocation="$(IntDir)\"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\ChatHTMLConfig.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerListingLocation="$(IntDir)\"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\ChatMonitor.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\"
-						XMLDocumentationFileName="$(IntDir)\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerListingLocation="$(IntDir)\"
-						ObjectFile="$(IntDir)\"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\ChatMultiConsole.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\"
-						XMLDocumentationFileName="$(IntDir)\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerListingLocation="$(IntDir)\"
-						ObjectFile="$(IntDir)\"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\ChatUtilities.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerListingLocation="$(IntDir)\"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\ChatUtils.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\"
-						XMLDocumentationFileName="$(IntDir)\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerListingLocation="$(IntDir)\"
-						ObjectFile="$(IntDir)\"
-						XMLDocumentationFileName="$(IntDir)\"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\HanksRT.c"
-				>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerListingLocation="$(IntDir)\"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\HTMLCommonCode.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\"
-						XMLDocumentationFileName="$(IntDir)\"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerListingLocation="$(IntDir)\"
-						ObjectFile="$(IntDir)\"
-						XMLDocumentationFileName="$(IntDir)\"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\BPQChat.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

BPQChat.vcproj.NOTTSDESKTOP.John.user

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NOTTSDESKTOP"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NOTTSDESKTOP"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>

BPQINP3.c

@@ -28,7 +28,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #pragma data_seg("_BPQDATA")
 
-#include "CHeaders.h"
+#include "cheaders.h"
 
 #include "time.h"
 #include "stdio.h"
@@ -64,7 +64,7 @@ typedef struct _RTTMSG
 
 } RTTMSG;
 
-extern int COUNTNODES();
+int COUNTNODES(struct ROUTE * ROUTE);
 
 VOID __cdecl Debugprintf(const char * format, ...);
 
@@ -932,7 +932,7 @@ int SendRIPTimer()
 
 				// Delay more if Locked - they could be retrying for a long time
 
-				if ((Route->NEIGHBOUR_FLAG & 1))	 // LOCKED ROUTE
+				if ((Route->NEIGHBOUR_FLAG))	 // LOCKED ROUTE
 					INP3Delay = 1200;
 				else
 					INP3Delay = 600;

BPQMail.c

@@ -1138,6 +1138,16 @@
 //	Allow selection of 2 or 4 character country codes for forward processing (39) 
 //	Fix Send P to multiple BBS's when routing on HR (40)
 //	Rewrite PG server code on Lunux (41)
+//	Fix SendPToMultiple not stopping at Implied AT match (45)
+//	Log Our HA when checking for flood bulls (45)
+//	Semaphore calls to SaveConfig
+//	Include SERVIC as valid from call (for Winlink Service messages) (49)
+//	Attempt to detect line draw characters in Webmail (50)
+//	Fix sending ampr.org mail when RMS is not enabled (51)
+//	Send forwarding info to packetnodes.spots.radio database (51)
+//	Fix bug in WP Message processing (56)
+//	Fix treating addresses ending in WW as Internet (57)
+//	Run sending to packetnodes.spots.radio in a separate thread (61)
 
 #include "bpqmail.h"
 #include "winstdint.h"
@@ -1156,6 +1166,8 @@ FARPROCZ pGetLOC;
 FARPROCX pRefreshWebMailIndex;
 FARPROCX pRunEventProgram;
 FARPROCX pGetPortFrequency;
+FARPROCX pSendWebRequest;
+FARPROCX pGetLatLon;
 
 BOOL WINE = FALSE;
 
@@ -1380,6 +1392,7 @@ char * CheckToAddress(CIRCUIT * conn, char * Addr);
 BOOL CheckifPacket(char * Via);
 int GetHTMLForms();
 VOID GetPGConfig();
+void SendBBSDataToPktMap();
 
 struct _EXCEPTION_POINTERS exinfox;
 	
@@ -1390,7 +1403,7 @@ DWORD Stack[16];
 
 BOOL Restarting = FALSE;
 
-Dump_Process_State(struct _EXCEPTION_POINTERS * exinfo, char * Msg)
+void Dump_Process_State(struct _EXCEPTION_POINTERS * exinfo, char * Msg)
 {
 	unsigned int SPPtr;
 	unsigned int SPVal;
@@ -1526,7 +1539,11 @@ VOID WriteMiniDump()
 }
 
 
-void GetSemaphore(struct SEM * Semaphore, int ID)
+
+#define GetSemaphore(Semaphore,ID) _GetSemaphore(Semaphore, ID, __FILE__, __LINE__)
+
+
+void _GetSemaphore(struct SEM * Semaphore, int ID, char * File, int Line)
 {
 	//
 	//	Wait for it to be free
@@ -1931,6 +1948,8 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
 		pRefreshWebMailIndex = GetProcAddress(ExtDriver,"_RefreshWebMailIndex@0");
 		pRunEventProgram = GetProcAddress(ExtDriver,"_RunEventProgram@8");
 		pGetPortFrequency = GetProcAddress(ExtDriver,"_GetPortFrequency@8");
+		pSendWebRequest = GetProcAddress(ExtDriver,"_SendWebRequest@16");
+		pGetLatLon = GetProcAddress(ExtDriver,"_GetLatLon@8");
 		
 
 		if (pGetLOC)
@@ -2178,6 +2197,13 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 					Debugprintf("|Enter HouseKeeping");
 					DoHouseKeeping(FALSE);
 				}
+				
+				if (APIClock < NOW)
+				{
+					SendBBSDataToPktMap();
+					APIClock = NOW + 7200;			// Every 2 hours
+				}
+
 				tm = gmtime(&NOW);	
 
 				if (tm->tm_wday == 0)		// Sunday
@@ -2811,6 +2837,12 @@ gotAddr:
 
 			EndDialog(hDlg, LOWORD(wParam));
 
+#ifndef NOMQTT
+			if (MQTT)
+				MQTTMessageEvent(Msg);
+#endif
+
+
 			return TRUE;
 		}
 
@@ -3052,7 +3084,6 @@ static PSOCKADDR_IN psin;
 SOCKET sock;
 
 
-
 BOOL Initialise()
 {
 	int i, len;
@@ -3067,6 +3098,8 @@ BOOL Initialise()
 
 	GetTimeZoneInformation(&TimeZoneInformation);
 
+	Debugprintf("%d", sizeof(struct MsgInfo));
+
 	_tzset();
 	_MYTIMEZONE = timezone;
 	_MYTIMEZONE = TimeZoneInformation.Bias * 60;
@@ -3378,6 +3411,8 @@ BOOL Initialise()
 	CreatePipeThread();
 	GetPGConfig();
 
+	APIClock = 0;
+
 	return TRUE;
 }
 

BPQMail.rc

@@ -1045,7 +1045,7 @@ BEGIN
     CONTROL         "Delete Log and Message Files to Recycle Bin",
                     IDC_DELETETORECYCLE,"Button",BS_AUTOCHECKBOX | 
                     BS_LEFTTEXT | BS_MULTILINE | WS_TABSTOP,5,142,115,20
-    CONTROL         "Supress Mailing of Housekeeping Results",
+    CONTROL         "Suppress Mailing of Housekeeping Results",
                     IDC_MAINTNOMAIL,"Button",BS_AUTOCHECKBOX | BS_LEFTTEXT | 
                     BS_MULTILINE | WS_TABSTOP,5,182,115,20
     CONTROL         "Generate Traffic Report",IDC_MAINTTRAFFIC,"Button",

BPQMail.sln

@@ -1,20 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C++ Express 2005
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BPQMail", "BPQMail.vcproj", "{3766AA10-C777-4ED8-A83D-F1452DE9B665}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Win32 = Debug|Win32
-		Release|Win32 = Release|Win32
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{3766AA10-C777-4ED8-A83D-F1452DE9B665}.Debug|Win32.ActiveCfg = Debug|Win32
-		{3766AA10-C777-4ED8-A83D-F1452DE9B665}.Debug|Win32.Build.0 = Debug|Win32
-		{3766AA10-C777-4ED8-A83D-F1452DE9B665}.Release|Win32.ActiveCfg = Release|Win32
-		{3766AA10-C777-4ED8-A83D-F1452DE9B665}.Release|Win32.Build.0 = Release|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

BPQMail.vcproj

@@ -1,493 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="BPQMail"
-	ProjectGUID="{3766AA10-C777-4ED8-A83D-F1452DE9B665}"
-	RootNamespace="TelnetServer"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="C:\Dev\Msdev2005\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			UseOfMFC="0"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine=""
-				Outputs=""
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\CKernel;..\CInclude;..\CommonSource;..\BPQMail"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				EnableFunctionLevelLinking="true"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\Include"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\bpq32.lib wsock32.lib comctl32.lib winmm.lib ..\lib\libconfig.lib DbgHelp.lib"
-				OutputFile="c:\DevProgs\bpq32\BPQMail.exe"
-				LinkIncremental="2"
-				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames="LIBCMT"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="$(IntDir)$(TargetName).pdb"
-				GenerateMapFile="true"
-				MapFileName="$(IntDir)\BBSListings\bpqmail.map"
-				MapExports="true"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="C:\Dev\Msdev2005\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-				CommandLine=""
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="..\CKernel;..\CInclude;..\CommonSource;..\BPQMail"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USE_32BIT_TIME_T"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				AdditionalIncludeDirectories="..\Include"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\bpq32.lib wsock32.lib comctl32.lib winmm.lib ..\lib\libconfig.lib DbgHelp.lib"
-				OutputFile="c:\DevProgs\bpq32\BPQMail.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="c:\DevProgs\bpq32\BPQMail.pdb"
-				GenerateMapFile="true"
-				MapFileName="c:\DevProgs\bpq32\BPQMail.map"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\CommonSource\Alloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\BBSHTMLConfig.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\BBSUtilities.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerOutput="2"
-						AssemblerListingLocation="$(IntDir)\"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\BPQMail.c"
-				>
-			</File>
-			<File
-				RelativePath=".\BPQMailConfig.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\CMSAuth.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\FBBRoutines.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\CommonSource\Housekeeping.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\HTMLCommonCode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\LzFind.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\lzhuf32.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerOutput="2"
-						AssemblerListingLocation="$(IntDir)\"
-						ObjectFile="$(IntDir)\"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\CommonSource\LzmaDec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\LzmaEnc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\LzmaLib.c"
-				>
-			</File>
-			<File
-				RelativePath=".\mailapi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\MailCommands.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\CommonSource\MailDataDefs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\MailRouting.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\CommonSource\MailTCP.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\CommonSource\MBLRoutines.c"
-				>
-			</File>
-			<File
-				RelativePath=".\Monitor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\Multicast.c"
-				>
-			</File>
-			<File
-				RelativePath=".\MultiConsole.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\NNTPRoutines.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\UIRoutines.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\CommonSource\utf8Routines.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\WebMail.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\WPRoutines.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						ObjectFile="$(IntDir)\$(InputName)1.obj"
-						XMLDocumentationFileName="$(IntDir)\$(InputName)1.xdc"
-					/>
-				</FileConfiguration>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\bpqmailrc.h"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\Versions.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath=".\BPQMail.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

BPQMail.vcproj.NOTTSDESKTOP.John.user

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NOTTSDESKTOP"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NOTTSDESKTOP"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>

BPQMail.vcproj.SKIGACER.johnw.user

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="SKIGACER"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="SKIGACER"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>

BPQMail.vcxproj

@@ -1,207 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{3766AA10-C777-4ED8-A83D-F1452DE9B665}</ProjectGuid>
-    <RootNamespace>TelnetServer</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>C:\Dev\Msdev2005\$(SolutionName)\$(ProjectName)\$(Configuration)\</OutDir>
-    <IntDir>C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(ProjectName)\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>C:\Dev\Msdev2005\$(SolutionName)\$(ProjectName)\$(Configuration)\</OutDir>
-    <IntDir>C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(ProjectName)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <CustomBuildStep>
-      <Command />
-    </CustomBuildStep>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\CKernel;..\CInclude;..\CommonSource;..\BPQMail;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\bpq32.lib;wsock32.lib;comctl32.lib;winmm.lib;..\lib\libconfig.lib;DbgHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>c:\DevProgs\bpq32\BPQMail.exe</OutputFile>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>$(IntDir)$(TargetName).pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>$(IntDir)BBSListings\bpqmail.map</MapFileName>
-      <MapExports>true</MapExports>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <PreBuildEvent>
-      <Command />
-    </PreBuildEvent>
-    <CustomBuildStep>
-      <Command />
-    </CustomBuildStep>
-    <ClCompile>
-      <Optimization>MaxSpeed</Optimization>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\CKernel;..\CInclude;..\CommonSource;..\BPQMail;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-      <CompileAs>CompileAsC</CompileAs>
-    </ClCompile>
-    <ResourceCompile>
-      <AdditionalIncludeDirectories>..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ResourceCompile>
-    <Link>
-      <AdditionalDependencies>..\lib\bpq32.lib;wsock32.lib;comctl32.lib;winmm.lib;..\lib\libconfig.lib;DbgHelp.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>c:\DevProgs\bpq32\BPQMail.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>c:\DevProgs\bpq32\BPQMail.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>c:\DevProgs\bpq32\BPQMail.map</MapFileName>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration />
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="Alloc.c" />
-    <ClCompile Include="BBSHTMLConfig.c" />
-    <ClCompile Include="BBSUtilities.c">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">All</AssemblerOutput>
-      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-    </ClCompile>
-    <ClCompile Include="BPQMail.c" />
-    <ClCompile Include="BPQMailConfig.c" />
-    <ClCompile Include="CMSAuth.c" />
-    <ClCompile Include="FBBRoutines.c">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-    </ClCompile>
-    <ClCompile Include="Housekeeping.c" />
-    <ClCompile Include="HTMLCommonCode.c" />
-    <ClCompile Include="LzFind.c" />
-    <ClCompile Include="lzhuf32.c">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">All</AssemblerOutput>
-      <AssemblerListingLocation Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)</AssemblerListingLocation>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-    </ClCompile>
-    <ClCompile Include="LzmaDec.c" />
-    <ClCompile Include="LzmaEnc.c" />
-    <ClCompile Include="LzmaLib.c" />
-    <ClCompile Include="MailCommands.c">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-    </ClCompile>
-    <ClCompile Include="MailDataDefs.c" />
-    <ClCompile Include="MailRouting.c">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-    </ClCompile>
-    <ClCompile Include="MailTCP.c">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-    </ClCompile>
-    <ClCompile Include="MBLRoutines.c" />
-    <ClCompile Include="Monitor.c" />
-    <ClCompile Include="Multicast.c" />
-    <ClCompile Include="MultiConsole.c" />
-    <ClCompile Include="NNTPRoutines.c" />
-    <ClCompile Include="UIRoutines.c">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-    </ClCompile>
-    <ClCompile Include="utf8Routines.c" />
-    <ClCompile Include="WebMail.c" />
-    <ClCompile Include="WPRoutines.c">
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.obj</ObjectFileName>
-      <XMLDocumentationFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)%(Filename)1.xdc</XMLDocumentationFileName>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="bpqmailrc.h" />
-    <ClInclude Include="Versions.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="BPQMail.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

BPQMail.vcxproj.filters

@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="Alloc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BBSHTMLConfig.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BBSUtilities.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BPQMail.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BPQMailConfig.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CMSAuth.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FBBRoutines.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Housekeeping.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="HTMLCommonCode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LzFind.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="lzhuf32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LzmaDec.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LzmaEnc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LzmaLib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MailCommands.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MailDataDefs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MailRouting.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MailTCP.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MBLRoutines.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Monitor.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Multicast.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MultiConsole.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="NNTPRoutines.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UIRoutines.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="utf8Routines.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WebMail.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WPRoutines.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="bpqmailrc.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Versions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="BPQMail.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>

BPQNRR.c

@@ -36,7 +36,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 //#include "vmm.h"
 
 
-#include "CHeaders.h"
+#include "cheaders.h"
 
 
 extern int SENDNETFRAME();

BPQRemotePTT.vcproj

@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="BPQRemotePTT"
-	ProjectGUID="{E9A342AF-65CF-4E38-9079-216264179675}"
-	RootNamespace="BPQRemotePTT"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory=".\xxx"
-			IntermediateDirectory="c:\dev\msdev2005\intermed\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/BPQRemotePTT.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/BPQRemotePTT.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="WS2_32.Lib Psapi.lib ..\lib\libconfigd.lib"
-				OutputFile="c:\DevProgs\bpq32\BPQRemotePTT.exe"
-				LinkIncremental="2"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/bpq32.pdb"
-				GenerateMapFile="true"
-				MapFileName="c:\devprogs\bpq32\bpqpp.map"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/BPQRemotePTT.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory=".\xxx"
-			IntermediateDirectory="c:\msdev2005\intermed\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/BPQRemotePTT.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="..\cinclude"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="C:\msdev2005\Intermed\Release/BPQRemotePTT.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="WS2_32.Lib Psapi.lib ..\lib\libconfig.lib"
-				OutputFile="c:\DevProgs\bpq32\BPQRemotePTT.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\Release/BPQRemotePTT.pdb"
-				GenerateMapFile="true"
-				MapFileName="c:\devprogs\bpq32\BPQRemotePTT.map"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/BPQRemotePTT.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-			>
-			<File
-				RelativePath=".\BPQRemotePTT.c"
-				>
-			</File>
-			<File
-				RelativePath=".\BPQRemotePTT.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

BPQTermMDI.c

@@ -214,7 +214,7 @@ LRESULT APIENTRY InputProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ;
 LRESULT APIENTRY MonProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) ;
 
 
-extern CMDX COMMANDS[];
+extern struct CMDX COMMANDS[];
 extern int APPL1;
 
 static HMENU trayMenu;

BPQWinAPP.vcproj

@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="BPQWinAPP"
-	ProjectGUID="{005A91EA-3A00-4FB4-ADD9-EB78DBFA2B81}"
-	RootNamespace="BPQWinAPP"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="C:\Dev\Msdev200\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="_DEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Debug/BPQWinAPP.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="C:\Users\johnw\OneDrive\Dev\Source\bpq32\Commonsource;C:\Users\johnw\OneDrive\Dev\Source\bpq32\CInclude"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS"
-				MinimalRebuild="true"
-				RuntimeLibrary="1"
-				PrecompiledHeaderFile=".\Debug/BPQWinAPP.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="_DEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\bpq32.lib DbgHelp.lib"
-				OutputFile="c:\DevProgs\bpq32\bpq32.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile=".\Debug/bpq32.pdb"
-				GenerateMapFile="true"
-				SubSystem="2"
-				StackReserveSize="0"
-				StackCommitSize="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Debug/BPQWinAPP.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC60.vsprops"
-			UseOfMFC="0"
-			ATLMinimizesCRunTimeLibraryUsage="false"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-				PreprocessorDefinitions="NDEBUG"
-				MkTypLibCompatible="true"
-				SuppressStartupBanner="true"
-				TargetEnvironment="1"
-				TypeLibraryName=".\Release/BPQWinAPP.tlb"
-				HeaderFileName=""
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="2"
-				InlineFunctionExpansion="1"
-				AdditionalIncludeDirectories="C:\Users\johnw\OneDrive\Dev\Source\bpq32\Commonsource"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS"
-				StringPooling="true"
-				RuntimeLibrary="0"
-				EnableFunctionLevelLinking="true"
-				PrecompiledHeaderFile="C:\msdev2005\Intermed\Release/BPQWinAPP.pch"
-				AssemblerListingLocation="$(IntDir)\"
-				ObjectFile="$(IntDir)\"
-				ProgramDataBaseFileName="$(IntDir)\"
-				WarningLevel="3"
-				SuppressStartupBanner="true"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-				PreprocessorDefinitions="NDEBUG"
-				Culture="2057"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="..\lib\bpq32.lib DbgHelp.lib"
-				OutputFile="c:\DevProgs\bpq32\bpq32.exe"
-				LinkIncremental="1"
-				SuppressStartupBanner="true"
-				ProgramDatabaseFile=".\Release/bpq32.pdb"
-				GenerateMapFile="true"
-				MapFileName="c:\DevProgs\bpq32\bpq32app.map"
-				SubSystem="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				SuppressStartupBanner="true"
-				OutputFile=".\Release/BPQWinAPP.bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
-			>
-			<File
-				RelativePath=".\BPQWinAPP.c"
-				>
-			</File>
-			<File
-				RelativePath=".\BPQWinAPP.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

BPQWinAPP.vcproj.LAPTOP-Q6S4RP5Q.johnw.user

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="LAPTOP-Q6S4RP5Q"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="LAPTOP-Q6S4RP5Q"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>

BPQWinAPP.vcproj.NOTTSDESKTOP.John.user

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NOTTSDESKTOP"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NOTTSDESKTOP"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>

BPQtoAGW.c

@@ -56,7 +56,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #define _CRT_SECURE_NO_DEPRECATE
 
-#include "CHeaders.h"
+#include "cheaders.h"
 #ifndef WIN32
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -87,7 +87,7 @@ void CreateMHWindow();
 int Update_MH_List(struct in_addr ipad, char * call, char proto);
 
 static BOOL ReadConfigFile(int Port);
-int ConnecttoAGW();
+int ConnecttoAGW(int port);
 int ProcessReceivedData(int bpqport);
 static int ProcessLine(char * buf, int Port, BOOL CheckPort);
 

Bpq32.c

@@ -3,7 +3,7 @@ Copyright 2001-2022 John Wiseman G8BPQ
 
 This file is part of LinBPQ/BPQ32.
 
-LinBPQ/BPQ32 is free software: you can redistribute it and/or modify
+LinBPQ/BPQ32 is free software: you can redistribute it and/or modifyextern int HTTP
 it under the terms of the GNU General Public License as published by
 the Free Software Foundation, either version 3 of the License, or
 (at your option) any later version.
@@ -1086,7 +1086,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 //	Add ? and * wildcards to NODES command (74)
 //  Add Port RADIO config parameter (74)
 
-//  Version 6.0.24.1 August 2024
+//  Version 6.0.24.1 August 2023
 
 //	Apply NODES command wildcard to alias as well a call (2)
 //	Add STOPPORT/STARTPORT to VARA Driver (2)
@@ -1212,7 +1212,6 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 //	Add NodeAPI call sendLinks and remove get from other calls (32)
 //	Improve validation of Web Beacon Config (33)
 //	Support SNMP via host ip stack as well as IPGateway (34)
-
 //	Switch APRS Map to OSM tile servers (36)
 //	Fix potential buffer overflow in Telnet login (36)
 //	Allow longer serial device names (37)
@@ -1222,6 +1221,40 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 //	Change default of SECURETELNET to 1 (41)
 //	Add optional ATTACH time limit for ARDOP (42)
 //	Fix buffer overflow risk in HTTP Terminal(42)
+//	Fix KISSHF Interlock (43)
+//	Support other than channel A on HFKISS (43)
+//	Support additional port info reporting for M0LTE Map (44)
+//	Allow interlocking of KISS and Session mode ports (eg ARDOP and VARA) (45)
+//	Add ARDOP UI Packets to MH (45)
+//	Add support for Qtsm Mgmt Interface (45)
+//	NodeAPI improvements (46)
+//	Add MQTT Interface (46)
+//	Fix buffer leak in ARDOP code(46)
+//	Fix possible crash if MQTT not in use (47)
+//	Add optional ATTACH time limit for VARA (48)
+//	API format fixes (48)
+//	AGWAPI Add protection against accidental connects from a non-agw application (50)
+//	Save MH and NODES every hour (51)
+//	Fix handling long unix device names (now max 250 bytes) (52)
+//	Fix error reporting in api update (53)
+//	Coding changes to remove some compiler warnings (53, 54)
+//	Add MQTT reporting of Mail Events (54)
+//	Fix beaconong on KISSHF ports (55)
+//	Fix MailAPI msgs endpoint
+//	Attempt to fix NC going to wrong application. (57)
+//	Improve ARDOP end of session code (58)
+//	Run M0LTE Map reporting in a separate thread (59/60)
+//	Add RHP support for WhatsPac (59)
+//  Add timestamps to LIS monitor (60)
+//	Fix problem with L4 frames being delivered out of sequence (60)
+//	Add Compression of Netrom connections (62)
+//	Improve handling of Locked Routes (62)
+//	Add L4 RESET (Paula G8PZT's extension to NETROM)
+//	Fix problem using SENDRAW from BPQMail (63)
+//	Fix compatibility with latest ardopcf (64)
+//	Fix bug in RHP socket timeout code (65)
+//	Fix L4 RTT (66)
+//	Fix RigConrol with Chanxx but no other settings (66)
 
 
 
@@ -1364,6 +1397,9 @@ extern struct _LINKTABLE * LINKS;
 extern int	LINK_TABLE_LEN; 
 extern int	MAXLINKS;
 
+extern double LatFromLOC;
+extern double LonFromLOC;
+
 
 extern int BPQHOSTAPI();
 extern int INITIALISEPORTS();
@@ -1482,6 +1518,7 @@ VOID APRSClose();
 VOID CloseTNCEmulator();
 
 VOID Poll_AGW();
+void RHPPoll();
 BOOL AGWAPIInit();
 int AGWAPITerminate();
 
@@ -1500,7 +1537,9 @@ UINT Sem_edx = 0;
 UINT Sem_esi = 0;
 UINT Sem_edi = 0;
 
-void GetSemaphore(struct SEM * Semaphore, int ID);
+
+#define GetSemaphore(Semaphore,ID) _GetSemaphore(Semaphore, ID, __FILE__, __LINE__)
+void _GetSemaphore(struct SEM * Semaphore, int ID, char * File, int Line);
 void FreeSemaphore(struct SEM * Semaphore);
 
 DllExport void * BPQHOSTAPIPTR = &BPQHOSTAPI;
@@ -1848,8 +1887,8 @@ VOID MonitorThread(int x)
 		{
 			// It is stuck - try to release
 
-				Debugprintf ("Semaphore locked - Process ID = %d, Held By %d",
+				Debugprintf ("Semaphore locked - Process ID = %d, Held By %d from %s Line %d",
-					Semaphore.SemProcessID, SemHeldByAPI);
+					Semaphore.SemProcessID, SemHeldByAPI, Semaphore.File, Semaphore.Line);
 			
 			// Write a minidump
 
@@ -2270,6 +2309,7 @@ VOID TimerProcX()
 			Poll_AGW();
 
 		DRATSPoll();
+		RHPPoll();
 
 		CheckGuardZone();
 
@@ -3058,7 +3098,7 @@ SkipInit:
 
 		if (AttachedProcesses < 2)
 		{
-			if (AUTOSAVE == 1)
+			if (AUTOSAVE)
 				SaveNodes();
 			if (AUTOSAVEMH)
 				SaveMH();
@@ -6080,13 +6120,14 @@ DllExport BOOL APIENTRY SaveReg(char * KeyIn, HANDLE hFile)
 						{
 							if (len > 76)
 							{
-								len = sprintf(RegLine, "%s\\\r\n", RegLine);
+								len += sprintf(&RegLine[len], "\\\r\n", RegLine);
+								strcat(RegLine, "\\\r\n");
 								WriteFile(hFile, RegLine, len, &written, NULL);
 								strcpy(RegLine, "  ");
 								len = 2;
 							}
 
-							len = sprintf(RegLine, "%s%02x,", RegLine, Value[k]);
+							len += sprintf(&RegLine[len], "%02x,", Value[k]);
 						}
 						RegLine[--len] = 0x0d;
 						RegLine[++len] = 0x0a;	
@@ -6112,19 +6153,20 @@ DllExport BOOL APIENTRY SaveReg(char * KeyIn, HANDLE hFile)
 						{
 							if (len > 76)
 							{
-								len = sprintf(RegLine, "%s\\\r\n", RegLine);
+								len += sprintf(RegLine[len], "\\\r\n");
 								WriteFile(hFile, RegLine, len, &written, NULL);
 								strcpy(RegLine, "  ");
 								len = 2;
 							}
-							len = sprintf(RegLine, "%s%02x,", RegLine, Value[k]);
+
+							len += sprintf(&RegLine[len], "%02x,", Value[k]);
 							if (len > 76)
 							{
-								len = sprintf(RegLine, "%s\\\r\n", RegLine);
+								len += sprintf(RegLine[len], "\\\r\n");
 								WriteFile(hFile, RegLine, len, &written, NULL);
 								strcpy(RegLine, "  ");
 							}
-							len = sprintf(RegLine, "%s00,", RegLine);
+							len += sprintf(&RegLine[len], "00,");
 						}
 
 						RegLine[--len] = 0x0d;
@@ -6616,6 +6658,14 @@ DllExport char *  APIENTRY GetLOC()
 	return LOC;
 }
 
+DllExport void  APIENTRY GetLatLon(double * lat, double * lon)
+{
+	*lat = LatFromLOC;
+	*lon = LonFromLOC;
+	return;
+}
+
+
 // UZ7HO Dll PTT interface
 
 // 1 ext_PTT_info

CBPQ32.vcproj

@@ -1,625 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="CBPQ32"
-	ProjectGUID="{8EFA1E59-8654-4A23-8102-AA77A074D57C}"
-	RootNamespace="CBPQ32"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-		<DefaultToolFile
-			FileName="masm.rules"
-		/>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="d:\devprogs\bpq32"
-			IntermediateDirectory="C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-				PreserveIdentifierCase="3"
-				IncludePaths="..\CInclude"
-				EnableMASM51Compatibility="true"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\CInclude;..\CommonSource;..\CKernel"
-				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;BPQ32_EXPORTS;MDIKERNEL;_USE_32BIT_TIME_T;BPQ32"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				AssemblerOutput="2"
-				AssemblerListingLocation="c:\devprogs\bpq32\listings\debug\"
-				BrowseInformation="1"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" /section:_BPQDATA,srw"
-				AdditionalDependencies="WS2_32.Lib winmm.lib DbgHelp.lib comctl32.lib Iphlpapi.lib setupapi.lib ..\lib\libconfigd.lib miniupnpc.lib zlibstat.lib"
-				OutputFile="c:\DevProgs\BPQ32\bpq32.dll"
-				LinkIncremental="2"
-				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames="LIBCMTD.lib"
-				ModuleDefinitionFile="..\CommonSource\bpq32.def"
-				GenerateDebugInformation="true"
-				GenerateMapFile="true"
-				MapFileName="c:\DevProgs\BPQ32\bpqdev.map"
-				MapExports="true"
-				SubSystem="2"
-				HeapCommitSize="8000000"
-				StackCommitSize="4000000"
-				EnableCOMDATFolding="1"
-				EntryPointSymbol=""
-				BaseAddress="0x42000000"
-				ImportLibrary="..\lib\bpq32.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(ConfigurationName)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="&quot;C:\Program Files\7-Zip\7z.exe&quot; a  C:\DevProgs\BPQ32\bpq32.zip C:\DevProgs\BPQ32\bpq32.dll &amp;&amp; myxcopy /y  c:\DevProgs\BPQ32\bpq32.dll c:\windows\SysWOW64\bpq32.dll &amp;&amp; del C:\DevProgs\BPQ32\bpq32.dll"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="C:\Dev\Msdev2005\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="0"
-			WholeProgramOptimization="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="MASM"
-				PreserveIdentifierCase="3"
-				AssembledCodeListingFile="$(IntDir)\$(InputName)"
-				IncludePaths="..\CInclude"
-				ListAllAvailableInformation="true"
-				EnableAssemblyGeneratedCodeListing="true"
-				EnableFalseConditionalsInListing="true"
-				EnableMASM51Compatibility="true"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalOptions="/D &quot;MDIKERNEL&quot;"
-				Optimization="0"
-				WholeProgramOptimization="false"
-				AdditionalIncludeDirectories="..\CInclude;..\CommonSource;..\CKernel"
-				PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;BPQ32_EXPORTS;MDIKERNEL;_USE_32BIT_TIME_T"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				AssemblerOutput="2"
-				AssemblerListingLocation="c:\devprogs\bpq32\listings\"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalOptions=" /section:_BPQDATA,srw"
-				AdditionalDependencies="WS2_32.Lib winmm.lib comctl32.lib setupapi.lib ..\lib\libconfig.lib miniupnpc.lib zlibstat.lib DbgHelp.lib"
-				OutputFile="C:\DevProgs\BPQ32\bpq32.dll"
-				LinkIncremental="1"
-				IgnoreDefaultLibraryNames=""
-				ModuleDefinitionFile="..\CommonSource\bpq32.def"
-				GenerateDebugInformation="true"
-				ProgramDatabaseFile="c:\DevProgs\BPQ32\bpq32.pdb"
-				GenerateMapFile="true"
-				MapFileName="c:\DevProgs\BPQ32\bpqpdn.map"
-				MapExports="true"
-				SubSystem="2"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				LinkTimeCodeGeneration="0"
-				BaseAddress="0x42000000"
-				ImportLibrary="C:\Dev\Msdev2005\Projects\BPQ32\lib\bpq32.lib"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-				OutputFile="C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(ConfigurationName)\$(ProjectName).bsc"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-				CommandLine="&quot;C:\Program Files\7-Zip\7z.exe&quot; a  C:\DevProgs\BPQ32\bpq32.zip C:\DevProgs\BPQ32\bpq32.dll &amp;&amp; myxcopy /y  c:\DevProgs\BPQ32\bpq32.dll c:\windows\SysWOW64\bpq32.dll &amp;&amp; del C:\DevProgs\BPQ32\bpq32.dll"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\6pack.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\adif.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\AEAPactor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\AGWAPI.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\AGWMoncode.c"
-				>
-			</File>
-			<File
-				RelativePath=".\AISCommon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\APRSCode.c"
-				>
-			</File>
-			<File
-				RelativePath=".\APRSIconData.c"
-				>
-			</File>
-			<File
-				RelativePath=".\APRSStdPages.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\ARDOP.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\asmDOSAPI.asm"
-				>
-			</File>
-			<File
-				RelativePath=".\base64.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\Bpq32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\bpqaxip.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\bpqether.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\bpqhdlc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\BPQINP3.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\BPQNRR.c"
-				>
-			</File>
-			<File
-				RelativePath=".\BPQTermMDI.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\BPQtoAGW.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\bpqvkiss.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\cMain.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\Cmd.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerOutput="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\CommonSource\CMSAuth.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerOutput="0"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\CommonSource\CommonCode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\compatbits.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\config.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\datadefs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\DOSAPI.c"
-				>
-			</File>
-			<File
-				RelativePath=".\DRATS.c"
-				>
-			</File>
-			<File
-				RelativePath=".\Events.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\FLDigi.c"
-				>
-			</File>
-			<File
-				RelativePath=".\FreeDATA.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\HALDriver.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\HFCommon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\hid.c"
-				>
-			</File>
-			<File
-				RelativePath=".\HSMODEM.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\HTTPcode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\IPCode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\KAMPactor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\kiss.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\KISSHF.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\L2Code.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\L3Code.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\L4Code.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\md5.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\Moncode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\MULTIPSK.c"
-				>
-			</File>
-			<File
-				RelativePath=".\nodeapi.c"
-				>
-			</File>
-			<File
-				RelativePath=".\png.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngerror.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngget.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngmem.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngread.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngrio.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngrtran.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngrutil.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngset.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngtrans.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngvcrd.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngwio.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngwrite.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngwtran.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngwutil.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\PortMapper.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\RigControl.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\SCSPactor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\SCSTrackeMulti.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\SCSTracker.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\SerialPort.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\TelnetV6.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\TNCCode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\TNCEmulators.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\UIARQ.c"
-				>
-			</File>
-			<File
-				RelativePath=".\upnp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\utf8Routines.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\UZ7HODrv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\V4.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\VARA.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\WINMOR.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\WinRPR.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath="..\CommonSource\asmstrucs.h"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\bpq32.def"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\CHeaders.h"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\compatbits.h"
-				>
-			</File>
-			<File
-				RelativePath="..\CKernel\kernelresource.h"
-				>
-			</File>
-			<File
-				RelativePath="..\CInclude\Strucs.inc"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\Versions.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-			<File
-				RelativePath="..\CommonSource\KernelScript1.rc"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

CBPQ32.vcproj.LAPTOP-Q6S4RP5Q.johnw.user

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command="C:\Devprogs\BPQ32\bpq32.exe"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="LAPTOP-Q6S4RP5Q"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command=""
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="LAPTOP-Q6S4RP5Q"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>

CBPQ32.vcproj.NOTTSDESKTOP.John.user

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command="C:\Devprogs\BPQ32\bpq32.exe"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NOTTSDESKTOP"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command="C:\Devprogs\BPQ32\bpq32.exe"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NOTTSDESKTOP"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>

CBPQ32.vcproj.SKIGACER.johnw.user

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command="C:\DevProgs\BPQ32\bpq32.exe"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="SKIGACER"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command=""
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="SKIGACER"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>

CBPQ32.vcxproj

@@ -1,232 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{8EFA1E59-8654-4A23-8102-AA77A074D57C}</ProjectGuid>
-    <RootNamespace>CBPQ32</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>false</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.props" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>15.0.28127.55</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir>C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
-    <IntDir>C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <MASM>
-      <PreserveIdentifierCase>3</PreserveIdentifierCase>
-      <IncludePaths>..\CInclude</IncludePaths>
-      <EnableMASM51Compatibility>true</EnableMASM51Compatibility>
-    </MASM>
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\CInclude;..\CommonSource;..\CKernel;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;BPQ32_EXPORTS;MDIKERNEL;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader />
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>c:\devprogs\bpq32\listings\debug\</AssemblerListingLocation>
-      <BrowseInformation>true</BrowseInformation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> /section:_BPQDATA,srw %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>WS2_32.Lib;winmm.lib;DbgHelp.lib;comctl32.lib;Iphlpapi.lib;setupapi.lib;..\lib\libconfig.lib;miniupnpc.lib;zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>c:\DevProgs\BPQ32\bpq32.dll</OutputFile>
-      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
-      <IgnoreSpecificDefaultLibraries>LIBCMTD.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <ModuleDefinitionFile>..\CommonSource\bpq32.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>c:\DevProgs\BPQ32\bpqdev.map</MapFileName>
-      <MapExports>true</MapExports>
-      <SubSystem>Windows</SubSystem>
-      <HeapCommitSize>8000000</HeapCommitSize>
-      <StackCommitSize>4000000</StackCommitSize>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-      <EntryPointSymbol />
-      <BaseAddress>0x42000000</BaseAddress>
-      <ImportLibrary>..\lib\bpq32.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
-    </Link>
-    <Bscmake>
-      <OutputFile>C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(Configuration)\$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>"C:\Program Files\7-Zip\7z.exe" a  C:\DevProgs\BPQ32\bpq32.zip C:\DevProgs\BPQ32\bpq32.dll &amp;&amp; myxcopy /y  c:\DevProgs\BPQ32\bpq32.dll c:\windows\SysWOW64\bpq32.dll &amp;&amp; del C:\DevProgs\BPQ32\bpq32.dll</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <MASM>
-      <PreserveIdentifierCase>3</PreserveIdentifierCase>
-      <AssembledCodeListingFile>$(IntDir)$(ProjectName)</AssembledCodeListingFile>
-      <IncludePaths>..\CInclude</IncludePaths>
-      <ListAllAvailableInformation>true</ListAllAvailableInformation>
-      <EnableAssemblyGeneratedCodeListing>true</EnableAssemblyGeneratedCodeListing>
-      <EnableFalseConditionalsInListing>true</EnableFalseConditionalsInListing>
-      <EnableMASM51Compatibility>true</EnableMASM51Compatibility>
-    </MASM>
-    <ClCompile>
-      <AdditionalOptions>/D "MDIKERNEL" %(AdditionalOptions)</AdditionalOptions>
-      <Optimization>Disabled</Optimization>
-      <WholeProgramOptimization>false</WholeProgramOptimization>
-      <AdditionalIncludeDirectories>..\CInclude;..\CommonSource;..\CKernel;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;BPQ32_EXPORTS;MDIKERNEL;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader />
-      <AssemblerOutput>All</AssemblerOutput>
-      <AssemblerListingLocation>c:\devprogs\bpq32\listings\</AssemblerListingLocation>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalOptions> /section:_BPQDATA,srw %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalDependencies>WS2_32.Lib;winmm.lib;DbgHelp.lib;comctl32.lib;setupapi.lib;..\lib\libconfig.lib;miniupnpc.lib;zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>C:\DevProgs\BPQ32\bpq32.dll</OutputFile>
-      <ModuleDefinitionFile>..\CommonSource\bpq32.def</ModuleDefinitionFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>c:\DevProgs\BPQ32\bpq32.pdb</ProgramDatabaseFile>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>c:\DevProgs\BPQ32\bpqpdn.map</MapFileName>
-      <MapExports>true</MapExports>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <LinkTimeCodeGeneration />
-      <BaseAddress>0x42000000</BaseAddress>
-      <ImportLibrary>C:\Dev\Msdev2005\Projects\BPQ32\lib\bpq32.lib</ImportLibrary>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-    <Bscmake>
-      <OutputFile>C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(Configuration)\$(ProjectName).bsc</OutputFile>
-    </Bscmake>
-    <PostBuildEvent>
-      <Command>"C:\Program Files\7-Zip\7z.exe" a  C:\DevProgs\BPQ32\bpq32.zip C:\DevProgs\BPQ32\bpq32.dll &amp;&amp; myxcopy /y  c:\DevProgs\BPQ32\bpq32.dll c:\windows\SysWOW64\bpq32.dll &amp;&amp; del C:\DevProgs\BPQ32\bpq32.dll</Command>
-    </PostBuildEvent>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="adif.c" />
-    <ClCompile Include="AEAPactor.c" />
-    <ClCompile Include="AGWAPI.c" />
-    <ClCompile Include="AGWMoncode.c" />
-    <ClCompile Include="AISCommon.c" />
-    <ClCompile Include="APRSCode.c" />
-    <ClCompile Include="APRSStdPages.c" />
-    <ClCompile Include="ARDOP.c" />
-    <ClCompile Include="Bpq32.c" />
-    <ClCompile Include="bpqaxip.c" />
-    <ClCompile Include="bpqether.c" />
-    <ClCompile Include="bpqhdlc.c" />
-    <ClCompile Include="BPQINP3.c" />
-    <ClCompile Include="BPQNRR.c" />
-    <ClCompile Include="BPQTermMDI.c" />
-    <ClCompile Include="BPQtoAGW.c" />
-    <ClCompile Include="bpqvkiss.c" />
-    <ClCompile Include="cMain.c" />
-    <ClCompile Include="Cmd.c" />
-    <ClCompile Include="CMSAuth.c" />
-    <ClCompile Include="CommonCode.c" />
-    <ClCompile Include="compatbits.c" />
-    <ClCompile Include="config.c" />
-    <ClCompile Include="datadefs.c" />
-    <ClCompile Include="DOSAPI.c" />
-    <ClCompile Include="FLDigi.c" />
-    <ClCompile Include="HALDriver.c" />
-    <ClCompile Include="HFCommon.c" />
-    <ClCompile Include="hid.c" />
-    <ClCompile Include="HSMODEM.c" />
-    <ClCompile Include="HTTPcode.c" />
-    <ClCompile Include="IPCode.c" />
-    <ClCompile Include="KAMPactor.c" />
-    <ClCompile Include="kiss.c" />
-    <ClCompile Include="KISSHF.c" />
-    <ClCompile Include="L2Code.c" />
-    <ClCompile Include="L3Code.c" />
-    <ClCompile Include="L4Code.c" />
-    <ClCompile Include="md5.c" />
-    <ClCompile Include="Moncode.c" />
-    <ClCompile Include="MULTIPSK.c" />
-    <ClCompile Include="PortMapper.c" />
-    <ClCompile Include="RigControl.c" />
-    <ClCompile Include="SCSPactor.c" />
-    <ClCompile Include="SCSTrackeMulti.c" />
-    <ClCompile Include="SCSTracker.c" />
-    <ClCompile Include="SerialPort.c" />
-    <ClCompile Include="TelnetV6.c" />
-    <ClCompile Include="TNCCode.c" />
-    <ClCompile Include="TNCEmulators.c" />
-    <ClCompile Include="UIARQ.c" />
-    <ClCompile Include="upnp.c" />
-    <ClCompile Include="utf8Routines.c" />
-    <ClCompile Include="UZ7HODrv.c" />
-    <ClCompile Include="V4.c" />
-    <ClCompile Include="VARA.c" />
-    <ClCompile Include="WINMOR.c" />
-    <ClCompile Include="WinRPR.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <MASM Include="asmDOSAPI.asm" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="..\CKernel\kernelresource.h" />
-    <ClInclude Include="asmstrucs.h" />
-    <ClInclude Include="CHeaders.h" />
-    <ClInclude Include="compatbits.h" />
-    <ClInclude Include="Versions.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="..\CInclude\Strucs.inc" />
-    <None Include="bpq32.def" />
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="KernelScript1.rc" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-    <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
-  </ImportGroup>
-</Project>

CBPQ32.vcxproj.filters

@@ -1,228 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="adif.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AEAPactor.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AGWAPI.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AGWMoncode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AISCommon.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="APRSCode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="APRSStdPages.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ARDOP.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Bpq32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bpqaxip.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bpqether.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bpqhdlc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BPQINP3.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BPQNRR.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BPQTermMDI.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BPQtoAGW.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bpqvkiss.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="cMain.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Cmd.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CMSAuth.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CommonCode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="compatbits.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="config.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="datadefs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DOSAPI.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FLDigi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="HALDriver.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="HFCommon.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="hid.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="HSMODEM.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="HTTPcode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="IPCode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="KAMPactor.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="kiss.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="KISSHF.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="L2Code.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="L3Code.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="L4Code.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="md5.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Moncode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MULTIPSK.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="PortMapper.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RigControl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SCSPactor.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SCSTrackeMulti.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SCSTracker.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SerialPort.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TelnetV6.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TNCCode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TNCEmulators.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UIARQ.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="upnp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="utf8Routines.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UZ7HODrv.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="V4.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="VARA.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WINMOR.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WinRPR.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <MASM Include="asmDOSAPI.asm">
-      <Filter>Source Files</Filter>
-    </MASM>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="asmstrucs.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CHeaders.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="compatbits.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="..\CKernel\kernelresource.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Versions.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="bpq32.def">
-      <Filter>Header Files</Filter>
-    </None>
-    <None Include="..\CInclude\Strucs.inc">
-      <Filter>Header Files</Filter>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <ResourceCompile Include="KernelScript1.rc">
-      <Filter>Resource Files</Filter>
-    </ResourceCompile>
-  </ItemGroup>
-</Project>

CMSAuth.c

@@ -23,6 +23,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #ifdef LINBPQ
 
 #include "compatbits.h"
+char * strlop(char * buf, char delim);
 
 #define APIENTRY
 #define VOID void
@@ -31,7 +32,6 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #include <windows.h>
 #endif
 
-char * strlop(char * buf, char delim);
 
 VOID APIENTRY md5 (char *arg, unsigned char * checksum);
 

ChatUtilities.c

@@ -39,7 +39,8 @@ VOID __cdecl Logprintf(int LogMode, ChatCIRCUIT * conn, int InOut, const char *
 	return;
 }
 
-void GetSemaphore(struct SEM * Semaphore, int ID)
+
+void _GetSemaphore(struct SEM * Semaphore, int ID, char * File, int Line)
 {
 	//
 	//	Wait for it to be free
@@ -74,6 +75,9 @@ loop1:
 ;
 	}
 
+	Semaphore->Line = Line;
+	strcpy(Semaphore->File, File);
+
 	return;
 }
 void FreeSemaphore(struct SEM * Semaphore)

Cmd.c

@@ -10,7 +10,7 @@ the Free Software Foundation, either version 3 of the License, or
 
 LinBPQ/BPQ32 is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  S"paclenee the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
@@ -35,7 +35,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 //#include "vmm.h"
 //#include "SHELLAPI.H"
 
-#include "CHeaders.h"
+#include "cheaders.h"
 #include "bpqaprs.h"
 #include "kiss.h"
 
@@ -44,6 +44,8 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #include "tncinfo.h"
 #include "telnetserver.h"
 
+
+
 //#include "GetVersion.h"
 
 //#define DllImport	__declspec( dllimport )
@@ -64,8 +66,12 @@ VOID L2SENDXID(struct _LINKTABLE * LINK);
 int CountBits(unsigned long in);
 VOID SaveMH();
 BOOL RestartTNC(struct TNCINFO * TNC);
-void GetPortCTEXT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+void GetPortCTEXT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
 VOID WriteMiniDump();
+int CheckKissInterlock(struct PORTCONTROL * PORT, int Exclusive);
+int seeifInterlockneeded(struct PORTCONTROL * PORT);
+
+extern VOID KISSTX(struct KISSINFO * KISS, PMESSAGE Buffer);
 
 char COMMANDBUFFER[81] = "";		// Command Hander input buffer
 char OrigCmdBuffer[81] = "";		// Command Hander input buffer before toupper
@@ -130,8 +136,8 @@ int L4FRAMESRETRIED = 0;
 int OLDFRAMES = 0;
 int L3FRAMES = 0;
 
-VOID SENDSABM();
+VOID SENDSABM(struct _LINKTABLE * LINK);
-VOID RESET2();
+VOID RESET2(struct _LINKTABLE * LINK);
 
 int APPL1 = 0;
 int PASSCMD = 0;
@@ -145,33 +151,36 @@ char * ALIASPTR	= &CMDALIAS[0][0];
 
 extern int RigReconfigFlag;
 
-CMDX COMMANDS[];
 
-int CMDXLEN	= sizeof (CMDX);
+
+struct CMDX COMMANDS[];
+
+int CMDXLEN	= sizeof (struct CMDX);
 
 VOID SENDNODESMSG();
-VOID KISSCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+VOID KISSCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
-VOID STOPCMS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+VOID STOPCMS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
-VOID STARTCMS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+VOID STARTCMS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
-VOID STOPPORT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+VOID STOPPORT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
-VOID STARTPORT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+VOID STARTPORT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
-VOID FINDBUFFS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+VOID FINDBUFFS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
-VOID WL2KSYSOP(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+VOID WL2KSYSOP(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
-VOID AXRESOLVER(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+VOID AXRESOLVER(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
-VOID AXMHEARD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+VOID AXMHEARD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
-VOID SHOWTELNET(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+VOID SHOWTELNET(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
-VOID SHOWAGW(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+VOID SHOWAGW(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
-VOID SHOWARP(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+VOID SHOWARP(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
-VOID SHOWNAT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+VOID SHOWNAT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
-VOID PING(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+VOID PING(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
-VOID SHOWIPROUTE(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+VOID SHOWIPROUTE(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
-VOID FLMSG(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * UserCMD);
+VOID FLMSG(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * UserCMD);
-void ListExcludedCalls(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+void ListExcludedCalls(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
-VOID APRSCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+VOID APRSCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
-VOID RECONFIGTELNET (TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+VOID RECONFIGTELNET (TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
-VOID HELPCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+VOID HELPCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
-VOID UZ7HOCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * UserCMD);
+VOID UZ7HOCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * UserCMD);
-
+VOID QTSMCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * UserCMD);
+void hookL2SessionAttempt(int Port, char * fromCall, char * toCall, struct _LINKTABLE * LINK);
 
 
 
@@ -237,7 +246,7 @@ char * __cdecl Cmdprintf(TRANSPORTENTRY * Session, char * Bufferptr, const char
 }
 
 
-VOID SENDNODES(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID SENDNODES(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	SENDNODESMSG();
 
@@ -247,7 +256,7 @@ VOID SENDNODES(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 }
 
-VOID SAVEMHCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID SAVEMHCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	SaveMH();
 							
@@ -257,7 +266,7 @@ VOID SAVEMHCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 }
 
-VOID SAVENODES(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID SAVENODES(struct _TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail,  struct CMDX * CMD)
 {
 	SaveNodes();
 							
@@ -267,7 +276,7 @@ VOID SAVENODES(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 }
 
-VOID DUMPCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID DUMPCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	WriteMiniDump();
 
@@ -277,7 +286,7 @@ VOID DUMPCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX *
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 }
 
-VOID RIGRECONFIG(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID RIGRECONFIG(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	if (!ProcessConfig())
 	{
@@ -292,7 +301,7 @@ VOID RIGRECONFIG(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMD
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 }
 
-VOID REBOOT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID REBOOT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	if (Reboot())
 	{
@@ -308,7 +317,7 @@ VOID REBOOT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * C
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 }
 	
-VOID RESTART(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID RESTART(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	if (Restart())
 	{
@@ -324,7 +333,7 @@ VOID RESTART(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX *
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 }
 
-VOID RESTARTTNC(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID RESTARTTNC(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	char * ptr, *Context;
 	int portno;
@@ -368,20 +377,20 @@ VOID RESTARTTNC(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX
 
 UCHAR VALNODESFLAG = 0, EXTONLY = 0;
 
-VOID PORTVAL (TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD);
+VOID PORTVAL (TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
 
-VOID VALNODES(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID VALNODES(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	VALNODESFLAG = 1;
 	PORTVAL(Session, Bufferptr, CmdTail, CMD);
 }
 
-VOID EXTPORTVAL(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID EXTPORTVAL(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	EXTONLY = 1;
 	PORTVAL(Session, Bufferptr, CmdTail, CMD);
 }
-VOID PORTVAL(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID PORTVAL(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	//	PROCESS PORT VALUE COMMANDS
 
@@ -496,7 +505,7 @@ VOID PORTVAL(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX *
 
 }
 
-VOID SWITCHVAL (TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID SWITCHVAL (TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	// Update switch 8 bit value
 	
@@ -541,7 +550,7 @@ VOID SWITCHVAL (TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX
 
 }
 
-VOID SWITCHVALW (TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID SWITCHVALW (TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	// Update switch 16 bit value
 	
@@ -704,7 +713,7 @@ BOOL cATTACHTOBBS(TRANSPORTENTRY * Session, UINT Mask, int Paclen, int * AnySess
 	return FALSE;
 }
 
-VOID APPLCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID APPLCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {		
 	BOOL CONFAILED = 0;
 	UINT CONERROR ;
@@ -815,13 +824,13 @@ VOID APPLCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX *
 }
 
 
-VOID CMDI00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID CMDI00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	Bufferptr = Cmdprintf(Session, Bufferptr, "%s", INFOMSG);
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 }
 	
-VOID CMDV00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID CMDV00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	if (sizeof(void *) == 4)
 		Bufferptr = Cmdprintf(Session, Bufferptr, "Version %s\r", VersionString);
@@ -831,14 +840,14 @@ VOID CMDV00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * C
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 }
 
-VOID BYECMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID BYECMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	CLOSECURRENTSESSION(Session);		// Kills any crosslink, plus local link
 	ReleaseBuffer((UINT *)REPLYBUFFER);
 	return;
 }
 
-VOID CMDPAC(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID CMDPAC(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	//	SET PACLEN FOR THIS SESSION
 
@@ -860,7 +869,7 @@ VOID CMDPAC(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * C
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 }
 
-VOID CMDIDLE(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID CMDIDLE(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	//	SET IDLETIME FOR THIS SESSION
 
@@ -882,7 +891,7 @@ VOID CMDIDLE(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX *
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 
 }
-VOID CMDT00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID CMDT00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	//	SET L4 TIMEOUT FOR CONNECTS ON THIS SESSION
 
@@ -907,7 +916,7 @@ VOID CMDT00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * C
 UCHAR PWLen;
 char PWTEXT[80];
 
-VOID PWDCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID PWDCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	char * ptr, *Context;
 	USHORT pwsum = 0;
@@ -975,11 +984,10 @@ VOID PWDCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * C
 	return;
 }
 
-VOID CMDSTATS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID CMDSTATS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	char * ptr, *Context;
 	int Port = 0, cols = NUMBEROFPORTS, i;
-	char * uptime;
 	struct PORTCONTROL * PORT = PORTTABLE;
 	struct PORTCONTROL * STARTPORT;
 
@@ -996,8 +1004,16 @@ VOID CMDSTATS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX *
 
 	if (Port == 0)
 	{
-		uptime = FormatUptime(STATSTIME);
+		struct tm * TM;
-		Bufferptr = Cmdprintf(Session, Bufferptr, "%s", uptime);
+		char UPTime[50];
+		time_t szClock = STATSTIME * 60;
+
+		TM = gmtime(&szClock);
+
+		sprintf(UPTime, "Uptime (Days Hours Mins)     %.2d:%.2d:%.2d\r",
+			TM->tm_yday, TM->tm_hour, TM->tm_min);
+
+		Bufferptr = Cmdprintf(Session, Bufferptr, "%s", UPTime);
 
 		Bufferptr = Cmdprintf(Session, Bufferptr, "Semaphore Get-Rel/Clashes   %9d%9d\r", 
 					Semaphore.Gets - Semaphore.Rels, Semaphore.Clashes);
@@ -1196,11 +1212,12 @@ VOID CMDSTATS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX *
 	Bufferptr = Cmdprintf(Session, Bufferptr, "\r");
 
 	PORT = STARTPORT;
-	Bufferptr = Cmdprintf(Session, Bufferptr, "Link Active %%   ");
+//	Bufferptr = Cmdprintf(Session, Bufferptr, "Link Active %%   ");
+	Bufferptr = Cmdprintf(Session, Bufferptr, "Active(TX/Busy) %%");
 
 	for (i = 0; i < cols; i++)
 	{
-		Bufferptr = Cmdprintf(Session, Bufferptr, "   %2d %3d", PORT->AVSENDING, PORT->AVACTIVE);
+		Bufferptr = Cmdprintf(Session, Bufferptr, "  %2d %3d ", PORT->AVSENDING, PORT->AVACTIVE);
 		PORT = PORT->PORTPOINTER;	
 	}
 	Bufferptr = Cmdprintf(Session, Bufferptr, "\r");
@@ -1208,7 +1225,7 @@ VOID CMDSTATS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX *
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 }
 
-VOID CMDL00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID CMDL00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	//	PROCESS 'LINKS' MESSAGE
 
@@ -1244,7 +1261,7 @@ VOID CMDL00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * C
 }
 
 
-VOID CMDS00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID CMDS00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	//	PROCESS 'USERS'
 
@@ -1316,7 +1333,7 @@ CMDS60:
 
 extern int MasterPort[MAXBPQPORTS+1];	// Pointer to first BPQ port for a specific MPSK or UZ7HO host
 
-VOID CMDP00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID CMDP00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	// Process PORTS Message
 
@@ -1499,7 +1516,7 @@ VOID CMDP00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * C
 char *  DisplayRoute(TRANSPORTENTRY * Session, char * Bufferptr, struct ROUTE * Routes, char Verbose)
 {
 	char Normcall[10];
-	char locked[] = " ! ";
+	char locked[4] = "   ";
 	int NodeCount;
 	int Percent = 0;
 	char PercentString[20];
@@ -1513,11 +1530,16 @@ char *  DisplayRoute(TRANSPORTENTRY * Session, char * Bufferptr, struct ROUTE *
 
 	Normcall[9]=0;
 
-	if ((Routes->NEIGHBOUR_FLAG & 1) == 1)
+	if (Routes->NEIGHBOUR_FLAG == LOCKEDBYCONFIG)
 		strcpy(locked, "!");
+	else if (Routes->NEIGHBOUR_FLAG == LOCKEDBYSYSOP)
+		strcpy(locked, "!!");
+	else if (Routes->NEIGHBOUR_FLAG == LOCKEDBYSYSOP + LOCKEDBYCONFIG)
+		strcpy(locked, "!!!");
 	else
 		strcpy(locked, " ");
 
+
 	NodeCount = COUNTNODES(Routes);
 				
 	if (Routes->NEIGHBOUR_LINK && Routes->NEIGHBOUR_LINK->L2STATE >= 5)
@@ -1571,7 +1593,7 @@ char *  DisplayRoute(TRANSPORTENTRY * Session, char * Bufferptr, struct ROUTE *
 }
 
 
-VOID CMDR00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID CMDR00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	struct ROUTE * Routes = NEIGHBOURS;
 	int MaxRoutes = MAXNEIGHBOURS;
@@ -1661,7 +1683,7 @@ ROUTEUPDATE:
 		{
 			// Toggle Lock
 
-			Routes->NEIGHBOUR_FLAG ^= 1;	// FLIP LOCKED BIT
+			Routes->NEIGHBOUR_FLAG ^= LOCKEDBYSYSOP;	// FLIP LOCKED BIT
 			goto Displayit;
 		}
 
@@ -1680,7 +1702,7 @@ ROUTEUPDATE:
 		{
 			// Toggle Lock
 
-			Routes->NEIGHBOUR_FLAG ^= 1;	// FLIP LOCKED BIT
+			Routes->NEIGHBOUR_FLAG ^= LOCKEDBYSYSOP;	// FLIP LOCKED BIT
 			goto Displayit;
 		}
 	}
@@ -1694,174 +1716,13 @@ Displayit:
 	else
 		Bufferptr = Cmdprintf(Session, Bufferptr, "Not Found\r");
 
-
-
-/*	MOV	ROUTEDISP,1
-
-	CMP	BYTE PTR [ESI],20H
-	JE SHORT JUSTDISPLAY
-
-	MOV	ZAPFLAG,0
-
-	CMP	BYTE PTR [ESI],'Z'
-	JNE SHORT NOTZAP
-
-	MOV	ZAPFLAG,1
-	JMP SHORT JUSTDISPLAY
-
-	PUBLIC	NOTZAP
-NOTZAP:
-
-	MOV	ROUTEDISP,2		; LOCK UPDATE
-
-	CMP	BYTE PTR [ESI],'!'
-	JE SHORT JUSTDISPLAY
-;
-;	LOOK FOR V FOR ADDING A DIGI
-;
-	CMP	WORD PTR [ESI],' V'	; V [SPACE]
-	JE 	ADDDIGI
-
-	CALL	GETVALUE		; GET NUMBER, UP TO SPACE , CR OR OFFH
-	JC SHORT BADROUTECMD		; INVALID DIGITS
-
-	MOV	NEWROUTEVAL,AL
-
-	MOV	ROUTEDISP,0
-
-	CALL	SCAN			; SEE IF !
-	MOV	AH,[ESI]
-
-
-	PUBLIC	JUSTDISPLAY
-JUSTDISPLAY:
-
-
-	MOV	ESI,OFFSET32 AX25CALL
-	CALL	_FINDNEIGHBOUR
-	JZ SHORT FOUNDROUTE		; IN LIST - OK
-
-	CMP	EBX,0
-	JE SHORT BADROUTECMD		; TABLE FULL??
-
-	MOV	ECX,7
-	MOV	EDI,EBX
-	REP MOVSB			; PUT IN CALL
-
-	MOV	AL,SAVEPORT
-	MOV	NEIGHBOUR_PORT[EBX],AL
-
-	JMP SHORT FOUNDROUTE
-
-
-	PUBLIC	BADROUTECMD
-BADROUTECMD:
-
-	POP	EDI
-
-	JMP	PBADVALUE
-
-	PUBLIC	FOUNDROUTE
-FOUNDROUTE:
-
-	CMP	ZAPFLAG,1
-	JNE SHORT NOTCLEARCOUNTS
-
-	XOR	AX,AX
-	MOV	ES:WORD PTR NBOUR_IFRAMES[EDI],AX
-	MOV	ES:WORD PTR NBOUR_IFRAMES+2[EDI],AX
-	MOV	ES:WORD PTR NBOUR_RETRIES[EDI],AX
-	MOV	ES:WORD PTR NBOUR_RETRIES+2[EDI],AX
-
-	JMP SHORT NOUPDATE
-
-	PUBLIC	NOTCLEARCOUNTS
-NOTCLEARCOUNTS:
-
-	CMP	ROUTEDISP,1
-	JE SHORT NOUPDATE
-
-	CMP	ROUTEDISP,2
-	JE SHORT LOCKUPDATE
-
-	MOV	AL,NEWROUTEVAL
-	MOV	NEIGHBOUR_QUAL[EBX],AL
-
-	CMP	AH,'!'
-	JNE SHORT NOUPDATE
-
-	PUBLIC	LOCKUPDATE
-LOCKUPDATE:
-
-	XOR	NEIGHBOUR_FLAG[EBX],1	; FLIP LOCKED BIT
-
-	PUBLIC	NOUPDATE
-NOUPDATE:
-
-	MOV	ESI,EBX
-	POP	EDI
-
-	POP	EBX
-	CALL	DISPLAYROUTE
-
-	JMP	SENDCOMMANDREPLY
-
-	PUBLIC	ADDDIGI
-ADDDIGI:
-
-	ADD	ESI,2
-	PUSH	ESI			; SAVE INPUT BUFFER
-
-	MOV	ESI,OFFSET32 AX25CALL
-	CALL	_FINDNEIGHBOUR
-
-	POP	ESI
-
-	JZ SHORT ADD_FOUND		; IN LIST - OK
-
-	JMP	BADROUTECMD
-
-	PUBLIC	ADD_FOUND
-ADD_FOUND:
-
-	CALL	CONVTOAX25		; GET DIGI CALLSIGN
-
-	PUSH	ESI
-
-	MOV	ESI,OFFSET32 AX25CALL
-	LEA	EDI,NEIGHBOUR_DIGI[EBX]
-	MOV	ECX,7
-	REP MOVSB
-
-	POP	ESI			; MSG BUFFER
-;
-;	SEE IF ANOTHER DIGI
-;
-	CMP	BYTE PTR [ESI],20H
-	JE SHORT NOMORE
-
-	CALL	CONVTOAX25		; GET DIGI CALLSIGN
-	MOV	ESI,OFFSET32 AX25CALL
-	LEA	EDI,NEIGHBOUR_DIGI+7[EBX]
-	MOV	ECX,7
-	REP MOVSB
-
-	PUBLIC	NOMORE
-NOMORE:
-
-	JMP	NOUPDATE
-
-
-
-*/
-
 SendReply:
 
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 }
 
 
-VOID LISTENCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID LISTENCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	// PROCESS LISTEN COMMAND
 
@@ -1872,6 +1733,7 @@ VOID LISTENCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX
 	char * ptr, *Context;
 	struct PORTCONTROL * PORT = NULL;
 	char ListenPortList[128] = "";
+	int len = 0;
 
 	ptr = strtok_s(CmdTail, " ,", &Context);
 
@@ -1924,7 +1786,7 @@ VOID LISTENCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX
 			}
 		}
 
-		sprintf(ListenPortList, "%s %d", ListenPortList, Port);
+		len += sprintf(&ListenPortList[len], " %d", Port);
 
 		ListenMask |= ((uint64_t)1 << (Port - 1));
 	}
@@ -1944,7 +1806,7 @@ VOID LISTENCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX
 }
 
 
-VOID UNPROTOCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID UNPROTOCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	// PROCESS UNPROTO COMMAND
 
@@ -2013,7 +1875,7 @@ VOID UNPROTOCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX
 	return;
 }
 
-VOID CALCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID CALCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	// PROCESS CAL COMMAND
 
@@ -2066,7 +1928,7 @@ VOID CALCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * C
 
 
 
-VOID CQCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID CQCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	// Send a CQ Beacon on a radio port. Must be in LISTEN state
 
@@ -2272,9 +2134,9 @@ BOOL FindLink(UCHAR * LinkCall, UCHAR * OurCall, int Port, struct _LINKTABLE **
 	return FALSE;
 }
 
-VOID ATTACHCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * UserCMD);
+VOID ATTACHCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * UserCMD);
 
-VOID CMDC00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID CMDC00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	//	PROCESS CONNECT COMMAND
 	
@@ -2295,7 +2157,7 @@ VOID CMDC00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * C
 	int TextCallLen;
 	char PortString[10];
 	char cmdCopy[256];
-	struct _EXTPORTDATA * EXTPORT = (struct _EXTPORTDATA *)PORT;;
+	struct _EXTPORTDATA * EXTPORT = (struct _EXTPORTDATA *)PORT;
 
 
 #ifdef EXCLUDEBITS
@@ -2738,6 +2600,16 @@ noFlip:
 		return;
 	}
 
+	ret = CheckKissInterlock(PORT, TRUE);
+
+	if (ret)
+	{
+		Bufferptr = Cmdprintf(Session, Bufferptr, "Sorry, Interlocked port %d is in use\r", ret);
+		SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
+		return;
+	}
+
+	
 	if (Session->L4USER[6] == 0x42 || Session->L4USER[6] == 0x44)
 	{	
 		Bufferptr = Cmdprintf(Session, Bufferptr, "Sorry - Can't make ax.25 calls with SSID of T or R\r");
@@ -2836,6 +2708,8 @@ noFlip3:
 
 	if (CQFLAG == 0)			// if a CQ CALL  DONT SEND SABM
 	{
+		seeifInterlockneeded(PORT);
+		
 		if (LINK->L2STATE == 1)
 			L2SENDXID(LINK);
 		else	
@@ -2902,7 +2776,7 @@ BOOL DecodeCallString(char * Calls, BOOL * Stay, BOOL * Spy, UCHAR * AXCalls)
 }
 
 
-VOID LINKCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID LINKCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	// PROCESS *** LINKED to CALLSIGN
 
@@ -3094,7 +2968,7 @@ int WildCmp(char * pattern, char * string)
 	return 0;
 }
 
-VOID CMDN00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID CMDN00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	struct DEST_LIST * Dest = DESTS;
 	int count = MAXDESTS, i;
@@ -3615,7 +3489,7 @@ SendReply:
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 }
 
-VOID CMDQUERY(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * UserCMD)
+VOID CMDQUERY(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * UserCMD)
 {
 	//	DISPLAY AVAILABLE COMMANDS
 
@@ -3624,7 +3498,7 @@ VOID CMDQUERY(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX *
 	char ApplList[2048];
 	char * out = ApplList;
 
-	CMDX * CMD = &COMMANDS[APPL1];
+	struct CMDX * CMD = &COMMANDS[APPL1];
 
 	for (n = 0; n < NumberofAppls; n++)
 	{
@@ -3654,7 +3528,7 @@ VOID CMDQUERY(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX *
 
 char * FormatMH(MHSTRUC * MH, char Format);
 
-VOID MHCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID MHCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	//	DISPLAY HEARD LIST
 	
@@ -3836,7 +3710,7 @@ VOID MHCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CM
 
 int Rig_Command(TRANSPORTENTRY * Session, char * Command);
 
-VOID RADIOCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * UserCMD)
+VOID RADIOCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * UserCMD)
 {
 	char * ptr;
 	
@@ -3865,7 +3739,7 @@ VOID RADIOCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX *
 VOID SendNRRecordRoute(struct DEST_LIST * DEST, TRANSPORTENTRY * Session);
 
 
-VOID NRRCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * UserCMD)
+VOID NRRCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * UserCMD)
 {
 	//	PROCESS 'NRR - Netrom Record Route' COMMAND
 
@@ -3935,7 +3809,7 @@ int CHECKINTERLOCK(struct PORTCONTROL * OURPORT)
 	return 0;
 }
 
-VOID ATTACHCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * UserCMD)
+VOID ATTACHCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * UserCMD)
 {
 	//	ATTACH to a PACTOR or similar port
 
@@ -4115,7 +3989,7 @@ VOID ATTACHCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX
 
 	if (ret & 0x8000)			// Disconnecting
 	{
-		Bufferptr = Cmdprintf(Session, Bufferptr, "Error - Port in use\r");
+		Bufferptr = Cmdprintf(Session, Bufferptr, "Error - Port in use (Disconnecting)\r");
 		SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 		return;
 	}
@@ -4170,10 +4044,21 @@ VOID ATTACHCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX
 	{
 		// In use
 
-		Bufferptr = Cmdprintf(Session, Bufferptr, "Error - Port in use\r");
+		Bufferptr = Cmdprintf(Session, Bufferptr, "Error - Port in use (Session Attached\r");
 		SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 		return;
 	}
+
+	if (PORT->PortSuspended)
+	{
+		// In use
+
+		Bufferptr = Cmdprintf(Session, Bufferptr, "Error - Port Suspended\r");
+		SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
+		return;
+	}
+
+
 	//	GET CIRCUIT TABLE ENTRY FOR OTHER END OF LINK
 	
 	NewSess = SetupNewSession(Session, Bufferptr);
@@ -4300,16 +4185,17 @@ checkattachandcall:
 
 //	SYSOP COMMANDS
 
-CMDX COMMANDS[] =
+struct CMDX COMMANDS[] =
 {
-	"SAVENODES   ",8, SAVENODES, 0,
+//	"SAVENODES   ",8, SAVENODES(struct _TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD), 0,
-	"TELRECONFIG ",4, RECONFIGTELNET, 0,
+	"SAVENODES   ",8, &SAVENODES, 0,
-	"SAVEMH      ",6, SAVEMHCMD, 0,
+	"TELRECONFIG ",4, &RECONFIGTELNET, 0,
-	"REBOOT      ",6, REBOOT, 0,
+	"SAVEMH      ",6, &SAVEMHCMD, 0,
-	"RIGRECONFIG ",8 , RIGRECONFIG, 0,
+	"REBOOT      ",6, &REBOOT, 0,
-	"RESTART     ",7,RESTART,0,
+	"RIGRECONFIG ",8, &RIGRECONFIG, 0,
-	"RESTARTTNC  ",10,RESTARTTNC,0,
+	"RESTART     ",7, &RESTART,0,
-	"SENDNODES   ",8,SENDNODES,0,
+	"RESTARTTNC  ",10,&RESTARTTNC,0,
+	"SENDNODES   ",8, &SENDNODES,0,
 	"EXTRESTART  ",10, EXTPORTVAL, offsetof(EXTPORTDATA, EXTRESTART),
 	"TXDELAY     ",3, PORTVAL, offsetof(PORTCONTROLX, PORTTXDELAY),
 	"MAXFRAME    ",3, PORTVAL, offsetof(PORTCONTROLX, PORTWINDOW),
@@ -4434,13 +4320,14 @@ CMDX COMMANDS[] =
 	"NAT         ",3,SHOWNAT,0,
 	"IPROUTE     ",3,SHOWIPROUTE,0,
 	"UZ7HO       ",5,UZ7HOCMD,0,
+	"QTSM        ",4,QTSMCMD,0,
 
 	"..FLMSG     ",7,FLMSG,0
 };
 
-CMDX * CMD = NULL;
+struct CMDX * CMD = NULL;
 
-int NUMBEROFCOMMANDS = sizeof(COMMANDS)/sizeof(CMDX);
+int NUMBEROFCOMMANDS = sizeof(COMMANDS)/sizeof(struct CMDX);
 
 char * ReplyPointer;			// Pointer into reply buffer
 
@@ -4897,15 +4784,65 @@ VOID DoTheCommand(TRANSPORTENTRY * Session)
 VOID StatsTimer()
 {
 	struct PORTCONTROL * PORT = PORTTABLE;
-	int sum;
+	uint64_t sum, sum2;
+
+	// Interval is 60 secs
 
 	while(PORT)
+	{
+		int index = PORT->StatsPointer++;
+
+		if (index == 1439)
+			PORT->StatsPointer = 0;		// Cyclic through 24 hours (1440 Mins)
+
+		if (PORT->TNC)
+		{
+			struct TNCINFO * TNC = PORT->TNC;
+			if (TNC->Hardware == H_ARDOP || TNC->Hardware == H_VARA)
+			{
+				sum = TNC->PTTActivemS / 600;		// ms but  want %
+				PORT->AVSENDING = (UCHAR)sum;
+				TNC->PTTActivemS = 0;
+
+				sum2 = TNC->BusyActivemS / 600;		// ms but  want %
+				PORT->AVACTIVE = (UCHAR)(sum + sum2);
+				TNC->BusyActivemS = 0;
+			}
+		}
+		else
+		{
+			// if KISS port using QtSM Average is already updated
+
+			struct KISSINFO * KISS = (struct KISSINFO *)PORT;
+
+			if (PORT->PORTNUMBER == 17)
+			{
+				int x = 17;
+			}
+			
+			if ((void *)PORT->PORTTXROUTINE == (void *)KISSTX && (KISS->QtSMStats || KISS->FIRSTPORT->PORT.QtSMPort))			// KISS Port QtSM Stats
+			{
+			}
+			else
 			{
 				sum = PORT->SENDING / 11;
-		PORT->AVSENDING = sum;
+				PORT->AVSENDING = (UCHAR)sum;
 
 				sum = (PORT->SENDING + PORT->ACTIVE) /11;
-		PORT->AVACTIVE = sum;
+				PORT->AVACTIVE = (UCHAR)sum;
+			}
+		}
+
+		if (PORT->TX == NULL && PORT->AVACTIVE)
+		{
+			PORT->TX = zalloc(1440);	// Keep 1 day history
+			PORT->BUSY = zalloc(1440);	
+		}
+		if (PORT->TX)
+		{
+			PORT->TX[index] = PORT->AVSENDING;
+			PORT->BUSY[index] = PORT->AVACTIVE;
+		}
 
 		PORT->SENDING = 0;
 		PORT->ACTIVE = 0;
@@ -4921,7 +4858,7 @@ extern struct AXIPPORTINFO * Portlist[];
 #define TCPConnected 4
 
 
-VOID AXRESOLVER(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID AXRESOLVER(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	//	DISPLAY AXIP Resolver info
 	
@@ -5011,7 +4948,7 @@ VOID AXRESOLVER(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 }
 
-VOID AXMHEARD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID AXMHEARD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	//	DISPLAY AXIP Mheard info
 	
@@ -5081,7 +5018,7 @@ extern char WL2KLoc[7];
 BOOL GetWL2KSYSOPInfo(char * Call, char * _REPLYBUFFER);
 BOOL UpdateWL2KSYSOPInfo(char * Call, char * SQL);
 
-VOID WL2KSYSOP(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID WL2KSYSOP(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	char _REPLYBUFFER[1000] = "";
 
@@ -5233,7 +5170,7 @@ VOID WL2KSYSOP(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX
 
 VOID CloseKISSPort(struct PORTCONTROL * PortVector);
 
-VOID STOPCMS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID STOPCMS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	char _REPLYBUFFER[1000] = "";
 	char * ptr, * Context;
@@ -5294,7 +5231,7 @@ VOID STOPCMS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX *
 }
 
 
-VOID STARTCMS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID STARTCMS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	char _REPLYBUFFER[1000] = "";
 	char * ptr, * Context;
@@ -5354,7 +5291,7 @@ VOID STARTCMS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX *
 }
 
 
-VOID STOPPORT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID STOPPORT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	char _REPLYBUFFER[1000] = "";
 	char * ptr, * Context;
@@ -5438,7 +5375,7 @@ VOID STOPPORT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX *
 }
 
 
-VOID STARTPORT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID STARTPORT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	char _REPLYBUFFER[1000] = "";
 	char * ptr, * Context;
@@ -5530,7 +5467,7 @@ VOID STARTPORT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX
 int ASYSEND(struct PORTCONTROL * PortVector, char * buffer, int count);
 int	KissEncode(UCHAR * inbuff, UCHAR * outbuff, int len);
 
-VOID KISSCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID KISSCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	char _REPLYBUFFER[1000] = "";
 	char * ptr, * Context;
@@ -5621,7 +5558,7 @@ VOID KISSCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX *
 }
 
 
-VOID FINDBUFFS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID FINDBUFFS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	FindLostBuffers();
 
@@ -5633,7 +5570,7 @@ VOID FINDBUFFS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 }
 
-VOID FLMSG(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * UserCMD)
+VOID FLMSG(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * UserCMD)
 {
 	// Telnet Connection from FLMSG
 	CLOSECURRENTSESSION(Session);		// Kills any crosslink, plus local link
@@ -5656,7 +5593,7 @@ BOOL CheckExcludeList(UCHAR * Call)
 }
 
 
-void ListExcludedCalls(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+void ListExcludedCalls(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 
 	UCHAR * ptr = ExcludeList;
@@ -5705,7 +5642,7 @@ BOOL isSYSOP(TRANSPORTENTRY * Session, char * Bufferptr)
 	return TRUE;
 }
 
-VOID HELPCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID HELPCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	int FileSize;
 	char MsgFile[MAX_PATH];
@@ -5794,7 +5731,7 @@ int UZ7HOSetModem(int port, struct TNCINFO * TNC, struct AGWINFO * AGW, PDATAMES
 int UZ7HOSetFlags(int port, struct TNCINFO * TNC, struct AGWINFO * AGW, PDATAMESSAGE buff, PMSGWITHLEN buffptr);
 
 
-VOID UZ7HOCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID UZ7HOCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	char * Cmd;
 	int port;
@@ -5865,6 +5802,43 @@ VOID UZ7HOCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX *
 	return;
 }
 
+VOID QTSMCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
+{
+	int port;
+	struct PORTCONTROL * PORT;
+	struct KISSINFO * KISS;
+
+	CmdTail = CmdTail + (OrigCmdBuffer - COMMANDBUFFER); // Replace with original case version
+
+	port = atoi(CmdTail);
+
+	PORT = GetPortTableEntryFromPortNum(port);
+
+	if (PORT == NULL || (void *)PORT->PORTTXROUTINE != (void *)KISSTX)			// Must be a kiss like port
+	{
+		Bufferptr = Cmdprintf(Session, Bufferptr, "Error - Port %d is not a KISS port\r", port);
+		SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
+		return;
+	}
+	
+	KISS = (struct KISSINFO *)PORT;
+
+	if (KISS->QtSMModem == 0)
+	{
+		Bufferptr = Cmdprintf(Session, Bufferptr, "Error - Port %d has no QtSM information\r", port);
+		SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
+		return;
+	}
+
+	Bufferptr = Cmdprintf(Session, Bufferptr, "Modem %s Centre frequency %d\r", 
+		(KISS->QtSMModem) ? KISS->QtSMModem : "Not Available", KISS->QtSMFreq);
+		
+	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
+	return;
+}
+
+
+
 
 
 

CommonCode.c

@@ -18,7 +18,6 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 */	
 
 
-
 // General C Routines common to bpq32 and linbpq. Mainly moved from BPQ32.c
 
 #pragma data_seg("_BPQDATA")
@@ -28,10 +27,11 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
+#include "mqtt.h"
 
 #pragma data_seg("_BPQDATA")
 
-#include "CHeaders.h"
+#include "cheaders.h"
 #include "tncinfo.h"
 #include "configstructs.h"
 
@@ -68,11 +68,12 @@ VOID WriteMiniDump();
 void printStack(void);
 char * FormatMH(PMHSTRUC MH, char Format);
 void WriteConnectLog(char * fromCall, char * toCall, UCHAR * Mode);
-void SendDataToPktMap(char *Msg);
+void SendDataToPktMap();
 
 extern BOOL LogAllConnects;
 extern BOOL M0LTEMap;
 
+char * stristr (char *ch1, char *ch2);
 
 extern VOID * ENDBUFFERPOOL;
 
@@ -547,6 +548,7 @@ VOID * _GetBuff(char * File, int Line)
 
 		Msg->Process = (short)GetCurrentProcessId();
 		Msg->Linkptr = NULL;
+		Msg->Padding[0] = 0;		// Used for modem status info 
 	}
 	else
 		Debugprintf("Warning - Getbuff returned NULL");
@@ -689,7 +691,7 @@ VOID DISPLAYCIRCUIT(TRANSPORTENTRY * L4, char * Buffer)
 }
 
 VOID CheckForDetach(struct TNCINFO * TNC, int Stream, struct STREAMINFO * STREAM,
-			VOID TidyCloseProc(), VOID ForcedCloseProc(), VOID CloseComplete())
+			VOID TidyCloseProc(struct TNCINFO * TNC, int Stream), VOID ForcedCloseProc(struct TNCINFO * TNC, int Stream), VOID CloseComplete(struct TNCINFO * TNC, int Stream))
 {
 	void ** buffptr;
 
@@ -719,8 +721,6 @@ VOID CheckForDetach(struct TNCINFO * TNC, int Stream, struct STREAMINFO * STREAM
 
 		if (STREAM->Connected || STREAM->Connecting)
 		{
-			char logmsg[120];
-			time_t Duration;
 
 			// Need to do a tidy close
 
@@ -733,22 +733,7 @@ VOID CheckForDetach(struct TNCINFO * TNC, int Stream, struct STREAMINFO * STREAM
 
 			// Create a traffic record
 
-			if (STREAM->Connected && STREAM->ConnectTime)
+			hookL4SessionDeleted(TNC, STREAM);
-			{
-				Duration = time(NULL) - STREAM->ConnectTime;
-
-				if (Duration == 0)
-					Duration = 1;				// Or will get divide by zero error 
-
-				sprintf(logmsg,"Port %2d %9s Bytes Sent %d  BPS %d Bytes Received %d BPS %d Time %d Seconds",
-					TNC->Port, STREAM->RemoteCall,
-					STREAM->BytesTXed, (int)(STREAM->BytesTXed/Duration),
-					STREAM->BytesRXed, (int)(STREAM->BytesRXed/Duration), (int)Duration);
-
-				Debugprintf(logmsg);
-
-				STREAM->ConnectTime = 0;
-			}
 
 			if (STREAM->BPQtoPACTOR_Q)					// Still data to send?
 				return;									// Will close when all acked
@@ -918,6 +903,7 @@ BOOL ProcessIncommingConnectEx(struct TNCINFO * TNC, char * Call, int Stream, BO
 	int Totallen = 0;
 	UCHAR * ptr;
 	struct PORTCONTROL * PORT = (struct PORTCONTROL *)TNC->PortRecord;
+	struct STREAMINFO * STREAM = &TNC->Streams[Stream];
 	
 	// Stop Scanner
 
@@ -927,7 +913,7 @@ BOOL ProcessIncommingConnectEx(struct TNCINFO * TNC, char * Call, int Stream, BO
 
 		sprintf(Msg, "%d SCANSTOP", TNC->Port);
 
-		Rig_Command( (TRANSPORTENTRY *) -1, Msg);
+		Rig_Command((TRANSPORTENTRY *) -1, Msg);
 
 		UpdateMH(TNC, Call, '+', 'I');
 	}
@@ -950,7 +936,11 @@ BOOL ProcessIncommingConnectEx(struct TNCINFO * TNC, char * Call, int Stream, BO
 
 	memset(Session, 0, sizeof(TRANSPORTENTRY));
 
-	memcpy(TNC->Streams[Stream].RemoteCall, Call, 9);	// Save Text Callsign
+	memcpy(STREAM->RemoteCall, Call, 9);	// Save Text Callsign
+
+	// May be subsequently rejected but a good place to capture calls
+
+	hookL4SessionAccepted(STREAM, Call, TNC->TargetCall);
 
 	if (AllowTR)
 		ConvToAX25Ex(Call, Session->L4USER);				// Allow -T and -R SSID's for MPS
@@ -963,7 +953,7 @@ BOOL ProcessIncommingConnectEx(struct TNCINFO * TNC, char * Call, int Stream, BO
 	if (NEXTID == 0) NEXTID++;		// Keep non-zero
 
 	TNC->PortRecord->ATTACHEDSESSIONS[Stream] = Session;
-	TNC->Streams[Stream].Attached = TRUE;
+	STREAM->Attached = TRUE;
 
 	Session->L4TARGET.EXTPORT = TNC->PortRecord;
 
@@ -974,7 +964,7 @@ BOOL ProcessIncommingConnectEx(struct TNCINFO * TNC, char * Call, int Stream, BO
 	Session->SESSPACLEN = TNC->PortRecord->PORTCONTROL.PORTPACLEN;
 	Session->KAMSESSION = Stream;
 
-	TNC->Streams[Stream].Connected = TRUE;			// Subsequent data to data channel
+	STREAM->Connected = TRUE;			// Subsequent data to data channel
 
 	if (LogAllConnects)
 	{
@@ -1027,7 +1017,7 @@ BOOL ProcessIncommingConnectEx(struct TNCINFO * TNC, char * Call, int Stream, BO
 char * Config;
 static char * ptr1, * ptr2;
 
-BOOL ReadConfigFile(int Port, int ProcLine())
+BOOL ReadConfigFile(int Port, int ProcLine(char * buf, int Port))
 {
 	char buf[256],errbuf[256];
 
@@ -1465,7 +1455,21 @@ DllExport int APIENTRY SessionStateNoAck(int stream, int * state)
 	return 0;
 }
 
+
+int SendMsgEx(int stream, char * msg, int len, int GetSem);
+
+int SendMsgNoSem(int stream, char * msg, int len)
+{
+	return SendMsgEx(stream, msg, len, 0);
+}
+
 DllExport int APIENTRY SendMsg(int stream, char * msg, int len)
+{
+	return SendMsgEx(stream, msg, len, 1);
+}
+
+
+int SendMsgEx(int stream, char * msg, int len, int GetSem)
 {
 	//	Send message to stream (BPQHOST Function 2)
 
@@ -1488,10 +1492,12 @@ DllExport int APIENTRY SendMsg(int stream, char * msg, int len)
 		if (QCOUNT < 50)
 			return 0;					// Dont want to run out
 
+		if (GetSem)
 			GetSemaphore(&Semaphore, 10);
 
 		if ((MSG = GetBuff()) == 0)
 		{
+			if (GetSem)
 				FreeSemaphore(&Semaphore);
 			return 0;
 		}
@@ -1503,6 +1509,7 @@ DllExport int APIENTRY SendMsg(int stream, char * msg, int len)
 
 		SENDUIMESSAGE(MSG);
 		ReleaseBuffer(MSG);
+		if (GetSem)
 			FreeSemaphore(&Semaphore);
 		return 0;
 	}
@@ -1518,12 +1525,14 @@ DllExport int APIENTRY SendMsg(int stream, char * msg, int len)
 	if (L4 == 0)
 		return 0;
 
+	if (GetSem)
 		GetSemaphore(&Semaphore, 22);
 
 	SESS->HOSTFLAGS |= 0x80;		// SET ALLOCATED BIT
 
 	if (QCOUNT < 40)				// PLENTY FREE?
 	{
+		if (GetSem)
 			FreeSemaphore(&Semaphore);
 		return 1;
 	}
@@ -1537,6 +1546,7 @@ DllExport int APIENTRY SendMsg(int stream, char * msg, int len)
 		if (n > 100)
 		{
 			Debugprintf("Stream %d QCOUNT %d Q Len %d - discarding", stream, QCOUNT, n);
+			if (GetSem)
 				FreeSemaphore(&Semaphore);
 			return 1;
 		}
@@ -1544,6 +1554,7 @@ DllExport int APIENTRY SendMsg(int stream, char * msg, int len)
 
 	if ((MSG = GetBuff()) == 0)
 	{
+		if (GetSem)
 			FreeSemaphore(&Semaphore);
 		return 1;
 	}
@@ -1571,6 +1582,7 @@ DllExport int APIENTRY SendMsg(int stream, char * msg, int len)
 	else
 		C_Q_ADD(&L4->L4RX_Q, MSG);
 
+	if (GetSem)
 		FreeSemaphore(&Semaphore);
 	return 0;
 }
@@ -1610,9 +1622,9 @@ DllExport int APIENTRY SendRaw(int port, char * msg, int len)
 
 	MSG->LENGTH = len + MSGHDDRLEN;
 
-	if (PORT->PROTOCOL == 10)		 // PACTOR/WINMOR Style
+	if (PORT->PROTOCOL == 10 && PORT->HWType != H_KISSHF)		 // PACTOR/WINMOR Style
 	{
-		//	Pactor Style. Probably will only be used for Tracker uneless we do APRS over V4 or WINMOR
+		//	Pactor Style. Probably will only be used for Tracker unless we do APRS over V4 or WINMOR
 
 		EXTPORTDATA * EXTPORT = (EXTPORTDATA *) PORT;
 
@@ -1669,7 +1681,7 @@ DllExport time_t APIENTRY GetRaw(int stream, char * msg, int * len, int * count)
 
 	Stamp = MSG->Timestamp;
 
-	memcpy(msg, MSG, Msglen);
+	memcpy(msg, MSG, BUFFLEN - sizeof(void *));		// To c
 
 	*len = Msglen;
 
@@ -2444,7 +2456,7 @@ static struct speed_struct
 HANDLE OpenCOMPort(VOID * pPort, int speed, BOOL SetDTR, BOOL SetRTS, BOOL Quiet, int Stopbits)
 {
 	char Port[256];
-	char buf[100];
+	char buf[512];
 
 	//	Linux Version.
 
@@ -2454,8 +2466,8 @@ HANDLE OpenCOMPort(VOID * pPort, int speed, BOOL SetDTR, BOOL SetRTS, BOOL Quiet
 	struct termios term;
 	struct speed_struct *s;
 
-	if ((UINT)pPort < 256)
+	if ((uintptr_t)pPort < 256)
-		sprintf(Port, "%s/com%d", BPQDirectory, (int)pPort);
+		sprintf(Port, "%s/com%d", BPQDirectory, (int)(uintptr_t)pPort);
 	else
 		strcpy(Port, pPort);
 
@@ -2674,6 +2686,14 @@ int DoRoutes()
 	{
 		if (Routes->NEIGHBOUR_CALL[0] != 0)
 		{
+			// Dont save routes from config file here or they are difficult to get rid of
+
+			if (Routes->NEIGHBOUR_FLAG & LOCKEDBYCONFIG)
+			{
+				Routes++;
+				continue;
+			}
+
 			len=ConvFromAX25(Routes->NEIGHBOUR_CALL,Normcall);
 			Normcall[len]=0;
 
@@ -2697,7 +2717,7 @@ int DoRoutes()
 				digis[0] = 0;
 
 			len=sprintf(line,
-					"ROUTE ADD %s %d %d %s %d %d %d %d %d\n",
+					"ROUTE ADD %s %d %d %s %d %d %d %d %d %c\n",
 					Normcall,
 					Routes->NEIGHBOUR_PORT,
 					Routes->NEIGHBOUR_QUAL, digis,
@@ -2705,7 +2725,8 @@ int DoRoutes()
 					Routes->NBOUR_FRACK,
 					Routes->NBOUR_PACLEN,
 					Routes->INP3Node | (Routes->NoKeepAlive << 2),
-					Routes->OtherendsRouteQual);
+					Routes->OtherendsRouteQual,
+					(Routes->NEIGHBOUR_FLAG & LOCKEDBYSYSOP)?'!':' ');
 
 					fputs(line, file);
 		}
@@ -3016,19 +3037,7 @@ DllExport int APIENTRY ClearNodes ()
 
 	return (0);
 }
-char * FormatUptime(int Uptime)
- {
-	struct tm * TM;
-	static char UPTime[50];
-	time_t szClock = Uptime * 60;
 
-	TM = gmtime(&szClock);
-
-	sprintf(UPTime, "Uptime (Days Hours Mins)     %.2d:%.2d:%.2d\r",
-		TM->tm_yday, TM->tm_hour, TM->tm_min);
-
-	return UPTime;
- }
 
 static char *month[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
 
@@ -3339,7 +3348,7 @@ VOID SendLocation()
 	SendReportMsg((char *)&AXMSG.DEST, Len + 16);
 
 	if (M0LTEMap)
-		SendDataToPktMap("");
+		SendDataToPktMap();
 
 	return;
 
@@ -3347,7 +3356,6 @@ VOID SendLocation()
 
 
 
-
 VOID SendMH(struct TNCINFO * TNC, char * call, char * freq, char * LOC, char * Mode)
 {
 	MESSAGE AXMSG;
@@ -3363,7 +3371,8 @@ VOID SendMH(struct TNCINFO * TNC, char * call, char * freq, char * LOC, char * M
 	// Block includes the Msg Header (7 bytes), Len Does not!
 
 	memcpy(AXPTR->DEST, ReportDest, 7);
-	if (TNC->PortRecord->PORTCONTROL.PORTCALL[0])
+
+	if (TNC && TNC->PortRecord->PORTCONTROL.PORTCALL[0])
 		memcpy(AXPTR->ORIGIN, TNC->PortRecord->PORTCONTROL.PORTCALL, 7);
 	else
 		memcpy(AXPTR->ORIGIN, MYCALL, 7);
@@ -3523,8 +3532,10 @@ int __sync_lock_test_and_set(int * ptr, int val)
 #endif // MACBPQ
 
 
+#define GetSemaphore(Semaphore,ID) _GetSemaphore(Semaphore, ID, __FILE__, __LINE__)
 
-void GetSemaphore(struct SEM * Semaphore, int ID)
+
+void _GetSemaphore(struct SEM * Semaphore, int ID, char * File, int Line)
 {
 	//
 	//	Wait for it to be free
@@ -3568,6 +3579,8 @@ loop1:
 	Semaphore->SemProcessID = GetCurrentProcessId();
 	Semaphore->SemThreadID = GetCurrentThreadId();
 	SemHeldByAPI = ID;
+	Semaphore->Line = Line;
+	strcpy(Semaphore->File, File);
 
 	return;
 }
@@ -3688,7 +3701,7 @@ VOID OpenReportingSockets()
 	{
 		// Enable Node Map Reports
 
-		ReportTimer = 60;
+		ReportTimer = 1200;			// 2 mins - Give Rigcontrol time to start
 
 		ReportSocket = socket(AF_INET,SOCK_DGRAM,0);
 
@@ -3714,6 +3727,11 @@ VOID OpenReportingSockets()
 	Chatreportdest.sin_port = htons(81);
 
 	_beginthread(ResolveUpdateThread, 0, NULL);
+
+	printf("MQTT Enabled %d\n", MQTT);
+
+	if (MQTT) 
+		MQTTConnect(MQTT_HOST, MQTT_PORT, MQTT_USER, MQTT_PASS);
 }
 
 VOID WriteMiniDumpThread();
@@ -4187,10 +4205,10 @@ VOID GetUIConfig()
 
 			if (group)
 			{
-				GetStringValue(group, "UIDEST", &UIUIDEST[Port][0]);
+				GetStringValue(group, "UIDEST", &UIUIDEST[Port][0], 11);
-				GetStringValue(group, "FileName", &FN[Port][0]);
+				GetStringValue(group, "FileName", &FN[Port][0], 256);
-				GetStringValue(group, "Message", &Message[Port][0]);
+				GetStringValue(group, "Message", &Message[Port][0], 1000);
-				GetStringValue(group, "Digis", Digis);
+				GetStringValue(group, "Digis", Digis, 100);
 				UIUIDigi[Port] = _strdup(Digis);
 	
 				Interval[Port] = GetIntValue(group, "Interval");
@@ -4221,15 +4239,21 @@ int GetIntValue(config_setting_t * group, char * name)
 	return 0;
 }
 
-BOOL GetStringValue(config_setting_t * group, char * name, char * value)
+BOOL GetStringValue(config_setting_t * group, char * name, char * value, int maxlen)
 {
-	const char * str;
+	char * str;
 	config_setting_t *setting;
 
 	setting = config_setting_get_member (group, name);
 	if (setting)
 	{
-		str =  config_setting_get_string (setting);
+		str = (char *)config_setting_get_string(setting);
+
+		if (strlen(str) > maxlen)
+		{
+			Debugprintf("Suspect config record %s", str);
+			str[maxlen] = 0;
+		}
 		strcpy(value, str);
 		return TRUE;
 	}
@@ -4761,13 +4785,14 @@ LRESULT CALLBACK UIWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam
 extern struct DATAMESSAGE * REPLYBUFFER;
 char * __cdecl Cmdprintf(TRANSPORTENTRY * Session, char * Bufferptr, const char * format, ...);
 
-void GetPortCTEXT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+void GetPortCTEXT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	char FN[250];
 	FILE *hFile;
 	struct stat STAT;
 	struct PORTCONTROL * PORT = PORTTABLE;
 	char PortList[256] = "";
+	int len = 0;
 
 	while (PORT)
 	{
@@ -4809,7 +4834,7 @@ void GetPortCTEXT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CM
 				*ptr = '\r';
 
 
-			sprintf(PortList, "%s,%d", PortList, PORT->PORTNUMBER);
+			len += sprintf(&PortList[len], ",%d", PORT->PORTNUMBER);
 		}
 
 		PORT = PORT->PORTPOINTER;
@@ -4914,7 +4939,7 @@ SOCKET OpenHTTPSock(char * Host)
 	{
 		err = WSAGetLastError();
 
-		Debugprintf("Resolve Failed for %s %d %x", "api.winlink.org", err, err);
+		Debugprintf("Resolve Failed for %s %d %x", Host, err, err);
 		return 0 ;			// Resolve failed
 	}
 	
@@ -4947,7 +4972,7 @@ SOCKET OpenHTTPSock(char * Host)
 }
 
 static char HeaderTemplate[] = "POST %s HTTP/1.1\r\n"
-	"Accept: application/json\r\n"
+	"Accept: app  N B lication/json\r\n"
 //	"Accept-Encoding: gzip,deflate,gzip, deflate\r\n"
 	"Content-Type: application/json\r\n"
 	"Host: %s:%d\r\n"
@@ -4957,14 +4982,24 @@ static char HeaderTemplate[] = "POST %s HTTP/1.1\r\n"
 	"\r\n";
 
 
-VOID SendWebRequest(SOCKET sock, char * Host, char * Request, char * Params, int Len, char * Return)
+DllExport VOID WINAPI SendWebRequest(char * Host, char * Request, char * Params, char * Return)
 {
+	SOCKET sock;
 	int InputLen = 0;
 	int inptr = 0;
 	char Buffer[4096];
 	char Header[256];
 	char * ptr, * ptr1;
 	int Sent;
+	int Len = strlen(Params);
+
+	if (M0LTEMap == 0)
+		return;
+
+	sock = OpenHTTPSock(Host);
+
+	if (sock == 0)
+		return;
 
 #ifdef LINBPQ
 	sprintf(Header, HeaderTemplate, Request, Host, 80, Len, "linbpq/", VersionString, Params);
@@ -4978,23 +5013,22 @@ VOID SendWebRequest(SOCKET sock, char * Host, char * Request, char * Params, int
 	{
 		int Err = WSAGetLastError();
 		Debugprintf("Error %d from Web Update send()", Err);
+		closesocket(sock);
 		return;
 	}
 
 	while (InputLen != -1)
 	{
-		InputLen = recv(sock, &Buffer[inptr], 4096 - inptr, 0);
+		InputLen = recv(sock, &Buffer[inptr], 4095 - inptr, 0);
 
 		if (InputLen == -1 || InputLen == 0)
 		{
 			int Err = WSAGetLastError();
 			Debugprintf("Error %d from Web Update recv()", Err);
+			closesocket(sock);
 			return;
 		}
 
-		//	As we are using a persistant connection, can't look for close. Check
-		//	for complete message
-
 		inptr += InputLen;
 
 		Buffer[inptr] = 0;
@@ -5033,10 +5067,9 @@ VOID SendWebRequest(SOCKET sock, char * Host, char * Request, char * Params, int
 					else
 					{
 						strlop(Buffer, 13);
-						Debugprintf("Map Update Params - %s", Params);
-
 						Debugprintf("Map Update failed - %s", Buffer);
 					}
+					closesocket(sock);
 					return;
 				}
 			}
@@ -5047,7 +5080,8 @@ VOID SendWebRequest(SOCKET sock, char * Host, char * Request, char * Params, int
 				if (ptr1)
 				{
 					// Just accept anything until I've sorted things with Lee
-					Debugprintf("%s", ptr1);
+
+					closesocket(sock);
 					Debugprintf("Web Database update ok");
 					return;
 				}
@@ -5138,11 +5172,16 @@ skipit:
 	}
 }
 
+void SendDataToPktMapThread();
 
-void SendDataToPktMap(char *Msg)
+void SendDataToPktMap()
 {
-	SOCKET sock;
+	_beginthread(SendDataToPktMapThread,2048000,0);
-	char Return[256];
+}
+
+void SendDataToPktMapThread()
+{
+	char Return[256] = "";
 	char Request[64];
 	char Params[50000];
 
@@ -5160,6 +5199,7 @@ void SendDataToPktMap(char *Msg)
 	char * Use;
 	char * Type;
 	char * Modulation;
+	char * Usage;
 
 	char locked[] = " ! ";
 	int Percent = 0;
@@ -5264,6 +5304,10 @@ void SendDataToPktMap(char *Msg)
 		Type = "RF";
 		Bitrate = 0;
 		Modulation = "FSK";
+		Usage = "Access";
+
+		if (PORT->PortFreq)
+			Freq = PORT->PortFreq;
 
 		if (PORT->PORTTYPE == 0)
 		{
@@ -5321,7 +5365,7 @@ void SendDataToPktMap(char *Msg)
 					continue;
 				}
 
-				if (TNC->RIG)
+				if (Freq == 0 && TNC->RIG)
 					Freq = TNC->RIG->RigFreq * 1000000;
 
 				switch (TNC->Hardware)				// Hardware Type
@@ -5387,6 +5431,15 @@ void SendDataToPktMap(char *Msg)
 
 					break;
 
+				case H_KISSHF:
+
+				// Try to get mode from ID then drop through
+
+					if (stristr(PORT->PORTDESCRIPTION, "BPSK"))
+					{
+						Modulation = "BPSK";
+					}
+
 				case H_WINMOR:
 				case H_V4:
 
@@ -5395,7 +5448,7 @@ void SendDataToPktMap(char *Msg)
 				case H_UIARQ:
 				case H_ARDOP:
 				case H_VARA:
-				case H_KISSHF:
+
 				case H_FREEDATA:
 
 					// TCP
@@ -5431,12 +5484,58 @@ void SendDataToPktMap(char *Msg)
 			while (*(ptr2) == ' ' && ptr2 != ID)
 				*(ptr2--) = 0;
 
+			if (PORT->M0LTEMapInfo)
+			{
+				// Override with user configured values - RF,7.045,BPSK,300,300,Access
+
+				char param[256];
+				char *p1, *p2, *p3, *p4, *p5;
+
+				strcpy(param, PORT->M0LTEMapInfo);
+
+				p1 = strlop(param, ',');
+				p2 = strlop(p1, ',');
+				p3 = strlop(p2, ',');
+				p4 = strlop(p3, ',');
+				p5 = strlop(p4, ',');
+
+	//			int n = sscanf(PORT->M0LTEMapInfo, "%s,%s,%s,%s,%s,%s", &p1, &p2, &p3, &p4, &p5, &p6);
+
+				if (p5)
+				{
+					if (param[0]) Type = param;
+
+					if (p1[0])
+					{
+						// if set to DIAL+=n and frequency set from config or rigcontrol modify it
+						
+						uint64_t offset = 0;
+				
+						if (_memicmp(p1, "DIAL+", 5) == 0)
+							offset = atoi(&p1[5]);
+						else if (_memicmp(p1, "DIAL-", 5) == 0)
+							offset = -atoi(&p1[5]);
+						else
+							Freq = atof(p1) * 1000000;
+
+						if (Freq != 0)
+							Freq += offset;
+
+					}
+
+					if (p2[0]) Modulation = p2;
+					if (p3[0]) Baud = atoi(p3);
+					if (p4[0]) Bitrate = atoi(p4);
+					if (p5[0]) Usage = p5;
+				}
+			}
+
 			ptr += sprintf(ptr, "{\"id\": \"%d\",\"linkType\": \"%s\","
 			"\"freq\": \"%lld\",\"mode\": \"%s\",\"modulation\": \"%s\","
 			"\"baud\": \"%d\",\"bitrate\": \"%d\",\"usage\": \"%s\",\"comment\": \"%s\"},\r\n",
 			PortNo, Type, 
 			Freq, Mode, Modulation,
-			Baud, Bitrate, "Access", ID);
+			Baud, Bitrate, Usage, ID);
 
 // G7TAJ //
 			// make MH list to be added later
@@ -5526,19 +5625,11 @@ void SendDataToPktMap(char *Msg)
     }
   ],
 
-
-
 */
 	//  "contact": "string",
 	//  "neighbours": [{"node": "G7TAJ","port": "30"}]
 
-	sock = OpenHTTPSock("packetnodes.spots.radio");
+	SendWebRequest("packetnodes.spots.radio", Request, Params, 0);
-
-	if (sock == 0)
-		return;
-
-	SendWebRequest(sock, "packetnodes.spots.radio", Request, Params, strlen(Params), Return);
-	closesocket(sock);
 }
 
 //	="{\"neighbours\": [{\"node\": \"G7TAJ\",\"port\": \"30\"}]}";

ConfigDirewolf.vcxproj

@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{271FDA0A-4F41-4F35-8227-9F2F29AA5A25}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>ConsoleApplication2</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-    <ProjectName>ConfigDirewolf</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>c:\devprogs\bpq32\ConfigDirewolf.exe</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ConfigDirewolf.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

ConfigWinRPR.vcxproj

@@ -1,164 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>15.0</VCProjectVersion>
-    <ProjectGuid>{2AD91A25-DF1B-462E-8CCB-CD1ABC627AA5}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-    <RootNamespace>ConsoleApplication2</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-    <ProjectName>ConfigWinRPR</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>Disabled</Optimization>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <PrecompiledHeader>NotUsing</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <OutputFile>c:\devprogs\bpq32\ConfigWinRPR.exe</OutputFile>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <Optimization>MaxSpeed</Optimization>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="pch.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ConfigWinRPR.c" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

DOSAPI.c

@@ -32,7 +32,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #include "compatbits.h"
 
-#include "CHeaders.h"
+#include "cheaders.h"
 
 extern QCOUNT; 
 extern BPQVECSTRUC BPQHOSTVECTOR[];

DRATS.c

@@ -21,7 +21,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #define _CRT_SECURE_NO_DEPRECATE
 
-#include "CHeaders.h"
+#include "cheaders.h"
 
 #include "bpq32.h"
 #include "telnetserver.h"
@@ -168,7 +168,7 @@ int AllocateDRATSStream(struct DRATSSession * Sess)
 
 	if (Stream == 255) return 0;
 
-	if (memcmp(Sess->CallTo, "NODE", 6) == 0)
+	if (memcmp(Sess->CallTo, "NODE", 4) == 0)
 	{
 		//  Just connect to command level on switch
 	}
@@ -563,7 +563,7 @@ void DRATSConnectionLost(struct ConnectionInfo * sockptr)
 #define ZEXPORT __stdcall
 #endif
 
-#include "zlib.h"
+#include <zlib.h>
 
 
 int doinflate(unsigned char * source, unsigned char * dest, int Len, int destlen, int * outLen)

Events.c

@@ -23,6 +23,8 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #include "compatbits.h"
 #include <string.h>
+#include "asmstrucs.h"
+#include "tncinfo.h"
 
 VOID __cdecl Debugprintf(const char * format, ...);
 
@@ -37,6 +39,11 @@ VOID __cdecl Debugprintf(const char * format, ...);
 #endif
 
 extern BOOL EventsEnabled;
+void MQTTReportSession(char * Msg);
+extern int MQTT;
+
+
+extern char Modenames[19][10];
 
 // Runs use specified routine on certain event
 #ifndef WIN32
@@ -107,3 +114,124 @@ DllExport void APIENTRY RunEventProgram(char * Program, char * Param)
 
 	return;
 }
+
+void hookL2SessionAccepted(int Port, char * remotecall, char * ourcall, struct _LINKTABLE * LINK)
+{
+	// Incoming SABM
+
+	LINK->ConnectTime = time(NULL);
+	LINK->bytesTXed = LINK->bytesRXed = 0;
+
+	strcpy(LINK->callingCall, remotecall);
+	strcpy(LINK->receivingCall, ourcall);
+	strcpy(LINK->Direction, "In");
+}
+
+void hookL2SessionDeleted(struct _LINKTABLE * LINK)
+{
+	// calculate session time and av bytes/min in and out
+
+	if (LINK->ConnectTime)
+	{
+		if (LINK->bytesTXed == 0 && LINK->bytesRXed == 0)
+		{
+			// assume failed connect and ignore for now - maybe log later
+
+		}
+		else
+		{
+			char Msg[256];
+			char timestamp[16];
+			time_t sessionTime = time(NULL) - LINK->ConnectTime;
+			double avBytesSent = LINK->bytesTXed / (sessionTime / 60.0);
+			double avBytesRXed = LINK->bytesRXed / (sessionTime / 60.0);
+			time_t Now = time(NULL);
+			struct tm * TM = localtime(&Now);
+
+			sprintf(timestamp, "%02d:%02d:%02d", TM->tm_hour, TM->tm_min, TM->tm_sec);
+
+			if (sessionTime == 0)
+				sessionTime = 1;				// Or will get divide by zero error 
+
+			Debugprintf("KISS Session Stats Port %d %s %s %d secs Bytes Sent %d  BPM %4.2f Bytes Received %d %4.2f BPM ", 
+				LINK->LINKPORT->PORTNUMBER, LINK->callingCall, LINK->receivingCall, sessionTime, LINK->bytesTXed, avBytesSent, LINK->bytesRXed, avBytesRXed, timestamp);
+
+
+			sprintf(Msg, "{\"mode\": \"%s\", \"direction\": \"%s\", \"port\": %d, \"callfrom\": \"%s\", \"callto\": \"%s\", \"time\": %d,  \"bytesSent\": %d," 
+				"\"BPMSent\": %4.2f, \"BytesReceived\": %d,  \"BPMReceived\": %4.2f, \"timestamp\": \"%s\"}",
+				"KISS", LINK->Direction, LINK->LINKPORT->PORTNUMBER, LINK->callingCall, LINK->receivingCall, sessionTime,
+				LINK->bytesTXed,  avBytesSent, LINK->bytesRXed, avBytesRXed, timestamp);
+
+			if (MQTT)
+				MQTTReportSession(Msg);
+		}
+
+		LINK->ConnectTime = 0;
+	}
+}
+
+void hookL2SessionAttempt(int Port, char * ourcall, char * remotecall, struct _LINKTABLE * LINK)
+{
+	LINK->ConnectTime = time(NULL);
+	LINK->bytesTXed = LINK->bytesRXed = 0;
+
+	strcpy(LINK->callingCall, ourcall);
+	strcpy(LINK->receivingCall, remotecall);
+	strcpy(LINK->Direction, "Out");
+}
+
+void hookL4SessionAttempt(struct STREAMINFO * STREAM, char * remotecall, char * ourcall)
+{
+	// Outgoing Connect
+
+	STREAM->ConnectTime = time(NULL);
+	STREAM->bytesTXed = STREAM->bytesRXed = 0;
+
+	strcpy(STREAM->callingCall, ourcall);
+	strcpy(STREAM->receivingCall, remotecall);
+	strcpy(STREAM->Direction, "Out");
+}
+
+void hookL4SessionAccepted(struct STREAMINFO * STREAM, char * remotecall, char * ourcall)
+{
+	// Incoming Connect
+
+	STREAM->ConnectTime = time(NULL);
+	STREAM->bytesTXed = STREAM->bytesRXed = 0;
+
+	strcpy(STREAM->callingCall, remotecall);
+	strcpy(STREAM->receivingCall, ourcall);
+	strcpy(STREAM->Direction, "In");
+}
+
+void hookL4SessionDeleted(struct TNCINFO * TNC, struct STREAMINFO * STREAM)
+{
+	char Msg[256];
+
+	char timestamp[16];
+
+	if (STREAM->ConnectTime)
+	{
+		time_t sessionTime = time(NULL) - STREAM->ConnectTime;
+		double avBytesRXed = STREAM->bytesRXed / (sessionTime / 60.0);
+		double avBytesSent = STREAM->bytesTXed / (sessionTime / 60.0);
+		time_t Now = time(NULL);
+		struct tm * TM = localtime(&Now);
+		sprintf(timestamp, "%02d:%02d:%02d", TM->tm_hour, TM->tm_min, TM->tm_sec);
+
+		if (sessionTime == 0)
+			sessionTime = 1;				// Or will get divide by zero error 
+ 
+		sprintf(Msg, "{\"mode\": \"%s\", \"direction\": \"%s\", \"port\": %d, \"callfrom\": \"%s\", \"callto\": \"%s\", \"time\": %d,  \"bytesSent\": %d," 
+			"\"BPMSent\": %4.2f, \"BytesReceived\": %d,  \"BPMReceived\": %4.2f, \"timestamp\": \"%s\"}",
+			Modenames[TNC->Hardware - 1], STREAM->Direction, TNC->Port, STREAM->callingCall, STREAM->receivingCall, sessionTime,
+			STREAM->bytesTXed,  avBytesSent, STREAM->bytesRXed, avBytesRXed, timestamp);
+
+		if (MQTT)
+			MQTTReportSession(Msg);
+
+		STREAM->ConnectTime = 0;
+	}
+}
+
+

FBBRoutines.c

@@ -23,9 +23,13 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #include "bpqmail.h"
 
-int32_t Encode(char * in, char * out, int32_t inlen, BOOL B1Protocol, int Compress);
+#define GetSemaphore(Semaphore,ID) _GetSemaphore(Semaphore, ID, __FILE__, __LINE__)
+void _GetSemaphore(struct SEM * Semaphore, int ID, char * File, int Line);
 
 
+int32_t Encode(char * in, char * out, int32_t inlen, BOOL B1Protocol, int Compress);
+void MQTTMessageEvent(void* message);
+
 int MaxRXSize = 99999;
 int MaxTXSize = 99999;
 
@@ -807,6 +811,11 @@ VOID FlagSentMessages(CIRCUIT * conn, struct UserInfo * user)
 				FBBHeader->FwdMsg->datechanged=time(NULL);
 			}
 
+#ifndef NOMQTT
+		if (MQTT)
+			MQTTMessageEvent(FBBHeader->FwdMsg);
+#endif
+
 			FBBHeader->FwdMsg->Locked = 0;	// Unlock
 			conn->UserPointer->ForwardingInfo->MsgCount--;
 		}

FLDigi.c

@@ -23,7 +23,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #define _CRT_SECURE_NO_DEPRECATE
 
-#include "CHeaders.h"
+#include "cheaders.h"
 
 extern int (WINAPI FAR *GetModuleFileNameExPtr)();
 extern int (WINAPI FAR *EnumProcessesPtr)();
@@ -65,12 +65,12 @@ extern int (WINAPI FAR *GetModuleFileNameExPtr)();
 ;
 int SemHeldByAPI;
 
-static void ConnecttoFLDigiThread(void * portptr);
+void ConnecttoFLDigiThread(void * portptr);
 
 void CreateMHWindow();
 int Update_MH_List(struct in_addr ipad, char * call, char proto);
 
-static int ConnecttoFLDigi();
+int ConnecttoFLDigi(int port);
 static int ProcessReceivedData(int bpqport);
 static int ProcessLine(char * buf, int Port);
 int KillTNC(struct TNCINFO * TNC);
@@ -93,6 +93,7 @@ VOID CheckFLDigiData(struct TNCINFO * TNC);
 VOID SendPacket(struct TNCINFO * TNC, UCHAR * Msg, int MsgLen);
 int	KissEncode(UCHAR * inbuff, UCHAR * outbuff, int len);
 VOID SendXMLCommand(struct TNCINFO * TNC, char * Command, char * Value, char ParamType);
+VOID SendXMLCommandInt(struct TNCINFO * TNC, char * Command, int Value, char ParamType);
 VOID FLSlowTimer(struct TNCINFO * TNC);
 VOID SendKISSCommand(struct TNCINFO * TNC, char * Msg);
 
@@ -101,8 +102,6 @@ VOID SuspendOtherPorts(struct TNCINFO * ThisTNC);
 VOID ReleaseOtherPorts(struct TNCINFO * ThisTNC);
 VOID WritetoTrace(struct TNCINFO * TNC, char * Msg, int Len);
 
-char * strlop(char * buf, char delim);
-
 extern UCHAR BPQDirectory[];
 
 #define MAXMPSKPORTS 16
@@ -539,7 +538,11 @@ pollloop:
 
 			if (_memicmp(&buff->L2DATA[0], "RADIO ", 6) == 0)
 			{
-				sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &buff->L2DATA[6]);
+				char cmd[56];
+
+				strcpy(cmd, &buff->L2DATA[6]);
+				sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, cmd);
+
 	
 				if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, &buff->L2DATA[0]))
 				{
@@ -592,7 +595,7 @@ pollloop:
 				}
 				else
 				{
-					SendXMLCommand(TNC, "modem.set_carrier", (char *)atoi(&buff->L2DATA[5]), 'I');
+					SendXMLCommandInt(TNC, "modem.set_carrier", atoi(&buff->L2DATA[5]), 'I');
 				}
 
 				TNC->InternalCmd = TRUE;
@@ -1181,7 +1184,6 @@ VOID * FLDigiExtInit(EXTPORTDATA * PortEntry)
 	}
 
 	TNC->Port = port;
-
 	TNC->PortRecord = PortEntry;
 
 	if (PortEntry->PORTCONTROL.PORTCALL[0] == 0)
@@ -1212,7 +1214,7 @@ VOID * FLDigiExtInit(EXTPORTDATA * PortEntry)
 	ptr=strchr(TNC->NodeCall, ' ');
 	if (ptr) *(ptr) = 0;					// Null Terminate
 
-	TNC->Hardware = H_FLDIGI;
+	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_FLDIGI;
 
 	if (TNC->BusyWait == 0)
 		TNC->BusyWait = 10;
@@ -1482,14 +1484,14 @@ static int ProcessLine(char * buf, int Port)
 	return (TRUE);	
 }
 
-static int ConnecttoFLDigi(int port)
+int ConnecttoFLDigi(int port)
 {
 	_beginthread(ConnecttoFLDigiThread, 0, (void *)(size_t)port);
 
 	return 0;
 }
 
-static VOID ConnecttoFLDigiThread(void * portptr)
+VOID ConnecttoFLDigiThread(void * portptr)
 {	
 	int port = (int)(size_t)portptr;
 	char Msg[255];
@@ -1637,7 +1639,7 @@ static VOID ConnecttoFLDigiThread(void * portptr)
 VOID UpdateStatsLine(struct TNCINFO * TNC, struct STREAMINFO * STREAM)
 {
 	sprintf(TNC->WEB_TRAFFIC, "RX %d TX %d ACKED %d Resent %d Queued %d",
-	STREAM->BytesRXed, STREAM->BytesTXed, STREAM->BytesAcked, STREAM->BytesResent, STREAM->BytesOutstanding);
+	STREAM->bytesRXed, STREAM->bytesTXed, STREAM->BytesAcked, STREAM->BytesResent, STREAM->BytesOutstanding);
 	SetWindowText(TNC->xIDC_TRAFFIC, TNC->WEB_TRAFFIC);
 }
 
@@ -2531,7 +2533,7 @@ VOID ProcessFLDigiData(struct TNCINFO * TNC, UCHAR * Input, int Len, char Channe
 
 		strcpy(STREAM->MyCall, call2);
 		STREAM->ConnectTime = time(NULL); 
-		STREAM->BytesRXed = STREAM->BytesTXed = STREAM->BytesAcked = STREAM->BytesResent = 0;
+		STREAM->bytesRXed = STREAM->bytesTXed = STREAM->BytesAcked = STREAM->BytesResent = 0;
 		
 		if (TNC->RIG && TNC->RIG != &TNC->DummyRig && strcmp(TNC->RIG->RigName, "PTT"))
 		{
@@ -2580,7 +2582,7 @@ VOID ProcessFLDigiData(struct TNCINFO * TNC, UCHAR * Input, int Len, char Channe
 		{
 			char AppName[13];
 
-			memcpy(AppName, &ApplPtr[App * sizeof(CMDX)], 12);
+			memcpy(AppName, &ApplPtr[App * sizeof(struct CMDX)], 12);
 			AppName[12] = 0;
 
 			// Make sure app is available
@@ -2690,7 +2692,7 @@ AckConnectRequest:
 			goto SendKReply;		// Repeated ACK
 
 		STREAM->ConnectTime = time(NULL); 
-		STREAM->BytesRXed = STREAM->BytesTXed = STREAM->BytesAcked = STREAM->BytesResent = 0;
+		STREAM->bytesRXed = STREAM->bytesTXed = STREAM->BytesAcked = STREAM->BytesResent = 0;
 		STREAM->Connected = TRUE;
 
 		ARQ->ARQTimerState = 0;
@@ -2951,22 +2953,7 @@ SendKReply:
 
 		if (STREAM->Connected)
 		{
-			// Create a traffic record
+			hookL4SessionDeleted(TNC, STREAM);
-		
-			char logmsg[120];	
-			time_t Duration;
-
-			Duration = time(NULL) - STREAM->ConnectTime;
-				
-			if (Duration == 0)
-				Duration = 1;
-			
-			sprintf(logmsg,"Port %2d %9s Bytes Sent %d  BPS %d Bytes Received %d BPS %d Time %d Seconds",
-				TNC->Port, STREAM->RemoteCall,
-				STREAM->BytesTXed, (int)(STREAM->BytesTXed/Duration),
-				STREAM->BytesRXed, (int)(STREAM->BytesRXed/Duration), (int)Duration);
-
-			Debugprintf(logmsg);
 		}
 
 		STREAM->Connecting = FALSE;
@@ -3029,7 +3016,7 @@ SendKReply:
 
 			buffptr->Len = Len;
 			memcpy(buffptr->Data, &Input[1], Len);
-			STREAM->BytesRXed += Len;
+			STREAM->bytesRXed += Len;
 
 			UpdateStatsLine(TNC, STREAM);
 
@@ -3146,7 +3133,7 @@ VOID SendARQData(struct TNCINFO * TNC, PMSGWITHLEN Buffer)
 
 	ARQ->TXHOLDQ[ARQ->TXSeq] = Buffer;
 
-	STREAM->BytesTXed += Origlen;
+	STREAM->bytesTXed += Origlen;
 
 	UpdateStatsLine(TNC, STREAM);
 
@@ -3212,7 +3199,7 @@ VOID FLReleaseTNC(struct TNCINFO * TNC)
 		else
 		{
 			SendXMLCommand(TNC, "modem.set_by_name", TNC->FLInfo->DefaultMode, 'S');
-			SendXMLCommand(TNC, "modem.set_carrier", (char *)TNC->FLInfo->DefaultFreq, 'I');
+			SendXMLCommandInt(TNC, "modem.set_carrier", TNC->FLInfo->DefaultFreq, 'I');
 		}
 	}
 	//	Start Scanner
@@ -3910,6 +3897,27 @@ VOID SendXMLCommand(struct TNCINFO * TNC, char * Command, char * Value, char Par
 	return;
 }
 
+VOID SendXMLCommandInt(struct TNCINFO * TNC, char * Command, int Value, char ParamType)
+{
+	int Len;
+	char ReqBuf[512];
+	char SendBuff[512];
+	struct FLINFO *	FL = TNC->FLInfo;
+	struct ARQINFO * ARQ = TNC->ARQInfo;
+	char ValueString[256] ="";
+
+	if (!TNC->CONNECTED || TNC->FLInfo->KISSMODE)
+		return;
+
+	sprintf(ValueString, "<params><param><value><i4>%d</i4></value></param></params\r\n>", Value);
+
+	strcpy(FL->LastXML, Command);
+	Len = sprintf(ReqBuf, Req, FL->LastXML, ValueString);
+	Len = sprintf(SendBuff, MsgHddr, Len, ReqBuf);
+	send(TNC->TCPSock, SendBuff, Len, 0); 
+	return;
+}
+
 VOID SendXMLPoll(struct TNCINFO * TNC)
 {
 	int Len;

FormatHTML.vcproj

@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="FormatHTML"
-	ProjectGUID="{2B892B53-6549-4872-AF51-45280ADC8AB5}"
-	RootNamespace="FormatHTML"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="C:\Dev\Msdev2005\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="kernel32.lib $(NoInherit)"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="C:\Dev\Msdev2005\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="kernel32.lib $(NoInherit)"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\FormatHTML.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						CompileAs="1"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\stdafx.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\stdafx.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

FreeDATA.c

@@ -32,7 +32,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #endif
 #endif
 
-#include "CHeaders.h"
+#include "cheaders.h"
 #include "bpq32.h"
 #include "tncinfo.h"
 
@@ -347,41 +347,6 @@ loop:
 	return 1;
 }
 
-BOOL FreeDataReadConfigFile(int Port, int ProcLine())
-{
-	char buf[256],errbuf[256];
-
-	Config = PortConfig[Port];
-
-	if (Config)
-	{
-		// Using config from bpq32.cfg
-
-		if (strlen(Config) == 0)
-		{
-			return TRUE;
-		}
-
-		ptr1 = Config;
-		ptr2 = strchr(ptr1, 13);
-
-		if (!ProcLine(buf, Port))
-		{
-			WritetoConsoleLocal("\n");
-			WritetoConsoleLocal("Bad config record ");
-			WritetoConsoleLocal(errbuf);
-		}
-	}
-	else
-	{
-		sprintf(buf," ** Error - No Configuration info in bpq32.cfg");
-		WritetoConsoleLocal(buf);
-	}
-
-	return (TRUE);
-}
-
-
 
 VOID SuspendOtherPorts(struct TNCINFO * ThisTNC);
 VOID ReleaseOtherPorts(struct TNCINFO * ThisTNC);
@@ -686,8 +651,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 
 			if (buffptr == 0) return (0);			// No buffers, so ignore
 
-			buffptr->Len = 36;
+			buffptr->Len = sprintf(&buffptr->Data[0], "No Connection to TNC\r");
-			memcpy(&buffptr->Data[0], "No Connection to TNC\r", 36);
 
 			C_Q_ADD(&TNC->Streams[Stream].PACTORtoBPQ_Q, buffptr);
 			
@@ -776,7 +740,10 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 
 		if (_memicmp(&buff->L2DATA[0], "RADIO ", 6) == 0)
 		{
-			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &buff->L2DATA[6]);
+			char cmd[56];
+
+			strcpy(cmd, &buff->L2DATA[6]);
+			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, cmd);
 
 			if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, &buff->L2DATA[0]))
 			{
@@ -868,7 +835,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 			char Message[256];
 			int Len, ret;
 
-			Len = sprintf(Message, TXF);
+			Len = sprintf(Message, "%s", TXF);
 			ret = send(TNC->TCPDataSock, (char *)&Message, Len, 0);
 			
 			if (buffptr)
@@ -972,7 +939,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 			memset(STREAM->RemoteCall, 0, 10);
 			strcpy(STREAM->RemoteCall, &buff->L2DATA[2]);
 			STREAM->ConnectTime = time(NULL); 
-			STREAM->BytesRXed = STREAM->BytesTXed = STREAM->PacketsSent = 0;
+			STREAM->bytesRXed = STREAM->bytesTXed = STREAM->PacketsSent = 0;
 
 			sprintf(TNC->WEB_TNCSTATE, "%s Connecting to %s", STREAM->MyCall, STREAM->RemoteCall);
 			MySetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
@@ -1429,14 +1396,14 @@ VOID * FreeDataExtInit(EXTPORTDATA * PortEntry)
 	Consoleprintf("FreeData Host %s %d", TNC->HostName, TNC->TCPPort);
 
 	TNC->Port = port;
-	TNC->Hardware = H_FREEDATA;
+	TNC->PortRecord = PortEntry;
+	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_FREEDATA;
 
 	TNC->WeStartedTNC = 1;
 
 	TNC->ARDOPDataBuffer = malloc(MAXRXSIZE);
 	TNC->ARDOPBuffer = malloc(FREEDATABUFLEN);
 
-	TNC->PortRecord = PortEntry;
 
 	if (PortEntry->PORTCONTROL.PORTCALL[0] == 0)
 		memcpy(TNC->NodeCall, MYNODECALL, 10);
@@ -1882,7 +1849,7 @@ VOID FreeDataProcessTNCMessage(struct TNCINFO * TNC, char * Call, unsigned char
 		if (App < 32)
 		{
 
-			memcpy(AppName, &ApplPtr[App * sizeof(CMDX)], 12);
+			memcpy(AppName, &ApplPtr[App * sizeof(struct CMDX)], 12);
 			AppName[12] = 0;
 
 			// if SendTandRtoRelay set and Appl is RMS change to RELAY
@@ -1951,7 +1918,7 @@ VOID FreeDataProcessTNCMessage(struct TNCINFO * TNC, char * Call, unsigned char
 		MySetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
 
 		STREAM->ConnectTime = time(NULL); 
-		STREAM->BytesRXed = STREAM->BytesTXed = STREAM->PacketsSent = 0;
+		STREAM->bytesRXed = STREAM->bytesTXed = STREAM->PacketsSent = 0;
 		STREAM->Connected = TRUE;
 
 		// Send Connect ACK
@@ -2020,20 +1987,7 @@ VOID FreeDataProcessTNCMessage(struct TNCINFO * TNC, char * Call, unsigned char
 		{
 			// Create a traffic record
 		
-			char logmsg[120];	
+			hookL4SessionDeleted(TNC, STREAM);
-			time_t Duration;
-
-			Duration = time(NULL) - STREAM->ConnectTime;
-
-			if (Duration == 0)
-				Duration = 1;
-				
-			sprintf(logmsg,"Port %2d %9s Bytes Sent %d  BPS %d Bytes Received %d BPS %d Time %d Seconds",
-				TNC->Port, STREAM->RemoteCall,
-				STREAM->BytesTXed, (int)(STREAM->BytesTXed/Duration),
-				STREAM->BytesRXed, (int)(STREAM->BytesRXed/Duration), (int)Duration);
-
-			Debugprintf(logmsg);
 		}
 
 		STREAM->Connected = FALSE;		// Back to Command Mode
@@ -2063,7 +2017,7 @@ VOID FreeDataProcessTNCMessage(struct TNCINFO * TNC, char * Call, unsigned char
 			WritetoTrace(TNC, Msg, 256);
 			Len -= 256;
 			Msg += 256;
-			STREAM->BytesRXed += 256;
+			STREAM->bytesRXed += 256;
 
 		}
 
@@ -2072,9 +2026,9 @@ VOID FreeDataProcessTNCMessage(struct TNCINFO * TNC, char * Call, unsigned char
 		memcpy(buffptr->Data, Msg, Len);
 		C_Q_ADD(&STREAM->PACTORtoBPQ_Q, buffptr);
 		WritetoTrace(TNC, Msg, Len);
-		STREAM->BytesRXed += Len;
+		STREAM->bytesRXed += Len;
 		sprintf(TNC->WEB_TRAFFIC, "Sent %d RXed %d Queued %d",
-				STREAM->BytesTXed - TNC->FreeDataInfo->toSendCount, STREAM->BytesRXed, TNC->FreeDataInfo->toSendCount);
+				STREAM->bytesTXed - TNC->FreeDataInfo->toSendCount, STREAM->bytesRXed, TNC->FreeDataInfo->toSendCount);
 		MySetWindowText(TNC->xIDC_TRAFFIC, TNC->WEB_TRAFFIC);
 
 		return;
@@ -2256,7 +2210,7 @@ VOID FreeDataProcessNewConnect(struct TNCINFO * TNC, char * fromCall, char * toC
 	if (App < 32)
 	{
 
-		memcpy(AppName, &ApplPtr[App * sizeof(CMDX)], 12);
+		memcpy(AppName, &ApplPtr[App * sizeof(struct CMDX)], 12);
 		AppName[12] = 0;
 
 		// if SendTandRtoRelay set and Appl is RMS change to RELAY
@@ -2327,7 +2281,7 @@ VOID FreeDataProcessNewConnect(struct TNCINFO * TNC, char * fromCall, char * toC
 	MySetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
 
 	STREAM->ConnectTime = time(NULL); 
-	STREAM->BytesRXed = STREAM->BytesTXed = STREAM->PacketsSent = 0;
+	STREAM->bytesRXed = STREAM->bytesTXed = STREAM->PacketsSent = 0;
 	STREAM->Connected = TRUE;
 
 	return;
@@ -2427,7 +2381,7 @@ void FlushData(struct TNCINFO * TNC)
 	Info->toSendTimeout = 0;
 
 	sprintf(TNC->WEB_TRAFFIC, "Sent %d RXed %d Queued %d",
-			STREAM->BytesTXed - TNC->FreeDataInfo->toSendCount, STREAM->BytesRXed, TNC->FreeDataInfo->toSendCount);
+			STREAM->bytesTXed - TNC->FreeDataInfo->toSendCount, STREAM->bytesRXed, TNC->FreeDataInfo->toSendCount);
 	MySetWindowText(TNC->xIDC_TRAFFIC, TNC->WEB_TRAFFIC);
 
 }
@@ -2450,10 +2404,10 @@ static int SendAsFile(struct TNCINFO * TNC, char * Call, char * Msg, int Len)
 	Info->toSendCount += Len;
 	Info->toSendTimeout = 10;		// About a second
 
-	STREAM->BytesTXed += Len;
+	STREAM->bytesTXed += Len;
 
 	sprintf(TNC->WEB_TRAFFIC, "Sent %d RXed %d Queued %d",
-			STREAM->BytesTXed - TNC->FreeDataInfo->toSendCount, STREAM->BytesRXed, TNC->FreeDataInfo->toSendCount);
+			STREAM->bytesTXed - TNC->FreeDataInfo->toSendCount, STREAM->bytesRXed, TNC->FreeDataInfo->toSendCount);
 	MySetWindowText(TNC->xIDC_TRAFFIC, TNC->WEB_TRAFFIC);
 
 	return Len;
@@ -2490,7 +2444,7 @@ static void SendCQ(struct TNCINFO * TNC)
 	char Message[256];
 	int Len, ret;
 
-	Len = sprintf(Message, CQ);
+	Len = sprintf(Message, "%s", CQ);
 	ret = send(TNC->TCPDataSock, (char *)&Message, Len, 0);
 }
 
@@ -2505,7 +2459,7 @@ static void SendBeacon(struct TNCINFO * TNC, int Interval)
 	if (Interval > 0)
 		Len = sprintf(Message, Template1, Interval);
 	else
-		Len = sprintf(Message, Template2);
+		Len = sprintf(Message, "%s", Template2);
 
 	ret = send(TNC->TCPDataSock, (char *)&Message, Len, 0);
 }
@@ -2720,7 +2674,7 @@ void ProcessMessageObject(struct TNCINFO * TNC, char * This)
 					WritetoTrace(TNC, Line, 256);
 					Len -= 256;
 					Line += 256;
-					STREAM->BytesRXed += 256;
+					STREAM->bytesRXed += 256;
 				}
 
 				buffptr = GetBuff();
@@ -2728,12 +2682,12 @@ void ProcessMessageObject(struct TNCINFO * TNC, char * This)
 				memcpy(buffptr->Data, Line, Len);
 				C_Q_ADD(&STREAM->PACTORtoBPQ_Q, buffptr);
 				WritetoTrace(TNC, Line, Len);
-				STREAM->BytesRXed += Len;
+				STREAM->bytesRXed += Len;
 
 			}
 
 			sprintf(TNC->WEB_TRAFFIC, "Sent %d RXed %d Queued %d",
-				STREAM->BytesTXed - TNC->FreeDataInfo->toSendCount, STREAM->BytesRXed, TNC->FreeDataInfo->toSendCount);
+				STREAM->bytesTXed - TNC->FreeDataInfo->toSendCount, STREAM->bytesRXed, TNC->FreeDataInfo->toSendCount);
 			MySetWindowText(TNC->xIDC_TRAFFIC, TNC->WEB_TRAFFIC);
 		}
 		return;
@@ -2812,7 +2766,7 @@ void ProcessMessageObject(struct TNCINFO * TNC, char * This)
 						WritetoTrace(TNC, Line, 256);
 						Len -= 256;
 						TEXT += 256;
-						STREAM->BytesRXed += 256;
+						STREAM->bytesRXed += 256;
 					}
 
 					buffptr = GetBuff();
@@ -2820,14 +2774,14 @@ void ProcessMessageObject(struct TNCINFO * TNC, char * This)
 					memcpy(buffptr->Data, Line, Len);
 					C_Q_ADD(&STREAM->PACTORtoBPQ_Q, buffptr);
 					WritetoTrace(TNC, Line, Len);
-					STREAM->BytesRXed += Len;
+					STREAM->bytesRXed += Len;
 
 					TEXT = rest;
 					rest = strlop(TEXT, 10);		// FreeData chat ues LF
 				}
 				
 				sprintf(TNC->WEB_TRAFFIC, "Sent %d RXed %d Queued %d",
-					STREAM->BytesTXed - TNC->FreeDataInfo->toSendCount, STREAM->BytesRXed, TNC->FreeDataInfo->toSendCount);
+					STREAM->bytesTXed - TNC->FreeDataInfo->toSendCount, STREAM->bytesRXed, TNC->FreeDataInfo->toSendCount);
 				MySetWindowText(TNC->xIDC_TRAFFIC, TNC->WEB_TRAFFIC);
 			}
 		}
@@ -3159,22 +3113,8 @@ void ProcessTNCJSON(struct TNCINFO * TNC, char * Msg, int Len)
 
 					if (STREAM->Connected)
 					{
-						// Create a traffic record
 	
-						char logmsg[120];	
+						hookL4SessionDeleted(TNC, STREAM);
-						time_t Duration;
-
-						Duration = time(NULL) - STREAM->ConnectTime;
-
-						if (Duration == 0)
-							Duration = 1;
-
-						sprintf(logmsg,"Port %2d %9s Bytes Sent %d  BPS %d Bytes Received %d BPS %d Time %d Seconds",
-							TNC->Port, STREAM->RemoteCall,
-							STREAM->BytesTXed, (int)(STREAM->BytesTXed/Duration),
-							STREAM->BytesRXed, (int)(STREAM->BytesRXed/Duration), (int)Duration);
-
-						Debugprintf(logmsg);
 
 						STREAM->Connected = FALSE;		// Back to Command Mode
 						STREAM->ReportDISC = TRUE;		// Tell Node
@@ -3215,7 +3155,7 @@ void ProcessTNCJSON(struct TNCINFO * TNC, char * Msg, int Len)
 					}
 				}
 
-				else if (memcmp(ptr, "close", 12) == 0)
+				else if (memcmp(ptr, "close", 5) == 0)
 				{
 					if (TNC->FreeDataInfo->arqstate != 4)
 					{
@@ -3352,20 +3292,7 @@ void ProcessTNCJSON(struct TNCINFO * TNC, char * Msg, int Len)
 				{
 					// Create a traffic record
 
-					char logmsg[120];	
+					hookL4SessionDeleted(TNC, STREAM);
-					time_t Duration;
-
-					Duration = time(NULL) - STREAM->ConnectTime;
-
-					if (Duration == 0)
-						Duration = 1;
-
-					sprintf(logmsg,"Port %2d %9s Bytes Sent %d  BPS %d Bytes Received %d BPS %d Time %d Seconds",
-						TNC->Port, STREAM->RemoteCall,
-						STREAM->BytesTXed, (int)(STREAM->BytesTXed/Duration),
-						STREAM->BytesRXed, (int)(STREAM->BytesRXed/Duration), (int)Duration);
-
-					Debugprintf(logmsg);
 
 					STREAM->Connected = FALSE;		// Back to Command Mode
 					STREAM->ReportDISC = TRUE;		// Tell Node
@@ -3723,7 +3650,7 @@ int FreeDataDisconnect(struct TNCINFO * TNC)
 
 //	return FreeDataSendCommand(TNC, "D");
 
-	Len = sprintf(Msg, Disconnect);
+	Len = sprintf(Msg, "%s", Disconnect);
 
 	return send(TNC->TCPDataSock, Msg, Len, 0);
 }
@@ -3735,7 +3662,7 @@ int FreeGetData(struct TNCINFO * TNC)
 	char Msg[128];
 	int Len;
 
-	Len = sprintf(Msg, GetData);
+	Len = sprintf(Msg, "%s", GetData);
 
 	return send(TNC->TCPDataSock, Msg, Len, 0);
 }
@@ -4215,7 +4142,7 @@ void buildParamString(struct TNCINFO * TNC, char * line)
 		FDI->TuningRange * -1.0, FDI->TuningRange * 1.0, FDI->TXLevel);
 
 	if (FDI->hamlibHost)
-		sprintf(line, "%s --rigctld_ip %s --rigctld_port %d", line, FDI->hamlibHost, FDI->hamlibPort);
+		sprintf(&line[strlen(line)], " --rigctld_ip %s --rigctld_port %d", FDI->hamlibHost, FDI->hamlibPort);
 
 	if (FDI->LimitBandWidth)
 		strcat(line, " --500hz");

HALDriver.c

@@ -28,7 +28,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #include "time.h"
 
-#include "CHeaders.h"
+#include "cheaders.h"
 #include "tncinfo.h"
 
 #include "bpq32.h"
@@ -471,7 +471,7 @@ VOID * HALExtInit(EXTPORTDATA *  PortEntry)
 	int port;
 	char * ptr;
 	int len;
-	char Msg[80];
+	char Msg[512];
 #ifndef LINBPQ
 	HWND x;
 #endif
@@ -499,15 +499,15 @@ VOID * HALExtInit(EXTPORTDATA *  PortEntry)
 	}
 	
 	TNC->Port = port;
+	TNC->PortRecord = PortEntry;
 
-	TNC->Hardware = H_HAL;
+	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_HAL;
 
 	if (PortEntry->PORTCONTROL.PORTINTERLOCK && TNC->RXRadio == 0 && TNC->TXRadio == 0)
 		TNC->RXRadio = TNC->TXRadio = PortEntry->PORTCONTROL.PORTINTERLOCK;
 
 	PortEntry->MAXHOSTMODESESSIONS = 1;		// Default
 
-	TNC->PortRecord = PortEntry;
 
 	if (PortEntry->PORTCONTROL.PORTCALL[0] == 0)
 	{
@@ -548,7 +548,7 @@ VOID * HALExtInit(EXTPORTDATA *  PortEntry)
 	TNC->WebWinX = 510;
 	TNC->WebWinY = 280;
 
-	TNC->WEB_COMMSSTATE = zalloc(100);
+	TNC->WEB_COMMSSTATE = zalloc(512);
 	TNC->WEB_TNCSTATE = zalloc(100);
 	strcpy(TNC->WEB_TNCSTATE, "Free");
 	TNC->WEB_MODE = zalloc(100);
@@ -749,7 +749,7 @@ VOID HALPoll(int Port)
 
 		STREAM->Attached = TRUE;
 
-		STREAM->BytesRXed = STREAM->BytesTXed = STREAM->BytesAcked = 0;
+		STREAM->bytesRXed = STREAM->bytesTXed = STREAM->BytesAcked = 0;
 
 		calllen = ConvFromAX25(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4USER, STREAM->MyCall);
 		STREAM->MyCall[calllen] = 0;
@@ -829,7 +829,7 @@ VOID HALPoll(int Port)
 
 	//for (Stream = 0; Stream <= MaxStreams; Stream++)
 	{
-		if (TNC->TNCOK && STREAM->BPQtoPACTOR_Q && (STREAM->BytesTXed - STREAM->BytesAcked < 600))
+		if (TNC->TNCOK && STREAM->BPQtoPACTOR_Q && (STREAM->bytesTXed - STREAM->BytesAcked < 600))
 		{
 			int datalen;
 			PMSGWITHLEN buffptr;
@@ -872,7 +872,7 @@ VOID HALPoll(int Port)
 				ReleaseBuffer(buffptr);
 				WriteLogLine(2, MsgPtr, datalen);
 
-				STREAM->BytesTXed += datalen; 
+				STREAM->bytesTXed += datalen; 
 				STREAM->FramesQueued--;
 
 				ShowTraffic(TNC);
@@ -1090,10 +1090,10 @@ VOID ProcessHALData(struct TNCINFO * TNC)
 		STREAM->BytesAcked += Len;
 //		Debugprintf("Acked %d", Len);
 
-		if (STREAM->BytesAcked > STREAM->BytesTXed)
+		if (STREAM->BytesAcked > STREAM->bytesTXed)
 			Debugprintf("Too Much Acked");
 
-		if ((STREAM->BPQtoPACTOR_Q == 0) && STREAM->BytesAcked >= STREAM->BytesTXed)
+		if ((STREAM->BPQtoPACTOR_Q == 0) && STREAM->BytesAcked >= STREAM->bytesTXed)
 		{
 			// All sent 
 
@@ -1121,7 +1121,7 @@ VOID ProcessHALData(struct TNCINFO * TNC)
 
 			WriteLogLine(1, TNC->DataBuffer, Len);
 
-			STREAM->BytesRXed += Len;
+			STREAM->bytesRXed += Len;
 
 			memcpy(buffptr->Data, TNC->DataBuffer, Len);
 
@@ -1756,7 +1756,7 @@ BOOL HALConnected(struct TNCINFO * TNC, char * Call)
 	strcpy(CallCopy, Call);
 	strcat(CallCopy, "          ");			// Some routines expect 10 char calls
 
-	STREAM->BytesRXed = STREAM->BytesTXed = STREAM->BytesAcked = 0;
+	STREAM->bytesRXed = STREAM->bytesTXed = STREAM->BytesAcked = 0;
 	STREAM->ConnectTime = time(NULL); 
 
 	// Stop Scanner
@@ -1804,7 +1804,7 @@ BOOL HALConnected(struct TNCINFO * TNC, char * Call)
 			EncodeAndSend(TNC, CTEXTMSG, CTEXTLEN);
 			WriteLogLine(2, CTEXTMSG, CTEXTLEN);
 
-			STREAM->BytesTXed += CTEXTLEN;
+			STREAM->bytesTXed += CTEXTLEN;
 		}
 		return TRUE;
 	}

HFCommon.c

@@ -30,7 +30,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 
 #include "kernelresource.h"
-#include "CHeaders.h"
+#include "cheaders.h"
 #include "tncinfo.h"
 #ifndef LINBPQ
 #include <commctrl.h>
@@ -336,7 +336,8 @@ LRESULT CALLBACK PacWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPara
 }
 #endif
 
-BOOL CreatePactorWindow(struct TNCINFO * TNC, char * ClassName, char * WindowTitle, int RigControlRow, WNDPROC WndProc, int Width, int Height, VOID ForcedCloseProc())
+BOOL CreatePactorWindow(struct TNCINFO * TNC, char * ClassName, char * WindowTitle, int RigControlRow, WNDPROC WndProc, int Width, int Height,
+						VOID ForcedCloseProc(struct TNCINFO * TNC, int Stream))
 {
 #ifdef LINBPQ
 	return FALSE;
@@ -1602,7 +1603,7 @@ VOID ShowTraffic(struct TNCINFO * TNC)
 	char Status[80];
 
 	sprintf(Status, "RX %d TX %d ACKED %d ", 
-		TNC->Streams[0].BytesRXed, TNC->Streams[0].BytesTXed, TNC->Streams[0].BytesAcked);
+		TNC->Streams[0].bytesRXed, TNC->Streams[0].bytesTXed, TNC->Streams[0].BytesAcked);
 #ifndef LINBPQ
 	SetDlgItemText(TNC->hDlg, IDC_TRAFFIC, Status);
 #endif

HSMODEM.c

@@ -33,7 +33,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #endif
 
 
-#include "CHeaders.h"
+#include "cheaders.h"
 
 #pragma pack(1)
 
@@ -309,47 +309,10 @@ loop:
 	return 1;
 }
 
-BOOL HSMODEMReadConfigFile(int Port, int ProcLine())
-{
-	char buf[256],errbuf[256];
-
-	Config = PortConfig[Port];
-
-	if (Config)
-	{
-		// Using config from bpq32.cfg
-
-		if (strlen(Config) == 0)
-		{
-			return TRUE;
-		}
-
-		ptr1 = Config;
-		ptr2 = strchr(ptr1, 13);
-
-		if (!ProcLine(buf, Port))
-		{
-			WritetoConsoleLocal("\n");
-			WritetoConsoleLocal("Bad config record ");
-			WritetoConsoleLocal(errbuf);
-		}
-	}
-	else
-	{
-		sprintf(buf," ** Error - No Configuration info in bpq32.cfg");
-		WritetoConsoleLocal(buf);
-	}
-
-	return (TRUE);
-}
-
-
-
 VOID SuspendOtherPorts(struct TNCINFO * ThisTNC);
 VOID ReleaseOtherPorts(struct TNCINFO * ThisTNC);
 VOID WritetoTrace(struct TNCINFO * TNC, char * Msg, int Len);
 
-
 static time_t ltime;
 
 
@@ -589,7 +552,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 				UCHAR * data = &buffptr->Data[0];
 				STREAM->FramesQueued--;
 				txlen = (int)buffptr->Len;
-				STREAM->BytesTXed += txlen;
+				STREAM->bytesTXed += txlen;
 
 				bytes=HSMODEMSendData(TNC, data, txlen);
 				WritetoTrace(TNC, data, txlen);
@@ -668,7 +631,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 
 			bytes=HSMODEMSendData(TNC, TXMsg, txlen);
 			TNC->Streams[Stream].BytesOutstanding += bytes;		// So flow control works - will be updated by BUFFER response
-			STREAM->BytesTXed += bytes;
+			STREAM->bytesTXed += bytes;
 //			WritetoTrace(TNC, &buff->L2DATA[0], txlen);
 	
 			return 1;
@@ -685,7 +648,11 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 
 		if (_memicmp(&buff->L2DATA[0], "RADIO ", 6) == 0)
 		{
-			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &buff->L2DATA[6]);
+			char cmd[56];
+
+			strcpy(cmd, &buff->L2DATA[6]);
+			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, cmd);
+
 	
 			if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, &buff->L2DATA[0]))
 			{
@@ -1214,10 +1181,10 @@ VOID * HSMODEMExtInit(EXTPORTDATA * PortEntry)
 	Consoleprintf("HSMODEM Host %s %d", TNC->HostName, TNC->TCPPort);
 
 	TNC->Port = port;
-	TNC->Hardware = H_HSMODEM;
-
 	TNC->PortRecord = PortEntry;
 
+	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_HSMODEM;
+
 	if (PortEntry->PORTCONTROL.PORTCALL[0] == 0)
 		memcpy(TNC->NodeCall, MYNODECALL, 10);
 	else

HTMLCommonCode.c

@@ -27,7 +27,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #pragma data_seg("_BPQDATA")
 
-#include "CHeaders.h"
+#include "cheaders.h"
 
 #include "templatedefs.c"				// Inline definitions from HTLMPages
 

HTTPcode.c

@@ -24,7 +24,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #define DllImport
 
-#include "CHeaders.h"
+#include "cheaders.h"
 #include <stdlib.h>
 
 #include "tncinfo.h"
@@ -38,7 +38,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #define ZEXPORT __stdcall
 #endif
 
-#include "zlib.h"
+#include <zlib.h>
 
 #define CKernel
 #include "httpconnectioninfo.h"
@@ -70,6 +70,9 @@ char * GetStandardPage(char * FN, int * Len);
 BOOL SHA1PasswordHash(char * String, char * Hash);
 char * byte_base64_encode(char *str, int len);
 int APIProcessHTTPMessage(char * response, char * Method, char * URL, char * request,	BOOL LOCAL, BOOL COOKIE);
+int RHPProcessHTTPMessage(struct ConnectionInfo * conn, char * response, char * Method, char * URL, char * request, BOOL LOCAL, BOOL COOKIE);
+unsigned char * Compressit(unsigned char * In, int Len, int * OutLen);
+int doinflate(unsigned char * source, unsigned char * dest, int Len, int destlen, int * outLen);
 
 extern struct ROUTE * NEIGHBOURS;
 extern int  ROUTE_LEN;
@@ -102,16 +105,16 @@ extern int NumberofPorts;
 
 extern UCHAR ConfigDirectory[260];
 
-char * strlop(char * buf, char delim);
 VOID sendandcheck(SOCKET sock, const char * Buffer, int Len);
 int CompareNode(const void *a, const void *b);
 int CompareAlias(const void *a, const void *b);
-void ProcessMailHTTPMessage(struct HTTPConnectionInfo * Session, char * Method, char * URL, char * input, char * Reply, int * RLen, int InputLen);
+void ProcessMailHTTPMessage(struct HTTPConnectionInfo * Session, char * Method, char * URL, char * input, char * Reply, int * RLen, int InputLen, char * Token);
 void ProcessChatHTTPMessage(struct HTTPConnectionInfo * Session, char * Method, char * URL, char * input, char * Reply, int * RLen);
 struct PORTCONTROL * APIENTRY GetPortTableEntryFromSlot(int portslot);
 int SetupNodeMenu(char * Buff, int SYSOP);
 int StatusProc(char * Buff);
 int ProcessMailSignon(struct TCPINFO * TCP, char * MsgPtr, char * Appl, char * Reply, struct HTTPConnectionInfo ** Session, BOOL WebMail, int LOCAL);
+int ProcessMailAPISignon(struct TCPINFO * TCP, char * MsgPtr, char * Appl, char * Reply, struct HTTPConnectionInfo ** Session, BOOL WebMail, int LOCAL);
 int ProcessChatSignon(struct TCPINFO * TCP, char * MsgPtr, char * Appl, char * Reply, struct HTTPConnectionInfo ** Session, int LOCAL);
 VOID APRSProcessHTTPMessage(SOCKET sock, char * MsgPtr, BOOL LOCAL, BOOL COOKIE);
 
@@ -142,7 +145,7 @@ char Tail[] = "</body></html>";
 char RouteHddr[] = "<h2 align=center>Routes</h2><table align=center border=2 style=font-family:monospace bgcolor=white>"
 "<tr><th>Port</th><th>Call</th><th>Quality</th><th>Node Count</th><th>Frame Count</th><th>Retries</th><th>Percent</th><th>Maxframe</th><th>Frack</th><th>Last Heard</th><th>Queued</th><th>Rem Qual</th></tr>";
 
-char RouteLine[] = "<tr><td>%s%d</td><td>%s%c</td><td>%d</td><td>%d</td><td>%d</td><td>%d</td><td>%d%</td><td>%d</td><td>%d</td><td>%02d:%02d</td><td>%d</td><td>%d</td></tr>";
+char RouteLine[] = "<tr><td>%s%d</td><td>%s%s</td><td>%d</td><td>%d</td><td>%d</td><td>%d</td><td>%d%</td><td>%d</td><td>%d</td><td>%02d:%02d</td><td>%d</td><td>%d</td></tr>";
 char xNodeHddr[] = "<align=center><form align=center method=get action=/Node/Nodes.html>"
 "<table align=center  bgcolor=white>"
 "<tr><td><input type=submit class='btn' name=a value=\"Nodes Sorted by Alias\"></td><td>"
@@ -1167,6 +1170,9 @@ int SendMessageFile(SOCKET sock, char * FN, BOOL OnlyifExists, int allowDeflate)
 		if (_stricmp(ptr, "js") == 0)
 			strcpy(Type, "Content-Type: text/javascript\r\n");
 	
+		if (_stricmp(ptr, "css") == 0)
+			strcpy(Type, "Content-Type: text/css\r\n");
+
 		if (_stricmp(ptr, "pdf") == 0)
 			strcpy(Type, "Content-Type: application/pdf\r\n");
 
@@ -1180,7 +1186,8 @@ int SendMessageFile(SOCKET sock, char * FN, BOOL OnlyifExists, int allowDeflate)
 			Compressed = MsgBytes;
 		}
 
-		if (_stricmp(ptr, "jpg") == 0 || _stricmp(ptr, "jpeg") == 0 || _stricmp(ptr, "png") == 0 || _stricmp(ptr, "gif") == 0 || _stricmp(ptr, "ico") == 0)
+		if (_stricmp(ptr, "jpg") == 0 || _stricmp(ptr, "jpeg") == 0 || _stricmp(ptr, "png") == 0 ||
+			_stricmp(ptr, "gif") == 0 || _stricmp(ptr, "bmp") == 0 || _stricmp(ptr, "ico") == 0)
 			strcpy(Type, "Content-Type: image\r\n");
 
 		HeaderLen = sprintf(Header, "HTTP/1.1 200 OK\r\nContent-Length: %d\r\n"
@@ -1623,23 +1630,23 @@ int InnerProcessHTTPMessage(struct ConnectionInfo * conn)
 	char * WebSock = 0;
 
 	char PortsHddr[] = "<h2 align=center>Ports</h2><table align=center border=2 bgcolor=white>"
-		"<tr><th>Port</th><th>Driver</th><th>ID</th><th>Beacons</th><th>Driver Window</th></tr>";
+		"<tr><th>Port</th><th>Driver</th><th>ID</th><th>Beacons</th><th>Driver Window</th><th>Stats Graph</th></tr>";
 
-	char PortLine[] = "<tr><td>%d</td><td><a href=PortStats?%d&%s>&nbsp;%s</a></td><td>%s</td></tr>";
+//	char PortLine[] = "<tr><td>%d</td><td><a href=PortStats?%d&%s>&nbsp;%s</a></td><td>%s</td></tr>";
 
 	char PortLineWithBeacon[] = "<tr><td>%d</td><td><a href=PortStats?%d&%s>&nbsp;%s</a></td><td>%s</td>"
-		"<td><a href=PortBeacons?%d>&nbsp;Beacons</a><td> </td></td></tr>\r\n";
+		"<td><a href=PortBeacons?%d>&nbsp;Beacons</a><td> </td></td><td>%s</td></tr>\r\n";
 
 	char SessionPortLine[] = "<tr><td>%d</td><td>%s</td><td>%s</td><td> </td>"
-		"<td> </td></tr>\r\n";
+		"<td> </td><td>%s</td></tr>\r\n";
 
 	char PortLineWithDriver[] = "<tr><td>%d</td><td>%s</td><td>%s</td><td> </td>"
-		"<td><a href=\"javascript:dev_win('/Node/Port?%d',%d,%d,%d,%d);\">Driver Window</a></td></tr>\r\n";
+		"<td><a href=\"javascript:dev_win('/Node/Port?%d',%d,%d,%d,%d);\">Driver Window</a></td><td>%s</td></tr>\r\n";
 
 
 	char PortLineWithBeaconAndDriver[] = "<tr><td>%d</td><td>%s</td><td>%s</td>"
 		"<td><a href=PortBeacons?%d>&nbsp;Beacons</a></td>"
-		"<td><a href=\"javascript:dev_win('/Node/Port?%d',%d,%d,%d,%d);\">Driver Window</a></td></tr>\r\n";
+		"<td><a href=\"javascript:dev_win('/Node/Port?%d',%d,%d,%d,%d);\">Driver Window</a></td><td>%s</td></tr>\r\n";
 
 	char RigControlLine[] = "<tr><td>%d</td><td>%s</td><td>%s</td><td> </td>"
 		"<td><a href=\"javascript:dev_win('/Node/RigControl.html',%d,%d,%d,%d);\">Rig Control</a></td></tr>\r\n";
@@ -1793,6 +1800,28 @@ int InnerProcessHTTPMessage(struct ConnectionInfo * conn)
 		if (_memicmp(Context, "/api/", 5) == 0 || _stricmp(Context, "/api") == 0)
 		{
 			char * Compressed;
+
+			// if for mail api process signon here and rearrange url from
+			// api/v1/mail to mail/api/v1 so it goes to mail handler later
+
+			if (_memicmp(Context, "/api/v1/mail/", 13) == 0)
+			{
+				memcpy(MsgPtr, "GET /mail/api/v1/", 17);
+		
+				if (memcmp(&Context[13], "login", 5) == 0)
+				{
+					ReplyLen = ProcessMailAPISignon(TCP, MsgPtr, "M", Reply, &Session, FALSE, LOCAL);
+					memcpy(MsgPtr, "GET /mail/api/v1/", 17);
+
+					if (ReplyLen)			// Error message
+						goto Returnit;
+				}
+
+				memcpy(Context, "/mail/api/v1/", 13);
+				goto doHeader;
+			}
+			else
+			{
 				ReplyLen = APIProcessHTTPMessage(_REPLYBUFFER, Method, Context, MsgPtr, LOCAL, COOKIE);
 				
 				if (memcmp(_REPLYBUFFER, "HTTP", 4) == 0)
@@ -1813,6 +1842,7 @@ int InnerProcessHTTPMessage(struct ConnectionInfo * conn)
 					"Content-Length: %d\r\n"
 					"Content-Type: application/json\r\n"
 					"Connection: close\r\n"
+					"Access-Control-Allow-Origin: *\r\n"
 					"%s\r\n", ReplyLen, Encoding);
 
 				sendandcheck(sock, Header, HeaderLen);
@@ -1823,6 +1853,43 @@ int InnerProcessHTTPMessage(struct ConnectionInfo * conn)
 
 				return 0;
 			}
+		}
+
+		if (_memicmp(Context, "/rhp/", 5) == 0 || _stricmp(Context, "/rhp") == 0)
+		{
+			{
+				ReplyLen = RHPProcessHTTPMessage(conn, _REPLYBUFFER, Method, Context, MsgPtr, LOCAL, COOKIE);
+				
+				if (memcmp(_REPLYBUFFER, "HTTP", 4) == 0)
+				{
+					// Full Message - just send it
+
+					sendandcheck(sock, _REPLYBUFFER, ReplyLen);
+
+					return 0;
+				}
+
+				if (allowDeflate)
+					Compressed = Compressit(_REPLYBUFFER, ReplyLen, &ReplyLen);
+				else
+					Compressed = _REPLYBUFFER;
+
+				HeaderLen = sprintf(Header, "HTTP/1.1 200 OK\r\n"
+					"Content-Length: %d\r\n"
+					"Content-Type: application/json\r\n"
+					"Connection: close\r\n"
+					"Access-Control-Allow-Origin: *\r\n"
+					"%s\r\n", ReplyLen, Encoding);
+
+				sendandcheck(sock, Header, HeaderLen);
+				sendandcheck(sock, Compressed, ReplyLen);
+
+				if (allowDeflate)
+					free (Compressed);
+
+				return 0;
+			}
+		}
 
 
 		// APRS process internally
@@ -2095,11 +2162,7 @@ Returnit:
 					Compressed = Reply;
 
 				if (NodeURL && _memicmp(NodeURL, "/mail/api/", 10) == 0)
-					HeaderLen = sprintf(Header, "HTTP/1.1 200 OK\r\n"
+					HeaderLen = sprintf(Header, "HTTP/1.1 200 OK\r\nContent-Length: %d\r\nContent-Type: application/json\r\nConnection: close\r\n%s\r\n", ReplyLen, Encoding);
-						"Content-Length: %d\r\n"
-						"Content-Type: application/json\r\n"
-						"Connection: close\r\n"
-						"%s\r\n", ReplyLen, Encoding);
 				else
 					HeaderLen = sprintf(Header, "HTTP/1.1 200 OK\r\nContent-Length: %d\r\nContent-Type: text/html\r\n%s\r\n", ReplyLen, Encoding);
 				
@@ -2122,15 +2185,82 @@ doHeader:
 			char _REPLYBUFFER[250000];
 			struct HTTPConnectionInfo Dummy = {0};
 			int Sent, Loops = 0;
+			char token[16] = "";
+
+			// look for auth header	
+
+			const char * auth_header = "Authorization: Bearer ";
+			char * token_begin = strstr(MsgPtr, auth_header);
+			int Flags = 0, n;
+
+			char * Tok;
+			char * param;
+
+			if (token_begin)
+			{
+				// Using Auth Header
+
+				// Extract the token from the request (assuming it's present in the request headers)
+
+				token_begin += strlen(auth_header); // Move to the beginning of the token
+				strncpy(token, token_begin, 13);
+				token[13] = '\0'; // Null-terminate the token
+			}
 
 			ReplyLen = 0;
 
 			if (Session == 0)
 				Session = &Dummy;
 
-			Session->TNC = (void *)LOCAL;		// TNC only used for Web Terminal Sessions
+			if (LOCAL)
+				Session->TNC = (void *)1;		// TNC only used for Web Terminal Sessions
+			else
+				Session->TNC = (void *)0;
 
-			ProcessMailHTTPMessage(Session, Method, Context, MsgPtr, _REPLYBUFFER, &ReplyLen, MsgLen);
+			ProcessMailHTTPMessage(Session, Method, Context, MsgPtr, _REPLYBUFFER, &ReplyLen, MsgLen, token);
+
+			if (Context && _memicmp(Context, "/mail/api/", 10) == 0)
+			{
+				if (memcmp(_REPLYBUFFER, "HTTP", 4) == 0)
+				{
+					// Full Header provided by appl - just send it
+
+					// Send may block
+
+					Sent = send(sock, _REPLYBUFFER, ReplyLen, 0);
+
+					while (Sent != ReplyLen && Loops++ < 3000)					// 100 secs max
+					{	
+						//				Debugprintf("%d out of %d sent %d Loops", Sent, InputLen, Loops);
+
+						if (Sent > 0)					// something sent
+						{
+							InputLen -= Sent;
+							memmove(_REPLYBUFFER, &_REPLYBUFFER[Sent], ReplyLen);
+						}	
+
+						Sleep(30);
+						Sent = send(sock, _REPLYBUFFER, ReplyLen, 0);
+					}
+					return 0;
+				}
+
+				// compress if allowed
+
+				if (allowDeflate)
+					Compressed = Compressit(_REPLYBUFFER, ReplyLen, &ReplyLen);
+				else
+					Compressed = _REPLYBUFFER;
+
+				HeaderLen = sprintf(Header, "HTTP/1.1 200 OK\r\nContent-Length: %d\r\nContent-Type: application/json\r\nConnection: close\r\n%s\r\n", ReplyLen, Encoding);
+				sendandcheck(sock, Header, HeaderLen);
+				sendandcheck(sock, Compressed, ReplyLen);
+
+				if (allowDeflate)
+					free (Compressed);
+
+				return 0;
+			}
 
 			if (memcmp(_REPLYBUFFER, "HTTP", 4) == 0)
 			{
@@ -2156,11 +2286,16 @@ doHeader:
 				return 0;
 			}
 
+			if (Context && _memicmp(Context, "/mail/api/", 10) != 0)
+			{
+
 			// Add tail
 
 			strcpy(&_REPLYBUFFER[ReplyLen], Tail);
 			ReplyLen += strlen(Tail);
 
+			}
+
 			// compress if allowed
 				
 			if (allowDeflate)
@@ -2250,6 +2385,8 @@ doHeader:
 
 		// Pass to MailChat if active
 
+		NodeURL = Context;
+
 		if ((_memicmp(Context, "/MAIL/", 6) == 0) || (_memicmp(Context, "/WebMail", 8) == 0))
 		{
 			// If for Mail, Pass to Mail Server via Named Pipe
@@ -2277,7 +2414,10 @@ doHeader:
 				if (Session == 0)
 					Session = &Dummy;
 
-				Session->TNC = LOCAL;		// TNC is only used on Web Terminal Sessions so can reuse as LOCAL flag
+				if (LOCAL)
+					Session->TNC = (struct TNCINFO *)(uintptr_t)1;		// TNC is only used on Web Terminal Sessions so can reuse as LOCAL flag
+				else
+					Session->TNC = 0;
 
 				WriteFile(hPipe, Session, sizeof (struct HTTPConnectionInfo), &InputLen, NULL);
 				WriteFile(hPipe, MsgPtr, MsgLen, &InputLen, NULL);
@@ -2707,6 +2847,53 @@ doHeader:
 			return 0;
 		}
 
+		else if (_memicmp(NodeURL, "/portstats.txt", 15) == 0)
+		{
+			char * Compressed;
+			char * ptr;
+			int port;
+			struct PORTCONTROL * PORT;
+
+			ptr = &NodeURL[15];
+			
+			port = atoi(ptr);
+
+			PORT = GetPortTableEntryFromPortNum(port);
+
+			ReplyLen = 0;
+
+			if (PORT && PORT->TX)
+			{
+				// We send the last 24 hours worth of data. Buffer is cyclic so oldest byte is at StatsPointer
+
+				int first = PORT->StatsPointer;
+				int firstlen = 1440 - first;
+
+				memcpy(&_REPLYBUFFER[0], &PORT->TX[first], firstlen);
+				memcpy(&_REPLYBUFFER[firstlen], PORT->TX, first);
+
+				memcpy(&_REPLYBUFFER[1440], &PORT->BUSY[first], firstlen);
+				memcpy(&_REPLYBUFFER[1440 + firstlen], PORT->BUSY, first);
+
+				ReplyLen = 2880;
+			}
+
+			if (allowDeflate)
+				Compressed = Compressit(_REPLYBUFFER, ReplyLen, &ReplyLen);
+			else
+				Compressed = _REPLYBUFFER;
+
+			HeaderLen = sprintf(Header, "HTTP/1.1 200 OK\r\nAccess-Control-Allow-Origin: *\r\nContent-Length: %d\r\nContent-Type: Text\r\n%s\r\n", ReplyLen, Encoding);
+			sendandcheck(sock, Header, HeaderLen);
+			sendandcheck(sock, Compressed, ReplyLen);
+
+			if (allowDeflate)
+				free (Compressed);
+
+			return 0;
+		}
+
+
 		else if (_memicmp(NodeURL, "/Icon", 5) == 0 && _memicmp(&NodeURL[10], ".png", 4) == 0)
 		{
 			// APRS internal Icon
@@ -2880,7 +3067,7 @@ doHeader:
 					" {"
 					"  // The browser doesn't support WebSocket\r\n"
 					"	const div = document.getElementById('div');\r\n"
-					"	div.innerHTML = 'WebSocket not supported by your Browser - RigControl Page not availble'\r\n"
+					"	div.innerHTML = 'WebSocket not supported by your Browser - RigControl Page not availible'\r\n"
 					" }"
 					"}"
 					"function PTT(p)"
@@ -3235,6 +3422,7 @@ doHeader:
 
 				int count;
 				char DLL[20];
+				char StatsURL[64];
 
 				ReplyLen += sprintf(&_REPLYBUFFER[ReplyLen], "%s", PortsHddr);
 
@@ -3243,6 +3431,13 @@ doHeader:
 					Port = GetPortTableEntryFromSlot(count);
 					ExtPort = (struct _EXTPORTDATA *)Port;
 
+					// see if has a stats page
+
+					if (Port->AVACTIVE)
+						sprintf(StatsURL, "<a href=/PortStats.html?%d>&nbsp;Stats Graph</a>", Port->PORTNUMBER);
+					else
+						StatsURL[0] = 0;
+
 					if (Port->PORTTYPE == 0x10)
 					{	
 						strcpy(DLL, ExtPort->PORT_DLL_NAME);
@@ -3265,20 +3460,20 @@ doHeader:
 					{
 						if (Port->UICAPABLE)
 							ReplyLen += sprintf(&_REPLYBUFFER[ReplyLen], PortLineWithBeaconAndDriver, Port->PORTNUMBER, DLL,
-							Port->PORTDESCRIPTION, Port->PORTNUMBER, Port->PORTNUMBER, Port->TNC->WebWinX, Port->TNC->WebWinY, 200, 200);
+							Port->PORTDESCRIPTION, Port->PORTNUMBER, Port->PORTNUMBER, Port->TNC->WebWinX, Port->TNC->WebWinY, 200, 200, StatsURL);
 						else
 							ReplyLen += sprintf(&_REPLYBUFFER[ReplyLen], PortLineWithDriver, Port->PORTNUMBER, DLL,
-							Port->PORTDESCRIPTION, Port->PORTNUMBER, Port->TNC->WebWinX, Port->TNC->WebWinY, 200, 200);
+							Port->PORTDESCRIPTION, Port->PORTNUMBER, Port->TNC->WebWinX, Port->TNC->WebWinY, 200, 200, StatsURL);
 
 						continue;
 					}
 
 					if (Port->PORTTYPE == 16 && Port->PROTOCOL == 10 && Port->UICAPABLE == 0)		// EXTERNAL, Pactor/WINMO
 						ReplyLen += sprintf(&_REPLYBUFFER[ReplyLen], SessionPortLine, Port->PORTNUMBER, DLL,
-						Port->PORTDESCRIPTION, Port->PORTNUMBER);
+						Port->PORTDESCRIPTION, Port->PORTNUMBER, StatsURL);
 					else
 						ReplyLen += sprintf(&_REPLYBUFFER[ReplyLen], PortLineWithBeacon, Port->PORTNUMBER, Port->PORTNUMBER,
-						DLL, DLL, Port->PORTDESCRIPTION, Port->PORTNUMBER);
+						DLL, DLL, Port->PORTDESCRIPTION, Port->PORTNUMBER, StatsURL);
 				}
 
 				if (RigActive)
@@ -3606,7 +3801,7 @@ doHeader:
 				int MaxRoutes = MAXNEIGHBOURS;
 				int count;
 				char Normcall[10];
-				char locked;
+				char locked[4] = " ";
 				int NodeCount;
 				int Percent = 0;
 				int Iframes, Retries;
@@ -3622,10 +3817,14 @@ doHeader:
 						int len = ConvFromAX25(Routes->NEIGHBOUR_CALL, Normcall);
 						Normcall[len]=0;
 
-						if ((Routes->NEIGHBOUR_FLAG & 1) == 1)
+						if (Routes->NEIGHBOUR_FLAG == LOCKEDBYCONFIG)
-							locked = '!';
+							strcpy(locked, "!");
+						else if (Routes->NEIGHBOUR_FLAG == LOCKEDBYSYSOP)
+							strcpy(locked, "!!");
+						else if (Routes->NEIGHBOUR_FLAG == LOCKEDBYSYSOP + LOCKEDBYCONFIG)
+							strcpy(locked, "!!!");
 						else
-							locked = ' ';
+							strcpy(locked, " ");
 
 						NodeCount = COUNTNODES(Routes);
 
@@ -4128,6 +4327,78 @@ int ProcessNodeSignon(SOCKET sock, struct TCPINFO * TCP, char * MsgPtr, char * A
 	return ReplyLen;
 }
 
+int ProcessMailAPISignon(struct TCPINFO * TCP, char * MsgPtr, char * Appl, char * Reply, struct HTTPConnectionInfo ** Session, BOOL WebMail, int LOCAL)
+{
+	int ReplyLen = 0;
+	char * input = strstr(MsgPtr, "\r\n\r\n");	// End of headers
+	char * user, * password;
+	struct HTTPConnectionInfo * NewSession;
+	int i;
+	struct UserRec * USER;
+
+	if (strchr(MsgPtr, '?'))
+	{
+		// Check Password
+
+		user = strlop(MsgPtr, '?');
+		password = strlop(user, '&');
+		strlop(password, ' ');
+
+		for (i = 0; i < TCP->NumberofUsers; i++)
+		{
+			USER = TCP->UserRecPtr[i];
+
+			if (user && _stricmp(user, USER->UserName) == 0)
+			{
+				if ((strcmp(password, USER->Password) == 0) && (USER->Secure || WebMail))
+				{
+					// ok
+
+					NewSession = AllocateSession(Appl[0], 'M');
+
+					*Session = NewSession;
+
+					if (NewSession)
+					{
+						ReplyLen = 0;
+						strcpy(NewSession->Callsign, USER->Callsign);
+					}
+					else
+					{
+						ReplyLen =  SetupNodeMenu(Reply, LOCAL);
+						ReplyLen += sprintf(&Reply[ReplyLen], "%s", BusyError);
+					}
+					return ReplyLen;
+
+				}
+			}
+		}
+
+		// Pass failed attempt to BBS code so it can try a bbs user login
+
+		// Need to put url back together
+
+		if (user && user[0] && password && password[0])
+		{
+			sprintf(&MsgPtr[strlen(MsgPtr)], "?%s&%s", user, password); 
+		}
+	}
+
+	NewSession = AllocateSession(Appl[0], 'M');
+
+	*Session = NewSession;
+
+	if (NewSession)
+		ReplyLen = 0;
+	else
+	{
+		ReplyLen =  SetupNodeMenu(Reply, LOCAL);
+		ReplyLen += sprintf(&Reply[ReplyLen], "%s", BusyError);
+	}
+	
+	return ReplyLen;
+}
+
 
 
 
@@ -4911,6 +5182,3 @@ void SHA1PadMessage(SHA1Context *context)
 }
 
 
-
-
-

HanksRT.c

@@ -27,7 +27,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 
 #ifdef LINBPQ
-#include "CHeaders.h"
+#include "cheaders.h"
 #endif
 
 #include "bpqchat.h"
@@ -1186,7 +1186,7 @@ static BOOL CheckforDups(ChatCIRCUIT * circuit, char * Call, char * Msg)
 			// Duplicate, so discard, but save time
 
 			DupInfo[i].DupTime = Now;
-			Logprintf(LOG_CHAT, circuit, '?', "Duplicate Message From %s %s supressed", Call, Msg);
+			Logprintf(LOG_CHAT, circuit, '?', "Duplicate Message From %s %s suppressed", Call, Msg);
 
 			return TRUE;					// Duplicate
 		}
@@ -1860,7 +1860,7 @@ static void cn_dec(ChatCIRCUIT *circuit, CHATNODE *node)
 					__try
 					{
 #endif
-						len = sprintf(line, "%s %p %s", line, cn->node, cn->node->alias);
+						len += sprintf(&line[len], " %p %s", cn->node, cn->node->alias);
 						if (len > 80)
 						{
 							Debugprintf("%s", line);
@@ -2821,7 +2821,7 @@ static void show_circuits(ChatCIRCUIT *conn, char Flag)
 	CHATNODE    *node;
 	LINK *link;
 	char line[1000];
-	int     len;
+	int len = 0;
 	CN	*cn;
 
 	int i = 0;
@@ -2836,16 +2836,16 @@ static void show_circuits(ChatCIRCUIT *conn, char Flag)
 	nprintf(conn, "%d Node(s)\r", i);
 
 	if (Flag == 'c')
-		sprintf(line, "Here %-6.6s <-", OurNode);
+		len = sprintf(line, "Here %-6.6s <-", OurNode);
 	else
-		sprintf(line, "Here %-6.6s <-", OurAlias);
+		len = sprintf(line, "Here %-6.6s <-", OurAlias);
 
 	for (node = node_hd; node; node = node->next) if (node->refcnt)
 	{
 		if (Flag == 'c')
-			len = sprintf(line, "%s %s", line, node->call);
+			len += sprintf(&line[len], " %s", node->call);
 		else
-			len = sprintf(line, "%s %s", line, node->alias);
+			len += sprintf(&line[len], " %s", node->alias);
 		if (len > 80)
 		{
 			nprintf(conn, "%s\r", line);
@@ -2873,9 +2873,9 @@ static void show_circuits(ChatCIRCUIT *conn, char Flag)
 						__try
 						{
 							if (Flag == 'c')
-								len = sprintf(line, "%s %s", line, cn->node->call);
+								len += sprintf(&line[len], " %s", cn->node->call);
 							else
-								len = sprintf(line, "%s %s", line, cn->node->alias);
+								len += sprintf(&line[len], " %s", cn->node->alias);
 							if (len > 80)
 							{
 								nprintf(conn, "%s\r", line);
@@ -2883,23 +2883,23 @@ static void show_circuits(ChatCIRCUIT *conn, char Flag)
 							}
 						}
 						__except(EXCEPTION_EXECUTE_HANDLER)
-							{len = sprintf(line, "%s *PE* Corrupt Rec %x %x", line, cn, cn->node);}
+							{len += sprintf(&line[len], " *PE* Corrupt Rec %x %x", cn, cn->node);}
 					}
 					else
-						len = sprintf(line, "%s Corrupt Rec %x %x ", line, cn, cn->node);
+						len = sprintf(&line[len], " Corrupt Rec %x %x ", cn, cn->node);
 				}
 			}
 			__except(EXCEPTION_EXECUTE_HANDLER)
-			{len = sprintf(line, "%s *PE* Corrupt Rec %x %x ", line, cn, cn->node);}
+			{len += sprintf(&line[len], " *PE* Corrupt Rec %x %x ", cn, cn->node);}
 #else
 			for (cn = circuit->hnode; cn; cn = cn->next)
 			{
 				if (cn->node && cn->node->alias)
 				{
 					if (Flag == 'c')
-						len = sprintf(line, "%s %s", line, cn->node->call);
+						len += sprintf(&line[len], " %s", cn->node->call);
 					else
-						len = sprintf(line, "%s %s", line, cn->node->alias);
+						len += sprintf(&line[len], " %s", cn->node->alias);
 					if (len > 80)
 					{
 						nprintf(conn, "%s\r", line);
@@ -2907,7 +2907,7 @@ static void show_circuits(ChatCIRCUIT *conn, char Flag)
 					}
 				}
 				else
-					len = sprintf(line, "%s Corrupt Rec %p %p ", line, cn, cn->node);
+					len += sprintf(&line[len], " Corrupt Rec %p %p ", cn, cn->node);
 			}
 #endif
 			nprintf(conn, "%s\r", line);
@@ -3682,7 +3682,7 @@ VOID SendChatLinkStatus()
 			}
 		}
 
-		len = sprintf(Msg, "%s%s %c ", Msg, link->call, '0' + link->flags);
+		len += sprintf(&Msg[len], "%s %c ", link->call, '0' + link->flags);
 
 		if (len > 240)
 			break;
@@ -4178,10 +4178,10 @@ BOOL GetChatConfig(char * ConfigName)
 	MaxChatStreams = GetIntValue(group, "MaxStreams");
 	reportChatEvents = GetIntValue(group, "reportChatEvents");
 	chatPaclen = GetIntValue(group, "chatPaclen");
-	GetStringValue(group, "OtherChatNodes", OtherNodesList);
+	GetStringValue(group, "OtherChatNodes", OtherNodesList, 1000);
-	GetStringValue(group, "ChatWelcomeMsg", ChatWelcomeMsg);
+	GetStringValue(group, "ChatWelcomeMsg", ChatWelcomeMsg, 1000);
-	GetStringValue(group, "MapPosition", Position);
+	GetStringValue(group, "MapPosition", Position, 81);
-	GetStringValue(group, "MapPopup", PopupText);
+	GetStringValue(group, "MapPopup", PopupText, 260);
 	PopupMode = GetIntValue(group, "PopupMode");
 
 	if (chatPaclen == 0)

Housekeeping.c

@@ -21,6 +21,11 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 //
 //	Housekeeping Module
 
+
+
+#define GetSemaphore(Semaphore,ID) _GetSemaphore(Semaphore, ID, __FILE__, __LINE__)
+
+
 #include "bpqmail.h"
 
 char * APIENTRY GetBPQDirectory();
@@ -343,12 +348,12 @@ VOID ExpireMessages()
 
 	Killed = 0;
 
-	PRLimit = now - PR*86400;
+	PRLimit = now - (time_t)PR*86400;
-	PURLimit = now - PUR*86400;
+	PURLimit = now -(time_t)PUR*86400;
-	PFLimit = now - PF*86400;
+	PFLimit = now - (time_t)PF*86400;
-	PNFLimit = now - PNF*86400;
+	PNFLimit = now - (time_t)PNF*86400;
-	BFLimit = now - BF*86400;
+	BFLimit = now - (time_t)BF*86400;
-	BNFLimit = now - BNF*86400;
+	BNFLimit = now -(time_t) BNF*86400;
 
 	if (NTSU == 0)
 	{
@@ -391,7 +396,7 @@ VOID ExpireMessages()
 					if (Msg->datecreated < PURLimit)
 					{
 						if (SendNonDeliveryMsgs) 
-							SendNonDeliveryMessage(Msg, TRUE, PUR);
+							SendNonDeliveryMessage(Msg, TRUE, (int)PUR);
 
 						KillMsg(Msg);
 					}
@@ -401,7 +406,7 @@ VOID ExpireMessages()
 					if (Msg->datecreated < PNFLimit)
 					{
 						if (SendNonDeliveryMsgs) 
-							SendNonDeliveryMessage(Msg, FALSE, PNF);
+							SendNonDeliveryMessage(Msg, FALSE, (int)PNF);
 
 						KillMsg(Msg);
 					}

IPCode.c

@@ -81,7 +81,7 @@ TODo	?Multiple Adapters
 #include <stdio.h>
 #include <time.h>
 
-#include "CHeaders.h"
+#include "cheaders.h"
 
 #include "ipcode.h"
 
@@ -95,9 +95,13 @@ TODo	?Multiple Adapters
 #pragma comment(lib, "IPHLPAPI.lib")
 #endif
 
-#include "pcap.h"
+#include <pcap.h>
 
+#ifdef WIN32
 int pcap_sendpacket(pcap_t *p, u_char *buf, int size);
+#else
+ PCAP_API int pcap_sendpacket(pcap_t *, const u_char *, int);
+#endif
 
 #ifndef LINBPQ
 #include "kernelresource.h"
@@ -4731,7 +4735,7 @@ void OpenTAP()
 extern struct DATAMESSAGE * REPLYBUFFER;
 char * __cdecl Cmdprintf(TRANSPORTENTRY * Session, char * Bufferptr, const char * format, ...);
 
-VOID PING(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID PING(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	// Send ICMP Echo Request
 
@@ -4789,7 +4793,7 @@ VOID PING(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD
 	return;
 }
 
-VOID SHOWARP(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID SHOWARP(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	//	DISPLAY IP Gateway ARP status or Clear
 	
@@ -4884,7 +4888,7 @@ VOID SHOWARP(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX *
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 }
 
-VOID SHOWNAT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID SHOWNAT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	//	DISPLAY IP Gateway ARP status or Clear
 	
@@ -4943,7 +4947,7 @@ int CountBits(uint32_t in)
 	return n;
 }
 
-VOID SHOWIPROUTE(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, CMDX * CMD)
+VOID SHOWIPROUTE(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	//	DISPLAY IP Gateway ARP status or Clear
 
@@ -5334,7 +5338,7 @@ int ProcessSNMPPayload(UCHAR * Msg, int Len, UCHAR * Reply, int * OffPtr)
 		// Should be nothing left
 	}
 
-	if (RequestType = 160)
+	if (RequestType == 160)
 	{
 		int Offset = 255;
 		int PDULen = 0;
@@ -5409,11 +5413,8 @@ VOID ProcessSNMPMessage(PIPMSG IPptr)
 	int Len;
 	PUDPMSG UDPptr = (PUDPMSG)&IPptr->Data;
 	UCHAR * Msg;
-	int Type;
-	int Length, ComLen;
-	int  IntVal;
 	UCHAR Reply[256];
-	int PDULen, SendLen;
+	int SendLen;
 	int Offset = 0;
 
 	Len = ntohs(IPptr->IPLENGTH);

KAMPactor.c

@@ -53,7 +53,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #include <stdlib.h>
 #include "time.h"
 
-#include "CHeaders.h"
+#include "cheaders.h"
 #include "tncinfo.h"
 
 #include "bpq32.h"
@@ -567,15 +567,15 @@ void * KAMExtInit(EXTPORTDATA * PortEntry)
 		return ExtProc;
 	}
 	TNC->Port = port;
+	TNC->PortRecord = PortEntry;
 
-	TNC->Hardware = H_KAM;
+	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_KAM;
 
 	if (TNC->BusyWait == 0)
 		TNC->BusyWait = 10;
 
 	PortEntry->MAXHOSTMODESESSIONS = 11;		// Default
 
-	TNC->PortRecord = PortEntry;
 
 	if (PortEntry->PORTCONTROL.PORTCALL[0] == 0)
 		memcpy(TNC->NodeCall, MYNODECALL, 10);
@@ -1099,7 +1099,7 @@ VOID KAMPoll(int Port)
 
 					// Limit amount in TX, so we keep some on the TX Q and don't send turnround too early
 
-					if (TNC->Streams[0].BytesTXed - TNC->Streams[0].BytesAcked > 200)
+					if (TNC->Streams[0].bytesTXed - TNC->Streams[0].BytesAcked > 200)
 						continue;
 
 					// Dont send if IRS State
@@ -1132,7 +1132,7 @@ VOID KAMPoll(int Port)
 				}
 
 				Next = 0;
-				STREAM->BytesTXed += datalen; 
+				STREAM->bytesTXed += datalen; 
 
 				if (Stream == 0)
 				{
@@ -1157,7 +1157,7 @@ VOID KAMPoll(int Port)
 				if (Stream == 0)
 				{
 					sprintf(Status, "RX %d TX %d ACKED %d ",
-						TNC->Streams[0].BytesRXed, TNC->Streams[0].BytesTXed, TNC->Streams[0].BytesAcked);
+						TNC->Streams[0].bytesRXed, TNC->Streams[0].bytesTXed, TNC->Streams[0].BytesAcked);
 					SetWindowText(TNC->xIDC_TRAFFIC, Status);
 
 					if ((TNC->HFPacket == 0) && (TNC->Streams[0].BPQtoPACTOR_Q == 0))		// Nothing following
@@ -1532,14 +1532,14 @@ VOID ProcessKHOSTPacket(struct TNCINFO * TNC, UCHAR * Msg, int Len)
 	{
 		if (Msg[1] == '2')				// HF Port
 		{
-			if (TNC->Streams[0].BytesTXed)
+			if (TNC->Streams[0].bytesTXed)
 				TNC->Streams[0].BytesAcked += Len - 3;	// We get an ack before the first send
 
 			sprintf(Status, "RX %d TX %d ACKED %d ",
-				TNC->Streams[0].BytesRXed, TNC->Streams[0].BytesTXed, TNC->Streams[0].BytesAcked);
+				TNC->Streams[0].bytesRXed, TNC->Streams[0].bytesTXed, TNC->Streams[0].BytesAcked);
 			SetWindowText(TNC->xIDC_TRAFFIC, Status);
 
-			if (TNC->Streams[0].BytesTXed - TNC->Streams[0].BytesAcked < 500)
+			if (TNC->Streams[0].bytesTXed - TNC->Streams[0].BytesAcked < 500)
 				TNC->Streams[0].FramesOutstanding = 0;
 		}
 		return;
@@ -1555,7 +1555,7 @@ VOID ProcessKHOSTPacket(struct TNCINFO * TNC, UCHAR * Msg, int Len)
 		Len-=3;							// Remove Header
 
 		buffptr->Len = Len;				// Length
-		STREAM->BytesRXed += Len;
+		STREAM->bytesRXed += Len;
 		memcpy(buffptr->Data, Buffer, Len);
 
 		C_Q_ADD(&STREAM->PACTORtoBPQ_Q, buffptr);
@@ -1563,7 +1563,7 @@ VOID ProcessKHOSTPacket(struct TNCINFO * TNC, UCHAR * Msg, int Len)
 		if (Stream == 0)
 		{
 			sprintf(TNC->WEB_TRAFFIC, "RX %d TX %d ACKED %d ", 
-					TNC->Streams[0].BytesRXed, TNC->Streams[0].BytesTXed, TNC->Streams[0].BytesAcked);
+					TNC->Streams[0].bytesRXed, TNC->Streams[0].bytesTXed, TNC->Streams[0].BytesAcked);
 			SetWindowText(TNC->xIDC_TRAFFIC, TNC->WEB_TRAFFIC);
 		}
 
@@ -1762,7 +1762,7 @@ VOID ProcessKHOSTPacket(struct TNCINFO * TNC, UCHAR * Msg, int Len)
 				Buffer[Len-4] = 0;
 			}
 
-			STREAM->BytesRXed = STREAM->BytesTXed = STREAM->BytesAcked = 0;
+			STREAM->bytesRXed = STREAM->bytesTXed = STREAM->BytesAcked = 0;
 			STREAM->ConnectTime = time(NULL); 
 
 			if (Stream == 0)
@@ -1776,7 +1776,7 @@ VOID ProcessKHOSTPacket(struct TNCINFO * TNC, UCHAR * Msg, int Len)
 				Rig_Command( (TRANSPORTENTRY *) -1, Msg);
 
 				sprintf(TNC->WEB_TRAFFIC, "RX %d TX %d ACKED %d ", 
-					TNC->Streams[0].BytesRXed, TNC->Streams[0].BytesTXed, TNC->Streams[0].BytesAcked);
+					TNC->Streams[0].bytesRXed, TNC->Streams[0].bytesTXed, TNC->Streams[0].BytesAcked);
 				
 				SetWindowText(TNC->xIDC_TRAFFIC, TNC->WEB_TRAFFIC);
 			}
@@ -1874,7 +1874,7 @@ VOID ProcessKHOSTPacket(struct TNCINFO * TNC, UCHAR * Msg, int Len)
 					memcpy(&CTBuff[3], &CTEXTMSG[Next], Len);
 					EncodeAndSend(TNC, CTBuff, Len + 3);
 					EncodeAndSend(TNC, "E", 1);			// Changeover when all sent
-					TNC->Streams[0].BytesTXed += CTEXTLEN;
+					TNC->Streams[0].bytesTXed += CTEXTLEN;
 				}
 				return;
 

KISSHF.c

@@ -27,7 +27,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #include <stdio.h>
 #include <time.h>
 
-#include "CHeaders.h"
+#include "cheaders.h"
 
 
 extern int (WINAPI FAR *GetModuleFileNameExPtr)();
@@ -50,8 +50,8 @@ int DoScanLine(struct TNCINFO * TNC, char * Buff, int Len);
 VOID SendInitScript(struct TNCINFO * TNC);
 int KISSHFGetLine(char * buf);
 int ProcessEscape(UCHAR * TXMsg);
-VOID KISSHFProcessReceivedPacket(struct TNCINFO * TNC);
+VOID KISSHFProcessReceivedPacket(struct TNCINFO * TNC, int Channel);
-static int KissEncode(UCHAR * inbuff, UCHAR * outbuff, int len);
+static int KissEncode(struct TNCINFO * TNC, UCHAR * inbuff, UCHAR * outbuff, int len, int Channel);
 int ConnecttoKISS(int port);
 TRANSPORTENTRY * SetupNewSession(TRANSPORTENTRY * Session, char * Bufferptr);
 BOOL DecodeCallString(char * Calls, BOOL * Stay, BOOL * Spy, UCHAR * AXCalls);
@@ -265,6 +265,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 	struct TNCINFO * TNC = TNCInfo[port];
 	struct STREAMINFO * STREAM = &TNC->Streams[0];
 	struct ScanEntry * Scan;
+	int Channel = ((TNC->PortRecord->PORTCONTROL.CHANNELNUM - 1) & 15) << 4;
 
 	if (TNC == NULL)
 		return 0;							// Port not defined
@@ -349,6 +350,7 @@ ok:
 
 			// See if any frames for this port
 
+
 			STREAM = &TNC->Streams[0];
 
 			if (STREAM->BPQtoPACTOR_Q)
@@ -357,7 +359,7 @@ ok:
 				UCHAR * data = &buffptr->Data[0];
 				STREAM->FramesQueued--;
 				txlen = (int)buffptr->Len;
-				STREAM->BytesTXed += txlen;
+				STREAM->bytesTXed += txlen;
 
 				bytes=SerialSendData(TNC, data, txlen);
 				WritetoTrace(TNC, data, txlen);
@@ -417,7 +419,10 @@ ok:
 
 		if (buff->PID != 240)			// ax.25 address
 		{
-			txlen = KissEncode(&buff->PID, txbuff, txlen);
+			txlen = KissEncode(TNC, &buff->PID, txbuff, txlen, Channel);
+
+			// We need to che check for ackmode
+
 			txlen = send(TNC->TCPSock, txbuff, txlen, 0);
 			return 1;
 		}
@@ -453,7 +458,11 @@ ok:
 	
 		if (_memicmp(txbuff, "RADIO ", 6) == 0)
 		{
-			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &txbuff[6]);
+			char cmd[56];
+
+			strcpy(cmd, &buff->L2DATA[6]);
+			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, cmd);
+
 	
 			if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, &buff->L2DATA[0]))
 			{
@@ -504,7 +513,8 @@ ok:
 			}
 		}
 
-		if (toupper(buff->L2DATA[0]) == 'C' && buff->L2DATA[1] == ' ' && txlen > 2)	// Connect
+		if ((toupper(buff->L2DATA[0]) == 'C' && buff->L2DATA[1] == ' ' && txlen > 2)	// Connect
+			|| (toupper(buff->L2DATA[0]) == 'N' && buff->L2DATA[1] == ' ' && txlen > 2))	// Connect
 		{
 			// Connect Command. Pass to L2 code to start session
 
@@ -616,9 +626,9 @@ noFlip3:
 
 			RESET2(LINK);						// RESET ALL FLAGS
 
-//			if (CMD->String[0] == 'N' && SUPPORT2point2)
+			if (toupper(buff->L2DATA[0]) == 'N' && SUPPORT2point2)
-//				LINK->L2STATE = 1;					// New (2.2) send XID
+				LINK->L2STATE = 1;					// New (2.2) send XID
-//			else
+			else
 				LINK->L2STATE = 2;					// Send SABM
 
 			LINK->CIRCUITPOINTER = NewSess;
@@ -720,12 +730,18 @@ VOID KISSHFReleaseTNC(struct TNCINFO * TNC)
 	ReleaseOtherPorts(TNC);
 }
 
-VOID KISSHFSuspendPort(struct TNCINFO * TNC, struct TNCINFO * ThisTNC)
+VOID KISSHFSuspendPort(struct TNCINFO * TNC, struct TNCINFO * THISTNC)
 {
+	TNC->PortRecord->PORTCONTROL.PortSuspended = 1;
+	strcpy(TNC->WEB_TNCSTATE, "Interlocked");
+	MySetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
 }
 
 VOID KISSHFReleasePort(struct TNCINFO * TNC)
 {
+	TNC->PortRecord->PORTCONTROL.PortSuspended = 0;
+	strcpy(TNC->WEB_TNCSTATE, "Free");
+	MySetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
 }
 
 static int WebProc(struct TNCINFO * TNC, char * Buff, BOOL LOCAL)
@@ -735,9 +751,9 @@ static int WebProc(struct TNCINFO * TNC, char * Buff, BOOL LOCAL)
 		"function ScrollOutput()\r\n"
 		"{var textarea = document.getElementById('textarea');"
 		"textarea.scrollTop = textarea.scrollHeight;}</script>"
-		"</head><title>VARA Status</title></head><body id=Text onload=\"ScrollOutput()\">"
+		"</head><title>KISSHF Status</title></head><body id=Text onload=\"ScrollOutput()\">"
 		"<h2><form method=post target=\"POPUPW\" onsubmit=\"POPUPW = window.open('about:blank','POPUPW',"
-		"'width=440,height=150');\" action=ARDOPAbort?%d>KISSHF Status"
+		"'width=440,height=50');\" action=ARDOPAbort?%d>KISSHF Status"
 		"<input name=Save value=\"Abort Session\" type=submit style=\"position: absolute; right: 20;\"></form></h2>",
 		TNC->Port);
 
@@ -746,14 +762,14 @@ static int WebProc(struct TNCINFO * TNC, char * Buff, BOOL LOCAL)
 
 	Len += sprintf(&Buff[Len], "<tr><td width=110px>Comms State</td><td>%s</td></tr>", TNC->WEB_COMMSSTATE);
 	Len += sprintf(&Buff[Len], "<tr><td>TNC State</td><td>%s</td></tr>", TNC->WEB_TNCSTATE);
-	Len += sprintf(&Buff[Len], "<tr><td>Mode</td><td>%s</td></tr>", TNC->WEB_MODE);
+//	Len += sprintf(&Buff[Len], "<tr><td>Mode</td><td>%s</td></tr>", TNC->WEB_MODE);
-	Len += sprintf(&Buff[Len], "<tr><td>Channel State</td><td>%s</td></tr>", TNC->WEB_CHANSTATE);
+//	Len += sprintf(&Buff[Len], "<tr><td>Channel State</td><td>%s</td></tr>", TNC->WEB_CHANSTATE);
-	Len += sprintf(&Buff[Len], "<tr><td>Proto State</td><td>%s</td></tr>", TNC->WEB_PROTOSTATE);
+//	Len += sprintf(&Buff[Len], "<tr><td>Proto State</td><td>%s</td></tr>", TNC->WEB_PROTOSTATE);
-	Len += sprintf(&Buff[Len], "<tr><td>Traffic</td><td>%s</td></tr>", TNC->WEB_TRAFFIC);
+//	Len += sprintf(&Buff[Len], "<tr><td>Traffic</td><td>%s</td></tr>", TNC->WEB_TRAFFIC);
 //	Len += sprintf(&Buff[Len], "<tr><td>TNC Restarts</td><td></td></tr>", TNC->WEB_RESTARTS);
 	Len += sprintf(&Buff[Len], "</table>");
 
-	Len += sprintf(&Buff[Len], "<textarea rows=10 style=\"width:500px; height:250px;\" id=textarea >%s</textarea>", TNC->WebBuffer);
+	Len += sprintf(&Buff[Len], "<textarea rows=2 style=\"width:500px; height:50px;\" id=textarea >%s</textarea>", TNC->WebBuffer);
 	Len = DoScanLine(TNC, Buff, Len);
 
 	return Len;
@@ -797,10 +813,10 @@ VOID * KISSHFExtInit(EXTPORTDATA * PortEntry)
 	}
 	
 	TNC->Port = port;
-	TNC->Hardware = H_KISSHF;
+	TNC->PortRecord = PortEntry;
+	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_KISSHF;
 	TNC->ARDOPBuffer = malloc(8192);
 
-	TNC->PortRecord = PortEntry;
 
 	if (PortEntry->PORTCONTROL.PORTCALL[0] == 0)
 		memcpy(TNC->NodeCall, MYNODECALL, 10);
@@ -976,6 +992,7 @@ VOID KISSThread(void * portptr)
 	char * ptr1;
 	char * ptr2;
 	UINT * buffptr;
+	int Channel = ((TNC->PortRecord->PORTCONTROL.CHANNELNUM - 1) & 15) << 4;
 
 	if (TNC->HostName == NULL)
 		return;
@@ -1184,7 +1201,7 @@ VOID KISSThread(void * portptr)
 			if (FD_ISSET(TNC->TCPSock, &readfs))
 			{
 				GetSemaphore(&Semaphore, 52);
-				KISSHFProcessReceivedPacket(TNC);
+				KISSHFProcessReceivedPacket(TNC, Channel);
 				FreeSemaphore(&Semaphore);
 			}
 								
@@ -1243,16 +1260,43 @@ static int	KissDecode(UCHAR * inbuff, UCHAR * outbuff, int len)
 
 }
 
+#define ACKMODE	4				// CAN USE ACK REQURED FRAMES
+#define MSGHDDRLEN (USHORT)(sizeof(VOID *) + sizeof(UCHAR) + sizeof(USHORT))
+#define	ONEMINUTE 60*3
 
-static int	KissEncode(UCHAR * inbuff, UCHAR * outbuff, int len)
+static int	KissEncode(struct TNCINFO * TNC, UCHAR * inbuff, UCHAR * outbuff, int len, int Channel)
 {
 	int i,txptr=0;
 	UCHAR c;
 
-	outbuff[0]=FEND;
+	outbuff[0] = FEND;
-	outbuff[1]=0;
+	outbuff[1] = Channel;
 	txptr=2;
 
+	// See if we need ackmode
+
+	if (TNC->PortRecord->PORTCONTROL.KISSFLAGS & ACKMODE)
+	{
+		UCHAR * ptr =  inbuff - MSGHDDRLEN;
+		PMESSAGE Buffer = (PMESSAGE)ptr;
+
+		if (Buffer->Linkptr)					// Frame Needs ACK
+		{
+			UINT ACKWORD = (UINT)(Buffer->Linkptr - LINKS);
+			outbuff[1] |= 0x0c;			// ACK OPCODE 
+			outbuff[2] = ACKWORD & 0xff;
+			outbuff[3] = (ACKWORD >> 8) &0xff;
+
+			Buffer->Linkptr->L2TIMER = ONEMINUTE;		// Extend timeout
+
+			txptr = 4;
+
+			// have to reset flag so trace doesnt clear it
+
+			Buffer->Linkptr = 0;
+		}
+	}
+
 	for (i=0;i<len;i++)
 	{
 		c=inbuff[i];
@@ -1283,7 +1327,7 @@ static int	KissEncode(UCHAR * inbuff, UCHAR * outbuff, int len)
 }
 
 
-VOID KISSHFProcessReceivedPacket(struct TNCINFO * TNC)
+VOID KISSHFProcessReceivedPacket(struct TNCINFO * TNC, int Channel)
 {
 	int InputLen, MsgLen;
 	unsigned char * ptr;
@@ -1335,10 +1379,42 @@ VOID KISSHFProcessReceivedPacket(struct TNCINFO * TNC)
 
 		if (MsgLen > 1)
 		{
-			PMESSAGE Buff = GetBuff();
+			PMESSAGE Buff;
+
+			if ((TNC->ARDOPBuffer[1] & 0xf0) != Channel)
+				goto ignoreit;
+
+			Buff = GetBuff();
 
 			MsgLen = KissDecode(TNC->ARDOPBuffer, Buffer, MsgLen);
 
+			// See if ACKMODE ACK
+
+			if ((Buffer[1] & 0xf) == 12)
+			{
+				//Ackmode
+
+				struct _LINKTABLE * LINK;
+				int ACKWORD = Buffer[2] | Buffer[3] << 8;
+
+				if (ACKWORD < MAXLINKS)
+				{
+					LINK = LINKS + ACKWORD;
+
+					if (LINK->L2TIMER)
+						LINK->L2TIMER = LINK->L2TIME;
+				}
+
+				ReleaseBuffer(Buff);
+				goto ignoreit;
+			}
+
+			if ((Buffer[1] & 0xf) != 0)
+			{
+				ReleaseBuffer(Buff);
+				goto ignoreit;				// Not data
+			}
+
 			// we dont need the FENDS or control byte
 
 			MsgLen -= 3;
@@ -1354,6 +1430,8 @@ VOID KISSHFProcessReceivedPacket(struct TNCINFO * TNC)
 			}
 		}
 
+ignoreit:
+
 		if (TNC->InputLen == 0)
 			return;
 
@@ -1463,7 +1541,7 @@ void DetachKISSHF(struct PORTCONTROL * PORT)
 	struct STREAMINFO * STREAM = &TNC->Streams[0];
 
 	if (STREAM->Attached)
-		STREAM->ReportDISC = TRUE;		// Tell Node
+		STREAM->ReportDISC = 10;		// Tell Node but give time for error message to display
 
 	STREAM->Connecting = FALSE;
 	STREAM->Connected = FALSE;

L2Code.c

@@ -30,7 +30,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #include "time.h"
 #include "stdio.h"
 				 
-#include "CHeaders.h"
+#include "cheaders.h"
 #include "tncinfo.h"
 
 #define	PFBIT 0x10		// POLL/FINAL BIT IN CONTROL BYTE
@@ -47,8 +47,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #define	THREESECS 3*3
 
 
-VOID L2SENDCOMMAND();
+VOID L2Routine(struct PORTCONTROL * PORT, PMESSAGE Buffer);
-VOID L2ROUTINE();
 MESSAGE * SETUPL2MESSAGE(struct _LINKTABLE * LINK, UCHAR CMD);
 VOID SendSupervisCmd(struct _LINKTABLE * LINK);
 void SEND_RR_RESP(struct _LINKTABLE * LINK, UCHAR PF);
@@ -106,6 +105,13 @@ void AttachKISSHF(struct PORTCONTROL * PORT, MESSAGE * Buffer);
 void DetachKISSHF(struct PORTCONTROL * PORT);
 void KISSHFConnected(struct PORTCONTROL * PORT, struct _LINKTABLE * LINK);
 void WriteConnectLog(char * fromcall, char * tocall, UCHAR * Mode);
+int seeifInterlockneeded(struct PORTCONTROL * PORT);
+int seeifUnlockneeded(struct _LINKTABLE * LINK);
+int CheckKissInterlock(struct PORTCONTROL * MYPORT, int Exclusive);
+void hookL2SessionAccepted(int Port, char * fromCall, char * toCall, struct _LINKTABLE * LINK);
+void hookL2SessionDeleted(struct _LINKTABLE * LINK);
+void hookL2SessionAttempt(int Port, char * fromCall, char * toCall, struct _LINKTABLE * LINK);
+
 
 extern int REALTIMETICKS;
 
@@ -124,7 +130,7 @@ extern int REALTIMETICKS;
 
 UCHAR NO_CTEXT = 0;
 UCHAR ALIASMSG = 0;
-extern UINT APPLMASK;
+
 static UCHAR ISNETROMMSG = 0;
 UCHAR MSGFLAG = 0;
 extern char * ALIASPTR;
@@ -136,6 +142,30 @@ extern BOOL LogAllConnects;
 
 APPLCALLS * APPL;
 
+
+void SendL2ToMonMap(struct PORTCONTROL * PORT, char * ReportCall, char Mode, char Direction)
+{
+	// if Port Freq < 30Mhz send to Node Map
+
+	if (PORT->PortFreq && PORT->PortFreq < 30000000)
+	{
+		char ReportMode[16];
+		char ReportFreq[350] = "";
+
+		ReportMode[0] = '@';
+		ReportMode[1] = Mode;
+		ReportMode[2] = '?';
+		ReportMode[3] = Direction;
+		ReportMode[4] = 0;
+
+		// If no position see if we have an APRS posn
+
+		_gcvt(PORT->PortFreq, 9, ReportFreq);
+
+ 		SendMH(0, ReportCall, ReportFreq, 0, ReportMode);
+	}
+}
+
 VOID L2Routine(struct PORTCONTROL * PORT, PMESSAGE Buffer)
 {
 	//	LEVEL 2 PROCESSING
@@ -147,6 +177,7 @@ VOID L2Routine(struct PORTCONTROL * PORT, PMESSAGE Buffer)
 	UCHAR CTL;
 	uintptr_t Work;
 	UCHAR c;
+	unsigned int APPLMASK = 0;
 
 	//	Check for invalid length (< 22 7Header + 7Addr + 7Addr + CTL
 
@@ -160,7 +191,6 @@ VOID L2Routine(struct PORTCONTROL * PORT, PMESSAGE Buffer)
  	PORT->L2FRAMES++;
 
 	ALIASMSG = 0;
-	APPLMASK = 0;
 	ISNETROMMSG = 0;
 
 	MSGFLAG = 0;					// CMD/RESP UNDEFINED
@@ -232,6 +262,7 @@ VOID L2Routine(struct PORTCONTROL * PORT, PMESSAGE Buffer)
 	if (PORT->PORTMHEARD)
 		MHPROC(PORT, Buffer);
 
+
 	/// TAJ added 07/12/2020 for 'all RX traffic as IfinOctects
 
 	InOctets[PORT->PORTNUMBER] += Buffer->LENGTH - MSGHDDRLEN;
@@ -460,6 +491,8 @@ FORUS:
 	if (PORT->UIHook && CTL == 3)
 		PORT->UIHook(LINK, PORT, Buffer, ADJBUFFER, CTL, MSGFLAG);
 
+	LINK->APPLMASK = APPLMASK;
+
 	L2FORUS(LINK, PORT, Buffer, ADJBUFFER, CTL, MSGFLAG);
 }
 
@@ -726,7 +759,7 @@ VOID L2FORUS(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * Buff
 
 		NO_CTEXT = 1;
 		
-		if (ROUTE->NEIGHBOUR_FLAG == 1 && ROUTE->NEIGHBOUR_QUAL == 0)		// Locked, qual 0
+		if (ROUTE->NEIGHBOUR_FLAG && ROUTE->NEIGHBOUR_QUAL == 0)		// Locked, qual 0
 		{
 			ReleaseBuffer(Buffer);
 			return;
@@ -789,6 +822,14 @@ VOID ProcessXIDCommand(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESS
 	UCHAR TEMPDIGI[57];
 	int n;
 
+	// Check Interlock - should we also check exclude etc?. No, checked in L2FORUS
+
+	if (CheckKissInterlock(PORT, TRUE))			// Interlock with ARDOP/VARA etc
+	{
+		L2SENDDM(PORT, Buffer, ADJBUFFER);
+		return;
+	}
+
 	if (*ptr++ == 0x82 && *ptr++ == 0x80)
 	{
 		int Type;
@@ -915,13 +956,13 @@ VOID ProcessXIDCommand(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESS
 
 		ADJBUFFER->CTL = CTL | PFBIT;
 
-// 			Buffer->LENGTH = (UCHAR *)ADJBUFFER - (UCHAR *)Buffer + MSGHDDRLEN + 15;	// SET UP BYTE COUNT
+		// 			Buffer->LENGTH = (UCHAR *)ADJBUFFER - (UCHAR *)Buffer + MSGHDDRLEN + 15;	// SET UP BYTE COUNT
 
 		L2SWAPADDRESSES(Buffer);			// SWAP ADDRESSES AND SET RESP BITS
 
 		// We need to save APPLMASK and ALIASPTR so following SABM connects to application
 
-			LINK->APPLMASK = APPLMASK;
+		// LINK->APPLMASK now set in L2FORUS
 		LINK->ALIASPTR = ALIASPTR;
 
 		PUT_ON_PORT_Q(PORT, Buffer);
@@ -1048,7 +1089,7 @@ VOID L2LINKACTIVE(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE *
 
 		if (LINK->L2STATE == 1)			// Sent XID?
 		{
-			APPLMASK = LINK->APPLMASK;
+			LINK->APPLMASK;
 			ALIASPTR = LINK->ALIASPTR;
 
 			L2SABM(LINK, PORT, Buffer, ADJBUFFER, MSGFLAG);			// Process the SABM
@@ -1101,12 +1142,24 @@ VOID L2SABM(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * Buffe
 	TRANSPORTENTRY * Session;
 	int CONERROR;
 
+	char toCall[12], fromCall[12];
+
+
 	if (LINK == 0)			// NO LINK ENTRIES - SEND DM RESPONSE
 	{
 		L2SENDDM(PORT, Buffer, ADJBUFFER);
 		return;
 	}
 
+	if (CheckKissInterlock(PORT, TRUE))			// Interlock with ARDOP/VARA etc
+	{
+		L2SENDDM(PORT, Buffer, ADJBUFFER);
+		return;
+	}
+
+	toCall[ConvFromAX25(ADJBUFFER->DEST, toCall)] = 0;
+	fromCall[ConvFromAX25(ADJBUFFER->ORIGIN, fromCall)] = 0;
+
 	SETUPNEWL2SESSION(LINK, PORT, Buffer, MSGFLAG);
 
 	if (LINK->L2STATE != 5)			// Setup OK?
@@ -1115,9 +1168,13 @@ VOID L2SABM(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * Buffe
 		return;
 	}
 
+	// See if need to Interlock non-sharable modes, eg ARDOP and VARA
+
+	seeifInterlockneeded(PORT);
+
 	//	IF CONNECT TO APPL ADDRESS, SET UP APPL SESSION
 
-	if (APPLMASK == 0)
+	if (LINK->APPLMASK == 0)
 	{
 		//	Not ATTACH TO APPL
 	
@@ -1130,12 +1187,11 @@ VOID L2SABM(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * Buffe
 		UCHAR * ptr;
 
 		if (LogAllConnects)	
-		{		
-			char toCall[12], fromCall[12];
-			toCall[ConvFromAX25(ADJBUFFER->DEST, toCall)] = 0;
-			fromCall[ConvFromAX25(ADJBUFFER->ORIGIN, fromCall)] = 0;
 			WriteConnectLog(fromCall, toCall, "AX.25");
-		}
+
+		hookL2SessionAccepted(PORT->PORTNUMBER, fromCall, toCall, LINK);
+
+		SendL2ToMonMap(PORT, fromCall, '+', 'I');		
 	
 		L2SENDUA(PORT, Buffer, ADJBUFFER);
 
@@ -1251,6 +1307,10 @@ VOID L2SABM(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * Buffe
 
 		L2SENDUA(PORT, Buffer, ADJBUFFER);
 
+		hookL2SessionAccepted(PORT->PORTNUMBER, fromCall, toCall, LINK);
+
+		SendL2ToMonMap(PORT, fromCall, '+', 'I');		
+	
 		if (PORT->TNC && PORT->TNC->Hardware == H_KISSHF)
 		{
 			struct DATAMESSAGE * Msg;
@@ -1324,7 +1384,7 @@ VOID L2SABM(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * Buffe
 		return;
 	}
 
-	if (cATTACHTOBBS(Session, APPLMASK, PORT->PORTPACLEN, &CONERROR) == 0)
+	if (cATTACHTOBBS(Session, LINK->APPLMASK, PORT->PORTPACLEN, &CONERROR) == 0)
 	{
 		//	NO BBS AVAILABLE
 	
@@ -1349,6 +1409,10 @@ VOID L2SABM(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * Buffe
 
 	L2SENDUA(PORT, Buffer, ADJBUFFER);
 
+	hookL2SessionAccepted(PORT->PORTNUMBER, fromCall, toCall, LINK);
+
+	SendL2ToMonMap(PORT, fromCall, '+', 'I');		
+	
 	if (PORT->TNC && PORT->TNC->Hardware == H_KISSHF)
 	{
 		struct DATAMESSAGE * Msg;
@@ -1816,8 +1880,14 @@ VOID L2_PROCESS(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * B
 		{
 			//	RESPONSE TO SABM - SET LINK  UP
 
+			char fromCall[12];
+
+			fromCall[ConvFromAX25(Buffer->ORIGIN, fromCall)] = 0;
+
 			RESET2X(LINK);			// LEAVE QUEUED STUFF
 
+			SendL2ToMonMap(PORT, fromCall, '+', 'O');		
+	
 			LINK->L2STATE = 5;
 			LINK->L2TIMER = 0;		// CANCEL TIMER
 			LINK->L2RETRIES = 0;
@@ -2408,6 +2478,8 @@ VOID PROC_I_FRAME(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE *
 	Length = Buffer->LENGTH - (MSGHDDRLEN + 15);	// Buffer Header + addrs + CTL
 	Info  = &Buffer->PID;
 
+	LINK->bytesRXed += Length;
+
 	// Adjust for DIGIS
 
 	EOA = &Buffer->ORIGIN[6];		// End of address Bit
@@ -2613,6 +2685,13 @@ VOID RESET2(struct _LINKTABLE * LINK)
 
 VOID SENDSABM(struct _LINKTABLE * LINK)
 {
+	char toCall[10];
+	char fromCall[10];
+
+	toCall[ConvFromAX25(LINK->LINKCALL, toCall)] = 0;
+	fromCall[ConvFromAX25(LINK->OURCALL, fromCall)] = 0;
+	hookL2SessionAttempt(LINK->LINKPORT->PORTNUMBER, fromCall, toCall, LINK);
+
 	L2SENDCOMMAND(LINK, SABM | PFBIT);
 }
 
@@ -3056,7 +3135,7 @@ VOID ACKMSG(struct _LINKTABLE * LINK)
 	}
 }
 
-VOID CONNECTFAILED();
+VOID CONNECTFAILED(struct _LINKTABLE * LINK);
 	
 VOID L2TIMEOUT(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT)
 {
@@ -3226,6 +3305,10 @@ VOID SENDFRMR(struct _LINKTABLE * LINK)
 
 VOID CLEAROUTLINK(struct _LINKTABLE * LINK)
 {
+	hookL2SessionDeleted(LINK);
+
+	seeifUnlockneeded(LINK);
+
 	CLEARL2QUEUES(LINK);				// TO RELEASE ANY BUFFERS
 
 	memset(LINK, 0, sizeof(struct _LINKTABLE));
@@ -3553,7 +3636,7 @@ VOID CONNECTREFUSED(struct _LINKTABLE * LINK)
 	ConnectFailedOrRefused(LINK, "Busy from");
 }
 
-VOID L3CONNECTFAILED();
+VOID L3CONNECTFAILED(struct _LINKTABLE * LINK);
 
 VOID ConnectFailedOrRefused(struct _LINKTABLE * LINK, char * Msg)
 {
@@ -3593,7 +3676,7 @@ VOID ConnectFailedOrRefused(struct _LINKTABLE * LINK, char * Msg)
 	Buffer->LENGTH = (int)(ptr1 - (UCHAR *)Buffer);
 
 	Session = LINK->CIRCUITPOINTER;			// GET CIRCUIT TABLE ENTRY
-	InSession = Session->L4CROSSLINK;		// TO INCOMMONG SESSION
+	InSession = Session->L4CROSSLINK;		// TO INCOMMING SESSION
 
 	CLEARSESSIONENTRY(Session);
 
@@ -3960,3 +4043,141 @@ BOOL CheckForListeningSession(struct PORTCONTROL * PORT, MESSAGE * Msg)
 	}
 	return FALSE;
 }
+
+
+int COUNTLINKS(int Port);
+VOID SuspendOtherPorts(struct TNCINFO * ThisTNC);
+VOID ReleaseOtherPorts(struct TNCINFO * ThisTNC);
+
+
+int CheckKissInterlock(struct PORTCONTROL * PORT, int Exclusive)
+{
+	// This checks for interlocked kiss and other ports. Returns 1 if attach/connect not allowed
+
+	// If Exclusive is not set allow connects on specified port up to l2limit,
+
+	// If Exclusive is set also don't allow any connects on specified port.
+
+	// Generally use Exclusive if locking a port that doesn't allow shared access, eg ARDOP, VARAus
+
+	// Maybe only Exclusive is needed, and just check session mode ports. Sharing of KISS ports is controlled by USERS
+
+	int Interlock = PORT->PORTINTERLOCK;
+
+	if (Interlock == 0)
+		return 0;				// No locking
+
+	PORT = PORTTABLE;
+
+	if (Exclusive)
+	{
+		while(PORT)
+		{
+			if (PORT->TNC)
+			{
+				struct TNCINFO * TNC = PORT->TNC;
+
+				if (Interlock == TNC->RXRadio || Interlock == TNC->TXRadio)	// Same Group
+				{
+					// See if port in use
+
+					int n;
+
+					for (n = 0; n <= 26; n++)
+					{
+						if (TNC->PortRecord->ATTACHEDSESSIONS[n])
+						{			
+							return TNC->Port;			; // Refuse Connect
+						}
+					}
+				}
+			}
+			PORT = PORT->PORTPOINTER;
+		}
+	}
+	return 0;					// ok to connect
+}
+
+int seeifInterlockneeded(struct PORTCONTROL * PORT)
+{
+	// Can we just call SuspendOtherPorts - it won't do any harm if already suspended
+	// No, at that needs a TNC Record, so duplicate code here
+
+	int i;
+	int Interlock = PORT->PORTINTERLOCK;
+	struct TNCINFO * TNC;
+
+	if (Interlock == 0)
+		return 0;				// No locking
+
+	for (i = 1; i <= MAXBPQPORTS; i++)
+	{
+		TNC = TNCInfo[i];
+
+		if (TNC)
+			if (Interlock == TNC->RXRadio || Interlock == TNC->TXRadio)	// Same Group	
+				if (TNC->SuspendPortProc &&	TNC->PortRecord->PORTCONTROL.PortSuspended == FALSE)
+					TNC->SuspendPortProc(TNC, TNC);
+	}
+
+	return 0;
+}
+
+int seeifUnlockneeded(struct _LINKTABLE * LINK)
+{
+	// We need to see if any other links are active on any interlocked KISS ports. If not, release the lock
+
+	int i;
+	int links = 0;
+
+	int Interlock;
+	struct TNCINFO * TNC;
+	struct PORTCONTROL * PORT = LINK->LINKPORT;
+
+	if (PORT == NULL)
+		return 0;
+
+	// Should only be called for KISS links, but just in case
+
+	if (PORT->PORTTYPE > 12)		// INTERNAL or EXTERNAL?
+		return 0;					// Not KISS Port
+
+	Interlock = PORT->PORTINTERLOCK;
+
+	if (Interlock == 0)
+		return 0;				// No locking
+
+
+	// Count all L2 links on interlocked KISS ports
+
+	PORT = PORTTABLE;
+
+	while(PORT)
+	{
+		if (PORT->PORTTYPE <= 12)		// INTERNAL or EXTERNAL?	
+			if (Interlock == PORT->PORTINTERLOCK)
+				links += COUNTLINKS(PORT->PORTNUMBER);
+
+		PORT = PORT->PORTPOINTER;
+	}
+
+	if (links > 1)				// must be the one we are closing
+		return 0;				// Keep lock
+	
+
+	for (i = 1; i <= MAXBPQPORTS; i++)
+	{
+		TNC = TNCInfo[i];
+
+		if (TNC)
+			if (Interlock == TNC->RXRadio || Interlock == TNC->TXRadio)	// Same Group	
+				if (TNC->ReleasePortProc &&	TNC->PortRecord->PORTCONTROL.PortSuspended == TRUE)
+					TNC->ReleasePortProc(TNC);
+	}
+
+	return 0;
+}
+
+
+
+

L3Code.c

@@ -49,7 +49,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #include "stdio.h"
 #include <fcntl.h>
 
-#include "CHeaders.h"
+#include "cheaders.h"
 #include "tncinfo.h"
 
 VOID UPDATEDESTLIST();
@@ -319,13 +319,13 @@ VOID PROCESSNODEMESSAGE(MESSAGE * Msg, struct PORTCONTROL * PORT)
 
 	// if locked route with quality zero ignore
 
-	if ((ROUTE->NEIGHBOUR_FLAG & 1))	 // LOCKED ROUTE
+	if ((ROUTE->NEIGHBOUR_FLAG))	 // LOCKED ROUTE
 		if (ROUTE->NEIGHBOUR_QUAL == 0)
 			return;
 
 	//	If Ignoreunlocked set, ignore it not locked
 
-	if ((ROUTE->NEIGHBOUR_FLAG & 1) == 0)	 // LOCKED ROUTE
+	if ((ROUTE->NEIGHBOUR_FLAG) == 0)	 // LOCKED ROUTE
 		if (PORT->IgnoreUnlocked)
 			return;
 	
@@ -333,7 +333,7 @@ VOID PROCESSNODEMESSAGE(MESSAGE * Msg, struct PORTCONTROL * PORT)
 
 	// if not locked, update route quality from port quality (may have changed config and not cleared SAVENODES
 
-	if ((ROUTE->NEIGHBOUR_FLAG & 1) == 0)	 // Not LOCKED ROUTE
+	if (ROUTE->NEIGHBOUR_FLAG == 0)	 // Not LOCKED ROUTE
 		ROUTE->NEIGHBOUR_QUAL = PORT->PORTQUALITY;
 
 	//	GET TIME FROM BIOS DATA AREA OR RTC
@@ -1038,7 +1038,7 @@ VOID L3TimerProc()
 	{
 		ROUTE++;
 
-		if (ROUTE->NEIGHBOUR_FLAG & 1)			// Locked?
+		if (ROUTE->NEIGHBOUR_FLAG)				// Locked?
 			continue;
 
 		if (ROUTE->NEIGHBOUR_LINK)				// Has an active Session

L4Code.c

@@ -31,32 +31,32 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #include "stdio.h"
 #include <fcntl.h>					 
 
-#include "CHeaders.h"
+#include "cheaders.h"
 #include "tncinfo.h"
 
 extern BPQVECSTRUC BPQHOSTVECTOR[];
 #define BPQHOSTSTREAMS 64
 #define IPHOSTVECTOR BPQHOSTVECTOR[BPQHOSTSTREAMS + 3]
 
-VOID CLOSECURRENTSESSION(TRANSPORTENTRY * Session);
+void CLOSECURRENTSESSION(TRANSPORTENTRY * Session);
-VOID SENDL4DISC(TRANSPORTENTRY * Session);
+void SENDL4DISC(TRANSPORTENTRY * Session);
-int C_Q_COUNT(VOID * Q);
+int C_Q_COUNT(void * Q);
 TRANSPORTENTRY * SetupSessionForL2(struct _LINKTABLE * LINK);
-VOID InformPartner(struct _LINKTABLE * LINK, int Reason);
+void InformPartner(struct _LINKTABLE * LINK, int Reason);
-VOID IFRM150(TRANSPORTENTRY * Session, PDATAMESSAGE Buffer);
+void IFRM150(TRANSPORTENTRY * Session, PDATAMESSAGE Buffer);
-VOID SendConNAK(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG);
+void SendConNAK(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG);
 BOOL FINDCIRCUIT(L3MESSAGEBUFFER * L3MSG, TRANSPORTENTRY ** REQL4, int * NewIndex);
 int GETBUSYBIT(TRANSPORTENTRY * L4);
 BOOL cATTACHTOBBS(TRANSPORTENTRY * Session, UINT Mask, int Paclen, int * AnySessions);
 VOID SETUPNEWCIRCUIT(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, 
 		 TRANSPORTENTRY * L4, char * BPQPARAMS, int ApplMask, int * BPQNODE);
 extern char * ALIASPTR;
-VOID SendConACK(struct _LINKTABLE * LINK, TRANSPORTENTRY * L4, L3MESSAGEBUFFER * L3MSG, BOOL BPQNODE, UINT Applmask, UCHAR * ApplCall);
+void SendConACK(struct _LINKTABLE * LINK, TRANSPORTENTRY * L4, L3MESSAGEBUFFER * L3MSG, BOOL BPQNODE, UINT Applmask, UCHAR * ApplCall);
-VOID L3SWAPADDRESSES(L3MESSAGEBUFFER * L3MSG);
+void L3SWAPADDRESSES(L3MESSAGEBUFFER * L3MSG);
-VOID L4TIMEOUT(TRANSPORTENTRY * L4);
+void L4TIMEOUT(TRANSPORTENTRY * L4);
 struct DEST_LIST * CHECKL3TABLES(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * Msg);
 int CHECKIFBUSYL4(TRANSPORTENTRY * L4);
-VOID AUTOTIMER();
+VOID AUTOTIMER(TRANSPORTENTRY * L4);
 VOID NRRecordRoute(UCHAR * Buff, int Len);
 VOID REFRESHROUTE(TRANSPORTENTRY * Session);
 VOID ACKFRAMES(L3MESSAGEBUFFER * L3MSG, TRANSPORTENTRY * L4, int NR);
@@ -67,12 +67,18 @@ VOID ProcessRTTMsg(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Buff, int Len
 VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask, UCHAR * ApplCall);
 void WriteConnectLog(char * fromCall, char * toCall, UCHAR * Mode);
 void SendVARANetromMsg(struct TNCINFO * TNC, PL3MESSAGEBUFFER MSG);
+unsigned char * Compressit(unsigned char * In, int Len, int * OutLen);
+int doinflate(unsigned char * source, unsigned char * dest, int Len, int destlen, int * outLen);
 
-extern UINT APPLMASK;
+static UINT APPLMASK;
 
 extern BOOL LogL4Connects;
 extern BOOL LogAllConnects;
 
+extern int L4Compress;
+extern int L4CompMaxframe;
+extern int L4CompPaclen;
+
 // L4 Flags Values
 
 #define DISCPENDING	8		// SEND DISC WHEN ALL DATA ACK'ED
@@ -341,6 +347,17 @@ VOID SENDL4MESSAGE(TRANSPORTENTRY * L4, struct DATAMESSAGE * Msg)
 
 	L3MSG->L4FLAGS = L4INFO | L4->NAKBITS;
 
+	if (Msg->PID == 0xF1)		// Compressed Message
+	{
+		L3MSG->L4FLAGS |= L4COMP;
+		Msg->PID = 0xF0;
+	}
+	else if (Msg->PID == 0xF2)		// Compressed Message - More to come
+	{
+		L3MSG->L4FLAGS |= (L4COMP | L4MORE);
+		Msg->PID = 0xF0;
+	}
+
 	L4->L4TIMER = L4->SESSIONT1;			// SET TIMER
 	L4->L4ACKREQ = 0;						// CANCEL ACK NEEDED
 
@@ -470,6 +487,9 @@ VOID SENDL4CONNECT(TRANSPORTENTRY * Session)
 
 	MSG->LENGTH = (int)(&MSG->L4DATA[17] - (UCHAR *)MSG);
 
+	if (L4Compress)
+		MSG->L4DATA[16] |= 0x40;			// Set Compression Supported
+
 	if (Session->SPYFLAG)
 	{
 		MSG->L4DATA[17] = 'Z';							// ADD SPY ON BBS FLAG
@@ -500,6 +520,53 @@ void RETURNEDTONODE(TRANSPORTENTRY * Session)
 
 extern void * BUFFER;
 
+void sendChunk(TRANSPORTENTRY * L4, unsigned char * Compressed, int complen, int savePort)
+{
+	unsigned char * compdata;
+	struct DATAMESSAGE * Msg;
+	int sendLen = complen;
+	int fragments;
+
+	L4->SentAfterCompression += complen;
+	
+	if (complen > L4CompPaclen)
+	{
+		fragments = (complen / L4CompPaclen);			// Split to roughly equal sized fraagments
+
+		if (fragments * L4CompPaclen != complen)
+			fragments++;
+
+		sendLen = (complen / fragments) + 1;
+	}
+
+	compdata = Compressed;
+
+	while (complen > 0)
+	{
+		int PID = 0xF1;
+
+		if (complen > sendLen)
+			PID = 0xF2;				// More to come
+
+		Msg = GetBuff();
+
+		if (!Msg)
+			return;
+
+		Msg->PORT = savePort;
+
+		memcpy(Msg->L2DATA, compdata, sendLen);
+		Msg->LENGTH = sendLen + MSGHDDRLEN + 1;			// 1 for pid field
+		Msg->PID = PID;	// Not sent so use as a flag for compressed msg
+
+		compdata += sendLen;
+		complen -= sendLen;
+
+		SENDL4MESSAGE(L4, Msg);
+		ReleaseBuffer(Msg);
+	}
+}
+
 VOID L4BG()
 {
 	// PROCESS DATA QUEUED ON SESSIONS
@@ -593,8 +660,151 @@ VOID L4BG()
 
 			if (L4->L4CIRCUITTYPE & SESSION)
 			{
+				//	Now support compressing NetRom Sessions.
+				//	We collect as much data as possible before compressing and re-packetizing
+
+				if (L4->AllowCompress)
+				{
+					int complen = 0;
+					unsigned char * Compressed;
+					int dataLen;
+					int savePort = Msg->PORT;
+					int maxCompSendLen;
+
+					// Save first packet, then see if more on TX_Q
+
+					L4->toCompress = malloc(8192);
+					L4->toCompressLen = 0;
+
+					dataLen = Msg->LENGTH - MSGHDDRLEN - 1;		// No header or pid
+
+					L4->Sent += dataLen;
+
+					memcpy(&L4->toCompress[L4->toCompressLen], Msg->L2DATA, dataLen);
+					L4->toCompressLen += dataLen;
+
+					// See if first will compress. If not assume too short or already compressed data and just send
+
+					Compressed = Compressit(L4->toCompress, L4->toCompressLen, &complen);
+				
+					if (complen >= dataLen)
+					{
+						free(Compressed);
+						L4->SentAfterCompression += dataLen;
 						SENDL4MESSAGE(L4, Msg);
 						ReleaseBuffer(Msg);
+						free(L4->toCompress);
+						L4->toCompress = 0;
+						L4->toCompressLen = 0;
+						continue;
+					}
+
+					// Worth compressing. Try to collect several packets
+
+					if (L4->L4TX_Q == 0)
+					{
+						// no more, so just send the stuff we've just compressed. Compressed data will fit in input packet
+
+//						Debugprintf("%d %d %d%%", L4->toCompressLen, complen, ((L4->toCompressLen - complen) * 100) / L4->toCompressLen);
+
+						memcpy(Msg->L2DATA, Compressed, complen);
+						
+						Msg->PID = 0xF1;			// Compressed
+						Msg->LENGTH = complen + MSGHDDRLEN + 1;			// 1 for pid field
+
+						L4->SentAfterCompression += complen;
+						SENDL4MESSAGE(L4, Msg);
+						ReleaseBuffer(Msg);
+		
+						free(L4->toCompress);
+						L4->toCompressLen = 0;
+						L4->toCompress = 0;
+						free(Compressed);
+						continue;
+					}
+
+					free(Compressed);
+					ReleaseBuffer(Msg);					// Not going to use it
+
+					while (L4->L4TX_Q && L4->toCompressLen < (8192 - 256))		// Make sure can't overrin buffer
+					{
+						// Collect the data from L4TX_Q
+					
+						Msg = Q_REM((void *)&L4->L4TX_Q);
+						dataLen = Msg->LENGTH - MSGHDDRLEN - 1;		// No header or pid
+						L4->Sent += dataLen;
+
+						memcpy(&L4->toCompress[L4->toCompressLen], Msg->L2DATA, dataLen);
+						L4->toCompressLen += dataLen;
+
+						ReleaseBuffer(Msg);
+					}
+
+					L4->toCompress[L4->toCompressLen] = 0;
+	
+					Compressed = Compressit(L4->toCompress, L4->toCompressLen, &complen);
+//					Debugprintf("%d %d %d%%", L4->toCompressLen, complen, ((L4->toCompressLen - complen) * 100) / L4->toCompressLen);
+
+					// Send compressed
+
+					// Fragment if more than L4CompPaclen
+
+					// Entered with  original first fragment in saveMsg;
+
+					// Check for too big a compressed frame size. Bigger compresses better but adds latency to link
+
+					maxCompSendLen = L4CompPaclen * L4CompMaxframe;
+
+					if (complen > maxCompSendLen)
+					{
+						// Too Much Data. Needs to recompress less. To avoid too many recompresses be a bit conservative in calulating max size 
+						// to allow for a bit less compression of part of data. Getting it wrong isn't fatal as sending more than optimum isn't fatal
+
+						int Fragments;
+						int ChunkSize;
+						unsigned char * CompressPtr = L4->toCompress;
+						int bytesleft = L4->toCompressLen;
+
+						// Assume 10% worse compression on smaller input
+
+						int j = (complen * 11) / 10;		// New Comp size
+
+						Fragments = j / maxCompSendLen;
+						Fragments++;
+						ChunkSize = (L4->toCompressLen / Fragments) + 1;	// 1 for rounding
+
+						while (bytesleft > 0)
+						{
+							int Len = bytesleft;
+							if (Len > ChunkSize)
+								Len = ChunkSize;
+
+							free (Compressed);
+							Compressed = Compressit(CompressPtr, Len, &complen);
+//							Debugprintf("Chunked %d %d %d%%", Len, complen, ((Len - complen) * 100) / Len);
+
+							sendChunk(L4, Compressed, complen, savePort);
+
+							CompressPtr += Len;
+							bytesleft -= Len;
+						}
+
+					}
+					else
+						sendChunk(L4, Compressed, complen,savePort);
+
+					free(L4->toCompress);
+					L4->toCompressLen = 0;
+					L4->toCompress = 0;
+					free(Compressed);
+				}
+				else
+				{
+					// Compression Disabled
+
+					SENDL4MESSAGE(L4, Msg);
+					ReleaseBuffer(Msg);
+				}
 				continue;
 			}
 
@@ -603,6 +813,9 @@ VOID L4BG()
 			// If we want to enforce PACLEN this may be a good place to do it
 
 			Msglen = Msg->LENGTH - (MSGHDDRLEN + 1); //Dont include PID
+
+			LINK->bytesTXed += Msglen;
+
 			Paclen = L4->SESSPACLEN;
 
 			if (Paclen == 0)
@@ -700,12 +913,35 @@ VOID CLEARSESSIONENTRY(TRANSPORTENTRY * Session)
 		Session->L4RESEQ_Q = 0;
 	}
 
+	// if compressed session display stats
+
+	if (Session->Sent && Session->Received)
+	{
+		char SRCE[10];
+		char TO[10];
+
+		struct DEST_LIST * DEST = Session->L4TARGET.DEST;
+
+		SRCE[ConvFromAX25(Session->L4MYCALL, SRCE)] = 0;
+		TO[ConvFromAX25(DEST->DEST_CALL, TO)] = 0;
+
+		Debugprintf("L4 Compression Stats %s %s TX %d %d %d%% RX %d %d %d%%", SRCE, TO,
+			Session->Sent, Session->SentAfterCompression, ((Session->Sent - Session->SentAfterCompression) * 100) / Session->Sent,
+			Session->Received, Session->ReceivedAfterExpansion, ((Session->ReceivedAfterExpansion - Session->Received) * 100) / Session->Received);
+	}
+
 	while (Session->L4RESEQ_Q)
 		ReleaseBuffer(Q_REM((void *)&Session->L4RESEQ_Q));
 
 	if (Session->PARTCMDBUFFER)
 		ReleaseBuffer(Session->PARTCMDBUFFER);
 
+	if (Session->toCompress)
+		free(Session->toCompress);
+
+	if (Session->unCompress)
+		free(Session->unCompress);
+
 	memset(Session, 0, sizeof(TRANSPORTENTRY));
 }
 
@@ -897,10 +1133,14 @@ VOID L4TimerProc()
 				L4->STAYFLAG = 0;
 
 				Partner = L4->L4CROSSLINK;
+
 				CLOSECURRENTSESSION(L4);
 				
 				if (Partner)
 				{
+					// if compressed session display stats
+
+
 					Partner->L4KILLTIMER = 0;		//ITS TIMES IS ALSO ABOUT TO EXPIRE
 					CLOSECURRENTSESSION(Partner);	// CLOSE THIS ONE
 				}
@@ -975,6 +1215,8 @@ VOID L4TIMEOUT(TRANSPORTENTRY * L4)
 	{
 		//	RETRIED N2 TIMES - FAIL LINK
 
+		// if compressed session display stats
+
 		CloseSessionPartner(L4);	// SEND CLOSE TO PARTNER (IF PRESENT)
 		return;
 	}
@@ -1247,6 +1489,7 @@ VOID SENDL4DISC(TRANSPORTENTRY * Session)
 	MSG->LENGTH = (int)(&MSG->L4DATA[0] - (UCHAR *)MSG);
 
 	C_Q_ADD(&DEST->DEST_Q, (UINT *)MSG);
+
 }
 
 
@@ -1455,6 +1698,9 @@ VOID SendConACK(struct _LINKTABLE * LINK, TRANSPORTENTRY * L4, L3MESSAGEBUFFER *
 	if (BPQNODE)
 	{
 		L3MSG->L4DATA[1] = L3LIVES;		// Our TTL
+		if (L4->AllowCompress)
+			L3MSG->L4DATA[1] |= 0x80;
+
 		L3MSG->LENGTH++;
 	}
 
@@ -1530,7 +1776,7 @@ int FINDCIRCUIT(L3MESSAGEBUFFER * L3MSG, TRANSPORTENTRY ** REQL4, int * NewIndex
 	return FALSE;
 }
 
-VOID L3SWAPADDRESSES(L3MESSAGEBUFFER * L3MSG)
+void L3SWAPADDRESSES(L3MESSAGEBUFFER * L3MSG)
 {
 	//	EXCHANGE ORIGIN AND DEST
 
@@ -1545,7 +1791,7 @@ VOID L3SWAPADDRESSES(L3MESSAGEBUFFER * L3MSG)
 	L3MSG->L3SRCE[6] |= 1;			// Set Last Call
 }
 
-VOID SendConNAK(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG)
+void SendConNAK(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG)
 {
 	L3MSG->L4FLAGS = L4CACK | L4BUSY;			// REJECT
 	L3MSG->L4DATA[0] = 0;						// WINDOW
@@ -1556,6 +1802,25 @@ VOID SendConNAK(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG)
 	C_Q_ADD(&LINK->TX_Q, L3MSG);
 }
 
+VOID SendL4RESET(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG)
+{
+	// Paula's extension
+
+	L3MSG->L4FLAGS = L4RESET;
+
+	L3SWAPADDRESSES(L3MSG);	
+	L3MSG->L3TTL = L3LIVES;
+
+	L3MSG->LENGTH = (int)(&L3MSG->L4DATA[0] - (UCHAR *)L3MSG);
+	C_Q_ADD(&LINK->TX_Q, L3MSG);
+}
+
+
+
+
+
+
+
 VOID SETUPNEWCIRCUIT(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, 
 					 TRANSPORTENTRY * L4, char * BPQPARAMS, int ApplMask, int * BPQNODE)
 {
@@ -1570,6 +1835,7 @@ VOID SETUPNEWCIRCUIT(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG,
 	L4->CIRCUITID = NEXTID;
 
 	NEXTID++;
+		
 	if (NEXTID == 0)
 		NEXTID++;								// kEEP nON-ZERO
 
@@ -1597,7 +1863,15 @@ VOID SETUPNEWCIRCUIT(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG,
 	if (L3MSG->LENGTH  == MSGHDDRLEN + 38 || L3MSG->LENGTH == MSGHDDRLEN + 39)
 	{
 		*BPQNODE = 1;
+
 		memcpy(BPQPARAMS, &L3MSG->L4DATA[15],L3MSG->LENGTH - (MSGHDDRLEN + 36));
+	
+		// 40 bit of 2nd byte is Compress Flag
+
+		if (BPQPARAMS[1] & 0x40 && L4Compress)
+			L4->AllowCompress = 1;
+
+		BPQPARAMS[1] &= 0xf;		// Only bottom bit is significant in Timeeout field
 	}
 
 	L4->L4CIRCUITTYPE = SESSION | UPLINK;	
@@ -1655,7 +1929,7 @@ TryAgain:
 	{	
 		SHORT T1;
 		
-		DEST->DEST_STATE |= 0x40;			// SET BPQ _NODE BIT
+		DEST->DEST_STATE |= 0x40;			// SET BPQ NODE BIT
 		memcpy((char *)&T1, BPQPARAMS, 2);
 
 		if (T1 > 300)
@@ -1741,19 +2015,45 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 
 	//	OTHERS NEED A SESSION
 
-	L4 = &L4TABLE[L3MSG->L4INDEX];
+	if (Opcode == L4RESET)
-
-	if (L4->CIRCUITID!= L3MSG->L4ID)
 	{
+		// Paula's extension - other end dosn't know about session so disconnect 
+
+		// A reset has our far index and id, not our index and id so have to search table for L4 entry
+
+		int n = MAXCIRCUITS;
+		L4 = L4TABLE;
+
+		while (n--)
+		{
+			if (L4->L4USER[0] && L4->FARID == L3MSG->L4ID && L4->FARINDEX == L3MSG->L4INDEX)
+			{
+				//  Check L3 source call to be sure (should that be L4 source call??
+
+				L3MSG->L3SRCE[6] &= 0xfe;		// mask end of call
+
+				if (memcmp(L3MSG->L3SRCE, L4->L4TARGET.DEST->DEST_CALL, 7) == 0)
+				{
+					CloseSessionPartner(L4);				// SEND CLOSE TO PARTNER (IF PRESENT)
+				}
+				ReleaseBuffer(L3MSG);
+				return;
+			}
+			L4++;
+		}
+
 		ReleaseBuffer(L3MSG);
 		return;
 	}
 
-	if ((L4->L4CIRCUITTYPE & SESSION) == 0)
+	if (L3MSG->L4INDEX < MAXCIRCUITS)
-	{
+		L4 = &L4TABLE[L3MSG->L4INDEX];
-		// Not an L4 Session - must be an old connection
 
-		ReleaseBuffer(L3MSG);
+	// If wrong ID or not an L4 session we must have restarted or cleared session
+
+	if (L4 == 0 || L4->CIRCUITID != L3MSG->L4ID || (L4->L4CIRCUITTYPE & SESSION) == 0)
+	{
+		SendL4RESET(LINK, L3MSG);			// Paula's extension
 		return;
 	}
 
@@ -1771,6 +2071,12 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 
 		if (L3MSG->LENGTH > MSGHDDRLEN + 22)		// Standard Msg
 		{
+			if (L3MSG->L4DATA[1] & 0x80)		// Compress Flag
+			{
+				L4->AllowCompress = 1;
+				L3MSG->L4DATA[1] &= 0x7f;
+			}
+
 			DEST->DEST_STATE &= 0x80;
 			DEST->DEST_STATE |= (L3MSG->L4DATA[1] - L3MSG->L3TTL) + 0x41; // Hops to dest + x40
 		}
@@ -1871,6 +2177,19 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 			return;	
 		}
 
+		// Randomly drop packets
+
+		/*
+		Debugprintf("L4 Test Received packet %d ", L3MSG->L4TXNO);
+
+		if ((rand() % 7) > 5)
+		{
+		Debugprintf("L4 Test Drop packet %d ", L3MSG->L4TXNO);
+		ReleaseBuffer(L3MSG);
+		return;
+		}
+		*/
+
 		ACKFRAMES(L3MSG, L4, L3MSG->L4RXNO);
 
 		//	If DISCPENDING or STATE IS 4, THEN SESSION IS CLOSING - IGNORE ANY I FRAMES
@@ -1895,7 +2214,7 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 			// FRAME IS A REPEAT
 
 			Call[ConvFromAX25(L3MSG->L3SRCE, Call)] = 0;
-			Debugprintf("Discarding repeated frame seq %d from %s", L3MSG->L4TXNO, Call);
+			Debugprintf("L4 Discarding repeated frame seq %d from %s", L3MSG->L4TXNO, Call);
 
 			L4->L4ACKREQ = 1;
 			ReleaseBuffer(L3MSG);
@@ -1908,15 +2227,14 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 			//	AND KEEP THIS FRAME UNTIL MISSING ONE ARRIVES
 
 			L4->NAKBITS |= L4NAK;			// SET NAK REQUIRED
-	
 			SENDL4IACK(L4);			// SEND DATA ACK COMMAND TO ACK OUTSTANDING FRAMES
 
 			//	SEE IF WE ALREADY HAVE A COPY OF THIS ONE
-/*
+
 			Saved = L4->L4RESEQ_Q;
 
 			Call[ConvFromAX25(L3MSG->L3SRCE, Call)] = 0;
-			Debugprintf("saving seq %d from %s", L3MSG->L4TXNO, Call);
+			Debugprintf("L4 Out Of Seq saving seq %d from %s", L3MSG->L4TXNO, Call);
 
 			while (Saved)
 			{
@@ -1924,7 +2242,7 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 				{
 					//	ALREADY HAVE A COPY - DISCARD IT
 
-					Debugprintf("Already have seq %d - discarding", L3MSG->L4TXNO);
+					Debugprintf("L4 Already have seq %d - discarding", L3MSG->L4TXNO);
 					ReleaseBuffer(L3MSG);
 					return;
 				}
@@ -1934,7 +2252,6 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 
 			C_Q_ADD(&L4->L4RESEQ_Q, L3MSG);		// ADD TO CHAIN
 			return;
-*/
 		}
 
 		// Frame is OK
@@ -1963,15 +2280,122 @@ L4INFO_OK:
 
 		L3MSG->L3PID = 0xF0;				// Normal Data PID
 
+		// if compressed, expand
+
+		if ((L3MSG->L4FLAGS & L4COMP) == 0)
+		{
+			// Not Compressed
+
+			L4->Received += L3MSG->LENGTH - MSGHDDRLEN - 1;
+			L4->ReceivedAfterExpansion += L3MSG->LENGTH - MSGHDDRLEN - 1;
+
 			memmove(L3MSG->L3SRCE, L3MSG->L4DATA, L3MSG->LENGTH - (4 + sizeof(void *)));
+			IFRM150(L4, (PDATAMESSAGE)L3MSG);	// CHECK IF SETTING UP AND PASS ON
+		}
+		else
+		{
+			char Buffer[8192];
+			int Len;
+			int outLen;
+			int sendLen;
+			char * sendptr;
+			int savePort = L3MSG->Port;
 
-		REFRESHROUTE(L4);
+			// May be more thsn one packet
 
-		L4->L4ACKREQ = L4DELAY;				// SEND INFO ACK AFTER L4DELAY (UNLESS I FRAME SENT) 
+			Len = L3MSG->LENGTH - MSGHDDRLEN - 1;
+
+			L4->Received += Len;
+
+			if (L3MSG->L4FLAGS & L4MORE)
+			{
+				if (L4->unCompressLen == 0)
+				{
+					// New packet
+
+					L4->unCompress = malloc(8192);
+				}
+
+				// Save data
+
+				memcpy(&L4->unCompress[L4->unCompressLen], L3MSG->L4DATA, Len);
+				L4->unCompressLen += Len;
+
+				ReleaseBuffer(L3MSG);
+				goto checkReseq;
+			}
+
+			if (L4->unCompressLen)
+			{
+				// Already have some data - add this to it
+
+				memcpy(&L4->unCompress[L4->unCompressLen], L3MSG->L4DATA, Len);
+				L4->unCompressLen += Len;
+
+				Len = doinflate(L4->unCompress, Buffer, L4->unCompressLen, 8192, &outLen);
+			}
+
+			else
+			{
+				// Just inflate this bit
+
+				Len = doinflate(L3MSG->L4DATA, Buffer, L3MSG->LENGTH - MSGHDDRLEN - 1, 8192, &outLen);
+			}
+
+			free(L4->unCompress);
+			L4->unCompress = 0;
+			L4->unCompressLen = 0;
+
+			sendLen = outLen;
+			sendptr = Buffer;
+
+			L4->ReceivedAfterExpansion += outLen;
+
+			// Send first bit in input buffer. If still some left get new buffers for it
+
+			if (sendLen > 236)
+				sendLen = 236;
+
+			memcpy(L3MSG->L3SRCE, sendptr, sendLen);			// Converting to DATAMESSAGE format
+			L3MSG->LENGTH =  sendLen + MSGHDDRLEN + 1;
 
 			IFRM150(L4, (PDATAMESSAGE)L3MSG);	// CHECK IF SETTING UP AND PASS ON
 
+			outLen -= sendLen;
+			sendptr += sendLen;
+
+			while (outLen > 0)
+			{
+				sendLen = outLen;
+
+				if (sendLen > 236)
+					sendLen = 236;
+
+				Msg = GetBuff();
+
+				if (Msg)
+				{
+					// Just ignore if no buffers - shouldn't happen
+
+					Msg->PID = 240;
+					Msg->PORT = savePort;
+					memcpy(Msg->L2DATA, sendptr, sendLen);
+					Msg->LENGTH = sendLen + MSGHDDRLEN + 1;
+
+					IFRM150(L4, Msg);	// CHECK IF SETTING UP AND PASS ON
+				}
+
+				outLen -= sendLen;
+				sendptr += sendLen;
+			}
+		}
+
+		L4->L4ACKREQ = L4DELAY;				// SEND INFO ACK AFTER L4DELAY (UNLESS I FRAME SENT) 
+		REFRESHROUTE(L4);
+
+
 		// See if anything on reseq Q to process
+checkReseq:
 
 		if (L4->L4RESEQ_Q == 0)
 			return;
@@ -1990,11 +2414,11 @@ L4INFO_OK:
 				OLDFRAMES++;			// COUNT FOR STATS
 
 				L3MSG = Saved;
-				Debugprintf("Processing Saved Message %d Address %x", L4->RXSEQNO, L3MSG);
+				Debugprintf("L4 Processing Saved Message %d Address %x", L4->RXSEQNO, L3MSG);
 				goto L4INFO_OK;
 			}
 
-			Debugprintf("Message %d %x still on Reseq Queue", Saved->L4TXNO, Saved);
+			Debugprintf("L4 Message %d %x still on Reseq Queue", Saved->L4TXNO, Saved);
 
 			Prev = &Saved;
 			Saved = Saved->Next;
@@ -2007,7 +2431,9 @@ L4INFO_OK:
 		ACKFRAMES(L3MSG, L4, L3MSG->L4RXNO);
 		REFRESHROUTE(L4);
 
-		// Drop Through
+		ReleaseBuffer(L3MSG);
+		return;
+
 	}
 
 	// Unrecognised - Ignore
@@ -2063,11 +2489,15 @@ VOID ACKFRAMES(L3MESSAGEBUFFER * L3MSG, TRANSPORTENTRY * L4, int NR)
 
 				RTT = GetTickCount() - L4->RTT_TIMER;
 
+				if (RTT < 180000)				// Sanity Check
+				{
 					if (DEST->DEST_RTT == 0)
 						DEST->DEST_RTT = RTT;
 					else
 						DEST->DEST_RTT = ((DEST->DEST_RTT * 9) + RTT) /10;	// 90% Old + New
 				}
+				L4->RTT_TIMER = 0;
+			}
 		}
 
 		L4->L4WS++;
@@ -2103,7 +2533,7 @@ VOID ACKFRAMES(L3MESSAGEBUFFER * L3MSG, TRANSPORTENTRY * L4, int NR)
 		L4->FLAGS |= L3MSG->L4FLAGS & L4BUSY;		// Get Busy flag from message
 
 		if ((L3MSG->L4FLAGS & L4NAK) == 0)
-			return;						// Dont send while biust unless NAC received
+			return;						// Dont send while busy unless NAK received
 	}
 
 	if (L3MSG->L4FLAGS & L4NAK)
@@ -2131,17 +2561,6 @@ VOID ACKFRAMES(L3MESSAGEBUFFER * L3MSG, TRANSPORTENTRY * L4, int NR)
 
 
 
-
-
-
-
-
-
-
-
-
-
-
 VOID SENDL4IACK(TRANSPORTENTRY * Session)
 {
 	//	SEND INFO ACK
@@ -2165,6 +2584,7 @@ VOID SENDL4IACK(TRANSPORTENTRY * Session)
 	MSG->L4TXNO = 0;
 
 
+
 	MSG->L4RXNO = Session->RXSEQNO;
 	Session->L4LASTACKED = Session->RXSEQNO;	// SAVE LAST NUMBER ACKED
 
@@ -2172,7 +2592,10 @@ VOID SENDL4IACK(TRANSPORTENTRY * Session)
 
 	MSG->LENGTH = MSGHDDRLEN + 22;
 
+	//	Debugprintf("Sending L4 IACK %d %x", MSG->L4RXNO, MSG->L4FLAGS);
+
 	C_Q_ADD(&DEST->DEST_Q, (UINT *)MSG);
+
 }
 
 

LinBPQ.c

@@ -21,7 +21,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #define _CRT_SECURE_NO_DEPRECATE
 
-#include "CHeaders.h"
+#include "cheaders.h"
 #include "bpqmail.h"
 #ifdef WIN32
 #include <Iphlpapi.h>
@@ -45,7 +45,11 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 BOOL APIENTRY Rig_Init();
 
-void GetSemaphore(struct SEM * Semaphore, int ID);
+
+
+#define GetSemaphore(Semaphore,ID) _GetSemaphore(Semaphore, ID, __FILE__, __LINE__)
+
+void _GetSemaphore(struct SEM * Semaphore, int ID, char * File, int Line);
 void FreeSemaphore(struct SEM * Semaphore);
 VOID CopyConfigFile(char * ConfigName);
 VOID SendMailForThread(VOID * Param);
@@ -75,7 +79,10 @@ int upnpClose();
 void SaveAIS();
 void initAIS();
 void DRATSPoll();
+void RHPPoll();
+
 VOID GetPGConfig();
+void SendBBSDataToPktMap();
 
 extern uint64_t timeLoadedMS;
 
@@ -370,8 +377,45 @@ BOOL CtrlHandler(DWORD fdwCtrlType)
 
 #else
 
+#include <execinfo.h>
+#include <signal.h>
+
 // Linux Signal Handlers
 
+static void segvhandler(int sig)
+{
+	void *array[10];
+	size_t size;
+	char msg[] = "SIGSEGV Received\n";
+
+	write(STDERR_FILENO, msg, strlen(msg));
+
+	// get void*'s for all entries on the stack
+	size = backtrace(array, 10);
+
+	// print out all the frames to stderr
+
+	backtrace_symbols_fd(array, size, STDERR_FILENO);
+
+  exit(1);
+}
+
+static void abrthandler(int sig)
+{
+	void *array[10];
+	size_t size;
+	char msg[] = "SIGABRT Received\n";
+
+	write(STDERR_FILENO, msg, strlen(msg));
+
+	// get void*'s for all entries on the stack
+
+	size = backtrace(array, 10);
+	backtrace_symbols_fd(array, size, STDERR_FILENO);
+
+	exit(1);
+}
+
 static void sigterm_handler(int sig)
 {
 	syslog(LOG_INFO, "terminating on SIGTERM\n");
@@ -460,8 +504,9 @@ VOID MonitorThread(void * x)
 		{
 			// It is stuck - try to release
 
-			Debugprintf ("Semaphore locked - Process ID = %d, Held By %d",
+			Debugprintf ("Semaphore locked - Process ID = %d, Held By %d from %s Line %d",
-				Semaphore.SemProcessID, SemHeldByAPI);
+					Semaphore.SemProcessID, SemHeldByAPI, Semaphore.File, Semaphore.Line);
+			
 	
 			Semaphore.Flag = 0;
 		}
@@ -553,6 +598,8 @@ extern int POP3Timer;
 
 #ifndef WIN32
 
+
+
 #define _getch getchar
 
 /**
@@ -666,7 +713,7 @@ void ConTermPoll()
 
 		// Replace CR with CRLF
 
-			printf(ptr);
+			printf("%s", ptr);
 
 			if (ptr2)
 				printf("\r\n");
@@ -716,7 +763,7 @@ void ConTermPoll()
 
 }
 
-#include "getopt.h"
+#include <getopt.h>
 
 static struct option long_options[] =
 {
@@ -737,6 +784,10 @@ char HelpScreen[] =
 	
 int Redirected = 0;
 
+static void segvhandler(int sig);
+static void abrthandler(int sig);
+
+
 int main(int argc, char * argv[])
 {
 	int i;
@@ -766,6 +817,10 @@ int main(int argc, char * argv[])
 	}
 
 #else
+
+	signal(SIGSEGV, segvhandler);
+	signal(SIGABRT, abrthandler);
+
 	setlinebuf(stdout);
 	struct sigaction act;
  	openlog("LINBPQ", LOG_PID, LOG_DAEMON);
@@ -815,7 +870,7 @@ int main(int argc, char * argv[])
 			 {
 			 case 'h':
 
-				 printf(HelpScreen);
+				 printf("%s", HelpScreen);
 				 exit (0);
 
 			 case 'l':
@@ -1269,6 +1324,7 @@ int main(int argc, char * argv[])
 				}
 			}
 			for (i = optind; i < argc; i++)
+
 			{
 				if (_stricmp(argv[i], "tidymail") == 0)
 					DeleteRedundantMessages();
@@ -1280,6 +1336,10 @@ int main(int argc, char * argv[])
 			printf("Mail Started\n");
 			Logprintf(LOG_BBS, NULL, '!', "Mail Starting");
 
+			APIClock = 0;
+
+			SendBBSDataToPktMap();
+
 		}
 	}
 
@@ -1288,6 +1348,10 @@ int main(int argc, char * argv[])
 
 	AGWActive = AGWAPIInit();
 
+	if (Redirected == 0)
+		ConTerm.BPQStream = FindFreeStream();
+
+
 #ifndef WIN32
 
 	for (i = 1; i < argc; i++)
@@ -1523,6 +1587,7 @@ int main(int argc, char * argv[])
 			Poll_AGW();
 
 		DRATSPoll();
+		RHPPoll();
 
 		HTTPTimer();
 
@@ -1574,6 +1639,13 @@ int main(int argc, char * argv[])
 					DoHouseKeeping(FALSE);
 				}
 
+				if (APIClock < NOW)
+				{
+					SendBBSDataToPktMap();
+					APIClock = NOW + 7200;			// Every 2 hours
+				}
+
+
 				tm = gmtime(&NOW);
 
 				if (tm->tm_wday == 0)		// Sunday

MBLRoutines.c

@@ -23,7 +23,8 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #include "bpqmail.h"
 
-void SendMessageReadEvent(struct UserInfo * user, struct MsgInfo * Msg);
+void SendMessageReadEvent(char * call, struct MsgInfo * Msg);
+void MQTTMessageEvent(void* message);
 
 
 VOID ProcessMBLLine(CIRCUIT * conn, struct UserInfo * user, UCHAR* Buffer, int len)
@@ -199,6 +200,12 @@ VOID ProcessMBLLine(CIRCUIT * conn, struct UserInfo * user, UCHAR* Buffer, int l
 			}
 
 			conn->FwdMsg->Locked = 0;	// Unlock
+
+#ifndef NOMQTT
+			if (MQTT)
+			MQTTMessageEvent(conn->FwdMsg);
+#endif
+
 		}
 
 		return;
@@ -282,7 +289,7 @@ VOID ProcessMBLLine(CIRCUIT * conn, struct UserInfo * user, UCHAR* Buffer, int l
 	{
 		// Reverse forward request
 
-		// If we have just sent a nessage, Flag it as sent
+		// If we have just sent a message, Flag it as sent
 
 		if (conn->FBBMsgsSent)
 		{
@@ -300,6 +307,11 @@ VOID ProcessMBLLine(CIRCUIT * conn, struct UserInfo * user, UCHAR* Buffer, int l
 
 			conn->FwdMsg->Locked = 0;	// Unlock
 
+#ifndef NOMQTT
+			if (MQTT)
+				MQTTMessageEvent(conn->FwdMsg);
+#endif
+
 			conn->UserPointer->ForwardingInfo->MsgCount--;
 		}
 
@@ -354,6 +366,11 @@ VOID ProcessMBLLine(CIRCUIT * conn, struct UserInfo * user, UCHAR* Buffer, int l
 				conn->FwdMsg->datechanged=time(NULL);
 			}
 
+#ifndef NOMQTT
+			if (MQTT)
+				MQTTMessageEvent(conn->FwdMsg);
+#endif
+
 			conn->UserPointer->ForwardingInfo->MsgCount--;
 		}
 

MCP2221.vcproj

@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="MCP2221"
-	ProjectGUID="{FCBB40CD-F7C2-4A97-989A-FC5CEADF7FC1}"
-	RootNamespace="MCP2221"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="kernel32.lib setupapi.lib $(NOINHERIT)"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="kernel32.lib $(NoInherit)"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\hid.c"
-				>
-			</File>
-			<File
-				RelativePath=".\MCP2221.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

MULTIPSK.c

@@ -28,7 +28,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #define _CRT_SECURE_NO_DEPRECATE
 
-#include "CHeaders.h"
+#include "cheaders.h"
 #include <stdio.h>
 #include <time.h>
 
@@ -60,7 +60,7 @@ static void ConnecttoMPSKThread(void * portptr);
 void CreateMHWindow();
 int Update_MH_List(struct in_addr ipad, char * call, char proto);
 
-static int ConnecttoMPSK();
+static int ConnecttoMPSK(int port);
 static int ProcessReceivedData(int bpqport);
 static int ProcessLine(char * buf, int Port);
 int KillTNC(struct TNCINFO * TNC);
@@ -71,8 +71,6 @@ static VOID SendData(struct TNCINFO * TNC, char * Msg, int MsgLen);
 static VOID DoMonitorHddr(struct TNCINFO * TNC, struct AGWHEADER * RXHeader, UCHAR * Msg);
 VOID SendRPBeacon(struct TNCINFO * TNC);
 
-char * strlop(char * buf, char delim);
-
 extern UCHAR BPQDirectory[];
 
 #define MAXMPSKPORTS 16
@@ -409,7 +407,10 @@ static size_t ExtProc(int fn, int port,  PDATAMESSAGE buff)
 
 			if (_memicmp(buff->L2DATA, "RADIO ", 6) == 0)
 			{
-				sprintf(buff->L2DATA, "%d %s", TNC->Port, &buff->L2DATA[6]);
+				char cmd[56];
+
+				strcpy(cmd, &buff->L2DATA[6]);
+				sprintf(buff->L2DATA, "%d %s", TNC->Port, cmd);
 
 				if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, buff->L2DATA))
 				{
@@ -712,7 +713,7 @@ void * MPSKExtInit(EXTPORTDATA * PortEntry)
 	ptr=strchr(TNC->NodeCall, ' ');
 	if (ptr) *(ptr) = 0;					// Null Terminate
 
-	TNC->Hardware = H_MPSK;
+	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_MPSK;
 
 	MPSKChannel[port] = PortEntry->PORTCONTROL.CHANNELNUM-65;
 	
@@ -1317,7 +1318,7 @@ VOID ProcessMSPKData(struct TNCINFO * TNC)
 
 			C_Q_ADD(&STREAM->PACTORtoBPQ_Q, buffptr);
 
-			STREAM->BytesRXed += TNC->DataLen;
+			STREAM->bytesRXed += TNC->DataLen;
 		}
 
 		TNC->DataLen = 0;
@@ -1387,7 +1388,7 @@ DataLoop:
 				STREAM->Connected = TRUE;
 				STREAM->Connecting = FALSE;
 				STREAM->ConnectTime = time(NULL); 
-				STREAM->BytesRXed = STREAM->BytesTXed = 0;
+				STREAM->bytesRXed = STREAM->bytesTXed = 0;
 
 				buffptr = GetBuff();
 				if (buffptr)
@@ -1402,7 +1403,7 @@ DataLoop:
 
 					STREAM->Connected = TRUE;
 					STREAM->ConnectTime = time(NULL); 
-					STREAM->BytesRXed = STREAM->BytesTXed = 0;
+					STREAM->bytesRXed = STREAM->bytesTXed = 0;
 
 					UpdateMH(TNC, CallFrom, '+', 'I');
 	
@@ -1483,7 +1484,7 @@ VOID SendData(struct TNCINFO * TNC, char * Msg, int MsgLen)
 	char * inptr = Msg;
 	SOCKET sock = TNCInfo[MasterPort[TNC->Port]]->TCPSock;
 
-	TNC->Streams[0].BytesTXed += MsgLen;
+	TNC->Streams[0].bytesTXed += MsgLen;
 
 	for (n = 0; n < MsgLen; n++)
 	{
@@ -1541,7 +1542,7 @@ VOID CloseComplete(struct TNCINFO * TNC, int Stream)
 		sprintf(Cmd, "%cDIGITAL MODE %s\x1b", '\x1a', TNC->MPSKInfo->DefaultMode);
 
 	if (TNC->MPSKInfo->Beacon)
-		sprintf(Cmd, "%s%cBEACON_ARQ_FAE\x1b", Cmd, '\x1a');
+		sprintf(&Cmd[strlen(Cmd)], "%cBEACON_ARQ_FAE\x1b", '\x1a');
 	
 	Len = strlen(Cmd);
 

MailDataDefs.c

@@ -43,6 +43,7 @@ struct SEM AllocSemaphore = {0, 0};
 struct SEM ConSemaphore = {0, 0};
 struct SEM Semaphore = {0, 0};
 struct SEM OutputSEM = {0, 0};
+struct SEM ConfigSEM = {0, 0};
 
 struct UserInfo ** UserRecPtr=NULL;
 int NumberofUsers=0;
@@ -132,7 +133,7 @@ char HRoute[100];
 char AMPRDomain[100];
 BOOL SendAMPRDirect = 0;
 
-char SignoffMsg[100];
+char SignoffMsg[120];
 
 char AbortedMsg[100]="\rOutput aborted\r";
 
@@ -204,6 +205,7 @@ int MailForInterval = 0;
 char zeros[NBMASK];						// For forward bitmask tests
 
 time_t MaintClock;						// Time to run housekeeping
+time_t APIClock;						// Time to sent to MOLTE's Database
 
 struct MsgInfo * MsgnotoMsg[100000];	// Message Number to Message Slot List.
 

MailNode.vcproj

@@ -1,639 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="LinBPQ"
-	ProjectGUID="{3766AA10-C777-4ED8-A83D-F1452DE9B666}"
-	RootNamespace="MailNode"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="C:\Dev\Msdev2005\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="..\CKernel;..\CommonSource;..\CInclude"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;LINBPQ;_USE_32BIT_TIME_T"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="1"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="kernel32.lib WS2_32.Lib ..\lib\libconfigd.lib DbgHelp.lib setupapi.lib miniupnpc.lib zlibstat.lib"
-				OutputFile="c:\LINBPQ\$(ProjectName).exe"
-				LinkIncremental="2"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				GenerateMapFile="true"
-				MapFileName="c:\linbpq\linmail.map"
-				SubSystem="1"
-				StackReserveSize="4000000"
-				StackCommitSize="0"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="C:\Dev\Msdev2005\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			IntermediateDirectory="C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(ProjectName)\$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="0"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..\CKernel;..\CommonSource;..\CInclude"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;LINBPQ;_USE_32BIT_TIME_T"
-				RuntimeLibrary="0"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="kernel32.lib WS2_32.Lib ..\lib\libconfig.lib DbgHelp.lib Setupapi.lib miniupnpc.lib zlibstat.lib"
-				OutputFile="c:\devprogs\bpq32\LinBPQ.exe"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				HeapReserveSize="5000000"
-				StackReserveSize="10000000"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath="..\CommonSource\adif.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\AEAPactor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\AGWAPI.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\AGWMoncode.c"
-				>
-			</File>
-			<File
-				RelativePath=".\AISCommon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\Alloc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\APRSCode.c"
-				>
-			</File>
-			<File
-				RelativePath=".\APRSIconData.c"
-				>
-			</File>
-			<File
-				RelativePath=".\APRSStdPages.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\ARDOP.c"
-				>
-			</File>
-			<File
-				RelativePath=".\base64.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\BBSHTMLConfig.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\BBSUtilities.c"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerOutput="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AssemblerOutput="2"
-						ObjectFile="$(IntDir)\"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\CommonSource\bpqaxip.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\bpqether.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\bpqhdlc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\BPQINP3.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\BPQNRR.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\BPQtoAGW.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\bpqvkiss.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\ChatHTMLConfig.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\cMain.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\Cmd.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\CMSAuth.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\CommonCode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\compatbits.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\config.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\datadefs.c"
-				>
-			</File>
-			<File
-				RelativePath=".\DRATS.c"
-				>
-			</File>
-			<File
-				RelativePath=".\Events.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\FBBRoutines.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\FLDigi.c"
-				>
-			</File>
-			<File
-				RelativePath=".\FreeDATA.c"
-				>
-			</File>
-			<File
-				RelativePath=".\getopt.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\HALDriver.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\HanksRT.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\HFCommon.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\hid.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\Housekeeping.c"
-				>
-			</File>
-			<File
-				RelativePath=".\HSMODEM.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\HTMLCommonCode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\HTTPcode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\IPCode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\KAMPactor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\kiss.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\KISSHF.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\L2Code.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\L3Code.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\L4Code.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\LinBPQ.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\LzFind.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\lzhuf32.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\LzmaDec.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\LzmaEnc.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\LzmaLib.c"
-				>
-			</File>
-			<File
-				RelativePath=".\mailapi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\MailCommands.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\MailDataDefs.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\MailRouting.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\MailTCP.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\MBLRoutines.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\md5.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\Moncode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\Multicast.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\MULTIPSK.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\NNTPRoutines.c"
-				>
-			</File>
-			<File
-				RelativePath=".\nodeapi.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\pibits.c"
-				>
-			</File>
-			<File
-				RelativePath=".\png.c"
-				>
-			</File>
-			<File
-				RelativePath=".\png.h"
-				>
-			</File>
-			<File
-				RelativePath=".\pngerror.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pnggccrd.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngget.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngmem.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngpread.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngread.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngrio.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngrtran.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngrutil.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngset.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngtrans.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngvcrd.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngwio.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngwrite.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngwtran.c"
-				>
-			</File>
-			<File
-				RelativePath=".\pngwutil.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\RigControl.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\SCSPactor.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\SCSTrackeMulti.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\SCSTracker.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\SerialPort.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\TelnetV6.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\TNCCode.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\TNCEmulators.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\UIRoutines.c"
-				>
-			</File>
-			<File
-				RelativePath=".\upnp.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\utf8Routines.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\UZ7HODrv.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\V4.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\VARA.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\WebMail.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\WINMOR.c"
-				>
-			</File>
-			<File
-				RelativePath=".\WinRPR.c"
-				>
-			</File>
-			<File
-				RelativePath="..\CommonSource\WPRoutines.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

MailNode.vcproj.NOTTSDESKTOP.John.user

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory="c:\linbpq"
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NOTTSDESKTOP"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor="0"
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="NOTTSDESKTOP"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>

MailNode.vcproj.SKIGACER.johnw.user

@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioUserFile
-	ProjectType="Visual C++"
-	Version="8.00"
-	ShowAllFiles="false"
-	>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="SKIGACER"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			>
-			<DebugSettings
-				Command="$(TargetPath)"
-				WorkingDirectory=""
-				CommandArguments=""
-				Attach="false"
-				DebuggerType="3"
-				Remote="1"
-				RemoteMachine="SKIGACER"
-				RemoteCommand=""
-				HttpUrl=""
-				PDBPath=""
-				SQLDebugging=""
-				Environment=""
-				EnvironmentMerge="true"
-				DebuggerFlavor=""
-				MPIRunCommand=""
-				MPIRunArguments=""
-				MPIRunWorkingDirectory=""
-				ApplicationCommand=""
-				ApplicationArguments=""
-				ShimCommand=""
-				MPIAcceptMode=""
-				MPIAcceptFilter=""
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioUserFile>

MailNode.vcxproj

@@ -1,294 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>LinBPQ</ProjectName>
-    <ProjectGuid>{3766AA10-C777-4ED8-A83D-F1452DE9B666}</ProjectGuid>
-    <RootNamespace>MailNode</RootNamespace>
-    <Keyword>Win32Proj</Keyword>
-    <WindowsTargetPlatformVersion>10.0.17763.0</WindowsTargetPlatformVersion>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>NotSet</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <PlatformToolset>v141</PlatformToolset>
-    <CharacterSet>NotSet</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <OutDir>C:\Dev\Msdev2005\$(SolutionName)\$(ProjectName)\$(Configuration)\</OutDir>
-    <IntDir>C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(ProjectName)\$(Configuration)\</IntDir>
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-    <OutDir>D:\linbpq</OutDir>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <OutDir>C:\Dev\Msdev2005\$(SolutionName)\$(ProjectName)\$(Configuration)\</OutDir>
-    <IntDir>C:\Dev\Msdev2005\Intermed\$(SolutionName)\$(ProjectName)\$(Configuration)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\CKernel;..\CommonSource;..\CInclude;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;LINBPQ;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>kernel32.lib;WS2_32.Lib;..\lib\libconfigd.lib;DbgHelp.lib;setupapi.lib;miniupnpc.lib;zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>c:\LINBPQ\$(ProjectName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>c:\linbpq\linmail.map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <StackReserveSize>4000000</StackReserveSize>
-      <StackCommitSize>0</StackCommitSize>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\CKernel;..\CommonSource;..\CInclude;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;LINBPQ;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>kernel32.lib;WS2_32.Lib;C:\OneDrive\Dev\Source\bpq32\libconfig\x64\Release\libconfig.lib;DbgHelp.lib;setupapi.lib;C:\Dev\Msdev2005\projects\bpq32\CKernel\x64\Debug\miniupnpc.lib;C:\OneDrive\Dev\Source\zlib-1.2.11\contrib\vstudio\vc14\x64\ZlibStatDebug\zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>c:\LINBPQ\$(ProjectName).exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <GenerateMapFile>true</GenerateMapFile>
-      <MapFileName>c:\linbpq\linmail.map</MapFileName>
-      <SubSystem>Console</SubSystem>
-      <StackReserveSize>4000000</StackReserveSize>
-      <StackCommitSize>0</StackCommitSize>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\CKernel;..\CommonSource;..\CInclude;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;LINBPQ;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader />
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>kernel32.lib;WS2_32.Lib;..\lib\libconfig.lib;DbgHelp.lib;Setupapi.lib;miniupnpc.lib;zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>c:\devprogs\bpq32\LinBPQ.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <HeapReserveSize>5000000</HeapReserveSize>
-      <StackReserveSize>10000000</StackReserveSize>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <AdditionalIncludeDirectories>..\CKernel;..\CommonSource;..\CInclude;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;LINBPQ;_USE_32BIT_TIME_T;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>kernel32.lib;WS2_32.Lib;..\lib\libconfig.lib;DbgHelp.lib;Setupapi.lib;miniupnpc.lib;zlibstat.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>c:\devprogs\bpq32\LinBPQ.exe</OutputFile>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
-      <HeapReserveSize>5000000</HeapReserveSize>
-      <StackReserveSize>10000000</StackReserveSize>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="adif.c" />
-    <ClCompile Include="AEAPactor.c" />
-    <ClCompile Include="AGWAPI.c" />
-    <ClCompile Include="AGWMoncode.c" />
-    <ClCompile Include="AISCommon.c" />
-    <ClCompile Include="Alloc.c" />
-    <ClCompile Include="APRSCode.c" />
-    <ClCompile Include="APRSIconData.c" />
-    <ClCompile Include="APRSStdPages.c" />
-    <ClCompile Include="ARDOP.c" />
-    <ClCompile Include="base64.c" />
-    <ClCompile Include="BBSHTMLConfig.c" />
-    <ClCompile Include="BBSUtilities.c">
-      <AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-      </AssemblerOutput>
-      <AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      </AssemblerOutput>
-      <AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">All</AssemblerOutput>
-      <AssemblerOutput Condition="'$(Configuration)|$(Platform)'=='Release|x64'">All</AssemblerOutput>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(IntDir)</ObjectFileName>
-      <ObjectFileName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)</ObjectFileName>
-    </ClCompile>
-    <ClCompile Include="bpqaxip.c" />
-    <ClCompile Include="bpqether.c" />
-    <ClCompile Include="bpqhdlc.c" />
-    <ClCompile Include="BPQINP3.c" />
-    <ClCompile Include="BPQNRR.c" />
-    <ClCompile Include="BPQtoAGW.c" />
-    <ClCompile Include="bpqvkiss.c" />
-    <ClCompile Include="ChatHTMLConfig.c" />
-    <ClCompile Include="cMain.c" />
-    <ClCompile Include="Cmd.c" />
-    <ClCompile Include="CMSAuth.c" />
-    <ClCompile Include="CommonCode.c" />
-    <ClCompile Include="compatbits.c" />
-    <ClCompile Include="config.c" />
-    <ClCompile Include="datadefs.c" />
-    <ClCompile Include="DRATS.c" />
-    <ClCompile Include="Events.c" />
-    <ClCompile Include="FBBRoutines.c" />
-    <ClCompile Include="FLDigi.c" />
-    <ClCompile Include="FreeDATA.c" />
-    <ClCompile Include="getopt.c" />
-    <ClCompile Include="HALDriver.c" />
-    <ClCompile Include="HanksRT.c" />
-    <ClCompile Include="HFCommon.c" />
-    <ClCompile Include="hid.c" />
-    <ClCompile Include="Housekeeping.c" />
-    <ClCompile Include="HSMODEM.c" />
-    <ClCompile Include="HTMLCommonCode.c" />
-    <ClCompile Include="HTTPcode.c" />
-    <ClCompile Include="IPCode.c" />
-    <ClCompile Include="KAMPactor.c" />
-    <ClCompile Include="kiss.c" />
-    <ClCompile Include="KISSHF.c" />
-    <ClCompile Include="L2Code.c" />
-    <ClCompile Include="L3Code.c" />
-    <ClCompile Include="L4Code.c" />
-    <ClCompile Include="LinBPQ.c" />
-    <ClCompile Include="LzFind.c" />
-    <ClCompile Include="lzhuf32.c" />
-    <ClCompile Include="LzmaDec.c" />
-    <ClCompile Include="LzmaEnc.c" />
-    <ClCompile Include="LzmaLib.c" />
-    <ClCompile Include="MailCommands.c" />
-    <ClCompile Include="MailDataDefs.c" />
-    <ClCompile Include="MailRouting.c" />
-    <ClCompile Include="MailTCP.c" />
-    <ClCompile Include="MBLRoutines.c" />
-    <ClCompile Include="md5.c" />
-    <ClCompile Include="Moncode.c" />
-    <ClCompile Include="Multicast.c" />
-    <ClCompile Include="MULTIPSK.c" />
-    <ClCompile Include="NNTPRoutines.c" />
-    <ClCompile Include="pibits.c" />
-    <ClCompile Include="png.c" />
-    <ClCompile Include="pngerror.c" />
-    <ClCompile Include="pnggccrd.c" />
-    <ClCompile Include="pngget.c" />
-    <ClCompile Include="pngmem.c" />
-    <ClCompile Include="pngpread.c" />
-    <ClCompile Include="pngread.c" />
-    <ClCompile Include="pngrio.c" />
-    <ClCompile Include="pngrtran.c" />
-    <ClCompile Include="pngrutil.c" />
-    <ClCompile Include="pngset.c" />
-    <ClCompile Include="pngtrans.c" />
-    <ClCompile Include="pngvcrd.c" />
-    <ClCompile Include="pngwio.c" />
-    <ClCompile Include="pngwrite.c" />
-    <ClCompile Include="pngwtran.c" />
-    <ClCompile Include="pngwutil.c" />
-    <ClCompile Include="RigControl.c" />
-    <ClCompile Include="SCSPactor.c" />
-    <ClCompile Include="SCSTrackeMulti.c" />
-    <ClCompile Include="SCSTracker.c" />
-    <ClCompile Include="SerialPort.c" />
-    <ClCompile Include="TelnetV6.c" />
-    <ClCompile Include="TNCCode.c" />
-    <ClCompile Include="TNCEmulators.c" />
-    <ClCompile Include="UIRoutines.c" />
-    <ClCompile Include="upnp.c" />
-    <ClCompile Include="utf8Routines.c" />
-    <ClCompile Include="UZ7HODrv.c" />
-    <ClCompile Include="V4.c" />
-    <ClCompile Include="VARA.c" />
-    <ClCompile Include="WebMail.c" />
-    <ClCompile Include="WINMOR.c" />
-    <ClCompile Include="WinRPR.c" />
-    <ClCompile Include="WPRoutines.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="png.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>

MailNode.vcxproj.filters

@@ -1,327 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="adif.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AEAPactor.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AGWAPI.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AGWMoncode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="AISCommon.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Alloc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="APRSCode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="APRSIconData.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="APRSStdPages.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ARDOP.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="base64.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BBSHTMLConfig.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BBSUtilities.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bpqaxip.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bpqether.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bpqhdlc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BPQINP3.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BPQNRR.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BPQtoAGW.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="bpqvkiss.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="ChatHTMLConfig.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="cMain.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Cmd.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CMSAuth.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CommonCode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="compatbits.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="config.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="datadefs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="DRATS.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Events.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FBBRoutines.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FLDigi.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FreeDATA.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="HALDriver.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="HanksRT.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="HFCommon.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="hid.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Housekeeping.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="HSMODEM.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="HTMLCommonCode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="HTTPcode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="IPCode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="KAMPactor.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="kiss.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="KISSHF.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="L2Code.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="L3Code.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="L4Code.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LinBPQ.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LzFind.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="lzhuf32.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LzmaDec.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LzmaEnc.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="LzmaLib.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MailCommands.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MailDataDefs.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MailRouting.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MailTCP.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MBLRoutines.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="md5.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Moncode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Multicast.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="MULTIPSK.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="NNTPRoutines.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pibits.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="png.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pngerror.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pnggccrd.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pngget.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pngmem.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pngpread.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pngread.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pngrio.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pngrtran.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pngrutil.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pngset.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pngtrans.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pngvcrd.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pngwio.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pngwrite.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pngwtran.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="pngwutil.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="RigControl.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SCSPactor.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SCSTrackeMulti.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SCSTracker.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SerialPort.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TelnetV6.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TNCCode.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="TNCEmulators.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UIRoutines.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="upnp.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="utf8Routines.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="UZ7HODrv.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="V4.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="VARA.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WebMail.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WINMOR.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WinRPR.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="WPRoutines.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="getopt.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="png.h">
-      <Filter>Source Files</Filter>
-    </ClInclude>
-  </ItemGroup>
-</Project>

MailRouting.c

@@ -141,7 +141,7 @@ struct Country Countries[] =
 	"HKG", "ASIA", "AS", 		// Hong Kong Special Administrative Region of China
 	"MAC", "ASIA", "AS", 		// Macao Special Administrative Region of China
 	"COL", "ASIA", "SA", 		// Colombia
-	"COM", "SAFR", "AF", 		// Comoros
+//	"COM", "SAFR", "AF", 		// Comoros
 	"COG", "CAFR", "AF", 		// Congo
 	"COK", "SPAC", "OC", 		// Cook Islands
 	"CRI", "CEAM", "NA", 		// Costa Rica
@@ -1317,6 +1317,10 @@ FULLHA:
 	{
 		int i = 0;
 
+		// Log My HA for debugging
+
+		Logprintf(LOG_BBS, conn, '?', "Routing Trace. Check if reached correct area My HA is %s", HRoute);
+
 		// All elements of Helements must match Myelements
 
 		while (MyElements[i] && HElements[i]) // Until one set runs out
@@ -1409,6 +1413,9 @@ NOHA:
 	// So if SendPtoMultiple is set I think I need to find the best depth then send to all with the same depth
 	// If none are found on HA match drop through.
 
+	// But this means a message at the @BBS call will be forwarded without checking the Implied AT. So do that first
+
+
 	if (SendPtoMultiple && Msg->type == 'P')
 	{
 		struct UserInfo * bestbbs = NULL;
@@ -1425,6 +1432,16 @@ NOHA:
 		{		
 			ForwardingInfo = bbs->ForwardingInfo;
 
+			// Check Implied AT
+
+			if ((strcmp(ATBBS, bbs->Call) == 0))			// @BBS = BBS		
+			{
+				Logprintf(LOG_BBS, conn, '?', "Routing Trace %s Matches implied AT %s", ATBBS, bbs->Call);
+
+				CheckAndSend(Msg, conn, bbs);
+				return 1;
+			}
+
 			depth = CheckBBSHElements(Msg, bbs, ForwardingInfo, ATBBS, &HElements[0]);
 
 			if (depth)

MailTCP.c

@@ -1570,12 +1570,12 @@ VOID ProcessSMTPServerMessage(SocketConn * sockptr, char * Buffer, int Len)
 						if (CheckifLocalRMSUser(Addr)) // if local RMS - Leave Here
 							continue;
 						
-						ToLen = sprintf(ToString, "%sTo: %s\r\n", ToString, &Addr[4]);
+						ToLen = sprintf(&ToString[strlen(ToString)], "To: %s\r\n", &Addr[4]);
 						*sockptr->RecpTo[i] = 0;		// So we dont create individual one later
 						continue;
 					}
 
-					ToLen = sprintf(ToString, "%sTo: %s@%s\r\n", ToString, &Addr[4], Via);
+					ToLen = sprintf(&ToString[strlen(ToString)], "To: %s@%s\r\n", &Addr[4], Via);
 					*sockptr->RecpTo[i] = 0;			// So we dont create individual one later
 					continue;
 				}
@@ -1591,7 +1591,7 @@ VOID ProcessSMTPServerMessage(SocketConn * sockptr, char * Buffer, int Len)
 					if (CheckifLocalRMSUser(Addr)) // if local RMS - Leave Here
 						continue;
 					
-					ToLen = sprintf(ToString, "%sTo: %s\r\n", ToString, Addr);
+					ToLen = sprintf(&ToString[strlen(ToString)], "To: %s\r\n", Addr);
 					*sockptr->RecpTo[i] = 0;		// So we dont create individual one later
 
 					continue;
@@ -2656,6 +2656,7 @@ VOID ProcessPOP3ServerMessage(SocketConn * sockptr, char * Buffer, int Len)
 				// Must be some other coding
 
 				int code = TrytoGuessCode(msgbytes, Len);
+
 				UCHAR * UTF = malloc(Len * 3);
 
 				if (code == 437)
@@ -2896,6 +2897,8 @@ SocketConn * SMTPConnect(char * Host, int Port, BOOL AMPR, struct MsgInfo * Msg,
 	sinx.sin_addr.s_addr = INADDR_ANY;
 	sinx.sin_port = 0;
 
+	sockptr->Timeout = 0;
+
 	if (bind(sockptr->socket, (LPSOCKADDR) &sinx, addrlen) != 0 )
 	{
 		//
@@ -3589,7 +3592,6 @@ VOID ProcessPOP3ClientMessage(SocketConn * sockptr, char * Buffer, int Len)
 			if (sockptr->POP3MsgCount > sockptr->POP3MsgNum++)
 			{
 				sockprintf(sockptr, "RETR %d", sockptr->POP3MsgNum);
-
 				sockptr->State = WaitingForRETRResponse;
 			}
 			else

Moncode.c

@@ -31,7 +31,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #pragma data_seg("_BPQDATA")
 				
-#include "CHeaders.h"
+#include "cheaders.h"
 #include "tncinfo.h"
 
 //	MSGFLAG contains CMD/RESPONSE BITS
@@ -59,7 +59,6 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #define	NODES_SIG	0xFF
 
-char * strlop(char * buf, char delim);
 UCHAR * DisplayINP3RIF(UCHAR * ptr1, UCHAR * ptr2, unsigned int msglen);
 
 char * DISPLAY_NETROM(MESSAGE * ADJBUFFER, UCHAR * Output, int MsgLen);
@@ -210,7 +209,12 @@ KC6OAR*>ID:
 	Port &= 0x7F;
 
 	if ((((uint64_t)1 << (Port - 1)) & Mask) == 0)		// Check MMASK
+	{
+		if (msg->Padding[0] == '[')
+			msg->Padding[0] = 0;
+
 		return 0;
+	}
 	
 
 	// We now pass Text format monitoring from non-ax25 drivers through this code
@@ -535,6 +539,12 @@ KC6OAR*>ID:
 			}	
 		}
 	}
+
+	if (msg->Padding[0] == '[')
+		Output += sprintf((char *)Output, " %s", msg->Padding);
+
+	msg->Padding[0] = 0;
+
 	if (Info)
 	{
 		// We have an info frame
@@ -718,6 +728,10 @@ char * DISPLAY_NETROM(MESSAGE * ADJBUFFER, UCHAR * Output, int MsgLen)
 
 		return Output + sprintf((char *)Output, " <DISC ACK>");
 
+	case L4RESET:
+
+		return Output + sprintf((char *)Output, " <RESET>");
+
 	case L4INFO:
 		{
 			char Infofield[257];
@@ -736,6 +750,9 @@ char * DISPLAY_NETROM(MESSAGE * ADJBUFFER, UCHAR * Output, int MsgLen)
 			if (Flags & L4MORE)
 				*(Output++) = 'M';
 	
+			if (Flags & L4COMP)
+				*(Output++) = 'C';
+
 			MsgLen = MsgLen - (19 + sizeof(void *));
 
 			if (MsgLen < 0 || MsgLen > 257)

Multicast.c

@@ -612,15 +612,15 @@ struct MSESSION * FindMSession(unsigned int Key)
 
 #define LZMA_STR "\1LZMA"
 
-UCHAR * LZUncompress(UCHAR * Decoded, int Len, int * NewLen)
+UCHAR * LZUncompress(UCHAR * Decoded, size_t Len, size_t * NewLen)
 {
 	unsigned char * buf;
 	unsigned char inprops[LZMA_PROPS_SIZE];
 	size_t inlen;
 	int r;
 	
-	UINT rlen;
+	size_t rlen = 0;
-	UINT outlen;
+	size_t outlen;
 
 	memcpy(&rlen, &Decoded[5], 4);
 
@@ -668,8 +668,8 @@ void SaveMulticastMessage(struct MSESSION * MSession)
 {
 	UCHAR * Decoded = NULL;			// Output from Basexxx decode
 	UCHAR * Uncompressed = NULL;
-	int DecodedLen;					// Length of decoded message
+	size_t DecodedLen;				// Length of decoded message
-	int UncompressedLen;			// Length of decompressed message
+	size_t UncompressedLen;			// Length of decompressed message
 	int ExpectedLen;				// From front of Base128 or Base256 message
 	int HddrLen;					// Length of Expected Len Header
 
@@ -1612,7 +1612,7 @@ int MulticastStatusHTML(char * Reply)
 	if (Sess ==NULL)
 		return 0;
 
-	Len = sprintf(Reply, StatusPage);
+	Len = sprintf(Reply, "%s", StatusPage);
 
 	while (Sess)
 	{
@@ -1670,7 +1670,7 @@ int MulticastStatusHTML(char * Reply)
 		Sess = Sess->Next;
 	}
 
-	Len += sprintf(&Reply[Len], StatusTail);
+	Len += sprintf(&Reply[Len], "%s", StatusTail);
 
 	return Len;
 }

NNTPRoutines.c

@@ -25,6 +25,10 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 VOID __cdecl Debugprintf(const char * format, ...);
 VOID ReleaseSock(SOCKET sock);
+void MQTTMessageEvent(void* message);
+
+#define GetSemaphore(Semaphore,ID) _GetSemaphore(Semaphore, ID, __FILE__, __LINE__)
+void _GetSemaphore(struct SEM * Semaphore, int ID, char * File, int Line);
 
 struct NNTPRec * FirstNNTPRec = NULL;
 
@@ -352,6 +356,12 @@ int CreateNNTPMessage(char * From, char * To, char * MsgTitle, time_t Date, char
 
 	BuildNNTPList(Msg);				// Build NNTP Groups list
 
+#ifndef NOMQTT
+	if (MQTT)
+		MQTTMessageEvent(Msg);
+#endif
+
+
 	return CreateSMTPMessageFile(MsgBody, Msg);
 		
 }

NodeMapTest.vcproj

@@ -1,209 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="NodeMapTest"
-	ProjectGUID="{FAF0D3D4-CB63-4E07-9AE2-11A90760023D}"
-	RootNamespace="NodeMapTest"
-	Keyword="Win32Proj"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="2"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
-				MinimalRebuild="true"
-				BasicRuntimeChecks="3"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="false"
-				DebugInformationFormat="4"
-				CompileAs="1"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="WS2_32.Lib  kernel32.lib $(NoInherit)"
-				OutputFile="c:\devprogs\bpq32\$(ProjectName).exe"
-				LinkIncremental="2"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
-			IntermediateDirectory="$(ConfigurationName)"
-			ConfigurationType="1"
-			CharacterSet="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="0"
-				WarningLevel="3"
-				Detect64BitPortabilityProblems="true"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="kernel32.lib $(NoInherit)"
-				LinkIncremental="1"
-				GenerateDebugInformation="true"
-				SubSystem="1"
-				OptimizeReferences="2"
-				EnableCOMDATFolding="2"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCWebDeploymentTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\NodeMapTest.c"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\stdafx.h"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Resource Files"
-			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
-			>
-		</Filter>
-		<File
-			RelativePath=".\ReadMe.txt"
-			>
-		</File>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>

PortMapper.c

@@ -60,7 +60,7 @@ TODo	?Multiple Adapters
 #include <stdio.h>
 #include <time.h>
 
-#include "CHeaders.h"
+#include "cheaders.h"
 
 #include "ipcode.h"
 

RHP.c

@@ -0,0 +1,756 @@
+/*
+Copyright 2001-2022 John Wiseman G8BPQ
+
+This file is part of LinBPQ/BPQ32.
+
+LinBPQ/BPQ32 is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+LinBPQ/BPQ32 is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
+*/	
+
+/*
+
+	Paula (G8PZT)'s Remote Host Protocol interface. 
+	For now only sufficient support for WhatsPac
+	
+ 	
+*/
+#define _CRT_SECURE_NO_DEPRECATE
+
+#include "cheaders.h"
+#include "bpq32.h"
+#include "telnetserver.h"
+
+int FindFreeStreamNoSem();
+DllExport int APIENTRY DeallocateStream(int stream);
+int SendMsgNoSem(int stream, char * msg, int len);
+
+static void GetJSONValue(char * _REPLYBUFFER, char * Name, char * Value, int Len);
+static int GetJSONInt(char * _REPLYBUFFER, char * Name);
+
+// Generally Can have multiple RHP connections and each can have multiple RHF Sessions
+
+struct RHPSessionInfo
+{  
+	struct ConnectionInfo * sockptr;
+	SOCKET Socket;				// Websocks Socket
+    int BPQStream;
+	int Handle;				// RHP session ID
+	int Seq;
+    char Local[12];
+    char Remote[12];
+    BOOL Connecting;		// Set while waiting for connection to complete
+    BOOL Listening; 
+	BOOL Connected;
+	int Busy;
+};
+
+struct RHPConnectionInfo
+{
+    SOCKET socket;
+	struct RHPSessionInfo ** RHPSessions;
+	int NumberofRHPSessions;
+};
+
+// Struct passed by beginhread
+
+struct RHPParamBlock
+{
+	unsigned char * Msg;
+	int Len;
+	SOCKET Socket;
+	struct ConnectionInfo * sockptr;
+};
+
+
+
+//struct RHPConnectionInfo ** RHPSockets = NULL;
+//int NumberofRHPConnections = 0;
+
+struct RHPSessionInfo ** RHPSessions;
+int NumberofRHPSessions;
+
+char ErrCodes[18][24] = 
+{
+	"Ok",
+	"Unspecified",
+	"Bad or missing type",
+	"Invalid handle",
+	"No memory",
+	"Bad or missing mode",
+	"Invalid local address",
+	"Invalid remote address" ,
+	"Bad or missing family" ,
+	"Duplicate socket"   ,
+	"No such port"    ,
+	"Invalid protocol"      , 
+	"Bad parameter" ,
+	"No buffers"  ,
+	"Unauthorised"  ,
+	"No Route"  ,
+	"Operation not supported"};
+
+
+
+
+extern char pgm[256];	
+
+SOCKET agwsock;
+
+extern int SemHeldByAPI;
+
+char szBuff[80];
+
+int WhatsPacConfigured = 1;
+
+
+int RHPPaclen = 236;
+
+
+int processRHCPOpen(struct ConnectionInfo * sockptr, SOCKET Socket, char * Msg, char * ReplyBuffer);
+int processRHCPSend(SOCKET Socket, char * Msg, char * ReplyBuffer);
+int processRHCPClose(SOCKET Socket, char * Msg, char * ReplyBuffer);
+int processRHCPStatus(SOCKET Socket, char * Msg, char * ReplyBuffer);
+
+
+
+void SendWebSockMessage(SOCKET socket, char * Msg, int Len)
+{
+	int Loops = 0;
+	int Sent;
+	int TxLen;
+	char * OutBuffer = Msg;
+
+	// WebSock Encode. Buffer has 10 bytes on front for header but header len depends on Msg len
+
+	if (Len < 126)
+	{
+		// Two Byte Header
+
+		OutBuffer[8] = 0x81;		// Fin, Data
+		OutBuffer[9] = Len;
+
+		TxLen = Len + 2;
+		OutBuffer = &Msg[8];
+	}
+	else if (Len < 65536)
+	{
+		OutBuffer[6] = 0x81;		// Fin, Data
+		OutBuffer[7] = 126;			// Unmasked, Extended Len 16
+		OutBuffer[8] = Len >> 8;
+		OutBuffer[9] = Len & 0xff;
+		TxLen = Len + 4;
+		OutBuffer = &Msg[6];
+	}
+	else
+	{
+		OutBuffer[0] = 0x81;		// Fin, Data
+		OutBuffer[1] = 127;			// Unmasked, Extended Len 64 bits
+		// Len is 32 bits, so pad with zeros
+		OutBuffer[2] = 0;
+		OutBuffer[3] = 0;
+		OutBuffer[4] = 0;
+		OutBuffer[5] = 0;
+		OutBuffer[6] = (Len >> 24) & 0xff;
+		OutBuffer[7] = (Len >> 16) & 0xff;
+		OutBuffer[8] = (Len >> 8) & 0xff;
+		OutBuffer[9] = Len & 0xff;
+
+		TxLen = Len +  + 10;
+		OutBuffer = &Msg[0];
+	}
+
+	// Send may block
+
+	Sent = send(socket, OutBuffer, TxLen, 0);
+
+	while (Sent != TxLen && Loops++ < 3000)					// 100 secs max
+	{	
+		if (Sent > 0)					// something sent
+		{
+			TxLen -= Sent;
+			memmove(OutBuffer, &OutBuffer[Sent], TxLen);
+		}	
+
+		Sleep(30);
+		Sent = send(socket, OutBuffer, TxLen, 0);
+		if (Sent == -1)
+			break;
+	}
+
+	free(Msg);
+	return;
+}
+
+void ProcessRHPWebSock(struct ConnectionInfo * sockptr, SOCKET Socket, char * Msg, int MsgLen);
+
+void RHPThread(void * Params)
+{
+	// Params and data buffer are malloced blocks so free when done with it
+
+	struct RHPParamBlock * Block = (struct RHPParamBlock *)Params;
+
+	ProcessRHPWebSock(Block->sockptr, Block->Socket, Block->Msg, Block->Len);
+
+	free(Block->Msg);
+	free(Params);
+}
+
+int RHPProcessHTTPMessage(void * conn, char * response, char * Method, char * URL, char * request, BOOL LOCAL, BOOL COOKIE)
+{
+	// RHP messages can be sent over Websocks or normal http but I think WhatsPac only uses WebSocks
+	return 0;
+}
+
+void ProcessRHPWebSock(struct ConnectionInfo * sockptr, SOCKET Socket, char * Msg, int MsgLen)
+{
+	int Loops = 0;
+	int InputLen = 0;
+	int Len;
+
+	char Value[16];
+	char * OutBuffer = malloc(250000);
+
+//	struct RHPConnectionInfo * RHPSocket = NULL;
+//	int n;
+
+	Msg[MsgLen] = 0;
+
+	// Find Connection Record. If none, create one
+
+	// I dont think I need connection records
+
+/*
+	for (n = 0; n < NumberofRHPConnections; n++)
+	{
+		if (RHPSockets[n]->socket == socket)
+		{
+			RHPSocket = RHPSockets[n];
+			break;
+		}
+	}
+
+	if (RHPSocket == 0)
+	{
+		// See if there is an old one we can reuse
+
+		for (n = 0; n < NumberofRHPConnections; n++)
+		{
+			if (RHPSockets[n]-Socket  == -1)
+			{
+				RHPSocket = RHPSockets[n];
+				RHP
+
+				break;
+			}
+		}
+
+		if (RHPSocket == 0)
+
+		NumberofRHPConnections;
+		RHPSockets = realloc(RHPSockets, sizeof(void *) * (NumberofRHPConnections + 1));
+		RHPSocket = RHPSockets[NumberofRHPConnections] = zalloc(sizeof (struct RHPConnectionInfo));
+		NumberofRHPConnections++;
+		RHPSocket->socket = socket;
+	}
+*/
+
+//	{"type":"open","id":5,"pfam":"ax25","mode":"stream","port":"1","local":"G8BPQ","remote":"G8BPQ-2","flags":128}
+//	{"type": "openReply", "id": 82, "handle": 1, "errCode": 0, "errText": "Ok"}
+//	{"seqno": 0, "type": "status", "handle": 1, "flags": 0}
+//	("seqno": 1, "type": "close", "handle": 1}
+//	{"id":40,"type":"close","handle":1}
+
+//	{"seqno": 0, "type": "status", "handle": 1, "flags": 2}.~.
+//	{"seqno": 1, "type": "recv", "handle": 1, "data": "Welcome to G8BPQ's Test Switch in Nottingham \rType ? for list of available commands.\r"}.
+
+//	{"type": "status", "handle": 0}. XRouter will reply with {"type": "statusReply", "handle": 0, "errcode": 12, "errtext": "invalid handle"}. It
+//	{type: 'keepalive'} if there has been no other activity for nearly 3 minutes. Replies with {"type": "keepaliveReply"}
+
+	GetJSONValue(Msg, "\"type\":", Value, 15);
+
+	if (_stricmp(Value, "open") == 0)
+	{
+		Len = processRHCPOpen(sockptr, Socket, Msg, &OutBuffer[10]);		// Space at front for WebSock Header
+		if (Len)
+			SendWebSockMessage(Socket, OutBuffer, Len);
+		return;
+	}
+
+	if (_stricmp(Value, "send") == 0)
+	{
+		Len = processRHCPSend(Socket, Msg, &OutBuffer[10]);		// Space at front for WebSock Header
+		SendWebSockMessage(Socket, OutBuffer, Len);
+		return;
+	}
+	
+	if (_stricmp(Value, "close") == 0)
+	{
+		Len = processRHCPClose(Socket, Msg, &OutBuffer[10]);		// Space at front for WebSock Header
+		SendWebSockMessage(Socket, OutBuffer, Len);
+		return;
+	}
+
+	if (_stricmp(Value, "status") == 0)
+	{
+		Len = processRHCPStatus(Socket, Msg, &OutBuffer[10]);		// Space at front for WebSock Header
+		SendWebSockMessage(Socket, OutBuffer, Len);
+		return;
+	}
+	
+	if (_stricmp(Value, "keepalive") == 0)
+	{
+		Len = sprintf(&OutBuffer[10], "{\"type\": \"keepaliveReply\"}"); // Space at front for WebSock Header
+		SendWebSockMessage(Socket, OutBuffer, Len);
+		return;
+	}
+
+	Debugprintf("Unrecognised RHP Message - %s", Msg);
+}
+
+void ProcessRHPWebSockClosed(SOCKET socket)
+{
+	// Close any connections on this scoket and delete socket entry
+
+	struct RHPSessionInfo * RHPSession = 0;
+	int n;
+
+	// Find and close any Sessions
+
+	for (n = 0; n < NumberofRHPSessions; n++)
+	{
+		if (RHPSessions[n]->Socket == socket)
+		{
+			RHPSession = RHPSessions[n];
+
+			if (RHPSession->BPQStream)
+			{
+				Disconnect(RHPSession->BPQStream);
+				DeallocateStream(RHPSession->BPQStream);
+
+				RHPSession->BPQStream = 0;
+
+			}
+
+			RHPSession->Connecting = 0;
+
+			// We can't send a close to RHP endpont as socket has gone
+
+			RHPSession->Connected = 0;
+		}
+	}
+}
+
+
+
+
+int processRHCPOpen(struct ConnectionInfo * sockptr, SOCKET Socket, char * Msg, char * ReplyBuffer)
+{
+	//{"type":"open","id":5,"pfam":"ax25","mode":"stream","port":"1","local":"G8BPQ","remote":"G8BPQ-2","flags":128}
+
+	struct RHPSessionInfo * RHPSession = 0;
+
+	char * Value = malloc(strlen(Msg));	// Will always be long enough
+	int ID;
+
+	char pfam[16];
+	char Mode[16];
+	int Port;
+	char Local[16];
+	char Remote[16];
+	int flags;
+	int Handle = 1;
+	int Stream;
+	unsigned char AXCall[10];
+
+	int n;
+
+	// ID seems to be used for control commands like open. SeqNo for data within a session (i Think!
+
+	ID = GetJSONInt(Msg, "\"id\":");
+	GetJSONValue(Msg, "\"pfam\":", pfam, 15);
+	GetJSONValue(Msg, "\"mode\":", Mode, 15);
+	Port = GetJSONInt(Msg, "\"port\":");
+	GetJSONValue(Msg, "\"local\":", Local, 15);
+	GetJSONValue(Msg, "\"remote\":", Remote, 15);
+	flags = GetJSONInt(Msg, "\"flags\":");
+
+	if (_stricmp(pfam, "ax25") != 0)
+		return sprintf(ReplyBuffer, "{\"type\": \"openReply\", \"id\": %d, \"handle\": %d, \"errCode\": 12, \"errText\": \"Bad parameter\"}", ID, 0);
+
+	if (_stricmp(Mode, "stream") == 0)
+	{
+		{
+			// Allocate a RHP Session
+
+			// See if there is an old one we can reuse
+
+			for (n = 0; n < NumberofRHPSessions; n++)
+			{
+				if (RHPSessions[n]->BPQStream == 0)
+				{
+					RHPSession = RHPSessions[n];
+					Handle = n + 1;
+					Stream = RHPSessions[n]->BPQStream;
+
+					break;
+				}
+			}
+
+			if (RHPSession == 0)
+			{
+				RHPSessions = realloc(RHPSessions, sizeof(void *) * (NumberofRHPSessions + 1));
+				RHPSession = RHPSessions[NumberofRHPSessions] = zalloc(sizeof (struct RHPSessionInfo));
+				NumberofRHPSessions++;
+
+				Handle = NumberofRHPSessions;
+			}
+
+			strcpy(pgm, "RHP");
+			Stream = FindFreeStream();
+			strcpy(pgm, "bpq32.exe");
+
+			if (Stream == 255)
+				return sprintf(ReplyBuffer, "{\"type\": \"openReply\", \"id\": %d, \"handle\": %d, \"errCode\": 12, \"errText\": \"Bad parameter\"}", ID, 0);
+
+			RHPSession->BPQStream = Stream;
+			RHPSession->Handle = Handle;
+			RHPSession->Connecting = TRUE;
+			RHPSession->Socket = Socket;
+			RHPSession->sockptr = sockptr;
+
+			strcpy(RHPSession->Local, Local);
+			strcpy(RHPSession->Remote, Remote);
+
+			Connect(Stream);
+
+			ConvToAX25(Local, AXCall);
+			ChangeSessionCallsign(Stream, AXCall);
+
+			return sprintf(ReplyBuffer, "{\"type\": \"openReply\", \"id\": %d, \"handle\": %d, \"errCode\": 0, \"errText\": \"Ok\"}", ID, Handle);
+		}
+	}
+	return sprintf(ReplyBuffer, "{\"type\": \"openReply\", \"id\": %d, \"handle\": %d, \"errCode\": 12, \"errText\": \"Bad parameter\"}", ID, 0);
+}
+
+int processRHCPSend(SOCKET Socket, char * Msg, char * ReplyBuffer)
+{
+	// {"type":"send","handle":1,"data":";;;;;;\r","id":70}
+
+	struct RHPSessionInfo * RHPSession;
+
+	int ID;
+	char * Data;
+	char * ptr;
+	int c;
+	int Len;
+
+	int Handle = 1;
+
+	Data = malloc(strlen(Msg));
+
+	ID = GetJSONInt(Msg, "\"id\":");
+	Handle = GetJSONInt(Msg, "\"handle\":");
+	GetJSONValue(Msg, "\"data\":", Data, strlen(Msg) - 1);
+
+	if (Handle < 1 || Handle > NumberofRHPSessions)
+	{
+		free(Data);
+		return sprintf(ReplyBuffer, "{\"type\": \"sendReply\", \"id\": %d, \"handle\": %d, \"errCode\": 3, \"errtext\": \"Invalid handle\"}", ID, Handle);
+	}
+
+	RHPSession = RHPSessions[Handle - 1];
+
+	// Look for \ escapes
+
+	ptr = Data;
+
+	while (ptr = strchr(ptr, '\\'))
+	{
+		c = ptr[1];
+
+		switch (c)
+		{
+		case 'r':
+
+			*ptr = 13;
+			break;	
+			
+		case '\\':
+
+			*ptr = '\\';
+			break;	
+
+		case '"':
+
+			*ptr = '"';
+			break;	
+		}
+		memmove(ptr + 1, ptr + 2, strlen(ptr + 1));
+		ptr++;
+	}
+
+	Len = strlen(Data);
+	ptr = Data;
+
+	while (Len > RHPPaclen)
+	{
+		SendMsg(RHPSession->BPQStream, ptr, RHPPaclen);
+		Len -= RHPPaclen;
+		ptr += RHPPaclen;
+	}
+
+	SendMsg(RHPSession->BPQStream, ptr, Len);
+
+	free(Data);
+	return sprintf(ReplyBuffer, "{\"type\": \"sendReply\", \"id\": %d, \"handle\": %d, \"errCode\": 0, \"errText\": \"Ok\", \"status\": %d}", ID, Handle, 2);
+}
+
+
+int processRHCPClose(SOCKET Socket, char * Msg, char * ReplyBuffer)
+{
+
+	// {"id":70,"type":"close","handle":1}
+
+
+	struct RHPSessionInfo * RHPSession;
+
+	int ID;
+	int Handle = 1;
+
+	char * OutBuffer = malloc(256);
+
+	ID = GetJSONInt(Msg, "\"id\":");
+	Handle = GetJSONInt(Msg, "\"handle\":");
+
+	if (Handle < 1 || Handle > NumberofRHPSessions)
+		return sprintf(ReplyBuffer, "{\"id\": %d, \"type\": \"closeReply\", \"handle\": %d, \"errcode\": 3, \"errtext\": \"Invalid handle\"}", ID, Handle);
+
+
+	RHPSession = RHPSessions[Handle - 1];
+	Disconnect(RHPSession->BPQStream);
+	RHPSession->Connected = 0;
+	RHPSession->Connecting = 0;
+
+	DeallocateStream(RHPSession->BPQStream);
+	RHPSession->BPQStream = 0;
+
+	return sprintf(ReplyBuffer, "{\"id\": %d, \"type\": \"closeReply\", \"handle\": %d, \"errcode\": 0, \"errtext\": \"Ok\"}", ID, Handle);
+}
+
+int processRHCPStatus(SOCKET Socket, char * Msg, char * ReplyBuffer)
+{
+	// {"type": "status", "handle": 0}. XRouter will reply with {"type": "statusReply", "handle": 0, "errcode": 3, "errtext": "invalid handle"}. It
+
+	struct RHPSessionInfo * RHPSession;
+	int Handle = 0;
+
+	Handle = GetJSONInt(Msg, "\"handle\":");
+
+	if (Handle < 1 || Handle > NumberofRHPSessions)
+		return sprintf(ReplyBuffer, "{\"type\": \"statusReply\", \"handle\": %d, \"errcode\": 3, \"errtext\": \"Invalid handle\"}", Handle);
+
+	RHPSession = RHPSessions[Handle - 1];
+
+	return sprintf(ReplyBuffer, "{\"type\": \"status\", \"handle\": %d, \"flags\": 2}", RHPSession->Handle);
+
+}
+
+char toHex[] = "0123456789abcdef";
+
+void RHPPoll()
+{
+	int Stream;
+	int n;
+	int state, change;
+	int Len;
+	char * RHPMsg;
+	unsigned char Buffer[2048];			// Space to escape control chars
+	int pktlen, count;
+
+	struct RHPSessionInfo * RHPSession;
+
+	for (n = 0; n < NumberofRHPSessions; n++)
+	{
+		RHPSession = RHPSessions[n];
+		Stream = RHPSession->BPQStream;
+
+		// See if connected state has changed
+
+		SessionState(Stream, &state, &change);
+
+		if (change == 1)
+		{
+			if (state == 1)
+			{
+				// Connected
+
+				RHPSession->Seq = 0;
+				RHPSession->Connecting = FALSE;
+				RHPSession->Connected = TRUE;
+
+				RHPMsg = malloc(256);
+				Len = sprintf(&RHPMsg[10], "{\"seqno\": %d, \"type\": \"status\", \"handle\": %d, \"flags\": 2}", RHPSession->Seq++, RHPSession->Handle);
+				SendWebSockMessage(RHPSession->Socket, RHPMsg, Len);
+
+				// Send RHP CTEXT
+
+				RHPMsg = malloc(256);
+				Sleep(10);			// otherwise WhatsPac doesn't display connected
+				Len = sprintf(&RHPMsg[10], "{\"seqno\": %d, \"type\": \"recv\", \"handle\": %d, \"data\": \"Connected to RHP Server\\r\"}", RHPSession->Seq++, RHPSession->Handle);
+				SendWebSockMessage(RHPSession->Socket, RHPMsg, Len);
+			}
+			else
+			{
+				// Disconnected. Send Close to client
+
+				RHPMsg = malloc(256);
+				Len = sprintf(&RHPMsg[10], "{\"type\": \"close\", \"seqno\": %d, \"handle\": %d}", RHPSession->Seq++, RHPSession->Handle);
+				SendWebSockMessage(RHPSession->Socket, RHPMsg, Len);
+
+				RHPSession->Connected = 0;
+				RHPSession->Connecting = 0;
+
+				DeallocateStream(RHPSession->BPQStream);
+				RHPSession->BPQStream = 0;
+			}
+		}
+		do
+		{ 
+			GetMsg(Stream, Buffer, &pktlen, &count);
+
+			if (pktlen > 0)
+			{
+				char * ptr = Buffer;
+				unsigned char c;
+
+				Buffer[pktlen] = 0;
+
+				RHPSession->sockptr->LastSendTime = time(NULL);
+
+
+				// Message is JSON so Convert CR to \r, \ to \\ " to \"
+
+				// Looks like I need to escape everything not between 0x20 and 0x7f eg \U00c3
+
+
+				while (c = *(ptr))
+				{
+					switch (c)
+					{
+					case 13:
+
+						memmove(ptr + 2, ptr + 1, strlen(ptr) + 1);
+						*(ptr++) = '\\';
+						*(ptr++) = 'r';
+						break;
+		
+					case '"':
+
+						memmove(ptr + 2, ptr + 1, strlen(ptr) + 1);
+						*(ptr++) = '\\';
+						*(ptr++) = '"';
+						break;
+	
+					case '\\':
+
+						memmove(ptr + 2, ptr + 1, strlen(ptr) + 1);
+						*(ptr++) = '\\';
+						*(ptr++) = '\\';
+						break;
+				
+					default:
+
+						if (c > 127)
+						{
+							memmove(ptr + 6, ptr + 1, strlen(ptr) + 1);
+							*(ptr++) = '\\';
+							*(ptr++) = 'u';
+							*(ptr++) = '0';
+							*(ptr++) = '0';
+							*(ptr++) = toHex[c >> 4];
+							*(ptr++) = toHex[c & 15];
+							break;
+						}
+						else	
+							ptr++;
+					}
+				}
+
+				RHPMsg = malloc(2048);
+
+				Len = sprintf(&RHPMsg[10], "{\"seqno\": %d, \"type\": \"recv\", \"handle\": %d, \"data\": \"%s\"}", RHPSession->Seq++, RHPSession->Handle, Buffer);
+				SendWebSockMessage(RHPSession->Socket, RHPMsg, Len);
+
+			}
+    
+		}
+		while (count > 0);
+	}
+}
+
+
+
+static void GetJSONValue(char * _REPLYBUFFER, char * Name, char * Value, int Len)
+{
+	char * ptr1, * ptr2;
+
+	Value[0] = 0;
+
+	ptr1 = strstr(_REPLYBUFFER, Name);
+
+	if (ptr1 == 0)
+		return;
+
+	ptr1 += (strlen(Name) + 1);
+
+//	"data":"{\"t\":\"c\",\"n\":\"John\",\"c\":\"G8BPQ\",\"lm\":1737912636,\"le\":1737883907,\"led\":1737758451,\"v\":0.33,\"cc\":[{\"cid\":1,\"lp\":1737917257201,\"le\":1737913735726,\"led\":1737905249785},{\"cid\":0,\"lp\":1737324074107,\"le\":1737323831510,\"led\":1737322973662},{\"cid\":5,\"lp\":1737992107419,\"le\":1737931466510,\"led\":1737770056244}]}\r","id":28}
+
+	// There may be escaped " in data stream
+
+	ptr2 = strchr(ptr1, '"');
+
+	while (*(ptr2 - 1) == '\\')
+	{
+		ptr2 = strchr(ptr2 + 2, '"');
+	}
+
+		
+	if (ptr2)
+	{
+		size_t ValLen = ptr2 - ptr1;
+		if (ValLen > Len)
+			ValLen = Len;
+
+		memcpy(Value, ptr1, ValLen);
+		Value[ValLen] = 0;
+	}
+
+	return;
+}
+
+
+static int GetJSONInt(char * _REPLYBUFFER, char * Name)
+{
+	char * ptr1;
+
+	ptr1 = strstr(_REPLYBUFFER, Name);
+
+	if (ptr1 == 0)
+		return 0;
+
+	ptr1 += (strlen(Name));
+
+	return atoi(ptr1);
+}
+
+

RigControl.c

@@ -48,7 +48,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #include <stdlib.h>
 #include "time.h"
 
-#include "CHeaders.h"
+#include "cheaders.h"
 #include "tncinfo.h"
 #ifdef WIN32
 #include <commctrl.h>
@@ -324,7 +324,7 @@ VOID Rig_PTTEx(struct RIGINFO * RIG, BOOL PTTState, struct TNCINFO * TNC)
 
 						// Convert to CAT string
 
-						sprintf(FreqString, "%012d", txfreq);
+						sprintf(FreqString, "%012lld", txfreq);
 
 						switch (PORT->PortType)
 						{
@@ -455,7 +455,7 @@ VOID Rig_PTTEx(struct RIGINFO * RIG, BOOL PTTState, struct TNCINFO * TNC)
 
 					// Convert to CAT string
 
-					sprintf(FreqString, "%012d", txfreq);
+					sprintf(FreqString, "%012lld", txfreq);
 
 					switch (PORT->PortType)
 					{
@@ -896,7 +896,7 @@ int Rig_CommandEx(struct RIGPORTINFO * PORT, struct RIGINFO * RIG, TRANSPORTENTR
 	// if Port starts with 'R' then select Radio (was Interlock) number, not BPQ Port
 
 	if (Command[0] == 'R')
-		n = sscanf(Command,"%s %s %s %s %s", &Dummy, &FreqString[0], &Mode[0], &FilterString[0], &Data[0]);
+		n = sscanf(Command,"%s %s %s %s %s", &Dummy[0], &FreqString[0], &Mode[0], &FilterString[0], &Data[0]);
 	else
 		n = sscanf(Command,"%d %s %s %s %s", &Port, &FreqString[0], &Mode[0], &FilterString[0], &Data[0]);
 
@@ -1117,7 +1117,7 @@ int Rig_CommandEx(struct RIGPORTINFO * PORT, struct RIGINFO * RIG, TRANSPORTENTR
 
 	if (_stricmp(FreqString, "POWER") == 0)
 	{
-		char PowerString[8] = "";
+		char PowerString[16] = "";
 		int Power = atoi(Mode);
 		int len;
 		char cmd[80];
@@ -1291,7 +1291,7 @@ int Rig_CommandEx(struct RIGPORTINFO * PORT, struct RIGINFO * RIG, TRANSPORTENTR
 
 			// use text command
 
-			Len = sprintf(CmdPtr, ptr1);
+			Len = sprintf(CmdPtr, "%s", ptr1);
 			break;
 
 		case YAESU:
@@ -2072,7 +2072,7 @@ int Rig_CommandEx(struct RIGPORTINFO * PORT, struct RIGINFO * RIG, TRANSPORTENTR
 
 	case HAMLIB:
 	{
-		char cmd[80];
+		char cmd[200];
 
 		int len = sprintf(cmd, "F %s\n+f\nM %s %d\n+m\n",
 			FreqString, Mode, atoi(Data));
@@ -3205,7 +3205,7 @@ VOID ReleasePermission(struct RIGINFO *RIG)
 	while (RIG->PortRecord[i])
 	{
 		PortRecord = RIG->PortRecord[i];
-		PortRecord->PORT_EXT_ADDR(6, PortRecord->PORTCONTROL.PORTNUMBER, 3);	// Release Perrmission
+		PortRecord->PORT_EXT_ADDR(6, PortRecord->PORTCONTROL.PORTNUMBER, (PDATAMESSAGE)3);	// Release Perrmission
 		i++;
 	}
 }
@@ -3235,7 +3235,7 @@ int GetPermissionToChange(struct RIGPORTINFO * PORT, struct RIGINFO *RIG)
 		// TNC has been asked for permission, and we are waiting respoonse
 		// Only SCS pactor returns WaitingForPrmission, so check shouldn't be called on others
 		
-		RIG->OKtoChange = (int)(intptr_t)RIG->PortRecord[0]->PORT_EXT_ADDR(6, RIG->PortRecord[0]->PORTCONTROL.PORTNUMBER, 2);	// Get Ok Flag
+		RIG->OKtoChange = (int)(intptr_t)RIG->PortRecord[0]->PORT_EXT_ADDR(6, RIG->PortRecord[0]->PORTCONTROL.PORTNUMBER, (PDATAMESSAGE)2);	// Get Ok Flag
 	
 		if (RIG->OKtoChange == 1)
 		{
@@ -3277,7 +3277,7 @@ int GetPermissionToChange(struct RIGPORTINFO * PORT, struct RIGINFO *RIG)
 		// not waiting for permission, so must be first call of a cycle
 
 		if (RIG->PortRecord[0] && RIG->PortRecord[0]->PORT_EXT_ADDR)
-			RIG->WaitingForPermission = (int)(intptr_t)RIG->PortRecord[0]->PORT_EXT_ADDR(6, RIG->PortRecord[0]->PORTCONTROL.PORTNUMBER, 1);	// Request Perrmission
+			RIG->WaitingForPermission = (int)(intptr_t)RIG->PortRecord[0]->PORT_EXT_ADDR(6, RIG->PortRecord[0]->PORTCONTROL.PORTNUMBER, (PDATAMESSAGE)1);	// Request Perrmission
 				
 		// If it returns zero there is no need to wait.
 		// Normally SCS Returns True for first call, but returns 0 if Link not running
@@ -3300,7 +3300,7 @@ CheckOtherPorts:
 	{
 		PortRecord = RIG->PortRecord[i];
 
-		if (PortRecord->PORT_EXT_ADDR && PortRecord->PORT_EXT_ADDR(6, PortRecord->PORTCONTROL.PORTNUMBER, 1))
+		if (PortRecord->PORT_EXT_ADDR && PortRecord->PORT_EXT_ADDR(6, PortRecord->PORTCONTROL.PORTNUMBER, (PDATAMESSAGE)1))
 		{
 			// 1 means can't change - release all
 
@@ -3392,7 +3392,7 @@ VOID DoBandwidthandAntenna(struct RIGINFO *RIG, struct ScanEntry * ptr)
 
 			RIG->CurrentBandWidth = ptr->Bandwidth;
 
-			PortRecord->PORT_EXT_ADDR(6, PortRecord->PORTCONTROL.PORTNUMBER, ptr);
+			PortRecord->PORT_EXT_ADDR(6, PortRecord->PORTCONTROL.PORTNUMBER, (PDATAMESSAGE)ptr);
 
 /*			if (ptr->Bandwidth == 'R')			// Robust Packet
 				PortRecord->PORT_EXT_ADDR(6, PortRecord->PORTCONTROL.PORTNUMBER, 6);	// Set Robust Packet
@@ -5286,10 +5286,13 @@ BOOL DecodeModePtr(char * Param, double * Dwell, double * Freq, char * Mode,
 
 	ptr = strtok_s(NULL, ",", &Context);
 
-	if (ptr == NULL || strlen(ptr) >  8)
+	if (ptr == NULL)
-		return FALSE;
+		if (*MemoryNumber)		// If channel, dont need mode
+			return TRUE;
+
+	if (ptr == NULL || strlen(ptr) >  8)
+		return FALSE;		// Mode Missing
 
-	// If channel, dont need mode
 
 	if (*MemoryNumber == 0)
 	{
@@ -7252,7 +7255,7 @@ CheckScan:
 		}
 		else if	(PORT->PortType == FT991A || PORT->PortType == FTDX10)
 		{	
-			FreqPtr[0]->Cmd1Len = sprintf(CmdPtr, "FA%s;MD0%X;FA;MD0;", &FreqString, ModeNo);
+			FreqPtr[0]->Cmd1Len = sprintf(CmdPtr, "FA%s;MD0%X;FA;MD0;", &FreqString[0], ModeNo);
 		}
 		else if	(PORT->PortType == FT100 || PORT->PortType == FT990
 			|| PORT->PortType == FT1000)
@@ -7393,6 +7396,8 @@ VOID SetupScanInterLockGroups(struct RIGINFO *RIG)
 	int Interlock = RIG->Interlock;
 	char PortString[128] = "";
 	char TxPortString[128] = "";
+	int n = 0;
+	int nn = 0;
 
 	// Find TNC ports in this Rig's scan group
 
@@ -7409,7 +7414,7 @@ VOID SetupScanInterLockGroups(struct RIGINFO *RIG)
 		{
 			int p = PortRecord->PORTNUMBER;
 			RIG->BPQPort |= ((uint64_t)1 << p);
-			sprintf(PortString, "%s,%d", PortString, p);
+			n += sprintf(&PortString[n], ",%d", p);
 			TNC->RIG = RIG;
 
 			if (RIG->PTTMode == 0 && TNC->PTTMode)
@@ -7419,7 +7424,7 @@ VOID SetupScanInterLockGroups(struct RIGINFO *RIG)
 		{
 			int p = PortRecord->PORTNUMBER;
 			RIG->BPQPort |= ((uint64_t)1 << p);
-			sprintf(TxPortString, "%s,%d", TxPortString, p);
+			nn += sprintf(&TxPortString[nn], ",%d", p);
 			TNC->TXRIG = RIG;
 
 			if (RIG->PTTMode == 0 && TNC->PTTMode)
@@ -8139,7 +8144,7 @@ void ProcessFLRIGFrame(struct RIGPORTINFO * PORT)
 
 void HLSetMode(SOCKET Sock, struct RIGINFO * RIG, unsigned char * Msg, char sep)
 {
-	char Resp[80];
+	char Resp[120];
 	int Len;
 	char mode[80] = "";
 	int filter = 0;
@@ -8385,7 +8390,7 @@ int ProcessHAMLIBSlaveMessage(SOCKET Sock, struct RIGINFO * RIG, unsigned char *
 
 	switch (Msg[0])
 	{
-	case 'f':			// Get Freqency
+	case 'f':			// Get Frequency
 
 		HLGetFreq(Sock, RIG, sep);
 		return 0;
@@ -8941,7 +8946,7 @@ VOID FLRIGThread(struct RIGPORTINFO * PORT)
 	setsockopt(PORT->remoteSock, SOL_SOCKET, SO_REUSEADDR, (const char FAR *)&bcopt, 4);
 	setsockopt(PORT->remoteSock, IPPROTO_TCP, TCP_NODELAY, (const char FAR *)&bcopt, 4); 
 
-	if (connect(PORT->remoteSock,(LPSOCKADDR) &PORT->remoteDest,sizeof(PORT->remoteDest)) == 0)
+	if (connect(PORT->remoteSock,(LPSOCKADDR) &PORT->remoteDest, sizeof(PORT->remoteDest)) == 0)
 	{
 		//
 		//	Connected successful
@@ -9422,7 +9427,7 @@ return TRUE;
 
 #include <stdio.h>
 #include <stdlib.h>
-//#include <stdint.h>
+//
 //#include <windows.h>
 #include <setupapi.h>
 //#include <ddk/hidsdi.h>
@@ -9938,14 +9943,10 @@ void ProcessSDRANGELFrame(struct RIGPORTINFO * PORT)
 	int Length;
 
 	char * msg;
-	char * rest;
 
 	struct RIGINFO * RIG;
 	char * ptr, * ptr1, * ptr2, * ptr3, * pos;
-	int Len, TotalLen;
 	char cmd[80];
-	char ReqBuf[256];
-	char SendBuff[256];
 	int chunklength;
 	int headerlen;
 	int i, n = 0;
@@ -10168,7 +10169,7 @@ VOID ConnecttoSDRANGEL(struct RIGPORTINFO * PORT)
 VOID SDRANGELThread(struct RIGPORTINFO * PORT)
 {
 	// Opens sockets and looks for data
-	char Msg[255];
+	char Msg[512];
 	int err, i, ret;
 	u_long param=1;
 	BOOL bcopt=TRUE;
@@ -10332,7 +10333,6 @@ VOID SDRANGELPoll(struct RIGPORTINFO * PORT)
 
 	struct RIGINFO * RIG = &PORT->Rigs[0];
 	int Len, i;
-	char ReqBuf[256];
 	char SendBuff[256];
 	//char * SDRANGEL_GETheader = "GET /sdrangel/deviceset/%d/device/settings "
 	//			   "HTTP/1.1\nHost: %s\nConnection: keep-alive\n\r\n";
@@ -10379,7 +10379,6 @@ VOID SDRANGELPoll(struct RIGPORTINFO * PORT)
 			if (GetPermissionToChange(PORT, RIG))
 			{
 				char cmd[80];
-				double freq;
 
 				if (RIG->RIG_DEBUG)
 					Debugprintf("BPQ32 Change Freq to %9.4f", PORT->FreqPtr->Freq);
@@ -10451,7 +10450,6 @@ VOID SDRANGELPoll(struct RIGPORTINFO * PORT)
 VOID SDRANGELSendCommand(struct RIGPORTINFO * PORT, char * Command, char * Value)
 {
 	int Len, ret;
-	char ReqBuf[512];
 	char SendBuff[512];
 	char ValueString[256] ="";
 	char * SDRANGEL_PATCHheader = "PATCH /sdrangel/deviceset/%d/device/settings "

SCSPactor.c

@@ -78,7 +78,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #define MaxStreams 10			// First is used for Pactor, even though Pactor uses channel 31
 
-#include "CHeaders.h"
+#include "cheaders.h"
 #include "tncinfo.h"
 
 #include "bpq32.h"
@@ -854,7 +854,8 @@ void * SCSExtInit(EXTPORTDATA *  PortEntry)
 	}
 	
 	TNC->Port = port;
-	TNC->Hardware = H_SCS;
+	TNC->PortRecord = PortEntry;
+	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_SCS;
 
 	OpenLogFile(TNC->Port);
 	CloseLogFile(TNC->Port);
@@ -885,8 +886,6 @@ void * SCSExtInit(EXTPORTDATA *  PortEntry)
 	PortEntry->PERMITGATEWAY = TRUE;					// Can change ax.25 call on each stream
 	PortEntry->SCANCAPABILITIES = CONLOCK;				// Scan Control 3 stage/conlock 
 
-	TNC->PortRecord = PortEntry;
-
 	if (PortEntry->PORTCONTROL.PORTINTERLOCK && TNC->RXRadio == 0 && TNC->TXRadio == 0)
 		TNC->RXRadio = TNC->TXRadio = PortEntry->PORTCONTROL.PORTINTERLOCK;
 
@@ -1972,7 +1971,7 @@ VOID SCSPoll(int Port)
 				}
 
 				Poll[3] = 0;			// Data?
-				TNC->Streams[Stream].BytesTXed += datalen;
+				TNC->Streams[Stream].bytesTXed += datalen;
 
 				Poll[4] = datalen - 1;
 				memcpy(&Poll[5], Buffer, datalen);
@@ -2324,7 +2323,7 @@ void SCSTryToSendDATA(struct TNCINFO * TNC, int Stream)
 	}
 
 	Poll[3] = 0;			// Data
-	STREAM->BytesTXed += datalen;
+	STREAM->bytesTXed += datalen;
 
 	Poll[4] = datalen - 1;
 	memcpy(&Poll[5], Buffer, datalen);
@@ -2893,7 +2892,7 @@ VOID ProcessIncomingCall(struct TNCINFO * TNC, struct STREAMINFO * STREAM, int S
 		{
 			char AppName[13];
 			
-			memcpy(AppName, &ApplPtr[App * sizeof(CMDX)], 12);
+			memcpy(AppName, &ApplPtr[App * sizeof(struct CMDX)], 12);
 			AppName[12] = 0;
 
 			// Make sure app is available
@@ -3034,7 +3033,7 @@ VOID ProcessIncomingCall(struct TNCINFO * TNC, struct STREAMINFO * STREAM, int S
 		{
 			char AppName[13];
 
-			memcpy(AppName, &ApplPtr[App * sizeof(CMDX)], 12);
+			memcpy(AppName, &ApplPtr[App * sizeof(struct CMDX)], 12);
 			AppName[12] = 0;
 
 			// if SendTandRtoRelay set and Appl is RMS change to RELAY
@@ -3402,7 +3401,7 @@ VOID ProcessDEDFrame(struct TNCINFO * TNC, UCHAR * Msg, int framelen)
 				{					
 					if (TNC->TXBuffer[6]== 'T')	// TX count Status
 					{
-						sprintf(TNC->WEB_TRAFFIC, "RX %d TX %d ACKED %s", TNC->Streams[Stream].BytesRXed, TNC->Streams[Stream].BytesTXed, Buffer);
+						sprintf(TNC->WEB_TRAFFIC, "RX %d TX %d ACKED %s", TNC->Streams[Stream].bytesRXed, TNC->Streams[Stream].bytesTXed, Buffer);
 						SetWindowText(TNC->xIDC_TRAFFIC, TNC->WEB_TRAFFIC);
 						return;
 					}
@@ -3501,7 +3500,7 @@ VOID ProcessDEDFrame(struct TNCINFO * TNC, UCHAR * Msg, int framelen)
 				STREAM->Connected = TRUE;			// Subsequent data to data channel
 				STREAM->Connecting = FALSE;
 				STREAM->ConnectTime = time(NULL); 
-				STREAM->BytesRXed = STREAM->BytesTXed = 0;
+				STREAM->bytesRXed = STREAM->bytesTXed = 0;
 
 				//	Stop Scanner
 
@@ -3897,7 +3896,7 @@ VOID ProcessDEDFrame(struct TNCINFO * TNC, UCHAR * Msg, int framelen)
 		if (buffptr == NULL) return;			// No buffers, so ignore
 			
 		buffptr->Len = Msg[4] + 1;				// Length
-		TNC->Streams[Stream].BytesRXed += (int)buffptr->Len;
+		TNC->Streams[Stream].bytesRXed += (int)buffptr->Len;
 		memcpy(buffptr->Data, &Msg[5], buffptr->Len);
 
 		WritetoTrace(TNC, &Msg[5], (int)buffptr->Len);
@@ -4297,16 +4296,22 @@ VOID PTCSuspendPort(struct TNCINFO * TNC, struct TNCINFO * ThisTNC)
 {
 	struct STREAMINFO * STREAM = &TNC->Streams[0];
 
+	strcpy(TNC->WEB_TNCSTATE, "Interlocked");
+	MySetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
+
 	STREAM->CmdSet = STREAM->CmdSave = zalloc(100);
 	sprintf(STREAM->CmdSet, "I%s\r", "SCSPTC");		// Should prevent connects
 
-	Debugprintf("SCS Pactor CMDSet = %s", STREAM->CmdSet);
+//	Debugprintf("SCS Pactor CMDSet = %s", STREAM->CmdSet);
 }
 
 VOID PTCReleasePort(struct TNCINFO * TNC)
 {
 	struct STREAMINFO * STREAM = &TNC->Streams[0];
 
+	strcpy(TNC->WEB_TNCSTATE, "Free");
+	MySetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
+
 	STREAM->CmdSet = STREAM->CmdSave = zalloc(100);
 
 	if (TNC->UseAPPLCallsforPactor && TNC->RIG && TNC->RIG != &TNC->DummyRig 
@@ -4315,7 +4320,7 @@ VOID PTCReleasePort(struct TNCINFO * TNC)
 	else
 		sprintf(STREAM->CmdSet, "I%s\r", TNC->NodeCall);
 
-	Debugprintf("SCS Pactor CMDSet = %s", STREAM->CmdSet);
+//	Debugprintf("SCS Pactor CMDSet = %s", STREAM->CmdSet);
 }
 
 

SCSTrackeMulti.c

@@ -31,7 +31,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #define MaxStreams 10	
 
-#include "CHeaders.h"
+#include "cheaders.h"
 #include "tncinfo.h"
 
 #include "bpq32.h"
@@ -48,7 +48,6 @@ extern UCHAR BPQDirectory[];
 static RECT Rect;
 
 VOID __cdecl Debugprintf(const char * format, ...);
-char * strlop(char * buf, char delim);
 BOOL KAMStartPort(struct PORTCONTROL * PORT);
 BOOL KAMStopPort(struct PORTCONTROL * PORT);
 
@@ -377,7 +376,8 @@ void * TrackerMExtInit(EXTPORTDATA *  PortEntry)
 	}
 	
 	TNC->Port = port;
-	TNC->Hardware = H_TRKM;
+	TNC->PortRecord = PortEntry;
+	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_TRKM;
 
 	// Set up DED addresses for streams
 	
@@ -393,8 +393,6 @@ void * TrackerMExtInit(EXTPORTDATA *  PortEntry)
 	PortEntry->PERMITGATEWAY = TRUE;					// Can change ax.25 call on each stream
 	PortEntry->SCANCAPABILITIES = NONE;				// Scan Control 3 stage/conlock 
 
-	TNC->PortRecord = PortEntry;
-
 	if (PortEntry->PORTCONTROL.PORTCALL[0] == 0)
 		memcpy(TNC->NodeCall, MYNODECALL, 10);
 	else
@@ -825,7 +823,7 @@ static VOID DEDPoll(int Port)
 				}
 
 				Poll[1] = 0;			// Data
-				TNC->Streams[Stream].BytesTXed += datalen;
+				TNC->Streams[Stream].bytesTXed += datalen;
 
 				Poll[2] = datalen - 1;
 				memcpy(&Poll[3], Buffer, datalen);
@@ -1508,7 +1506,7 @@ static VOID ProcessDEDFrame(struct TNCINFO * TNC)
 				STREAM->Connected = TRUE;			// Subsequent data to data channel
 				STREAM->Connecting = FALSE;
 
-				STREAM->BytesRXed = STREAM->BytesTXed = 0;
+				STREAM->bytesRXed = STREAM->bytesTXed = 0;
 
 				memcpy(MHCall, Call, 9);
 				MHCall[9] = 0;
@@ -1677,7 +1675,7 @@ static VOID ProcessDEDFrame(struct TNCINFO * TNC)
 		if (buffptr == NULL) return;			// No buffers, so ignore
 			
 		buffptr->Len = framelen;				// Length
-		TNC->Streams[Stream].BytesRXed += buffptr->Len;
+		TNC->Streams[Stream].bytesRXed += buffptr->Len;
 		memcpy(buffptr->Data, Msg, buffptr->Len);
 		
 		C_Q_ADD(&TNC->Streams[Stream].PACTORtoBPQ_Q, buffptr);

SCSTracker.c

@@ -31,7 +31,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #define MaxStreams 1	
 
-#include "CHeaders.h"
+#include "cheaders.h"
 #include "tncinfo.h"
 
 //#include "bpq32.h"
@@ -52,7 +52,6 @@ extern char LOC[];
 static RECT Rect;
 
 VOID __cdecl Debugprintf(const char * format, ...);
-char * strlop(char * buf, char delim);
 
 char NodeCall[11];		// Nodecall, Null Terminated
 
@@ -109,6 +108,9 @@ VOID TRKSuspendPort(struct TNCINFO * TNC, struct TNCINFO * ThisTNC)
 {
 	struct STREAMINFO * STREAM = &TNC->Streams[0];
 
+	strcpy(TNC->WEB_TNCSTATE, "Interlocked");
+	MySetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
+
 	STREAM->CmdSet = STREAM->CmdSave = zalloc(100);
 	sprintf(STREAM->CmdSet, "\1\1\1IDSPTNC");
 }
@@ -117,6 +119,9 @@ VOID TRKReleasePort(struct TNCINFO * TNC)
 {
 	struct STREAMINFO * STREAM = &TNC->Streams[0];
 
+	strcpy(TNC->WEB_TNCSTATE, "Free");
+	MySetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
+
 	STREAM->CmdSet = STREAM->CmdSave = zalloc(100);
 	sprintf(STREAM->CmdSet, "\1\1\1I%s", TNC->NodeCall);
 }
@@ -661,7 +666,8 @@ void * TrackerExtInit(EXTPORTDATA *  PortEntry)
 	}
 	
 	TNC->Port = port;
-	TNC->Hardware = H_TRK;
+	TNC->PortRecord = PortEntry;
+	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_TRK;
 
 	// Set up DED addresses for streams
 	
@@ -677,8 +683,6 @@ void * TrackerExtInit(EXTPORTDATA *  PortEntry)
 	PortEntry->PERMITGATEWAY = TRUE;				// Can change ax.25 call on each stream
 	PortEntry->SCANCAPABILITIES = NONE;				// Scan Control 3 stage/conlock 
 
-	TNC->PortRecord = PortEntry;
-
 	if (PortEntry->PORTCONTROL.PORTCALL[0] == 0)
 		memcpy(TNC->NodeCall, MYNODECALL, 10);
 	else
@@ -1261,7 +1265,7 @@ reinit:
 				}
 
 				Poll[1] = 0;			// Data
-				TNC->Streams[Stream].BytesTXed += datalen;
+				TNC->Streams[Stream].bytesTXed += datalen;
 
 				Poll[2] = datalen - 1;
 				memcpy(&Poll[3], Buffer, datalen);
@@ -1882,7 +1886,7 @@ VOID TrkProcessDEDFrame(struct TNCINFO * TNC)
 				{				
 					if (TNC->TXBuffer[4]== 'T')	// TX count Status
 					{
-						sprintf(TNC->WEB_TRAFFIC, "RX %d TX %d ACKED %s", TNC->Streams[Stream].BytesRXed, TNC->Streams[Stream].BytesTXed, Buffer);
+						sprintf(TNC->WEB_TRAFFIC, "RX %d TX %d ACKED %s", TNC->Streams[Stream].bytesRXed, TNC->Streams[Stream].bytesTXed, Buffer);
 						SetWindowText(TNC->xIDC_TRAFFIC, TNC->WEB_TRAFFIC);
 						TNC->WEB_CHANGED = TRUE;
 						return;
@@ -2021,7 +2025,7 @@ VOID TrkProcessDEDFrame(struct TNCINFO * TNC)
 				STREAM->Connected = TRUE;			// Subsequent data to data channel
 				STREAM->Connecting = FALSE;
 				STREAM->ConnectTime = time(NULL); 
-				STREAM->BytesRXed = STREAM->BytesTXed = 0;
+				STREAM->bytesRXed = STREAM->bytesTXed = 0;
 
 				if (TNC->SlowTimer)
 					Debugprintf("RP Incoming call to APPLCALL completed");
@@ -2169,7 +2173,7 @@ VOID TrkProcessDEDFrame(struct TNCINFO * TNC)
 							{
 								char AppName[13];
 
-								memcpy(AppName, &ApplPtr[App * sizeof(CMDX)], 12);
+								memcpy(AppName, &ApplPtr[App * sizeof(struct CMDX)], 12);
 								AppName[12] = 0;
 
 								// Make sure app is available
@@ -2379,7 +2383,7 @@ VOID TrkProcessDEDFrame(struct TNCINFO * TNC)
 		if (buffptr == NULL) return;			// No buffers, so ignore
 			
 		buffptr->Len = framelen;				// Length
-		TNC->Streams[Stream].BytesRXed += (int)buffptr->Len;
+		TNC->Streams[Stream].bytesRXed += (int)buffptr->Len;
 		memcpy(buffptr->Data, Msg, buffptr->Len);
 		
 		WritetoTrace(TNC, Msg, (int)buffptr->Len);

SerialPort.c

@@ -36,7 +36,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #endif
 
 
-#include "CHeaders.h"
+#include "cheaders.h"
 
 
 extern int (WINAPI FAR *GetModuleFileNameExPtr)();
@@ -142,7 +142,7 @@ loop:
 	return 1;
 }
 
-BOOL SerialReadConfigFile(int Port, int ProcLine())
+BOOL SerialReadConfigFile(int Port, int ProcLine(char * buf, int Port))
 {
 	char buf[256],errbuf[256];
 
@@ -402,7 +402,7 @@ ok:
 				UCHAR * data = &buffptr->Data[0];
 				STREAM->FramesQueued--;
 				txlen = (int)buffptr->Len;
-				STREAM->BytesTXed += txlen;
+				STREAM->bytesTXed += txlen;
 
 				bytes=SerialSendData(TNC, data, txlen);
 				WritetoTrace(TNC, data, txlen);
@@ -491,7 +491,7 @@ ok:
 
 			bytes=SerialSendData(TNC, TXMsg, txlen);
 			TNC->Streams[Stream].BytesOutstanding += bytes;		// So flow control works - will be updated by BUFFER response
-			STREAM->BytesTXed += bytes;
+			STREAM->bytesTXed += bytes;
 //			WritetoTrace(TNC, &buff->L2DATA[0], txlen);
 	
 			return 1;
@@ -508,7 +508,10 @@ ok:
 
 		if (_memicmp(&buff->L2DATA[0], "RADIO ", 6) == 0)
 		{
-			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &buff->L2DATA[6]);
+			char cmd[56];
+
+			strcpy(cmd, &buff->L2DATA[6]);
+			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, cnd);
 
 				if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, &buff->L2DATA[0]))
 			{
@@ -735,7 +738,7 @@ VOID SerialReleasePort(struct TNCINFO * TNC)
 VOID * SerialExtInit(EXTPORTDATA * PortEntry)
 {
 	int port;
-	char Msg[255];
+	char Msg[512];
 	char * ptr;
 	struct TNCINFO * TNC;
 	char * TempScript;
@@ -770,9 +773,9 @@ VOID * SerialExtInit(EXTPORTDATA * PortEntry)
 	}
 	
 	TNC->Port = port;
-	TNC->Hardware = H_SERIAL;
-
 	TNC->PortRecord = PortEntry;
+	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_SERIAL;
+
 
 	if (PortEntry->PORTCONTROL.PORTCALL[0] == 0)
 		memcpy(TNC->NodeCall, MYNODECALL, 10);

TNCCode.c

@@ -30,7 +30,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #include "stdio.h"
 #include <fcntl.h>
 
-#include "CHeaders.h"
+#include "cheaders.h"
 #include "tncinfo.h"
 
 int C_Q_COUNT(VOID *PQ);