.rej

@@ -0,0 +1,139 @@
+--- APRSCode.c
++++ APRSCode.c
+@@ -3674,7 +3674,7 @@
+ 			if (ptr1)
+ 				*ptr1 = 0;
+ 
+-//			Debugprintf("Duplicate Message supressed %s", Msg);
++//			Debugprintf("Duplicate Message suppressed %s", Msg);
+ 			return TRUE;					// Duplicate
+ 		}
+ 	}
+--- BPQChat.rc
++++ BPQChat.rc
+@@ -162,7 +162,7 @@
+                     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 separated by |, eg NOTCHT:G8BPQ-4|C 3 GM8BPQ-9|CHAT",
+                     IDC_STATIC,9,52,355,24
+ END
+ 
+--- BPQMail.rc
++++ BPQMail.rc
+@@ -1045,7 +1045,7 @@
+     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",
+--- HanksRT.c
++++ HanksRT.c
+@@ -1186,7 +1186,7 @@
+ 			// 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
+ 		}
+--- RigControl.c
++++ RigControl.c
+@@ -8385,7 +8385,7 @@
+ 
+ 	switch (Msg[0])
+ 	{
+-	case 'f':			// Get Freqency
++	case 'f':			// Get Frequency
+ 
+ 		HLGetFreq(Sock, RIG, sep);
+ 		return 0;
+--- UZ7HODrv.c
++++ UZ7HODrv.c
+@@ -374,7 +374,7 @@
+ 	{
+ 		// Read Freq
+ 
+-		buffptr->Len = sprintf((UCHAR *)&buffptr->Data[0], "UZ7HO} Modem Freqency %d\r", AGW->CenterFreq);
++		buffptr->Len = sprintf((UCHAR *)&buffptr->Data[0], "UZ7HO} Modem Frequency %d\r", AGW->CenterFreq);
+ 		return 1;
+ 	}
+ 
+@@ -382,7 +382,7 @@
+ 
+ 	if (AGW->CenterFreq == 0)
+ 	{
+-		buffptr->Len = sprintf((UCHAR *)&buffptr->Data[0], "UZ7HO} Invalid Modem Freqency\r");
++		buffptr->Len = sprintf((UCHAR *)&buffptr->Data[0], "UZ7HO} Invalid Modem Frequency\r");
+ 		return 1;
+ 	}
+ 
+--- WinRPRHelper.c
++++ WinRPRHelper.c
+@@ -111,7 +111,7 @@
+ 
+ 	if (argc < 3)
+ 	{
+-		printf ("Missing paramters - you need COM port and IP Address and rigctl port of BPQ, eg \r\n"
++		printf ("Missing parameters - you need COM port and IP Address and rigctl port of BPQ, eg \r\n"
+ 			"  WinRPRHelper com10 192.168.1.64:4532\r\n\r\n"
+ 			"Press any key to exit\r\n");
+ 
+--- config.c
++++ config.c
+@@ -649,7 +649,7 @@
+ 	if (LOCATOR[0] == 0 && LocSpecified == 0 && RFOnly == 0)
+ 	{
+ 		Consoleprintf("");
+-		Consoleprintf("Please enter a LOCATOR statment in your BPQ32.cfg");
++		Consoleprintf("Please enter a LOCATOR statement in your BPQ32.cfg");
+ 		Consoleprintf("If you really don't want to be on the Node Map you can enter LOCATOR=NONE");
+ 		Consoleprintf("");
+ 
+--- kiss.c
++++ kiss.c
+@@ -1485,7 +1485,7 @@
+ 				}	
+ 			}
+ 			else
+-				Debugprintf("Polled KISS - response from wrong address - Polled %d Reponse %d",  
++				Debugprintf("Polled KISS - response from wrong address - Polled %d Response %d",  
+ 					KISS->POLLPOINTER->OURCTRL, (Port->RXMSG[0] & 0xf0));
+ 
+ 			goto SeeifMore;				// SEE IF ANYTHING ELSE
+--- templatedefs.c
++++ templatedefs.c
+@@ -1165,7 +1165,7 @@
+ 		"Send Non-delivery Notifications<br>\r\n"
+ 		"for P and T messages <input %sname=\"SendND\" value=\"SendND\" type=\"checkbox\" /><br>\r\n"
+ 		"  <br />\r\n"
+-		"Supress Mailing of<br>\r\n"
++		"Suppress Mailing of<br>\r\n"
+ 		"Housekeeping Result <input %sname=\"NoMail\" value=\"Yes\" type=\"checkbox\"><br><br>\r\n"
+ 		"Generate Traffic Report<input %sname=\"GenTraffic\" value=\"Yes\" type=\"checkbox\"><br><br>\r\n"
+ 		"<div style=\"text-align: center;\"><input class='btn'  name=RunNow value=\"Run Housekeeping\" type=submit class='btn'></div>\r\n"
+@@ -1454,7 +1454,7 @@
+ 		"<div style=\"text-align: left; width: 680px; margin: auto;\">The Nodes to link to box defines which other Chat Nodes should be connected to, or from which "
+ 		"connections may be accepted. The format is ALIAS:CALL, eg BPQCHT:G8BPQ-4. 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"
++		"separated by |, eg NOTCHT:G8BPQ-4|C 3 GM8BPQ-9|CHAT"
+ 
+ 		"<br><br>The Callsign of the Chat Node is not defined here - it is obtained from the bpq32.cfg APPLICATION line corresponding to the Chat Appl Number.<br>\r\n"
+ 		"<br></div>\n"
+--- WebMail.c
++++ WebMail.c
+@@ -2020,7 +2020,7 @@
+ 			"document.getElementById('myform').action = '/WebMail/QuoteOriginal' + '?%s';"
+ 			" document.getElementById('myform').submit();}</script>"
+ 			"<input type=button class='btn' onclick='myfunc()' "
+-			"value='Include Orignal Msg'>";
++			"value='Include Original Msg'>";
+ 		
+ 		char Temp[1024];
+ 		char ReplyAddr[128];

6pack.c

@@ -1412,11 +1412,10 @@ VOID * SIXPACKExtInit(EXTPORTDATA * PortEntry)
 	TNC->sixPack = zalloc(sizeof(struct sixPackTNCInfo));
 
 	TNC->Port = port;
-	TNC->PortRecord = PortEntry;
+	TNC->Hardware = H_SIXPACK;
-	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

@@ -382,8 +382,7 @@ VOID * AEAExtInit(EXTPORTDATA *  PortEntry)
 
 	TNC->Port = port;
 
-	TNC->PortRecord = PortEntry;
+	TNC->Hardware = H_AEA;
-	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_AEA;
 
 	TNC->TEXTMODE = FALSE;
 
@@ -391,6 +390,8 @@ VOID * AEAExtInit(EXTPORTDATA *  PortEntry)
 
 	TNC->InitScript = _strupr(TNC->InitScript);
 
+	TNC->PortRecord = PortEntry;
+
 	if (PortEntry->PORTCONTROL.PORTCALL[0] == 0)
 	{
 		memcpy(TNC->NodeCall, MYNODECALL, 10);

AGWAPI.c

@@ -1142,7 +1142,6 @@ 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
@@ -1197,7 +1196,7 @@ int ProcessAGWCommand(struct AGWSocketConnectionInfo * sockptr)
 
 			conport=GetPortNumber(VisiblePortToRealPort[key[0]-48]);
 
-			n = sprintf(ConnectMsg,"C %d %s",conport,ToCall);
+			sprintf(ConnectMsg,"C %d %s",conport,ToCall);
 
 			// if 'v' command add digis
 
@@ -1212,7 +1211,7 @@ int ProcessAGWCommand(struct AGWSocketConnectionInfo * sockptr)
 
 				while(nDigis--)
 				{
-					n += sprintf(&ConnectMsg[n], " %s", Digis);
+					sprintf(ConnectMsg, "%s, %s", ConnectMsg, Digis);
 					Digis += 10;
 				}
 			}

AISCommon.c

@@ -760,7 +760,7 @@ void SaveVesselDataBase()
 
 void LoadNavAidDataBase()
 {
-	int i, n, count;
+	int i;
 
 	FILE *file;
 	char buf[256];
@@ -793,12 +793,10 @@ 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[count] = navptr;
+		NavRecords[i] = navptr;
 		memset(navptr, 0, sizeof(struct NAVAIDRECORD));
 
 		fgets(buf, 255, file);
@@ -809,19 +807,6 @@ 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);
 
@@ -835,7 +820,6 @@ void LoadNavAidDataBase()
 		navptr->TimeLastUpdated = atoi(token);
 	}
 
-	NavAidCount = count;
 	fclose(file);
 }
 

APRSCode.c

@@ -553,8 +553,6 @@ int APRSWriteLog(char * msg)
 	UCHAR Value[MAX_PATH];
 	time_t T;
 	struct tm * tm;
-	int n;
-
 
 	if (LogAPRSIS == 0)
 		return 0;
@@ -576,9 +574,8 @@ int APRSWriteLog(char * msg)
 		strcat(Value, "logs/APRS_");
 	}
 
-	n = strlen(Value);
+	sprintf(Value, "%s%02d%02d%02d.log", 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;

APRSCode.c.rej

@@ -0,0 +1,139 @@
+--- APRSCode.c
++++ APRSCode.c
+@@ -3674,7 +3674,7 @@
+ 			if (ptr1)
+ 				*ptr1 = 0;
+ 
+-//			Debugprintf("Duplicate Message supressed %s", Msg);
++//			Debugprintf("Duplicate Message suppressed %s", Msg);
+ 			return TRUE;					// Duplicate
+ 		}
+ 	}
+--- BPQChat.rc
++++ BPQChat.rc
+@@ -162,7 +162,7 @@
+                     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 separated by |, eg NOTCHT:G8BPQ-4|C 3 GM8BPQ-9|CHAT",
+                     IDC_STATIC,9,52,355,24
+ END
+ 
+--- BPQMail.rc
++++ BPQMail.rc
+@@ -1045,7 +1045,7 @@
+     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",
+--- HanksRT.c
++++ HanksRT.c
+@@ -1186,7 +1186,7 @@
+ 			// 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
+ 		}
+--- RigControl.c
++++ RigControl.c
+@@ -8385,7 +8385,7 @@
+ 
+ 	switch (Msg[0])
+ 	{
+-	case 'f':			// Get Freqency
++	case 'f':			// Get Frequency
+ 
+ 		HLGetFreq(Sock, RIG, sep);
+ 		return 0;
+--- UZ7HODrv.c
++++ UZ7HODrv.c
+@@ -374,7 +374,7 @@
+ 	{
+ 		// Read Freq
+ 
+-		buffptr->Len = sprintf((UCHAR *)&buffptr->Data[0], "UZ7HO} Modem Freqency %d\r", AGW->CenterFreq);
++		buffptr->Len = sprintf((UCHAR *)&buffptr->Data[0], "UZ7HO} Modem Frequency %d\r", AGW->CenterFreq);
+ 		return 1;
+ 	}
+ 
+@@ -382,7 +382,7 @@
+ 
+ 	if (AGW->CenterFreq == 0)
+ 	{
+-		buffptr->Len = sprintf((UCHAR *)&buffptr->Data[0], "UZ7HO} Invalid Modem Freqency\r");
++		buffptr->Len = sprintf((UCHAR *)&buffptr->Data[0], "UZ7HO} Invalid Modem Frequency\r");
+ 		return 1;
+ 	}
+ 
+--- WinRPRHelper.c
++++ WinRPRHelper.c
+@@ -111,7 +111,7 @@
+ 
+ 	if (argc < 3)
+ 	{
+-		printf ("Missing paramters - you need COM port and IP Address and rigctl port of BPQ, eg \r\n"
++		printf ("Missing parameters - you need COM port and IP Address and rigctl port of BPQ, eg \r\n"
+ 			"  WinRPRHelper com10 192.168.1.64:4532\r\n\r\n"
+ 			"Press any key to exit\r\n");
+ 
+--- config.c
++++ config.c
+@@ -649,7 +649,7 @@
+ 	if (LOCATOR[0] == 0 && LocSpecified == 0 && RFOnly == 0)
+ 	{
+ 		Consoleprintf("");
+-		Consoleprintf("Please enter a LOCATOR statment in your BPQ32.cfg");
++		Consoleprintf("Please enter a LOCATOR statement in your BPQ32.cfg");
+ 		Consoleprintf("If you really don't want to be on the Node Map you can enter LOCATOR=NONE");
+ 		Consoleprintf("");
+ 
+--- kiss.c
++++ kiss.c
+@@ -1485,7 +1485,7 @@
+ 				}	
+ 			}
+ 			else
+-				Debugprintf("Polled KISS - response from wrong address - Polled %d Reponse %d",  
++				Debugprintf("Polled KISS - response from wrong address - Polled %d Response %d",  
+ 					KISS->POLLPOINTER->OURCTRL, (Port->RXMSG[0] & 0xf0));
+ 
+ 			goto SeeifMore;				// SEE IF ANYTHING ELSE
+--- templatedefs.c
++++ templatedefs.c
+@@ -1165,7 +1165,7 @@
+ 		"Send Non-delivery Notifications<br>\r\n"
+ 		"for P and T messages <input %sname=\"SendND\" value=\"SendND\" type=\"checkbox\" /><br>\r\n"
+ 		"  <br />\r\n"
+-		"Supress Mailing of<br>\r\n"
++		"Suppress Mailing of<br>\r\n"
+ 		"Housekeeping Result <input %sname=\"NoMail\" value=\"Yes\" type=\"checkbox\"><br><br>\r\n"
+ 		"Generate Traffic Report<input %sname=\"GenTraffic\" value=\"Yes\" type=\"checkbox\"><br><br>\r\n"
+ 		"<div style=\"text-align: center;\"><input class='btn'  name=RunNow value=\"Run Housekeeping\" type=submit class='btn'></div>\r\n"
+@@ -1454,7 +1454,7 @@
+ 		"<div style=\"text-align: left; width: 680px; margin: auto;\">The Nodes to link to box defines which other Chat Nodes should be connected to, or from which "
+ 		"connections may be accepted. The format is ALIAS:CALL, eg BPQCHT:G8BPQ-4. 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"
++		"separated by |, eg NOTCHT:G8BPQ-4|C 3 GM8BPQ-9|CHAT"
+ 
+ 		"<br><br>The Callsign of the Chat Node is not defined here - it is obtained from the bpq32.cfg APPLICATION line corresponding to the Chat Appl Number.<br>\r\n"
+ 		"<br></div>\n"
+--- WebMail.c
++++ WebMail.c
+@@ -2020,7 +2020,7 @@
+ 			"document.getElementById('myform').action = '/WebMail/QuoteOriginal' + '?%s';"
+ 			" document.getElementById('myform').submit();}</script>"
+ 			"<input type=button class='btn' onclick='myfunc()' "
+-			"value='Include Orignal Msg'>";
++			"value='Include Original Msg'>";
+ 		
+ 		char Temp[1024];
+ 		char ReplyAddr[128];

ARDOP.c

@@ -136,7 +136,6 @@ 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;
 
@@ -889,8 +888,7 @@ 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->ReportDISC = 1;
+				STREAM->Disconnecting = TRUE;
-				STREAM->AttachTime = 0;
 			}
 		}
 
@@ -1494,10 +1492,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 
 			if (_memicmp(&buff->L2DATA[0], "RADIO ", 6) == 0)
 			{
-				char cmd[56];
+				sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &buff->L2DATA[6]);
-
-				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]))
 				{
@@ -1984,7 +1979,6 @@ VOID * ARDOPExtInit(EXTPORTDATA * PortEntry)
 	}
 
 	TNC->Port = port;
-	TNC->PortRecord = PortEntry;
 
 	if (TNC->LogPath)
 		ARDOPOpenLogFiles(TNC); 
@@ -1997,7 +1991,7 @@ VOID * ARDOPExtInit(EXTPORTDATA * PortEntry)
 	if (TNC->ProgramPath)
 		TNC->WeStartedTNC = RestartTNC(TNC);
 
-	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_ARDOP;
+	TNC->Hardware = H_ARDOP;
 
 	if (TNC->BusyWait == 0)
 		TNC->BusyWait = 10;
@@ -2005,6 +1999,7 @@ 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);
@@ -2287,11 +2282,11 @@ VOID TNCLost(struct TNCINFO * TNC)
 		}
 
 		if (STREAM->Attached)
+		{
+			STREAM->Connected = FALSE;
+			STREAM->Connecting = FALSE;
 			STREAM->ReportDISC = TRUE;
-
+		}
-		STREAM->Connected = FALSE;
-		STREAM->Connecting = FALSE;
-
 	}
 }
 
@@ -3323,9 +3318,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)
@@ -5958,7 +5953,7 @@ VOID ARAXINIT(struct PORTCONTROL * PORT)
 	char Msg[80] = "";
 	
 	memcpy(Msg, PORT->PORTDESCRIPTION, 30);
-	strcat(Msg, "\n);
+	sprintf(Msg, "%s\n", Msg);
 		
 	WritetoConsoleLocal(Msg);
 }

BBSUtilities.c

@@ -5810,12 +5810,12 @@ VOID ProcessMsgLine(CIRCUIT * conn, struct UserInfo * user, char* Buffer, int ms
 						}
 						else
 						{
-							ToLen = sprintf(&ToString[strlen(ToString)], "To: %s\r\n", Addr);
+							ToLen = sprintf(ToString, "%sTo: %s\r\n", ToString, Addr);
 							continue;
 						}
 					}
 
-					ToLen = sprintf(&ToString[strlen(ToString)], "To: %s@%s\r\n", Addr, Via);
+					ToLen = sprintf(ToString, "%sTo: %s@%s\r\n", ToString, Addr, Via);
 					continue;
 				}
 
@@ -5833,7 +5833,7 @@ VOID ProcessMsgLine(CIRCUIT * conn, struct UserInfo * user, char* Buffer, int ms
 					}
 					else
 					{
-						ToLen = sprintf(&ToString[strlen(ToString)], "To: %s\r\n", Addr);
+						ToLen = sprintf(ToString, "%sTo: %s\r\n", ToString, Addr);
 
 						// Add to B2 Message for RMS
 

BPQINP3.c

@@ -932,7 +932,7 @@ int SendRIPTimer()
 
 				// Delay more if Locked - they could be retrying for a long time
 
-				if ((Route->NEIGHBOUR_FLAG))	 // LOCKED ROUTE
+				if ((Route->NEIGHBOUR_FLAG & 1))	 // LOCKED ROUTE
 					INP3Delay = 1200;
 				else
 					INP3Delay = 600;

BPQMail.c

@@ -1147,7 +1147,6 @@
 //	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"

Bpq32.c

@@ -1243,18 +1243,10 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 //	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)
+//	Run M0LTE Map repoorting in a separate thread (59)
-//	Add RHP support for WhatsPac (59)
+//	Add support fro WhatsPac (59)
-//  Add timestamps to LIS monitor (60)
+// Add timestamps to LIS monitor
-//	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)
 
 
 
@@ -6120,14 +6112,13 @@ DllExport BOOL APIENTRY SaveReg(char * KeyIn, HANDLE hFile)
 						{
 							if (len > 76)
 							{
-								len += sprintf(&RegLine[len], "\\\r\n", RegLine);
+								len = sprintf(RegLine, "%s\\\r\n", RegLine);
-								strcat(RegLine, "\\\r\n");
 								WriteFile(hFile, RegLine, len, &written, NULL);
 								strcpy(RegLine, "  ");
 								len = 2;
 							}
 
-							len += sprintf(&RegLine[len], "%02x,", Value[k]);
+							len = sprintf(RegLine, "%s%02x,", RegLine, Value[k]);
 						}
 						RegLine[--len] = 0x0d;
 						RegLine[++len] = 0x0a;	
@@ -6153,20 +6144,19 @@ DllExport BOOL APIENTRY SaveReg(char * KeyIn, HANDLE hFile)
 						{
 							if (len > 76)
 							{
-								len += sprintf(RegLine[len], "\\\r\n");
+								len = sprintf(RegLine, "%s\\\r\n", RegLine);
 								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[len], "\\\r\n");
+								len = sprintf(RegLine, "%s\\\r\n", RegLine);
 								WriteFile(hFile, RegLine, len, &written, NULL);
 								strcpy(RegLine, "  ");
 							}
-							len += sprintf(&RegLine[len], "00,");
+							len = sprintf(RegLine, "%s00,", RegLine);
 						}
 
 						RegLine[--len] = 0x0d;

Cmd.c

@@ -1516,7 +1516,7 @@ VOID CMDP00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct C
 char *  DisplayRoute(TRANSPORTENTRY * Session, char * Bufferptr, struct ROUTE * Routes, char Verbose)
 {
 	char Normcall[10];
-	char locked[4] = "   ";
+	char locked[] = " ! ";
 	int NodeCount;
 	int Percent = 0;
 	char PercentString[20];
@@ -1530,16 +1530,11 @@ char *  DisplayRoute(TRANSPORTENTRY * Session, char * Bufferptr, struct ROUTE *
 
 	Normcall[9]=0;
 
-	if (Routes->NEIGHBOUR_FLAG == LOCKEDBYCONFIG)
+	if ((Routes->NEIGHBOUR_FLAG & 1) == 1)
 		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)
@@ -1683,7 +1678,7 @@ ROUTEUPDATE:
 		{
 			// Toggle Lock
 
-			Routes->NEIGHBOUR_FLAG ^= LOCKEDBYSYSOP;	// FLIP LOCKED BIT
+			Routes->NEIGHBOUR_FLAG ^= 1;	// FLIP LOCKED BIT
 			goto Displayit;
 		}
 
@@ -1702,7 +1697,7 @@ ROUTEUPDATE:
 		{
 			// Toggle Lock
 
-			Routes->NEIGHBOUR_FLAG ^= LOCKEDBYSYSOP;	// FLIP LOCKED BIT
+			Routes->NEIGHBOUR_FLAG ^= 1;	// FLIP LOCKED BIT
 			goto Displayit;
 		}
 	}
@@ -1716,6 +1711,167 @@ 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));
@@ -1733,7 +1889,6 @@ VOID LISTENCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struc
 	char * ptr, *Context;
 	struct PORTCONTROL * PORT = NULL;
 	char ListenPortList[128] = "";
-	int len = 0;
 
 	ptr = strtok_s(CmdTail, " ,", &Context);
 
@@ -1786,7 +1941,7 @@ VOID LISTENCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struc
 			}
 		}
 
-		len += sprintf(&ListenPortList[len], " %d", Port);
+		sprintf(ListenPortList, "%s %d", ListenPortList, Port);
 
 		ListenMask |= ((uint64_t)1 << (Port - 1));
 	}
@@ -3989,7 +4144,7 @@ VOID ATTACHCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struc
 
 	if (ret & 0x8000)			// Disconnecting
 	{
-		Bufferptr = Cmdprintf(Session, Bufferptr, "Error - Port in use (Disconnecting)\r");
+		Bufferptr = Cmdprintf(Session, Bufferptr, "Error - Port in use\r");
 		SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 		return;
 	}
@@ -4040,25 +4195,14 @@ VOID ATTACHCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struc
 
 
 
-	if (EXTPORT->ATTACHEDSESSIONS[sess])
+	if (EXTPORT->ATTACHEDSESSIONS[sess] || 	PORT->PortSuspended)
 	{
 		// In use
 
-		Bufferptr = Cmdprintf(Session, Bufferptr, "Error - Port in use (Session Attached\r");
+		Bufferptr = Cmdprintf(Session, Bufferptr, "Error - Port in use\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);

CommonCode.c

@@ -18,6 +18,7 @@ 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")
@@ -913,7 +914,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');
 	}
@@ -1492,8 +1493,8 @@ int SendMsgEx(int stream, char * msg, int len, int GetSem)
 		if (QCOUNT < 50)
 			return 0;					// Dont want to run out
 
-		if (GetSem)
+			if (GetSem)
-			GetSemaphore(&Semaphore, 10);
+				GetSemaphore(&Semaphore, 10);
 
 		if ((MSG = GetBuff()) == 0)
 		{
@@ -1622,7 +1623,7 @@ DllExport int APIENTRY SendRaw(int port, char * msg, int len)
 
 	MSG->LENGTH = len + MSGHDDRLEN;
 
-	if (PORT->PROTOCOL == 10 && PORT->HWType != H_KISSHF)		 // PACTOR/WINMOR Style
+	if (PORT->PROTOCOL == 10 && PORT->TNC && PORT->TNC->Hardware != H_KISSHF)		 // PACTOR/WINMOR Style
 	{
 		//	Pactor Style. Probably will only be used for Tracker unless we do APRS over V4 or WINMOR
 
@@ -2686,14 +2687,6 @@ 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;
 
@@ -2717,7 +2710,7 @@ int DoRoutes()
 				digis[0] = 0;
 
 			len=sprintf(line,
-					"ROUTE ADD %s %d %d %s %d %d %d %d %d %c\n",
+					"ROUTE ADD %s %d %d %s %d %d %d %d %d\n",
 					Normcall,
 					Routes->NEIGHBOUR_PORT,
 					Routes->NEIGHBOUR_QUAL, digis,
@@ -2725,8 +2718,7 @@ int DoRoutes()
 					Routes->NBOUR_FRACK,
 					Routes->NBOUR_PACLEN,
 					Routes->INP3Node | (Routes->NoKeepAlive << 2),
-					Routes->OtherendsRouteQual,
+					Routes->OtherendsRouteQual);
-					(Routes->NEIGHBOUR_FLAG & LOCKEDBYSYSOP)?'!':' ');
 
 					fputs(line, file);
 		}
@@ -4792,7 +4784,6 @@ void GetPortCTEXT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, st
 	struct stat STAT;
 	struct PORTCONTROL * PORT = PORTTABLE;
 	char PortList[256] = "";
-	int len = 0;
 
 	while (PORT)
 	{
@@ -4834,7 +4825,7 @@ void GetPortCTEXT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, st
 				*ptr = '\r';
 
 
-			len += sprintf(&PortList[len], ",%d", PORT->PORTNUMBER);
+			sprintf(PortList, "%s,%d", PortList, PORT->PORTNUMBER);
 		}
 
 		PORT = PORT->PORTPOINTER;

FLDigi.c

@@ -538,11 +538,7 @@ pollloop:
 
 			if (_memicmp(&buff->L2DATA[0], "RADIO ", 6) == 0)
 			{
-				char cmd[56];
+				sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &buff->L2DATA[6]);
-
-				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]))
 				{
@@ -1184,6 +1180,7 @@ VOID * FLDigiExtInit(EXTPORTDATA * PortEntry)
 	}
 
 	TNC->Port = port;
+
 	TNC->PortRecord = PortEntry;
 
 	if (PortEntry->PORTCONTROL.PORTCALL[0] == 0)
@@ -1214,7 +1211,7 @@ VOID * FLDigiExtInit(EXTPORTDATA * PortEntry)
 	ptr=strchr(TNC->NodeCall, ' ');
 	if (ptr) *(ptr) = 0;					// Null Terminate
 
-	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_FLDIGI;
+	TNC->Hardware = H_FLDIGI;
 
 	if (TNC->BusyWait == 0)
 		TNC->BusyWait = 10;

FreeDATA.c

@@ -740,10 +740,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 
 		if (_memicmp(&buff->L2DATA[0], "RADIO ", 6) == 0)
 		{
-			char cmd[56];
+			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &buff->L2DATA[6]);
-
-			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]))
 			{
@@ -1396,14 +1393,14 @@ VOID * FreeDataExtInit(EXTPORTDATA * PortEntry)
 	Consoleprintf("FreeData Host %s %d", TNC->HostName, TNC->TCPPort);
 
 	TNC->Port = port;
-	TNC->PortRecord = PortEntry;
+	TNC->Hardware = H_FREEDATA;
-	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);
@@ -4142,7 +4139,7 @@ void buildParamString(struct TNCINFO * TNC, char * line)
 		FDI->TuningRange * -1.0, FDI->TuningRange * 1.0, FDI->TXLevel);
 
 	if (FDI->hamlibHost)
-		sprintf(&line[strlen(line)], " --rigctld_ip %s --rigctld_port %d", FDI->hamlibHost, FDI->hamlibPort);
+		sprintf(line, "%s --rigctld_ip %s --rigctld_port %d", line, FDI->hamlibHost, FDI->hamlibPort);
 
 	if (FDI->LimitBandWidth)
 		strcat(line, " --500hz");

HALDriver.c

@@ -499,15 +499,15 @@ VOID * HALExtInit(EXTPORTDATA *  PortEntry)
 	}
 	
 	TNC->Port = port;
-	TNC->PortRecord = PortEntry;
 
-	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_HAL;
+	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)
 	{

HFCommon.c

@@ -336,8 +336,7 @@ 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,
+BOOL CreatePactorWindow(struct TNCINFO * TNC, char * ClassName, char * WindowTitle, int RigControlRow, WNDPROC WndProc, int Width, int Height, VOID ForcedCloseProc())
-						VOID ForcedCloseProc(struct TNCINFO * TNC, int Stream))
 {
 #ifdef LINBPQ
 	return FALSE;

HSMODEM.c

@@ -648,11 +648,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 
 		if (_memicmp(&buff->L2DATA[0], "RADIO ", 6) == 0)
 		{
-			char cmd[56];
+			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &buff->L2DATA[6]);
-
-			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]))
 			{
@@ -1181,9 +1177,9 @@ VOID * HSMODEMExtInit(EXTPORTDATA * PortEntry)
 	Consoleprintf("HSMODEM Host %s %d", TNC->HostName, TNC->TCPPort);
 
 	TNC->Port = port;
-	TNC->PortRecord = PortEntry;
+	TNC->Hardware = H_HSMODEM;
 
-	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_HSMODEM;
+	TNC->PortRecord = PortEntry;
 
 	if (PortEntry->PORTCONTROL.PORTCALL[0] == 0)
 		memcpy(TNC->NodeCall, MYNODECALL, 10);

HTTPcode.c

@@ -71,8 +71,6 @@ 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;
@@ -145,7 +143,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%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 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 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>"
@@ -2414,10 +2412,7 @@ doHeader:
 				if (Session == 0)
 					Session = &Dummy;
 
-				if (LOCAL)
+				Session->TNC = LOCAL;		// TNC is only used on Web Terminal Sessions so can reuse as LOCAL flag
-					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);
@@ -3801,7 +3796,7 @@ doHeader:
 				int MaxRoutes = MAXNEIGHBOURS;
 				int count;
 				char Normcall[10];
-				char locked[4] = " ";
+				char locked;
 				int NodeCount;
 				int Percent = 0;
 				int Iframes, Retries;
@@ -3817,14 +3812,10 @@ doHeader:
 						int len = ConvFromAX25(Routes->NEIGHBOUR_CALL, Normcall);
 						Normcall[len]=0;
 
-						if (Routes->NEIGHBOUR_FLAG == LOCKEDBYCONFIG)
+						if ((Routes->NEIGHBOUR_FLAG & 1) == 1)
-							strcpy(locked, "!");
+							locked = '!';
-						else if (Routes->NEIGHBOUR_FLAG == LOCKEDBYSYSOP)
-							strcpy(locked, "!!");
-						else if (Routes->NEIGHBOUR_FLAG == LOCKEDBYSYSOP + LOCKEDBYCONFIG)
-							strcpy(locked, "!!!");
 						else
-							strcpy(locked, " ");
+							locked = ' ';
 
 						NodeCount = COUNTNODES(Routes);
 
@@ -4331,7 +4322,7 @@ int ProcessMailAPISignon(struct TCPINFO * TCP, char * MsgPtr, char * Appl, char
 {
 	int ReplyLen = 0;
 	char * input = strstr(MsgPtr, "\r\n\r\n");	// End of headers
-	char * user, * password;
+	char * user, * password, * Key;
 	struct HTTPConnectionInfo * NewSession;
 	int i;
 	struct UserRec * USER;
@@ -4380,7 +4371,7 @@ int ProcessMailAPISignon(struct TCPINFO * TCP, char * MsgPtr, char * Appl, char
 
 		if (user && user[0] && password && password[0])
 		{
-			sprintf(&MsgPtr[strlen(MsgPtr)], "?%s&%s", user, password); 
+			sprintf(MsgPtr, "%s?%s&%s", MsgPtr, user, password); 
 		}
 	}
 

HanksRT.c

@@ -1860,7 +1860,7 @@ static void cn_dec(ChatCIRCUIT *circuit, CHATNODE *node)
 					__try
 					{
 #endif
-						len += sprintf(&line[len], " %p %s", cn->node, cn->node->alias);
+						len = sprintf(line, "%s %p %s", line, 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 = 0;
+	int     len;
 	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')
-		len = sprintf(line, "Here %-6.6s <-", OurNode);
+		sprintf(line, "Here %-6.6s <-", OurNode);
 	else
-		len = sprintf(line, "Here %-6.6s <-", OurAlias);
+		sprintf(line, "Here %-6.6s <-", OurAlias);
 
 	for (node = node_hd; node; node = node->next) if (node->refcnt)
 	{
 		if (Flag == 'c')
-			len += sprintf(&line[len], " %s", node->call);
+			len = sprintf(line, "%s %s", line, node->call);
 		else
-			len += sprintf(&line[len], " %s", node->alias);
+			len = sprintf(line, "%s %s", line, 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[len], " %s", cn->node->call);
+								len = sprintf(line, "%s %s", line, cn->node->call);
 							else
-								len += sprintf(&line[len], " %s", cn->node->alias);
+								len = sprintf(line, "%s %s", line, 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[len], " *PE* Corrupt Rec %x %x", cn, cn->node);}
+							{len = sprintf(line, "%s *PE* Corrupt Rec %x %x", line, cn, cn->node);}
 					}
 					else
-						len = sprintf(&line[len], " Corrupt Rec %x %x ", cn, cn->node);
+						len = sprintf(line, "%s Corrupt Rec %x %x ", line, cn, cn->node);
 				}
 			}
 			__except(EXCEPTION_EXECUTE_HANDLER)
-			{len += sprintf(&line[len], " *PE* Corrupt Rec %x %x ", cn, cn->node);}
+			{len = sprintf(line, "%s *PE* Corrupt Rec %x %x ", line, cn, cn->node);}
 #else
 			for (cn = circuit->hnode; cn; cn = cn->next)
 			{
 				if (cn->node && cn->node->alias)
 				{
 					if (Flag == 'c')
-						len += sprintf(&line[len], " %s", cn->node->call);
+						len = sprintf(line, "%s %s", line, cn->node->call);
 					else
-						len += sprintf(&line[len], " %s", cn->node->alias);
+						len = sprintf(line, "%s %s", line, 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[len], " Corrupt Rec %p %p ", cn, cn->node);
+					len = sprintf(line, "%s Corrupt Rec %p %p ", line, cn, cn->node);
 			}
 #endif
 			nprintf(conn, "%s\r", line);
@@ -3682,7 +3682,7 @@ VOID SendChatLinkStatus()
 			}
 		}
 
-		len += sprintf(&Msg[len], "%s %c ", link->call, '0' + link->flags);
+		len = sprintf(Msg, "%s%s %c ", Msg, link->call, '0' + link->flags);
 
 		if (len > 240)
 			break;

IPCode.c

@@ -5413,8 +5413,11 @@ VOID ProcessSNMPMessage(PIPMSG IPptr)
 	int Len;
 	PUDPMSG UDPptr = (PUDPMSG)&IPptr->Data;
 	UCHAR * Msg;
+	int Type;
+	int Length, ComLen;
+	int  IntVal;
 	UCHAR Reply[256];
-	int SendLen;
+	int PDULen, SendLen;
 	int Offset = 0;
 
 	Len = ntohs(IPptr->IPLENGTH);

KAMPactor.c

@@ -567,15 +567,15 @@ void * KAMExtInit(EXTPORTDATA * PortEntry)
 		return ExtProc;
 	}
 	TNC->Port = port;
-	TNC->PortRecord = PortEntry;
 
-	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_KAM;
+	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);

KISSHF.c

@@ -458,11 +458,7 @@ ok:
 	
 		if (_memicmp(txbuff, "RADIO ", 6) == 0)
 		{
-			char cmd[56];
+			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &txbuff[6]);
-
-			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]))
 			{
@@ -813,10 +809,10 @@ VOID * KISSHFExtInit(EXTPORTDATA * PortEntry)
 	}
 	
 	TNC->Port = port;
-	TNC->PortRecord = PortEntry;
+	TNC->Hardware = H_KISSHF;
-	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);

L2Code.c

@@ -759,7 +759,7 @@ VOID L2FORUS(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * Buff
 
 		NO_CTEXT = 1;
 		
-		if (ROUTE->NEIGHBOUR_FLAG && ROUTE->NEIGHBOUR_QUAL == 0)		// Locked, qual 0
+		if (ROUTE->NEIGHBOUR_FLAG == 1 && ROUTE->NEIGHBOUR_QUAL == 0)		// Locked, qual 0
 		{
 			ReleaseBuffer(Buffer);
 			return;

L3Code.c

@@ -319,13 +319,13 @@ VOID PROCESSNODEMESSAGE(MESSAGE * Msg, struct PORTCONTROL * PORT)
 
 	// if locked route with quality zero ignore
 
-	if ((ROUTE->NEIGHBOUR_FLAG))	 // LOCKED ROUTE
+	if ((ROUTE->NEIGHBOUR_FLAG & 1))	 // LOCKED ROUTE
 		if (ROUTE->NEIGHBOUR_QUAL == 0)
 			return;
 
 	//	If Ignoreunlocked set, ignore it not locked
 
-	if ((ROUTE->NEIGHBOUR_FLAG) == 0)	 // LOCKED ROUTE
+	if ((ROUTE->NEIGHBOUR_FLAG & 1) == 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 == 0)	 // Not LOCKED ROUTE
+	if ((ROUTE->NEIGHBOUR_FLAG & 1) == 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)				// Locked?
+		if (ROUTE->NEIGHBOUR_FLAG & 1)			// Locked?
 			continue;
 
 		if (ROUTE->NEIGHBOUR_LINK)				// Has an active Session

L4Code.c

@@ -38,22 +38,22 @@ 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(TRANSPORTENTRY * L4);
@@ -67,18 +67,12 @@ 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);
 
 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
@@ -347,17 +341,6 @@ 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
 
@@ -487,9 +470,6 @@ 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
@@ -520,53 +500,6 @@ 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
@@ -660,151 +593,8 @@ VOID L4BG()
 
 			if (L4->L4CIRCUITTYPE & SESSION)
 			{
-				//	Now support compressing NetRom Sessions.
+				SENDL4MESSAGE(L4, Msg);
-				//	We collect as much data as possible before compressing and re-packetizing
+				ReleaseBuffer(Msg);
-
-				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;
 			}
 
@@ -913,35 +703,12 @@ 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));
 }
 
@@ -1133,14 +900,10 @@ 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
 				}
@@ -1215,8 +978,6 @@ VOID L4TIMEOUT(TRANSPORTENTRY * L4)
 	{
 		//	RETRIED N2 TIMES - FAIL LINK
 
-		// if compressed session display stats
-
 		CloseSessionPartner(L4);	// SEND CLOSE TO PARTNER (IF PRESENT)
 		return;
 	}
@@ -1489,7 +1250,6 @@ VOID SENDL4DISC(TRANSPORTENTRY * Session)
 	MSG->LENGTH = (int)(&MSG->L4DATA[0] - (UCHAR *)MSG);
 
 	C_Q_ADD(&DEST->DEST_Q, (UINT *)MSG);
-
 }
 
 
@@ -1698,9 +1458,6 @@ 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++;
 	}
 
@@ -1776,7 +1533,7 @@ int FINDCIRCUIT(L3MESSAGEBUFFER * L3MSG, TRANSPORTENTRY ** REQL4, int * NewIndex
 	return FALSE;
 }
 
-void L3SWAPADDRESSES(L3MESSAGEBUFFER * L3MSG)
+VOID L3SWAPADDRESSES(L3MESSAGEBUFFER * L3MSG)
 {
 	//	EXCHANGE ORIGIN AND DEST
 
@@ -1791,7 +1548,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
@@ -1802,25 +1559,6 @@ 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)
 {
@@ -1835,9 +1573,8 @@ VOID SETUPNEWCIRCUIT(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG,
 	L4->CIRCUITID = NEXTID;
 
 	NEXTID++;
-		
+		if (NEXTID == 0)
-	if (NEXTID == 0)
+			NEXTID++;								// kEEP nON-ZERO
-		NEXTID++;								// kEEP nON-ZERO
 
 	L4->SESSIONT1 = L4T1;
 	
@@ -1860,18 +1597,10 @@ VOID SETUPNEWCIRCUIT(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG,
 
 	//	GET BPQ EXTENDED CONNECT PARAMS IF PRESENT
 
-	if (L3MSG->LENGTH  == MSGHDDRLEN + 38 || L3MSG->LENGTH == MSGHDDRLEN + 39)
+	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;	
@@ -1929,7 +1658,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)
@@ -2015,45 +1744,19 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 		
 	//	OTHERS NEED A SESSION
 
-	if (Opcode == L4RESET)
+	L4 = &L4TABLE[L3MSG->L4INDEX];
+
+	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 (L3MSG->L4INDEX < MAXCIRCUITS)
+	if ((L4->L4CIRCUITTYPE & SESSION) == 0)
-		L4 = &L4TABLE[L3MSG->L4INDEX];
-
-	// 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
+		// Not an L4 Session - must be an old connection
+
+		ReleaseBuffer(L3MSG);
 		return;
 	}
 
@@ -2071,12 +1774,6 @@ 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
 		}
@@ -2143,13 +1840,13 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 
 		// DISCONNECT REQUEST
 
-		L3MSG->L4INDEX = L4->FARINDEX;
+		 L3MSG->L4INDEX = L4->FARINDEX;
-		L3MSG->L4ID = L4->FARID;
+		 L3MSG->L4ID = L4->FARID;
 		 
-		L3MSG->L4FLAGS = L4DACK;
+		 L3MSG->L4FLAGS = L4DACK;
 
-		L3SWAPADDRESSES(L3MSG);				// EXCHANGE SOURCE AND DEST
+		 L3SWAPADDRESSES(L3MSG);				// EXCHANGE SOURCE AND DEST
-		L3MSG->L3TTL = L3LIVES;
+		 L3MSG->L3TTL = L3LIVES;
 
 		TNC = LINK->LINKPORT->TNC;
 
@@ -2158,8 +1855,8 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 		else
 			C_Q_ADD(&LINK->TX_Q, L3MSG);
 
-		CloseSessionPartner(L4);				// SEND CLOSE TO PARTNER (IF PRESENT)
+		 CloseSessionPartner(L4);				// SEND CLOSE TO PARTNER (IF PRESENT)
-		return;
+		 return;
 	
 	case L4DACK:
 	
@@ -2177,19 +1874,6 @@ 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
@@ -2214,7 +1898,7 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 			// FRAME IS A REPEAT
 
 			Call[ConvFromAX25(L3MSG->L3SRCE, Call)] = 0;
-			Debugprintf("L4 Discarding repeated frame seq %d from %s", L3MSG->L4TXNO, Call);
+			Debugprintf("Discarding repeated frame seq %d from %s", L3MSG->L4TXNO, Call);
 
 			L4->L4ACKREQ = 1;
 			ReleaseBuffer(L3MSG);
@@ -2227,14 +1911,15 @@ 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("L4 Out Of Seq saving seq %d from %s", L3MSG->L4TXNO, Call);
+			Debugprintf("saving seq %d from %s", L3MSG->L4TXNO, Call);
 
 			while (Saved)
 			{
@@ -2242,7 +1927,7 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 				{
 					//	ALREADY HAVE A COPY - DISCARD IT
 			
-					Debugprintf("L4 Already have seq %d - discarding", L3MSG->L4TXNO);
+					Debugprintf("Already have seq %d - discarding", L3MSG->L4TXNO);
 					ReleaseBuffer(L3MSG);
 					return;
 				}
@@ -2252,6 +1937,7 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 
 			C_Q_ADD(&L4->L4RESEQ_Q, L3MSG);		// ADD TO CHAIN
 			return;
+*/
 		}
 
 		// Frame is OK
@@ -2280,122 +1966,15 @@ L4INFO_OK:
 
 		L3MSG->L3PID = 0xF0;				// Normal Data PID
 
-		// if compressed, expand
+		memmove(L3MSG->L3SRCE, L3MSG->L4DATA, L3MSG->LENGTH - (4 + sizeof(void *)));
 
-		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;
-
-			// May be more thsn one packet
-
-			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);
 
+		L4->L4ACKREQ = L4DELAY;				// SEND INFO ACK AFTER L4DELAY (UNLESS I FRAME SENT) 
+
+		IFRM150(L4, (PDATAMESSAGE)L3MSG);	// CHECK IF SETTING UP AND PASS ON
 
 		// See if anything on reseq Q to process
-checkReseq:
 
 		if (L4->L4RESEQ_Q == 0)
 			return;
@@ -2414,11 +1993,11 @@ checkReseq:
 				OLDFRAMES++;			// COUNT FOR STATS
 	
 				L3MSG = Saved;
-				Debugprintf("L4 Processing Saved Message %d Address %x", L4->RXSEQNO, L3MSG);
+				Debugprintf("Processing Saved Message %d Address %x", L4->RXSEQNO, L3MSG);
 				goto L4INFO_OK;
 			}
 
-			Debugprintf("L4 Message %d %x still on Reseq Queue", Saved->L4TXNO, Saved);
+			Debugprintf("Message %d %x still on Reseq Queue", Saved->L4TXNO, Saved);
 
 			Prev = &Saved;
 			Saved = Saved->Next;
@@ -2431,9 +2010,7 @@ checkReseq:
 		ACKFRAMES(L3MSG, L4, L3MSG->L4RXNO);
 		REFRESHROUTE(L4);
 
-		ReleaseBuffer(L3MSG);
+		// Drop Through
-		return;
-
 	}
 
 	// Unrecognised - Ignore
@@ -2489,14 +2066,10 @@ 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;
-					if (DEST->DEST_RTT == 0)
+				else
-						DEST->DEST_RTT = RTT;
+					DEST->DEST_RTT = ((DEST->DEST_RTT * 9) + RTT) /10;	// 90% Old + New
-					else
-						DEST->DEST_RTT = ((DEST->DEST_RTT * 9) + RTT) /10;	// 90% Old + New
-				}
-				L4->RTT_TIMER = 0;
 			}
 		}
 
@@ -2533,7 +2106,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 busy unless NAK received
+			return;						// Dont send while biust unless NAC received
 	}
 
 	if (L3MSG->L4FLAGS & L4NAK)
@@ -2561,6 +2134,17 @@ VOID ACKFRAMES(L3MESSAGEBUFFER * L3MSG, TRANSPORTENTRY * L4, int NR)
 
 
 
+
+
+
+
+
+
+
+
+
+
+
 VOID SENDL4IACK(TRANSPORTENTRY * Session)
 {
 	//	SEND INFO ACK
@@ -2584,7 +2168,6 @@ VOID SENDL4IACK(TRANSPORTENTRY * Session)
 	MSG->L4TXNO = 0;
 
 	
-
 	MSG->L4RXNO = Session->RXSEQNO;
 	Session->L4LASTACKED = Session->RXSEQNO;	// SAVE LAST NUMBER ACKED
 
@@ -2592,10 +2175,7 @@ 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);
-
 }
 
 

MULTIPSK.c

@@ -407,10 +407,7 @@ static size_t ExtProc(int fn, int port,  PDATAMESSAGE buff)
 
 			if (_memicmp(buff->L2DATA, "RADIO ", 6) == 0)
 			{
-				char cmd[56];
+				sprintf(buff->L2DATA, "%d %s", TNC->Port, &buff->L2DATA[6]);
-
-				strcpy(cmd, &buff->L2DATA[6]);
-				sprintf(buff->L2DATA, "%d %s", TNC->Port, cmd);
 
 				if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, buff->L2DATA))
 				{
@@ -713,7 +710,7 @@ void * MPSKExtInit(EXTPORTDATA * PortEntry)
 	ptr=strchr(TNC->NodeCall, ' ');
 	if (ptr) *(ptr) = 0;					// Null Terminate
 
-	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_MPSK;
+	TNC->Hardware = H_MPSK;
 
 	MPSKChannel[port] = PortEntry->PORTCONTROL.CHANNELNUM-65;
 	
@@ -1542,7 +1539,7 @@ VOID CloseComplete(struct TNCINFO * TNC, int Stream)
 		sprintf(Cmd, "%cDIGITAL MODE %s\x1b", '\x1a', TNC->MPSKInfo->DefaultMode);
 
 	if (TNC->MPSKInfo->Beacon)
-		sprintf(&Cmd[strlen(Cmd)], "%cBEACON_ARQ_FAE\x1b", '\x1a');
+		sprintf(Cmd, "%s%cBEACON_ARQ_FAE\x1b", Cmd, '\x1a');
 	
 	Len = strlen(Cmd);
 

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[strlen(ToString)], "To: %s\r\n", &Addr[4]);
+						ToLen = sprintf(ToString, "%sTo: %s\r\n", ToString, &Addr[4]);
 						*sockptr->RecpTo[i] = 0;		// So we dont create individual one later
 						continue;
 					}
 
-					ToLen = sprintf(&ToString[strlen(ToString)], "To: %s@%s\r\n", &Addr[4], Via);
+					ToLen = sprintf(ToString, "%sTo: %s@%s\r\n", ToString, &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[strlen(ToString)], "To: %s\r\n", Addr);
+					ToLen = sprintf(ToString, "%sTo: %s\r\n", ToString, Addr);
 					*sockptr->RecpTo[i] = 0;		// So we dont create individual one later
 
 					continue;

Moncode.c

@@ -728,10 +728,6 @@ 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];
@@ -750,9 +746,6 @@ 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)

RHP-skigdebian.c

@@ -0,0 +1,641 @@
+/*
+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"
+
+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
+{  
+	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;
+};
+
+struct RHPConnectionInfo
+{
+    SOCKET socket;
+	struct RHPSessionInfo ** RHPSessions;
+	int NumberofRHPSessions;
+};
+
+
+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 RHPConnectionInfo * RHPSocket, char * Msg, char * ReplyBuffer);
+int processRHCPSend(struct RHPConnectionInfo * RHPSocket, char * Msg, char * ReplyBuffer);
+int processRHCPClose(struct RHPConnectionInfo * RHPSocket, 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;
+}
+
+
+
+
+int RHPProcessHTTPMessage(struct ConnectionInfo * 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(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
+
+	for (n = 0; n < NumberofRHPConnections; n++)
+	{
+		if (RHPSockets[n]->socket == socket)
+		{
+			RHPSocket = RHPSockets[n];
+			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"}.
+
+	GetJSONValue(Msg, "\"type\":", Value, 15);
+
+	if (_stricmp(Value, "open") == 0)
+	{
+		Len = processRHCPOpen(RHPSocket, Msg, &OutBuffer[10]);		// Space at front for WebSock Header
+		if (Len)
+			SendWebSockMessage(RHPSocket->socket, OutBuffer, Len);
+		return;
+	}
+
+	if (_stricmp(Value, "send") == 0)
+	{
+		Len = processRHCPSend(RHPSocket, Msg, &OutBuffer[10]);		// Space at front for WebSock Header
+		SendWebSockMessage(RHPSocket->socket, OutBuffer, Len);
+		return;
+	}
+	
+	if (_stricmp(Value, "close") == 0)
+	{
+		Len = processRHCPClose(RHPSocket, Msg, &OutBuffer[10]);		// Space at front for WebSock Header
+		SendWebSockMessage(RHPSocket->socket, OutBuffer, Len);
+		return;
+	}
+	Debugprintf(Msg);
+}
+
+void ProcessRHPWebSockClosed(SOCKET socket)
+{
+	// Close any connections on this scoket and delete socket entry
+
+	struct RHPConnectionInfo * RHPSocket = NULL;
+	int n;
+
+	// Find Connection Record. CLear any Sessions
+
+	for (n = 0; n < NumberofRHPConnections; n++)
+	{
+		if (RHPSockets[n]->socket == socket)
+		{
+			RHPSocket = RHPSockets[n];
+
+			break;
+		}
+	}
+}
+
+
+
+int processRHCPOpen(struct RHPConnectionInfo * RHPSocket, 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 Len;
+	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 = FindFreeStreamNoSem();
+			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 = RHPSocket->socket;
+
+			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(struct RHPConnectionInfo * RHPSocket, 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\": 12, \"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++;
+	}
+
+	Debugprintf(Data);
+
+	Len = strlen(Data);
+	ptr = Data;
+
+
+	while (Len > RHPPaclen)
+	{
+		SendMsgNoSem(RHPSession->BPQStream, ptr, RHPPaclen);
+		Len -= RHPPaclen;
+		ptr += RHPPaclen;
+	}
+
+	SendMsgNoSem(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(struct RHPConnectionInfo * RHPSocket, 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\": 12, \"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);
+}
+
+
+
+void RHPPoll()
+{
+	int Stream;
+	int n;
+	int state, change;
+	int Len;
+	char * RHPMsg;
+	unsigned char Buffer[1024];			// 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);
+				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;
+				char c;
+
+				Buffer[pktlen] = 0;
+
+				// Message is JSON so Convert CR to \r, \ to \\ " to \"
+
+				while (c = *(ptr))
+				{
+					switch (c)
+					{
+					case 13:
+
+						memmove(ptr + 2, ptr + 1, strlen(ptr));
+						*(ptr++) = '\\';
+						*(ptr++) = 'r';
+						break;
+		
+					case '"':
+
+						memmove(ptr + 2, ptr + 1, strlen(ptr));
+						*(ptr++) = '\\';
+						*(ptr++) = '"';
+						break;
+	
+					case '\\':
+
+						memmove(ptr + 2, ptr + 1, strlen(ptr));
+						*(ptr++) = '\\';
+						*(ptr++) = '\\';
+						break;
+					}
+					ptr++;
+				}
+
+
+				RHPMsg = malloc(1024);
+
+				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);
+}
+
+

RHP.c

@@ -28,7 +28,6 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #include "cheaders.h"
 #include "bpq32.h"
-#include "telnetserver.h"
 
 int FindFreeStreamNoSem();
 DllExport int APIENTRY DeallocateStream(int stream);
@@ -41,7 +40,6 @@ static int GetJSONInt(char * _REPLYBUFFER, char * Name);
 
 struct RHPSessionInfo
 {  
-	struct ConnectionInfo * sockptr;
 	SOCKET Socket;				// Websocks Socket
     int BPQStream;
 	int Handle;				// RHP session ID
@@ -51,7 +49,6 @@ struct RHPSessionInfo
     BOOL Connecting;		// Set while waiting for connection to complete
     BOOL Listening; 
 	BOOL Connected;
-	int Busy;
 };
 
 struct RHPConnectionInfo
@@ -68,7 +65,6 @@ struct RHPParamBlock
 	unsigned char * Msg;
 	int Len;
 	SOCKET Socket;
-	struct ConnectionInfo * sockptr;
 };
 
 
@@ -80,24 +76,19 @@ struct RHPSessionInfo ** RHPSessions;
 int NumberofRHPSessions;
 
 char ErrCodes[18][24] = 
-{
+{"Ok",   "Unspecified",  "Bad or missing type",   "Invalid handle",   "No memory",  "Bad or missing mode",
-	"Ok",
+
-	"Unspecified",
+ "Invalid local address",
-	"Bad or missing type",
+ "Invalid remote address" ,
-	"Invalid handle",
+ "Bad or missing family" ,
-	"No memory",
+ "Duplicate socket"   ,
-	"Bad or missing mode",
+ "No such port"    ,
-	"Invalid local address",
+ "Invalid protocol"      , 
-	"Invalid remote address" ,
+ "Bad parameter" ,
-	"Bad or missing family" ,
+ "No buffers"  ,
-	"Duplicate socket"   ,
+  "Unauthorised"  ,
-	"No such port"    ,
+  "No Route"  ,
-	"Invalid protocol"      , 
+  "Operation not supported"};
-	"Bad parameter" ,
-	"No buffers"  ,
-	"Unauthorised"  ,
-	"No Route"  ,
-	"Operation not supported"};
 
 
 
@@ -116,10 +107,9 @@ int WhatsPacConfigured = 1;
 int RHPPaclen = 236;
 
 
-int processRHCPOpen(struct ConnectionInfo * sockptr, SOCKET Socket, char * Msg, char * ReplyBuffer);
+int processRHCPOpen(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);
 
 
 
@@ -132,6 +122,7 @@ void SendWebSockMessage(SOCKET socket, char * Msg, int Len)
 
 	// WebSock Encode. Buffer has 10 bytes on front for header but header len depends on Msg len
 
+
 	if (Len < 126)
 	{
 		// Two Byte Header
@@ -191,7 +182,7 @@ void SendWebSockMessage(SOCKET socket, char * Msg, int Len)
 	return;
 }
 
-void ProcessRHPWebSock(struct ConnectionInfo * sockptr, SOCKET Socket, char * Msg, int MsgLen);
+void ProcessRHPWebSock(SOCKET Socket, char * Msg, int MsgLen);
 
 void RHPThread(void * Params)
 {
@@ -199,7 +190,7 @@ void RHPThread(void * Params)
 
 	struct RHPParamBlock * Block = (struct RHPParamBlock *)Params;
 
-	ProcessRHPWebSock(Block->sockptr, Block->Socket, Block->Msg, Block->Len);
+	ProcessRHPWebSock(Block->Socket, Block->Msg, Block->Len);
 
 	free(Block->Msg);
 	free(Params);
@@ -211,7 +202,7 @@ int RHPProcessHTTPMessage(void * conn, char * response, char * Method, char * UR
 	return 0;
 }
 
-void ProcessRHPWebSock(struct ConnectionInfo * sockptr, SOCKET Socket, char * Msg, int MsgLen)
+void ProcessRHPWebSock(SOCKET Socket, char * Msg, int MsgLen)
 {
 	int Loops = 0;
 	int InputLen = 0;
@@ -273,14 +264,11 @@ void ProcessRHPWebSock(struct ConnectionInfo * sockptr, SOCKET Socket, char * Ms
 //	{"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
+		Len = processRHCPOpen(Socket, Msg, &OutBuffer[10]);		// Space at front for WebSock Header
 		if (Len)
 			SendWebSockMessage(Socket, OutBuffer, Len);
 		return;
@@ -299,22 +287,7 @@ void ProcessRHPWebSock(struct ConnectionInfo * sockptr, SOCKET Socket, char * Ms
 		SendWebSockMessage(Socket, OutBuffer, Len);
 		return;
 	}
-
+	Debugprintf(Msg);
-	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)
@@ -353,7 +326,7 @@ void ProcessRHPWebSockClosed(SOCKET socket)
 
 
 
-int processRHCPOpen(struct ConnectionInfo * sockptr, SOCKET Socket, char * Msg, char * ReplyBuffer)
+int processRHCPOpen(SOCKET Socket, char * Msg, char * ReplyBuffer)
 {
 	//{"type":"open","id":5,"pfam":"ax25","mode":"stream","port":"1","local":"G8BPQ","remote":"G8BPQ-2","flags":128}
 
@@ -371,7 +344,7 @@ int processRHCPOpen(struct ConnectionInfo * sockptr, SOCKET Socket, char * Msg,
 	int Handle = 1;
 	int Stream;
 	unsigned char AXCall[10];
-
+	int Len;
 	int n;
 
 	// ID seems to be used for control commands like open. SeqNo for data within a session (i Think!
@@ -416,7 +389,7 @@ int processRHCPOpen(struct ConnectionInfo * sockptr, SOCKET Socket, char * Msg,
 			}
 
 			strcpy(pgm, "RHP");
-			Stream = FindFreeStream();
+			Stream = FindFreeStreamNoSem();
 			strcpy(pgm, "bpq32.exe");
 
 			if (Stream == 255)
@@ -426,7 +399,6 @@ int processRHCPOpen(struct ConnectionInfo * sockptr, SOCKET Socket, char * Msg,
 			RHPSession->Handle = Handle;
 			RHPSession->Connecting = TRUE;
 			RHPSession->Socket = Socket;
-			RHPSession->sockptr = sockptr;
 
 			strcpy(RHPSession->Local, Local);
 			strcpy(RHPSession->Remote, Remote);
@@ -465,7 +437,7 @@ int processRHCPSend(SOCKET Socket, char * Msg, char * ReplyBuffer)
 	if (Handle < 1 || Handle > NumberofRHPSessions)
 	{
 		free(Data);
-		return sprintf(ReplyBuffer, "{\"type\": \"sendReply\", \"id\": %d, \"handle\": %d, \"errCode\": 3, \"errtext\": \"Invalid handle\"}", ID, Handle);
+		return sprintf(ReplyBuffer, "{\"type\": \"sendReply\", \"id\": %d, \"handle\": %d, \"errCode\": 12, \"errtext\": \"Invalid handle\"}", ID, Handle);
 	}
 
 	RHPSession = RHPSessions[Handle - 1];
@@ -499,17 +471,20 @@ int processRHCPSend(SOCKET Socket, char * Msg, char * ReplyBuffer)
 		ptr++;
 	}
 
+	Debugprintf(Data);
+
 	Len = strlen(Data);
 	ptr = Data;
 
+
 	while (Len > RHPPaclen)
 	{
-		SendMsg(RHPSession->BPQStream, ptr, RHPPaclen);
+		SendMsgNoSem(RHPSession->BPQStream, ptr, RHPPaclen);
 		Len -= RHPPaclen;
 		ptr += RHPPaclen;
 	}
 
-	SendMsg(RHPSession->BPQStream, ptr, Len);
+	SendMsgNoSem(RHPSession->BPQStream, ptr, Len);
 
 	free(Data);
 	return sprintf(ReplyBuffer, "{\"type\": \"sendReply\", \"id\": %d, \"handle\": %d, \"errCode\": 0, \"errText\": \"Ok\", \"status\": %d}", ID, Handle, 2);
@@ -533,7 +508,7 @@ int processRHCPClose(SOCKET Socket, char * Msg, char * ReplyBuffer)
 	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);
+		return sprintf(ReplyBuffer, "{\"id\": %d, \"type\": \"closeReply\", \"handle\": %d, \"errcode\": 12, \"errtext\": \"Invalid handle\"}", ID, Handle);
 
 
 	RHPSession = RHPSessions[Handle - 1];
@@ -547,24 +522,6 @@ int processRHCPClose(SOCKET Socket, char * Msg, char * ReplyBuffer)
 	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()
@@ -635,9 +592,6 @@ void RHPPoll()
 
 				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
@@ -695,6 +649,7 @@ void RHPPoll()
     
 		}
 		while (count > 0);
+
 	}
 }
 

RigControl.c

@@ -5286,13 +5286,10 @@ BOOL DecodeModePtr(char * Param, double * Dwell, double * Freq, char * Mode,
 
 	ptr = strtok_s(NULL, ",", &Context);
 
-	if (ptr == NULL)
-		if (*MemoryNumber)		// If channel, dont need mode
-			return TRUE;
-
 	if (ptr == NULL || strlen(ptr) >  8)
-		return FALSE;		// Mode Missing
+		return FALSE;
 
+	// If channel, dont need mode
 
 	if (*MemoryNumber == 0)
 	{
@@ -7396,8 +7393,6 @@ 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
 
@@ -7414,7 +7409,7 @@ VOID SetupScanInterLockGroups(struct RIGINFO *RIG)
 		{
 			int p = PortRecord->PORTNUMBER;
 			RIG->BPQPort |= ((uint64_t)1 << p);
-			n += sprintf(&PortString[n], ",%d", p);
+			sprintf(PortString, "%s,%d", PortString, p);
 			TNC->RIG = RIG;
 
 			if (RIG->PTTMode == 0 && TNC->PTTMode)
@@ -7424,7 +7419,7 @@ VOID SetupScanInterLockGroups(struct RIGINFO *RIG)
 		{
 			int p = PortRecord->PORTNUMBER;
 			RIG->BPQPort |= ((uint64_t)1 << p);
-			nn += sprintf(&TxPortString[nn], ",%d", p);
+			sprintf(TxPortString, "%s,%d", TxPortString, p);
 			TNC->TXRIG = RIG;
 
 			if (RIG->PTTMode == 0 && TNC->PTTMode)

SCSPactor.c

@@ -854,8 +854,7 @@ void * SCSExtInit(EXTPORTDATA *  PortEntry)
 	}
 	
 	TNC->Port = port;
-	TNC->PortRecord = PortEntry;
+	TNC->Hardware = H_SCS;
-	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_SCS;
 
 	OpenLogFile(TNC->Port);
 	CloseLogFile(TNC->Port);
@@ -886,6 +885,8 @@ 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;
 

SCSTrackeMulti.c

@@ -376,8 +376,7 @@ void * TrackerMExtInit(EXTPORTDATA *  PortEntry)
 	}
 	
 	TNC->Port = port;
-	TNC->PortRecord = PortEntry;
+	TNC->Hardware = H_TRKM;
-	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_TRKM;
 
 	// Set up DED addresses for streams
 	
@@ -393,6 +392,8 @@ 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

SCSTracker.c

@@ -666,8 +666,7 @@ void * TrackerExtInit(EXTPORTDATA *  PortEntry)
 	}
 	
 	TNC->Port = port;
-	TNC->PortRecord = PortEntry;
+	TNC->Hardware = H_TRK;
-	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_TRK;
 
 	// Set up DED addresses for streams
 	
@@ -683,6 +682,8 @@ 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

SerialPort.c

@@ -508,12 +508,9 @@ ok:
 
 		if (_memicmp(&buff->L2DATA[0], "RADIO ", 6) == 0)
 		{
-			char cmd[56];
+			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &buff->L2DATA[6]);
 
-			strcpy(cmd, &buff->L2DATA[6]);
+			if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, &buff->L2DATA[0]))
-			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, cnd);
-
-				if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, &buff->L2DATA[0]))
 			{
 			}
 			else
@@ -773,9 +770,9 @@ VOID * SerialExtInit(EXTPORTDATA * PortEntry)
 	}
 	
 	TNC->Port = port;
-	TNC->PortRecord = PortEntry;
+	TNC->Hardware = H_SERIAL;
-	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_SERIAL;
 
+	TNC->PortRecord = PortEntry;
 
 	if (PortEntry->PORTCONTROL.PORTCALL[0] == 0)
 		memcpy(TNC->NodeCall, MYNODECALL, 10);

TelnetV6.c

@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 */	
 
-
 //
 //	Telnet Driver for BPQ Switch 
 //
@@ -114,7 +113,7 @@ extern int REALTIMETICKS;
 #define MaxSockets 26
 
 struct UserRec RelayUser;
-struct UserRec SyncUser = {"","Sync"};
+struct UserRec SyncUser = {"","Sync"};;
 struct UserRec CMSUser;
 struct UserRec HostUser = {"","Host"};
 struct UserRec TriModeUser;
@@ -954,27 +953,13 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 				{
 					if (sockptr->WebSocks == 0)
 					{
-						if (sockptr->LastSendTime && (time(NULL) - sockptr->LastSendTime) > 150)	// ~ 2.5 mins
+						if (sockptr->LastSendTime && (REALTIMETICKS - sockptr->LastSendTime) > 1500)	// ~ 2.5 mins
 						{
 							closesocket(sockptr->socket);
 							sockptr->SocketActive = FALSE;
 							ShowConnections(TNC);
 						}
 					}
-					else if (memcmp(sockptr->WebURL, "rhp", 3) == 0)
-					{
-						// RHP Sockets (Used for WhatsPack) Need a timeout
-						// Normally keepalives are sent each way around every 9 mins
-						// Keepalives aren't sent when connecting so may need a bit longer
-						
-						if (sockptr->LastSendTime && (time(NULL) - sockptr->LastSendTime) > 20 * 60)	// 20mins
-						{
-							ProcessRHPWebSockClosed(sockptr->socket);
-							closesocket(sockptr->socket);
-							sockptr->SocketActive = FALSE;
-							ShowConnections(TNC);
-						}
-					}
 				}
 				else
 				{
@@ -1189,7 +1174,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 
 		TNC = TNCInfo[n];
 		TNC->Port = n;
-		TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_TELNET;
+		TNC->Hardware = H_TELNET;
 		TNC->RIG = &TNC->DummyRig;			// Not using Rig control, so use Dummy
 
 		// Get Menu Handles
@@ -1464,12 +1449,13 @@ void * TelnetExtInit(EXTPORTDATA * PortEntry)
 	TCP = TNC->TCPInfo;
 
 	TNC->Port = port;
-	TNC->PortRecord = PortEntry;
 
-	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_TELNET;
+	TNC->Hardware = H_TELNET;
 
 	PortEntry->MAXHOSTMODESESSIONS = TNC->TCPInfo->MaxSessions + 1;		// Default
 
+	TNC->PortRecord = PortEntry;
+
 	if (PortEntry->PORTCONTROL.PORTCALL[0] != 0)
 		ConvFromAX25(&PortEntry->PORTCONTROL.PORTCALL[0], TNC->NodeCall);
 
@@ -2487,11 +2473,15 @@ nosocks:
 
 		if (sockptr->SocketActive && sockptr->Keepalive && L4LIMIT)
 		{
-			if ((time(NULL) - sockptr->LastSendTime) > (L4LIMIT - 60))	// PC Ticks are about 10% slow
+#ifdef WIN32
+			if ((REALTIMETICKS - sockptr->LastSendTime) > (L4LIMIT - 60) * 9)	// PC Ticks are about 10% slow
+#else
+			if ((REALTIMETICKS - sockptr->LastSendTime) > (L4LIMIT - 60) * 10)
+#endif
 			{
 				// Send Keepalive
 
-				sockptr->LastSendTime = time(NULL);
+				sockptr->LastSendTime = REALTIMETICKS;
 				BuffertoNode(sockptr, "Keepalive\r", 10);
 			}
 		}
@@ -2621,7 +2611,7 @@ nosocks:
 						if (P3[0] == 'K' || P4[0] == 'K' || P5[0] == 'K' || P6[0] == 'K')
 						{
 							sockptr->Keepalive = TRUE;
-							sockptr->LastSendTime = time(NULL);
+							sockptr->LastSendTime = REALTIMETICKS;
 						}
 
 						if (P3[0] == 'S' || P4[0] == 'S' || P5[0] == 'S' || P6[0] == 'S')
@@ -2853,7 +2843,7 @@ nosocks:
 
 			SendtoNode(TNC, Stream, &sockptr->FromHostBuffer[sockptr->FromHostBuffGetptr], Msglen);
 			sockptr->FromHostBuffGetptr += Msglen;
-			sockptr->LastSendTime = time(NULL);
+			sockptr->LastSendTime = REALTIMETICKS;
 		}
 	}
 }
@@ -3110,10 +3100,7 @@ LRESULT CALLBACK TelWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPara
 
 			TNC = TNCInfo[n];
 			TNC->Port = n;
-			TNC->PortRecord = PortRecord;
+			TNC->Hardware = H_TELNET;
-
-			TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_TELNET;
-
 			TNC->hDlg = SavehDlg;
 			TNC->RIG = &TNC->DummyRig;			// Not using Rig control, so use Dummy
 
@@ -3144,6 +3131,8 @@ LRESULT CALLBACK TelWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPara
 					ModifyMenu(TCP->hDisMenu,i - 1 ,MF_BYPOSITION | MF_STRING,IDM_DISCONNECT + 1, ".");
 			}
 
+			TNC->PortRecord = PortRecord;
+
 			Sleep(500);
 			OpenSockets(TNC);
 			OpenSockets6(TNC);
@@ -3766,7 +3755,7 @@ MsgLoop:
 			BuffertoNode(sockptr, NodeLine, len);
 
 		sockptr->InputLen = 0;
-		ShowConnections(TNC);
+		ShowConnections(TNC);;
 
 		return 0;
 	}
@@ -3940,7 +3929,7 @@ MsgLoop:
 #ifndef LINBPQ
 			ModifyMenu(TCP->hDisMenu, n - 1, MF_BYPOSITION | MF_STRING, IDM_DISCONNECT + n, MsgPtr);
 #endif
-			ShowConnections(TNC);
+			ShowConnections(TNC);;
 			return 0;
 		}
         
@@ -4196,7 +4185,7 @@ int DataSocket_ReadRelay(struct TNCINFO * TNC, struct ConnectionInfo * sockptr,
 #ifndef LINBPQ
 		ModifyMenu(TCP->hDisMenu, n - 1, MF_BYPOSITION | MF_STRING, IDM_DISCONNECT + n, MsgPtr);
 #endif
-		ShowConnections(TNC);
+		ShowConnections(TNC);;
 
         return 0;
 	
@@ -4316,7 +4305,7 @@ int DataSocket_ReadRelay(struct TNCINFO * TNC, struct ConnectionInfo * sockptr,
 
 		SendtoNode(TNC, sockptr->Number, TCP->RelayAPPL, (int)strlen(TCP->RelayAPPL));
 
-		ShowConnections(TNC);
+		ShowConnections(TNC);;
 	
 		return 0;
 	
@@ -4815,7 +4804,7 @@ MsgLoop:
 			ModifyMenu(TCP->hDisMenu, n - 1, MF_BYPOSITION | MF_STRING, IDM_DISCONNECT + n, MsgPtr);
 #endif
 
-			ShowConnections(TNC);
+			ShowConnections(TNC);;
 
 			InputLen=InputLen-(MsgLen+1);
 
@@ -4891,7 +4880,7 @@ MsgLoop:
 				WriteLog (logmsg);
 			}
 
-			ShowConnections(TNC);
+			ShowConnections(TNC);;
 			InputLen=InputLen-(MsgLen+1);
 
 			sockptr->InputLen=InputLen;
@@ -4989,7 +4978,6 @@ struct RHPParamBlock
 	unsigned char * Msg;
 	int Len;
 	SOCKET Socket;
-	struct ConnectionInfo * sockptr;
 };
 
 
@@ -5119,7 +5107,7 @@ int DataSocket_ReadHTTP(struct TNCINFO * TNC, struct ConnectionInfo * sockptr, S
 			{
 				sockcopy = malloc(sizeof(struct ConnectionInfo));
 				sockptr->TNC = TNC;
-				sockptr->LastSendTime = time(NULL);
+				sockptr->LastSendTime = REALTIMETICKS;
 
 				memcpy(sockcopy, sockptr, sizeof(struct ConnectionInfo));
 
@@ -5132,13 +5120,10 @@ int DataSocket_ReadHTTP(struct TNCINFO * TNC, struct ConnectionInfo * sockptr, S
 
 				struct RHPParamBlock * ParamBlock = malloc(sizeof(struct RHPParamBlock));
 
-				ParamBlock->sockptr = sockptr;
 				ParamBlock->Socket = sockptr->socket;
 				ParamBlock->Len = Len;
 				ParamBlock->Msg = malloc(Len + 10);
 				memcpy(ParamBlock->Msg, Payload, Len);
-				sockptr->LastSendTime = time(NULL);
-
 				_beginthread(RHPThread, 0, (VOID *)ParamBlock);	
 	
 				sockptr->InputLen = 0;
@@ -5146,13 +5131,7 @@ int DataSocket_ReadHTTP(struct TNCINFO * TNC, struct ConnectionInfo * sockptr, S
 			}
 		}
 		else
-		{
 			Debugprintf("WebSock Opcode %d Msg %s", Opcode, &MsgPtr[6]);
-			closesocket(sockptr->socket);
-			sockptr->SocketActive = FALSE;
-			ShowConnections(TNC);
-		}
-
 
 		sockptr->InputLen = 0;
 		return 0;
@@ -5179,7 +5158,7 @@ int DataSocket_ReadHTTP(struct TNCINFO * TNC, struct ConnectionInfo * sockptr, S
 
 	sockcopy = malloc(sizeof(struct ConnectionInfo));
 	sockptr->TNC = TNC;
-	sockptr->LastSendTime = time(NULL);
+	sockptr->LastSendTime = REALTIMETICKS;
 
 	memcpy(sockcopy, sockptr, sizeof(struct ConnectionInfo));
 
@@ -5286,7 +5265,7 @@ int DataSocket_Disconnect(struct TNCINFO * TNC,  struct ConnectionInfo * sockptr
 		ModifyMenu(TNC->TCPInfo->hDisMenu, n - 1, MF_BYPOSITION | MF_STRING, IDM_DISCONNECT + n, ".");
 #endif
 		sockptr->SocketActive = FALSE;
-		ShowConnections(TNC);
+		ShowConnections(TNC);;
 	}
 	return 0;
 }
@@ -5473,7 +5452,8 @@ int WriteLog(char * msg)
 		strcat(Value, "logs/Telnet_");
 	}
 
-	sprintf(&Value[strlen(Value)], "%02d%02d%02d.log", tm->tm_year - 100, tm->tm_mon+1, tm->tm_mday);
+	sprintf(Value, "%s%02d%02d%02d.log", Value,
+				tm->tm_year - 100, tm->tm_mon+1, tm->tm_mday);
 
 	if ((file = fopen(Value, "a")) == NULL)
 		return FALSE;
@@ -5528,7 +5508,8 @@ VOID WriteCMSLog(char * msg)
 		strcat(Value, "logs/CMSAccess");
 	}
 
-	sprintf(&Value[strlen(Value)], "_%04d%02d%02d.log", tm->tm_year +1900, tm->tm_mon+1, tm->tm_mday);
+	sprintf(Value, "%s_%04d%02d%02d.log", Value,
+				tm->tm_year +1900, tm->tm_mon+1, tm->tm_mday);
 
 	Handle = fopen(Value, "ab");
 
@@ -7173,7 +7154,7 @@ int DoRefreshWebMailIndex()
 						{
 							sockcopy = malloc(sizeof(struct ConnectionInfo));
 							sockptr->TNC = TNC;
-							sockptr->LastSendTime = time(NULL);
+							sockptr->LastSendTime = REALTIMETICKS;
 
 							memcpy(sockcopy, sockptr, sizeof(struct ConnectionInfo));
 

UIARQ.c

@@ -464,7 +464,7 @@ UINT UIARQExtInit(EXTPORTDATA * PortEntry)
 	ptr=strchr(TNC->NodeCall, ' ');
 	if (ptr) *(ptr) = 0;					// Null Terminate
 
-	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_UIARQ;
+	TNC->Hardware = H_UIARQ;
 
 	if (TNC->BusyWait == 0)
 		TNC->BusyWait = 10;

UZ7HODrv.c

@@ -1023,11 +1023,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 
 			if (_memicmp(&buff->L2DATA[0], "RADIO ", 6) == 0)
 			{
-				char cmd[56];
+				sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &buff->L2DATA[6]);
-
-				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]))
 				{
@@ -1404,7 +1400,7 @@ void * UZ7HOExtInit(EXTPORTDATA * PortEntry)
 	ptr=strchr(TNC->NodeCall, ' ');
 	if (ptr) *(ptr) = 0;					// Null Terminate
 
-	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_UZ7HO;
+	TNC->Hardware = H_UZ7HO;
 
 	UZ7HOChannel[port] = PortEntry->PORTCONTROL.CHANNELNUM-65;
 	

V4.c

@@ -622,10 +622,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 
 			if (_memicmp(buff->L2DATA, "RADIO ", 6) == 0)
 			{
-				char cmd[56];
+				sprintf(buff->L2DATA, "%d %s", TNC->Port, &buff->L2DATA[6]);
-
-				strcpy(cmd, &buff->L2DATA[6]);
-				sprintf(buff->L2DATA, "%d %s", TNC->Port, cmd);
 
 				if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, buff->L2DATA))
 				{
@@ -974,13 +971,13 @@ void * V4ExtInit(EXTPORTDATA * PortEntry)
 	}
 
 	TNC->Port = port;
-	TNC->PortRecord = PortEntry;
 
 	if (TNC->ProgramPath)
 		TNC->WeStartedTNC = RestartTNC(TNC);
 
-	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_V4;
+	TNC->Hardware = H_V4;
 
+	TNC->PortRecord = PortEntry;
 
 	if (PortEntry->PORTCONTROL.PORTCALL[0] == 0)
 		memcpy(TNC->NodeCall, MYNODECALL, 10);

VARA.c

@@ -1163,7 +1163,6 @@ void * VARAExtInit(EXTPORTDATA * PortEntry)
 	}
 	
 	TNC->Port = port;
-	TNC->PortRecord = PortEntry;
 
 	TNC->ARDOPBuffer = malloc(8192);
 	TNC->ARDOPDataBuffer = malloc(8192);
@@ -1171,7 +1170,7 @@ void * VARAExtInit(EXTPORTDATA * PortEntry)
 	if (TNC->ProgramPath)
 		TNC->WeStartedTNC = 1;
 
-	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_VARA;
+	TNC->Hardware = H_VARA;
 
 	if (TNC->BusyWait == 0)
 		TNC->BusyWait = 10;
@@ -1179,6 +1178,8 @@ void * VARAExtInit(EXTPORTDATA * PortEntry)
 	if (TNC->BusyHold == 0)
 		TNC->BusyHold = 1;
 
+	TNC->PortRecord = PortEntry;
+
 	if (PortEntry->PORTCONTROL.PORTCALL[0] == 0)
 		memcpy(TNC->NodeCall, MYNODECALL, 10);
 	else
@@ -1445,6 +1446,9 @@ VOID VARAThread(void * portptr)
 		return;
 	}
 
+
+//	printf("Starting VARA Thread\n");
+
 // if on Windows and Localhost see if TNC is running
 
 #ifdef WIN32
@@ -1560,11 +1564,14 @@ TNCRunning:
 	sinx.sin_addr.s_addr = INADDR_ANY;
 	sinx.sin_port = 0;
 
+//	printf("Trying to connect to VARA TNC\n");
+
 	if (connect(TNC->TCPSock,(LPSOCKADDR) &TNC->destaddr,sizeof(TNC->destaddr)) == 0)
 	{
 		//	Connected successful
 
 		goto VConnected;
+
 	}
 
 	if (TNC->Alerted == FALSE)
@@ -1720,7 +1727,6 @@ VConnected:
 				GetSemaphore(&Semaphore, 52);
 				VARAProcessReceivedControl(TNC);
 				FreeSemaphore(&Semaphore);
-				Debugprintf("VARA Returned from processing control packet");
 			}
 								
 			if (FD_ISSET(TNC->TCPDataSock, &readfs))
@@ -2224,7 +2230,6 @@ VOID VARAProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
 			if (App < 32)
 			{
 				char AppName[13];
-				char AppBuffer[64];
 
 				memcpy(AppName, &ApplPtr[App * sizeof(struct CMDX)], 12);
 				AppName[12] = 0;
@@ -2239,7 +2244,7 @@ VOID VARAProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
 
 				if (CheckAppl(TNC, AppName))
 				{
-					MsgLen = sprintf(AppBuffer, "%s\r", AppName);
+					MsgLen = sprintf(Buffer, "%s\r", AppName);
 
 					buffptr = GetBuff();
 
@@ -2249,9 +2254,7 @@ VOID VARAProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
 					}
 
 					buffptr->Len = MsgLen;
-					memcpy(buffptr->Data, AppBuffer, MsgLen);
+					memcpy(buffptr->Data, Buffer, MsgLen);
-
-					Debugprintf("Calling Application %s", AppBuffer);
 
 					C_Q_ADD(&TNC->WINMORtoBPQ_Q, buffptr);
 		
@@ -2426,7 +2429,7 @@ VOID VARAProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
 //		return;
 	}
 
-	if (_memicmp(Buffer, "LINK REGISTERED", 9) == 0)
+	if (_memicmp(Buffer, "REGISTERED", 9) == 0)
 	{
 		strcat(Buffer, "\r");
 		WritetoTrace(TNC, Buffer, (int)strlen(Buffer));
@@ -2440,13 +2443,6 @@ VOID VARAProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
 		return;
 	}
 
-	if (_memicmp(Buffer, "UNENCRYPTED LINK ", 11) == 0)
-	{
-		strcat(Buffer, "\r");
-		WritetoTrace(TNC, Buffer, (int)strlen(Buffer));
-		return;
-	}
-
 	if (_memicmp(Buffer, "MISSING SOUNDCARD", 17) == 0)
 	{
 		strcat(Buffer, "\r");
@@ -2672,7 +2668,7 @@ VOID VARAProcessReceivedControl(struct TNCINFO * TNC)
 {
 	int InputLen, MsgLen;
 	char * ptr, * ptr2;
-	char Buffer[8192];
+	char Buffer[4096];
 
 	// shouldn't get several messages per packet, as each should need an ack
 	// May get message split over packets
@@ -2680,7 +2676,7 @@ VOID VARAProcessReceivedControl(struct TNCINFO * TNC)
 	if (TNC->InputLen > 8000)	// Shouldnt have packets longer than this
 		TNC->InputLen=0;
 				
-	InputLen=recv(TNC->TCPSock, &TNC->ARDOPBuffer[TNC->InputLen], 8191 - TNC->InputLen, 0);
+	InputLen=recv(TNC->TCPSock, &TNC->ARDOPBuffer[TNC->InputLen], 8192 - TNC->InputLen, 0);
 
 	if (InputLen == 0 || InputLen == SOCKET_ERROR)
 	{		
@@ -2703,18 +2699,12 @@ VOID VARAProcessReceivedControl(struct TNCINFO * TNC)
 
 	TNC->InputLen += InputLen;
 
-	TNC->ARDOPBuffer[TNC->InputLen] = 0;
-	Debugprintf("VARA Processing buffer - %s", TNC->ARDOPBuffer);
-
 loop:
 
 	ptr = memchr(TNC->ARDOPBuffer, '\r', TNC->InputLen);
 
 	if (ptr == 0)	//  CR in buffer
-	{
-		Debugprintf("VARA Part Packet Received - Waiting for rest");
 		return;		// Wait for it
-	}
 
 	ptr2 = &TNC->ARDOPBuffer[TNC->InputLen];
 
@@ -2737,10 +2727,9 @@ loop:
 		if (TNC->InputLen < MsgLen)
 		{
 			TNC->InputLen = 0;
-			Debugprintf("VARA Corrupt multi command input");
 			return;
 		}
-		memmove(TNC->ARDOPBuffer, ptr + 1,  TNC->InputLen - MsgLen);
+		memmove(TNC->ARDOPBuffer, ptr + 1,  TNC->InputLen-MsgLen);
 
 		TNC->InputLen -= MsgLen;
 		goto loop;

Versions-skigdebian.h

@@ -0,0 +1,125 @@
+
+#ifdef Kernel
+
+#define Vers 5,2,9,2
+#define Verstring "5.2.9.2\0"
+#define Datestring "September 2012"
+#define VerComments "G8BPQ Packet Switch V5.2.9.2\0"
+#define VerCopyright "Copyright © 2001-2012 John Wiseman G8BPQ\0"
+#define VerDesc "BPQ32 Switch\0"
+
+#endif
+
+#define KVers 6,0,24,59
+#define KVerstring "6.0.24.59\0"
+
+#ifdef CKernel
+
+#define Vers KVers
+#define Verstring KVerstring
+#define Datestring "January 2025"
+#define VerComments "G8BPQ Packet Switch (C Version)" KVerstring
+#define VerCopyright "Copyright © 2001-2025 John Wiseman G8BPQ\0"
+#define VerDesc "BPQ32 Switch\0"
+#define VerProduct "BPQ32"
+
+#endif
+
+#ifdef TermTCP
+
+#define Vers 1,0,16,2
+#define Verstring "1.0.16.2\0"
+#define VerComments "Internet Terminal for G8BPQ Packet Switch\0"
+#define VerCopyright "Copyright © 2011-2025 John Wiseman G8BPQ\0"
+#define VerDesc "Simple TCP Terminal Program for G8BPQ Switch\0"
+#define VerProduct "BPQTermTCP"
+
+#endif
+
+#ifdef BPQTerm
+
+#define Vers 2,2,5,2
+#define Verstring "2.2.5.2\0"
+#define VerComments "Simple Terminal for G8BPQ Packet Switch\0"
+#define VerCopyright "Copyright © 1999-2025 John Wiseman G8BPQ\0"
+#define VerDesc "Simple Terminal Program for G8BPQ Switch\0"
+#define VerProduct "BPQTerminal"
+
+#endif
+
+#ifdef BPQTermMDI
+
+#define Vers 2,2,0,3
+#define Verstring "2.2.0.3\0"
+#define VerComments "MDI Terminal for G8BPQ Packet Switch\0"
+#define VerCopyright "Copyright © 1999-2025 John Wiseman G8BPQ\0"
+#define VerDesc "MDI Terminal Program for G8BPQ Switch\0"
+
+#endif
+
+#ifdef MAIL
+
+#define Vers KVers
+#define Verstring KVerstring
+#define VerComments "Mail server for G8BPQ Packet Switch\0"
+#define VerCopyright "Copyright © 2009-2025 John Wiseman G8BPQ\0"
+#define VerDesc "Mail server for G8BPQ's 32 Bit Switch\0"
+#define VerProduct "BPQMail"
+
+#endif
+
+#ifdef HOSTMODES
+
+#define Vers 1,1,8,1
+#define Verstring "1.1.8.1\0"
+//#define SPECIALVERSION "Test 3"
+#define VerComments "Host Modes Emulator for G8BPQ Packet Switch\0"
+#define VerCopyright "Copyright © 2009-2019 John Wiseman G8BPQ\0"
+#define VerDesc "Host Modes Emulator for G8BPQ's 32 Bit Switch\0"
+#define VerProduct "BPQHostModes"
+
+#endif
+
+
+#ifdef UIUTIL
+
+#define Vers 0,1,3,1
+#define Verstring "0.1.3.1\0"
+#define VerComments "Beacon Utility for G8BPQ Packet Switch\0"
+#define VerCopyright "Copyright © 2011-2019 John Wiseman G8BPQ\0"
+#define VerDesc "Beacon Utility for G8BPQ Switch\0"
+#define VerProduct "BPQUIUtil"
+
+#endif
+
+#ifdef AUTH
+
+#define Vers 0,1,0,0
+#define Verstring "0.1.0.0\0"
+#define VerComments "Password Generation Utility for G8BPQ Packet Switch\0"
+#define VerCopyright "Copyright © 2011-2025 John Wiseman G8BPQ\0"
+#define VerDesc "Password Generation Utility for G8BPQ Switch\0"
+
+#endif
+
+#ifdef APRS
+
+#define Vers KVers
+#define Verstring KVerstring
+#define VerComments  "APRS Client for G8BPQ Switch\0"
+#define VerCopyright "Copyright © 2012-2025 John Wiseman G8BPQ\0"
+#define VerDesc "APRS Client for G8BPQ Switch\0"
+#define VerProduct "BPQAPRS"
+
+#endif
+
+#ifdef CHAT
+ 
+#define Vers KVers
+#define Verstring KVerstring
+#define VerComments "Chat server for G8BPQ Packet Switch\0"
+#define VerCopyright "Copyright © 2009-2025 John Wiseman G8BPQ\0"
+#define VerDesc "Chat server for G8BPQ's 32 Bit Switch\0"
+#define VerProduct "BPQChat"
+
+#endif

Versions.h

@@ -10,8 +10,8 @@
 
 #endif
 
-#define KVers 6,0,24,66
+#define KVers 6,0,24,59
-#define KVerstring "6.0.24.66\0"
+#define KVerstring "6.0.24.59\0"
 
 #ifdef CKernel
 

WINMOR.c

@@ -984,11 +984,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 
 			if (_memicmp(&buff->L2DATA[0], "RADIO ", 6) == 0)
 			{
-				char cmd[56];
+				sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &buff->L2DATA[6]);
-
-				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]))
 				{
@@ -1466,12 +1462,11 @@ void * WinmorExtInit(EXTPORTDATA * PortEntry)
 	}
 
 	TNC->Port = port;
-	TNC->PortRecord = PortEntry;
 
 	if (TNC->ProgramPath)
 		TNC->WeStartedTNC = RestartTNC(TNC);
 
-	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_WINMOR;
+	TNC->Hardware = H_WINMOR;
 
 	if (TNC->BusyWait == 0)
 		TNC->BusyWait = 10;
@@ -1479,6 +1474,7 @@ void * WinmorExtInit(EXTPORTDATA * PortEntry)
 	if (TNC->BusyHold == 0)
 		TNC->BusyHold = 1;
 
+	TNC->PortRecord = PortEntry;
 
 	if (PortEntry->PORTCONTROL.PORTCALL[0] == 0)
 		memcpy(TNC->NodeCall, MYNODECALL, 10);

WebMail.c

@@ -2293,7 +2293,6 @@ void ProcessWebMailMessage(struct HTTPConnectionInfo * Session, char * Key, BOOL
 			
 		struct HtmlFormDir * Dir;
 		int i;
-		int len;
 
 		SubDir = strlop(&NodeURL[17], ':');
 		DirNo = atoi(&NodeURL[17]);
@@ -2314,9 +2313,9 @@ void ProcessWebMailMessage(struct HTTPConnectionInfo * Session, char * Key, BOOL
 		Dir = HtmlFormDirs[DirNo];
 
 		if (SubDir)
-			len = sprintf(popup, popuphddr, Key, Dir->Dirs[SubDirNo]->DirName);
+			sprintf(popup, popuphddr, Key, Dir->Dirs[SubDirNo]->DirName);
 		else
-			len = sprintf(popup, popuphddr, Key, Dir->DirName);
+			sprintf(popup, popuphddr, Key, Dir->DirName);
 
 		if (SubDir)
 		{
@@ -2327,7 +2326,7 @@ void ProcessWebMailMessage(struct HTTPConnectionInfo * Session, char * Key, BOOL
 				// We only send if there is a .txt file
 
 				if (_stricmp(&Name[strlen(Name) - 4], ".txt") == 0)
-					len += sprintf(&popup[len], " <option value=%d:%d,%d>%s", DirNo, SubDirNo, i, Name);
+					sprintf(popup, "%s <option value=%d:%d,%d>%s", popup, DirNo, SubDirNo, i, Name);
 			}
 		}
 		else
@@ -2339,10 +2338,10 @@ void ProcessWebMailMessage(struct HTTPConnectionInfo * Session, char * Key, BOOL
 				// We only send if there is a .txt file
 
 				if (_stricmp(&Name[strlen(Name) - 4], ".txt") == 0)
-					len += sprintf(&popup[len], " <option value=%d,%d>%s", DirNo, i, Name);
+					sprintf(popup, "%s <option value=%d,%d>%s", popup, DirNo, i, Name);
 			}
 		}
-		len += sprintf(&popup[len], "</select></p>");
+		sprintf(popup, "%s</select></p>", popup);
 
 		*RLen = sprintf(Reply, "%s", popup);
 		return;
@@ -2410,7 +2409,6 @@ VOID SendTemplateSelectScreen(struct HTTPConnectionInfo * Session, char *Params,
 	int i;
 	int MsgLen = 0;
 	char * Boundary;
-	int len;
 				
 	WebMailInfo * WebMail = Session->WebMail;
 
@@ -2457,7 +2455,7 @@ VOID SendTemplateSelectScreen(struct HTTPConnectionInfo * Session, char *Params,
 
 	// Also to active fields in case not changed by form
 
-	len = sprintf(popup, popuphddr, Session->Key);
+	sprintf(popup, popuphddr, Session->Key);
 
 	LastGroup = HtmlFormDirs[0]->FormSet;		// Save so we know when changes
 
@@ -2470,21 +2468,21 @@ VOID SendTemplateSelectScreen(struct HTTPConnectionInfo * Session, char *Params,
 		if (strcmp(LastGroup, Dir->FormSet) != 0)
 		{
 			LastGroup = Dir->FormSet;
-			len += sprintf(&popup[len], "%s", NewGroup);
+			sprintf(popup, "%s%s", popup, NewGroup);
 		}
 
-		len += sprintf(&popup[len], " <option value=%d>%s", i, Dir->DirName);
+		sprintf(popup, "%s <option value=%d>%s", popup, i, Dir->DirName);
 			
 		// Recurse any Subdirs
 			
 		n = 0;
 		while (n < Dir->DirCount)
 		{
-			len += sprintf(&popup[len], " <option value=%d:%d>%s", i, n, Dir->Dirs[n]->DirName);
+			sprintf(popup, "%s <option value=%d:%d>%s", popup, i, n, Dir->Dirs[n]->DirName);
 			n++;
 		}
 	}
-	len += sprintf(&popup[len], "%</select></td></tr></table></p>");
+	sprintf(popup, "%s</select></td></tr></table></p>", popup);
 
 	*WebMail->RLen = sprintf(WebMail->Reply, "%s", popup);
 
@@ -5497,7 +5495,6 @@ BOOL DoSelectPrompt(struct HTTPConnectionInfo * Session, char * Select)
 	char * ptr, * ptr1;
 	char * prompt;
 	char * var[100];
-	int len;
 
 	WebMailInfo * WebMail = Session->WebMail;
 		
@@ -5567,7 +5564,7 @@ BOOL DoSelectPrompt(struct HTTPConnectionInfo * Session, char * Select)
 		ptr = ptr1;
 	}
 
-	len = sprintf(popup, popuphddr, Session->Key, prompt, vars + 1);
+	sprintf(popup, popuphddr, Session->Key, prompt, vars + 1);
 
 	for (i = 0; i < vars; i++)
 	{
@@ -5576,9 +5573,9 @@ BOOL DoSelectPrompt(struct HTTPConnectionInfo * Session, char * Select)
 		if (key == NULL)
 			key = var[i];
 
-		len += sprintf(&popup[len], " <option value='%s'>%s", key, var[i]);
+		sprintf(popup, "%s <option value='%s'>%s", popup, key, var[i]);
 	}
-	len += sprintf(&popup[len], "%s</select></td></tr></table><br><input onclick=window.history.back() value=Back type=button class='btn'></div>");
+	sprintf(popup, "%s</select></td></tr></table><br><input onclick=window.history.back() value=Back type=button class='btn'></div>", popup);
 
 	*WebMail->RLen = sprintf(WebMail->Reply, "%s", popup);
 	free(SelCopy);
@@ -6137,17 +6134,16 @@ VOID getAttachmentList(struct HTTPConnectionInfo * Session, char * Reply, int *
 	char popup[10000];
 	int i;
 	WebMailInfo * WebMail = Session->WebMail;
-	int len;
 
-	len = sprintf(popup, popuphddr, Session->Key, WebMail->Files);
+	sprintf(popup, popuphddr, Session->Key, WebMail->Files);
 
 	for (i = 0; i < WebMail->Files; i++)
 	{
 		if(WebMail->FileLen[i] < 100000)
-			len += sprintf(&popup[len], " <option value=%d>%s (Len %d)", i + 1, WebMail->FileName[i], WebMail->FileLen[i]);
+			sprintf(popup, "%s <option value=%d>%s (Len %d)", popup, i + 1, WebMail->FileName[i], WebMail->FileLen[i]);
 	}
 
-	len += sprintf(&popup[len], "%</select></td></tr></table><br><input onclick=window.history.back() value=Back type=button class='btn'></div>");
+	sprintf(popup, "%s</select></td></tr></table><br><input onclick=window.history.back() value=Back type=button class='btn'></div>", popup);
 
 	*RLen = sprintf(Reply, "%s", popup);
 	return;
@@ -6293,7 +6289,7 @@ int ProcessWebmailWebSock(char * MsgPtr, char * OutBuffer)
 		}
 	}
 
-	ptr += sprintf(&ptr[strlen(ptr)], "</pre> \r\n");
+	ptr += sprintf(ptr, "%s</pre> \r\n", ptr);
 
 	Len = ptr - &OutBuffer[10];
 

WinRPR.c

@@ -795,8 +795,7 @@ void * WinRPRExtInit(EXTPORTDATA *  PortEntry)
 	WritetoConsoleLocal(msg);
 
 	TNC->Port = port;
-	TNC->PortRecord = PortEntry;
+	TNC->Hardware = H_WINRPR;
-	TNC->PortRecord->PORTCONTROL.HWType = TNC->Hardware = H_WINRPR;
 
 	// Set up DED addresses for streams
 	
@@ -812,6 +811,8 @@ void * WinRPRExtInit(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

adif.c

@@ -409,7 +409,8 @@ BOOL WriteADIFRecord(ADIF * ADIF)
 		strcat(Value, "logs/BPQ_CMS_ADIF");
 	}
 
-	sprintf(&Value[strlen(Value)], "_%04d%02d.adi", tm->tm_year +1900, tm->tm_mon+1);
+	sprintf(Value, "%s_%04d%02d.adi", Value,
+				tm->tm_year +1900, tm->tm_mon+1);
 
 	STAT.st_size = 0;
 	stat(Value, &STAT);

asmstrucs.h

@@ -33,7 +33,6 @@ typedef int (FAR *FARPROCY)();
 #define L4BUSY	0x80		// BNA - DONT SEND ANY MORE
 #define L4NAK	0x40		// NEGATIVE RESPONSE FLAG
 #define L4MORE	0x20		// MORE DATA FOLLOWS - FRAGMENTATION FLAG
-#define L4COMP	0x10		// BPQ Specific use of spare it - data is compressed
 
 #define L4CREQ	1		// CONNECT REQUEST
 #define L4CACK	2		// CONNECT ACK
@@ -41,7 +40,6 @@ typedef int (FAR *FARPROCY)();
 #define L4DACK	4		// DISCONNECT ACK
 #define L4INFO	5		// INFORMATION
 #define L4IACK	6		// INFORMATION ACK
-#define L4RESET 7		// Paula's extension
 
 
 extern char MYCALL[];	// 7 chars, ax.25 format
@@ -172,23 +170,6 @@ typedef struct _TRANSPORTENTRY
 	char APPL[16];				// Set if session initiated by an APPL
 	int L4LIMIT;				// Idle time for this Session
 
-	//	Now support compressing NetRom Sessions.
-	//	We collect as much data as possible before compressing and re-packetizing
-
-	int AllowCompress;	
-	unsigned char * toCompress;	// Data being saved to compress
-	int toCompressLen;
-
-	unsigned char * unCompress;	// Data being saved to uncompress
-	int unCompressLen;
-
-	int Sent;
-	int SentAfterCompression;
-
-	int Received;
-	int ReceivedAfterExpansion;
-
-
 } TRANSPORTENTRY;
 
 //
@@ -214,9 +195,6 @@ typedef struct ROUTE
 	UCHAR NEIGHBOUR_QUAL;
 	UCHAR NEIGHBOUR_FLAG;		// SET IF 'LOCKED' ROUTE
 
-#define LOCKEDBYCONFIG 1
-#define	LOCKEDBYSYSOP 2
-
 	struct _LINKTABLE * NEIGHBOUR_LINK;		// POINTER TO LINK FOR THIS NEIGHBOUR
 
 	USHORT NEIGHBOUR_TIME;		// TIME LAST HEARD (HH MM)
@@ -467,8 +445,7 @@ typedef struct NR_DEST_ROUTE_ENTRY
 	struct ROUTE * ROUT_NEIGHBOUR;	// POINTER TO NEXT NODE IN PATH
 	UCHAR ROUT_QUALITY;		// QUALITY
 	UCHAR ROUT_OBSCOUNT;
-	UCHAR ROUT_LOCKED;
+	UCHAR Padding[5];		// SO Entries are the same length
-	UCHAR Padding[4];		// SO Entries are the same length
 } *PNR_DEST_ROUTE_ENTRY;
 
 typedef struct DEST_ROUTE_ENTRY
@@ -490,12 +467,12 @@ typedef struct DEST_LIST
 	UCHAR DEST_ALIAS[6];	
 
 	UCHAR DEST_STATE;			// CONTROL BITS - SETTING UP, ACTIVE ETC	
-	UCHAR DEST_LOCKED;
 
 	UCHAR DEST_ROUTE;			// CURRENTY ACTIVE DESTINATION
 	UCHAR INP3FLAGS;
 
 	struct NR_DEST_ROUTE_ENTRY NRROUTE[3];// Best 3 NR neighbours for this dest
+
 	struct DEST_ROUTE_ENTRY ROUTE[3];	// Best 3 INP neighbours for this dest
 
 	void * DEST_Q;				// QUEUE OF FRAMES FOR THIS DESTINATION
@@ -705,7 +682,6 @@ typedef struct PORTCONTROL
 	struct PORTCONTROL * HookPort;
 	int PortSlot;				// Index in Port Table
 	struct TNCINFO * TNC;		// Associated TNC record
-	int HWType;					// Hardware type of Driver. In here as external apps don't have access to TNC record
 	int RIGPort;				// Linked port for freq resporting
 	unsigned int PERMITTEDAPPLS;	// Appls allowed on this port (generalisation of BBSBANNED)
 	char * CTEXT;				// Port Specific CText

cMain.c

@@ -17,7 +17,6 @@ You should have received a copy of the GNU General Public License
 along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 */	
 
-
 //
 //	C replacement for Main.asm
 //
@@ -140,10 +139,6 @@ int NODE = 1;					// INCLUDE SWITCH SUPPORT
 
 int FULL_CTEXT = 1;				// CTEXT ON ALL CONNECTS IF NZ
 
-int L4Compress = 0;
-int L4CompMaxframe = 3;
-int L4CompPaclen = 236;
-
 BOOL LogL4Connects = FALSE;
 BOOL LogAllConnects = FALSE;
 BOOL AUTOSAVEMH = TRUE;
@@ -827,15 +822,6 @@ BOOL Start()
 	MQTT_PORT = cfg->C_MQTT_PORT;
 	strcpy(MQTT_USER, cfg->C_MQTT_USER);
 	strcpy(MQTT_PASS, cfg->C_MQTT_PASS);
-	L4Compress = cfg->C_L4Compress;
-	L4CompMaxframe = cfg->C_L4CompMaxframe;
-	L4CompPaclen = cfg->C_L4CompPaclen;
-
-	if (L4CompMaxframe < 1 || L4CompMaxframe > 16)
-		L4CompMaxframe = 3;
-
-	if (L4CompPaclen < 64 || L4CompPaclen > 236)
-		L4CompPaclen = 236;
  
 	// Get pointers to PASSWORD and APPL1 commands
 
@@ -1352,7 +1338,7 @@ BOOL Start()
 		ROUTE->NBOUR_PACLEN = Rcfg->ppacl;
 		ROUTE->OtherendsRouteQual = ROUTE->OtherendLocked = Rcfg->farQual;
 
-		ROUTE->NEIGHBOUR_FLAG = LOCKEDBYCONFIG;			// Locked
+		ROUTE->NEIGHBOUR_FLAG = 1;			// Locked
 		
 		Rcfg++;
 		ROUTE++;
@@ -1857,11 +1843,12 @@ VOID ReadNodes()
 			if (ptr == NULL) continue;
 
 			// I don't thinlk we should load locked flag from save file - only from config
-			// Now (2025) have two locked flags, from config or by sysop. Latter is saved and restored
+
+			// But need to parse it until I stop saving it
 
 			if (ptr[0] == '!')
 			{
-				ROUTE->NEIGHBOUR_FLAG = LOCKEDBYSYSOP;			// LOCKED ROUTE
+//				ROUTE->NEIGHBOUR_FLAG = 1;			// LOCKED ROUTE
 				ptr = strtok_s(NULL, seps, &Context);
 				if (ptr == NULL) continue;
 			}
@@ -1878,7 +1865,7 @@ VOID ReadNodes()
 
 				memcpy(ROUTE->NEIGHBOUR_DIGI1, axcall, 7);
 
-				ROUTE->NEIGHBOUR_FLAG = LOCKEDBYSYSOP;			// LOCKED ROUTE - Digi'ed routes must be locked
+				ROUTE->NEIGHBOUR_FLAG = 1;			// LOCKED ROUTE - Digi'ed routes must be locked
 
 				ptr = strtok_s(NULL, seps, &Context);
 				if (ptr == NULL) continue;
@@ -1934,14 +1921,6 @@ VOID ReadNodes()
 			if (ROUTE->NEIGHBOUR_FLAG == 0 || ROUTE->OtherendLocked == 0);		// Not LOCKED ROUTE
 				ROUTE->OtherendsRouteQual = atoi(ptr);
 
-			ptr = strtok_s(NULL, seps, &Context);	// INP3
-			if (ptr == NULL) continue;
-
-			if (ptr[0] == '!')
-			{
-				ROUTE->NEIGHBOUR_FLAG = LOCKEDBYSYSOP;			// LOCKED ROUTE
-				ptr = strtok_s(NULL, seps, &Context);
-			}
 			continue;
 		}
 

cheaders.h

@@ -2,6 +2,7 @@
 // Prototypes for BPQ32 Node Functions
 //
 
+
 #define DllImport
 
 #define EXCLUDEBITS

config.c

@@ -307,8 +307,7 @@ static char *keywords[] =
 "APPL5QUAL", "APPL6QUAL", "APPL7QUAL", "APPL8QUAL",
 "BTEXT:", "NETROMCALL", "C_IS_CHAT", "MAXRTT", "MAXHOPS",		// IPGATEWAY= no longer allowed
 "LogL4Connects", "LogAllConnects", "SAVEMH", "ENABLEADIFLOG", "ENABLEEVENTS", "SAVEAPRSMSGS", 
-"EnableM0LTEMap", "MQTT", "MQTT_HOST", "MQTT_PORT", "MQTT_USER", "MQTT_PASS",
+"EnableM0LTEMap", "MQTT", "MQTT_HOST", "MQTT_PORT", "MQTT_USER", "MQTT_PASS"
-"L4Compress", "L4CompMaxframe", "L4CompPaclen"
 };           /* parameter keywords */
 
 static void * offset[] =
@@ -329,8 +328,7 @@ static void * offset[] =
 &xxcfg.C_APPL[4].ApplQual, &xxcfg.C_APPL[5].ApplQual, &xxcfg.C_APPL[6].ApplQual, &xxcfg.C_APPL[7].ApplQual,
 &xxcfg.C_BTEXT, &xxcfg.C_NETROMCALL, &xxcfg.C_C, &xxcfg.C_MAXRTT, &xxcfg.C_MAXHOPS,		// IPGATEWAY= no longer allowed
 &xxcfg.C_LogL4Connects, &xxcfg.C_LogAllConnects, &xxcfg.C_SaveMH, &xxcfg.C_ADIF, &xxcfg.C_EVENTS, &xxcfg.C_SaveAPRSMsgs,
-&xxcfg.C_M0LTEMap, &xxcfg.C_MQTT, &xxcfg.C_MQTT_HOST, &xxcfg.C_MQTT_PORT, &xxcfg.C_MQTT_USER, &xxcfg.C_MQTT_PASS,
+&xxcfg.C_M0LTEMap, &xxcfg.C_MQTT, &xxcfg.C_MQTT_HOST, &xxcfg.C_MQTT_PORT, &xxcfg.C_MQTT_USER, &xxcfg.C_MQTT_PASS};		/* offset for corresponding data in config file */
-&xxcfg.C_L4Compress, &xxcfg.C_L4CompMaxframe, &xxcfg.C_L4CompPaclen};		/* offset for corresponding data in config file */
 
 static int routine[] = 
 {
@@ -350,8 +348,7 @@ static int routine[] =
 14, 14 ,14, 14,
 15, 0, 2, 9, 9,
 2, 2, 1, 2, 2, 2,
-2, 2, 0, 1, 20, 20,
+2, 2, 0, 1, 20, 20} ;			// Routine to process param
-1, 1, 1} ;			// Routine to process param
 
 int PARAMLIM = sizeof(routine)/sizeof(int);
 //int NUMBEROFKEYWORDS = sizeof(routine)/sizeof(int);
@@ -373,7 +370,8 @@ static char *pkeywords[] =
 "BCALL", "DIGIMASK", "NOKEEPALIVES", "COMPORT", "DRIVER", "WL2KREPORT", "UIONLY",
 "UDPPORT", "IPADDR", "I2CBUS", "I2CDEVICE", "UDPTXPORT", "UDPRXPORT", "NONORMALIZE",
 "IGNOREUNLOCKEDROUTES", "INP3ONLY", "TCPPORT", "RIGPORT", "PERMITTEDAPPLS", "HIDE",
-"SMARTID", "KISSCOMMAND", "SendtoM0LTEMap", "PortFreq", "M0LTEMapInfo", "QTSMPort"};         /* parameter keywords */
+"SMARTID", "KISSCOMMAND", "SendtoM0LTEMap", "PortFreq", "M0LTEMapInfo", "QTSMPort",
+"MQTT", "MQTT_HOST", "MQTT_PORT", "MQTT_USER", "MQTT_PASS"};           /* parameter keywords */
 
 static void * poffset[] =
 {
@@ -618,10 +616,6 @@ BOOL ProcessConfig()
 	paramok[83]=1;			// MQTT Params
 	paramok[84]=1;			// MQTT Params
 	paramok[85]=1;			// MQTT Params
-	paramok[86]=1;			// L4Compress
-	paramok[87]=1;			// L4Compress Maxframe
-	paramok[88]=1;			// L4Compress Paclen
-
 
 	for (i=0; i < PARAMLIM; i++)
 	{

configstructs.h

@@ -170,10 +170,6 @@ struct CONFIGTABLE
 	int C_MQTT_PORT;
 	char C_MQTT_USER[80];
 	char C_MQTT_PASS[80];
-	int C_L4Compress;
-	int C_L4CompMaxframe;
-	int C_L4CompPaclen;
-
  
 //#define ApplOffset 80000			// Applications offset in config buffer
 //#define InfoOffset 85000			// Infomsg offset in  buffer

debian/NEWS

@@ -1,11 +0,0 @@
-linbpq (6.0.24.22-2) unstable; urgency=medium
-
-  This is quite a big update, with config moving from /opt/oarc/bpq/bpq32.cfg to
-  /etc/bpq32.cfg. The system shall do this automatically for you, however
-  computers and their programmers are not perfect.
-
-  I strongly recommend at this point backing up your entire
-  /opt/oarc/bpq/ directory (cp -r /opt/oarc/bpq/ ~/bpq-backup/) before
-  proceeding with the upgrade
-
- -- Dave Hibberd <d@vehibberd.com>  Sat, 16 Dec 2023 13:30:06 +0000

debian/README.Debian

@@ -1,23 +0,0 @@
-README for linbpq on Debian
-===========================
-
-Please see https://wiki.oarc.uk/packet:linbpq-apt-installation for this guide
-
-# Set config
-Copy the config, edit it & set permissions.
-The permissions are so linbpq web interface can edit the config. 
-
-sudo mv /usr/share/doc/linbpq/examples/bpq32.cfg /etc/bpq32.cfg
-sudo nano /etc/bpq32.cfg
-sudo chown :linbpq /etc/bpq32.cfg
-sudo chmod 644 /etc/bpq32.cfg
-
-# Start linbpq
-
-sudo systemctl start linbpq
-
-# Access your node
-
-It shall be available by accessing http://localhost:8008 in the browser or telnet localhost 8010
-
--- Dave Hibberd <hibby@debian.org>  Tue, 26 Mar 2024 00:53:42 +0000

debian/bpq32.cfg

@@ -1,50 +0,0 @@
-SIMPLE
-NODECALL=MB7NAA
-NODEALIAS=AANODE
-LOCATOR=AA00aa
-PASSWORD=xxxxxxxx
-AUTOSAVE=1
-NODESINTERVAL=10
-MINQUAL=10
-CTEXT:
-Thanks for connecting.
-Type ? for help.
-***
-PORT
-  PORTNUM=1
-  ID=VHF
-  TYPE=ASYNC
-  PROTOCOL=KISS
-  KISSOPTIONS=ACKMODE
-  COMPORT=/dev/ttyACM0
-  SPEED=57600
-  FRACK=4000
-  PACLEN=150
-  DIGIFLAG=0
-  QUALITY=192
-  MINQUAL=20
-ENDPORT
-
-
-PORT
-  PORTNUM=9
-  ID=Telnet
-  DRIVER=Telnet
-  CONFIG
-    LOGGING=1
-    CMS=1
-    DisconnectOnClose=1
-    SECURETELNET=1
-    TCPPORT=8010
-    FBBPORT=8011
-    HTTPPORT=8008
-    LOGINPROMPT=user:
-    PASSWORDPROMPT=password:
-    MAXSESSIONS=10
-    CTEXT=Thanks for connecting\n Enter ? for list of commands\n\n
-    USER=username,xxxxxxxx,m0aaa,,SYSOP
-ENDPORT
-
-LINCHAT
-
-APPLICATION 2,CHAT,,MB7NAA-9,AACHAT,255

debian/changelog

@@ -1,248 +0,0 @@
-linbpq (6.0.24.66+repack-1~hibbian+2) bookworm-hibbian-unstable; urgency=medium
-
-  * Update postinst script to be a little quieter
-  * MINI_BUILDD_OPTION:
-    auto-ports=trixie-packetrepo-unstable,bookworm-packetrepo-unstable,bullseye-packetrepo-unstable,noble-packetrepo-unstable,jammy-packetrepo-unstable
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 11 Mar 2025 00:51:35 +0000
-
-linbpq (6.0.24.66+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New upstream version 6.0.24.66+repack
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 04 Mar 2025 22:50:09 +0000
-
-linbpq (6.0.24.65+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New Upstream 
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 25 Feb 2025 09:33:24 +0000
-
-linbpq (6.0.24.59a+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New Upstream 
-  * Little tweaks to makefile patch to account for new -rdynamic
-
- -- Dave Hibberd <hibby@debian.org>  Mon, 03 Feb 2025 22:32:11 +0000
-
-linbpq (6.0.24.56+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New Upstream
-
- -- Dave Hibberd <hibby@debian.org>  Mon, 06 Jan 2025 21:37:44 +0000
-
-linbpq (6.0.24.55+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New Upstream 
-  * d/rules
-    - Increased hardening
-
- -- Dave Hibberd <hibby@debian.org>  Sun, 05 Jan 2025 23:35:06 +0000
-
-linbpq (6.0.24.54+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New Upstream
-  * Drop AGW Patch
-  * Drop Spelling Patch
-  * Drop Dynamic Links patch
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 17 Dec 2024 16:46:05 +0000
-
-linbpq (6.0.24.53+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New upstream 
-    - Patches refreshed
-    - dropped some edits in ftbfs-gcc14
-    - dropped d/patches/headers.patch
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 03 Dec 2024 00:57:57 +0000
-
-linbpq (6.0.24.52+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New upstream
-    - Patches happy
-
- -- Dave Hibberd <hibby@debian.org>  Sat, 30 Nov 2024 21:47:17 +0000
-
-linbpq (6.0.24.51.1+repack-1~hibbian+2) bookworm-hibbian-unstable; urgency=medium
-
-  * Iron out an issue with time... 
-
- -- Dave Hibberd <hibby@debian.org>  Fri, 29 Nov 2024 19:57:28 +0000
-
-linbpq (6.0.24.51.1+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New upstream import after bug report
-  * Roll back some ftbfs-gcc14 edits
-  * Remove some more lib headers
-
- -- Dave Hibberd <hibby@debian.org>  Fri, 29 Nov 2024 19:30:22 +0000
-
-linbpq (6.0.24.51+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New upstream import
-    - Patches refreshed
-  * Upstream is now repacked to include less files
-  * Big build system review, now using Debian CFLAGS and LDFLAGS
-    - Hardening enabled, mostly
-    - A debug symbols package is now available
-  * Oh yeah, everything is now dynamic linking
-    - libpng
-    - libpaho-mqtt
-    - libjansson
-    - libminiupnpc
-
- -- Dave Hibberd <hibby@debian.org>  Fri, 29 Nov 2024 13:08:38 +0000
-
-linbpq (6.0.24.50-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New upstream import
-  * Files excluded at origtargz generation time for cleanliness
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 12 Nov 2024 21:56:38 +0000
-
-linbpq (6.0.24.49-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New Upstream import
-  * Patches refreshed
-  * Add mqtt requirements
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 05 Nov 2024 21:52:29 +0000
-
-linbpq (6.0.24.45-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New upstream import
-  * Patches refreshed
-
- -- Dave Hibberd <hibby@debian.org>  Fri, 11 Oct 2024 15:48:41 +0100
-
-linbpq (6.0.24.42-1~hibbian+3) bookworm-hibbian-unstable; urgency=medium
-
-  * 32bit build error
-    - Patch updated to fix hopefully
-
- -- Dave Hibberd <hibby@debian.org>  Fri, 30 Aug 2024 12:21:57 +0100
-
-linbpq (6.0.24.42-1~hibbian+2) bookworm-hibbian-unstable; urgency=medium
-
-  * Forgot to fix the ninotnc-smt issue, fixed now
-
- -- Dave Hibberd <hibby@debian.org>  Fri, 30 Aug 2024 12:05:54 +0100
-
-linbpq (6.0.24.42-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * Install config to /etc
-  * New upstream update
-  * Patches refreshed
-  * Debian hardening enabled
-    - 2 new patches created that touch almost every file
-    - Considered experimental.
-    - gcc14 builds for Debian Trixie!
-
- -- Dave Hibberd <hibby@debian.org>  Fri, 30 Aug 2024 10:15:11 +0100
-
-linbpq (6.0.24.40-1) unstable; urgency=medium
-
-  * Fresh upstream release
-    - Patches refreshed
-  * Secure by default patch
-
- -- Dave Hibberd <hibby@debian.org>  Sun, 07 Jul 2024 16:09:28 +0100
-
-linbpq (6.0.24.38-1) unstable; urgency=medium
-
-  * New Upstream
-  * Tweak config file per recommendation from 2M0MQN to make first start simple
-  * Bump standards to 4.7.0.0
-
- -- Dave Hibberd <hibby@debian.org>  Sun, 09 Jun 2024 22:38:40 +0100
-
-linbpq (6.0.24.34-2) unstable; urgency=medium
-
-  * Fix config permissions bug as reported by Alex 2E1PKY
-
- -- Dave Hibberd <hibby@debian.org>  Mon, 08 Apr 2024 22:27:02 +0100
-
-linbpq (6.0.24.34-1) unstable; urgency=medium
-
-  * Upstream bump
-
- -- Dave Hibberd <hibby@debian.org>  Sat, 06 Apr 2024 02:15:28 +0100
-
-linbpq (6.0.24.33-1) unstable; urgency=medium
-
-  * Upstream bump
-  * Moved config file to examples
-  * Updated service to fail on no config
-  * Added helpful README.Debian
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 26 Mar 2024 20:24:08 +0000
-
-linbpq (6.0.24.30-1) unstable; urgency=medium
-
-  * Upstream bump
-
- -- Dave Hibberd <hibby@debian.org>  Fri, 23 Feb 2024 23:24:46 +0000
-
-linbpq (6.0.24.29-1) unstable; urgency=medium
-
-  * Upstream bump
-  * Added my new details
-  * Tidied up some packaging errors
-
- -- Dave Hibberd <hibby@debian.org>  Tue, 13 Feb 2024 00:06:33 +0000
-
-linbpq (6.0.24.27-2) unstable; urgency=medium
-
-  * Permissions fix for web-config-editor users
-
- -- Dave Hibberd <d@vehibberd.com>  Thu, 18 Jan 2024 10:31:56 +0000
-
-linbpq (6.0.24.27-1) unstable; urgency=medium
-
-  * New Upstream Release
-
- -- Dave Hibberd <d@vehibberd.com>  Tue, 16 Jan 2024 20:51:43 +0000
-
-linbpq (6.0.24.25-1) unstable; urgency=medium
-
-  * New Upstream Release
-
- -- Dave Hibberd <d@vehibberd.com>  Thu, 28 Dec 2023 10:44:47 +0000
-
-linbpq (6.0.24.22-2) unstable; urgency=medium
-
-  * Moved config file home, caused chaos
-
- -- Dave Hibberd <d@vehibberd.com>  Sat, 16 Dec 2023 14:40:20 +0000
-
-linbpq (6.0.24.22-1) unstable; urgency=medium
-
-  * New Upstream Release
-
- -- Dave Hibberd <d@vehibberd.com>  Fri, 08 Dec 2023 12:29:40 +0000
-
-linbpq (6.0.24.16-1) unstable; urgency=medium
-
-  * New Upstream release
-
- -- Dave Hibberd <d@vehibberd.com>  Tue, 31 Oct 2023 22:50:01 +0000
-
-linbpq (6.0.24.15-2) unstable; urgency=medium
-
-  * debian/conffiles introduced to stop linbpq overwriting config files
-    - Thanks to Mark 2M0IIG for raising concern about this bug!
-
- -- Dave Hibberd <d@vehibberd.com>  Sun, 15 Oct 2023 21:45:24 +0100
-
-linbpq (6.0.24.15-1) unstable; urgency=medium
-
-  * New upstream release
-
- -- Dave Hibberd <d@vehibberd.com>  Tue, 10 Oct 2023 22:19:48 +0100
-
-linbpq (6.0.24.2-1) unstable; urgency=medium
-
-  * Initial release.
-
- -- Dave Hibberd <d@vehibberd.com>  Mon, 28 Aug 2023 23:20:45 +0100

debian/control

@@ -1,20 +0,0 @@
-Source: linbpq
-Section: hamradio
-Priority: optional
-Maintainer: Dave Hibberd <hibby@debian.org>
-Standards-Version: 4.7.1
-Vcs-Browser: https://git.hibbian.org/Hibbian/linbpq
-Vcs-Git: https://git.hibbian.org/Hibbian/linbpq.git
-Homepage: https://www.cantab.net/users/john.wiseman/Documents/
-Build-Depends: debhelper-compat (= 13)
-Build-Depends-Arch: libssl-dev, libminiupnpc-dev, libpcap-dev, libconfig-dev, zlib1g-dev, libpaho-mqtt-dev, libjansson-dev, libpng-dev
-Rules-Requires-Root: no
-
-Package: linbpq
-Architecture: linux-any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, hibbian-archive-keyring
-Description: Packet node and ax25 stack
- LINBPQ is a Linux version of the BPQ32 Node, BBS and Chat Server components.
- It is actively developed by John G8BPQ and contains a complete, independent
- implementation of ax.25 and net/rom as well as BBS and Chat applications and
- can be used either as a packet switch or as a full featured node.

debian/copyright

@@ -1,36 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: linBPQ
-Upstream-Contact: John Wiseman G8BPQ <john.wiseman@cantab.net>
-Source: https://www.cantab.net/users/john.wiseman/Documents/
-Files-Excluded: *.vcproj* *.bak *.lib *.dll *.wav *.asm *.vcxproj* *.pdb *.exe
-	.gitignore XAprs zlib.h zconf.h MQTT* pcap.h miniupnpc.h upnpdev.h
-	igd_desc_parse.h upnpcommands.h upnperrors.h miniupnpctypes.h
-
-Files: *
-Copyright: 1990-2024 John Wiseman G8BPQ <john.wiseman@cantab.net>
-License: GPL-3
-
-Files: debian/*
-Copyright: 2016-2021 Dave Hibberd <d@vehibberd.com>
-License: GPL-3
-
-Files: debian/linbpq.service
-Copyright: Tom Fanning M0LTE
-License: GPL-3
-
-License: GPL-3
- This program 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.
- .
- This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.
- .
- The GPL License which applies to this package can be found on your Debian
- system at /usr/share/common-licenses/GPL-3. 

debian/dirs

@@ -1,2 +0,0 @@
-usr/sbin
-opt/oarc/bpq

debian/gbp.conf

@@ -1,3 +0,0 @@
-[DEFAULT]
-debian-branch = hibbian/latest
-upstream-branch = upstream/latest

debian/gitlab-ci.yml

@@ -1,6 +0,0 @@
-include:
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
-
-reprotest:
-  extends: .test-reprotest-diffoscope

debian/install

@@ -1 +0,0 @@
-debian/bpq32.cfg etc/

debian/linbpq.examples

@@ -1 +0,0 @@
-debian/bpq32.cfg

debian/linbpq.service

@@ -1,14 +0,0 @@
-[Unit]
-Description=Linbpq systemd service file
-After=network.target
-ConditionPathExists=/etc/bpq32.cfg
-
-[Service]
-ExecStart=/usr/sbin/linbpq -c /etc -d /opt/oarc/bpq -l /opt/oarc/bpq
-WorkingDirectory=/opt/oarc/bpq
-Restart=always
-User=linbpq
-Group=linbpq
-
-[Install]
-WantedBy=multi-user.target

debian/lintian-overrides

@@ -1,11 +0,0 @@
-# weirdness from oarc packaging
-linbpq: dir-or-file-in-opt [opt/oarc/]
-linbpq: dir-or-file-in-opt [opt/oarc/bpq/]
-# i know!
-linbpq: no-manual-page [usr/sbin/linbpq]
-# Directory is populated on first run
-linbpq: package-contains-empty-directory [opt/oarc/bpq/]
-# Code convenience
-linbpq: spelling-error-in-binary Dont Don't [usr/sbin/linbpq]
-linbpq: spelling-error-in-binary Paramters Parameters [usr/sbin/linbpq]
-linbpq: spelling-error-in-binary lon long [usr/sbin/linbpq]

debian/patches/makefile

@@ -1,50 +0,0 @@
---- a/makefile
-+++ b/makefile
-@@ -2,8 +2,7 @@
- 
- #	To exclude i2c support run make noi2c
- 
--OBJS = pngwtran.o pngrtran.o pngset.o pngrio.o pngwio.o pngtrans.o pngrutil.o pngwutil.o\
-- pngread.o pngwrite.o png.o pngerror.o pngget.o pngmem.o APRSIconData.o AISCommon.o\
-+OBJS = APRSIconData.o AISCommon.o\
-  upnp.o APRSStdPages.o HSMODEM.o WinRPR.o KISSHF.o TNCEmulators.o bpqhdlc.o SerialPort.o\
-  adif.o WebMail.o utf8Routines.o VARA.o LzFind.o Alloc.o LzmaDec.o LzmaEnc.o LzmaLib.o \
-  Multicast.o ARDOP.o IPCode.o FLDigi.o linether.o CMSAuth.o APRSCode.o BPQtoAGW.o KAMPactor.o\
-@@ -18,9 +17,12 @@
- # Configuration:
- 
- CC = gcc
--		                       
--all: CFLAGS = -DLINBPQ -MMD -g -rdynamic -fcommon
--all: LDFLAGS = -l:libpaho-mqtt3a.a -l:libjansson.a
-+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-+CFLAGS+=$(shell dpkg-buildflags --get CPPFLAGS)
-+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-+
-+all: CFLAGS += -DLINBPQ -MMD -g -fcommon -rdynamic
-+all: LIBS = -lpaho-mqtt3a -ljansson -lminiupnpc -lrt -lm -lz -lpthread -lconfig -lpcap -lpng 
- all: linbpq
- 
- 
-@@ -32,12 +34,15 @@
- 
- 
- linbpq: $(OBJS)
--	gcc $(OBJS) -Xlinker -Map=output.map -l:libminiupnpc.a -lrt -lm -lz $(LDFLAGS) -lpthread -lconfig -lpcap -o linbpq
--	sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq		
-+	gcc $(OBJS) $(CLFAGS) $(LDFLAGS) $(LIBS) -o linbpq
-+	# sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq
- 
- -include *.d
- 
--clean :
--	rm *.d
--	rm linbpq $(OBJS)
--
-+install:
-+	install -b -m 755  -D -d		debian/linbpq/usr/sbin
-+	install -b -m 755  -p linbpq		debian/linbpq/usr/sbin
-+
-+clean:
-+	$(RM) *.d
-+	$(RM) linbpq $(OBJS)

debian/patches/series

@@ -1,2 +0,0 @@
-spelling-fixes.patch
-makefile

debian/patches/spelling-fixes.patch

@@ -1,11 +0,0 @@
---- a/UZ7HODrv.c
-+++ b/UZ7HODrv.c
-@@ -382,7 +382,7 @@
- 
- 	if (AGW->CenterFreq == 0)
- 	{
--		buffptr->Len = sprintf((UCHAR *)&buffptr->Data[0], "UZ7HO} Invalid Modem Freqency\r");
-+		buffptr->Len = sprintf((UCHAR *)&buffptr->Data[0], "UZ7HO} Invalid Modem Frequency\r");
- 		return 1;
- 	}
- 

debian/postinst

@@ -1,47 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = configure ]; then     
-
-#	if ! getent group linbpq >/dev/null; then
-#		addgroup --system --force-badname linbpq || true
-#	fi
-
-	echo "Creating/updating linbpq user account..."
-	adduser --system --group --home /opt/oarc/bpq \
-            --gecos "linbpq system user" --shell /bin/false \
-            --quiet --disabled-password linbpq || {
-        # adduser failed. Why?
-        if getent passwd linbpq >/dev/null ; then
-            echo "Non-system user linbpq found. I will not overwrite a non-system" >&2
-            echo "user.  Remove the user and reinstall linbpq." >&2
-            exit 1
-        fi
-        # unknown adduser error, simply exit
-        exit 1
-    } 
-    	if ! id -nGz linbpq | grep -qzxF 'dialout' ; then
-		adduser linbpq dialout
-	fi
-    	if ! id -nGz linbpq | grep -qzxF 'plugdev' ; then
-    		adduser linbpq plugdev
-	fi
-	chown :linbpq /opt/oarc/bpq
-	chmod 775 /opt/oarc/bpq
-
-# If we have setcap is installed, set the requirements
-# which allows us to install our binaries without the setuid
-# bit.     
-	if command -v setcap > /dev/null; then         
-			setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" /usr/sbin/linbpq
-		else
-			echo "Setcap failed on /usr/sbin/linbpq, Features may be limited" >&2
-	fi
-	else
-		echo "Setcap is not installed,  Features may be limited" >&2     
-
-
-fi 
-
-#DEBHELPER#

debian/preinst

@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-confile="/etc/bpq32.cfg"
-node="/opt/oarc/bpq/bpq32.cfg"
-
-if [ -L $confile ]; then
-	rm $confile
-	cp $node $confile
-	mv $node $node.bak
-fi
-
-#DEBHELPER#

debian/rules

@@ -1,6 +0,0 @@
-#!/usr/bin/make -f
-
-export DEB_BUILD_MAINT_OPTIONS=hardening=+all
-
-%:
-	dh $@

debian/source/format

@@ -1 +0,0 @@
-3.0 (quilt)

debian/watch

@@ -1,3 +0,0 @@
-version=4
-opts="pgpmode=none,dversionmangle=s/\+repack//,repacksuffix=+repack,repack,compression=xz" \
-http://127.0.0.1:8000/linbpq-(.+)\.(?:zip|tgz|tbz|txz|(?:tar\.(?:gz|bz2|xz)))

mailapi.c

@@ -852,14 +852,7 @@ double LatFromLOC = 0;
 double LonFromLOC = 0;
 #endif
 
-void SendBBSDataToPktMapThread();
-
 void SendBBSDataToPktMap()
-{
-	_beginthread(SendBBSDataToPktMapThread, 0, 0);
-}
-
-void SendBBSDataToPktMapThread()
 {
 	char Request[64];
 	char * Params;

makefile~

@@ -0,0 +1,43 @@
+#	LinBPQ Makefile
+
+#	To exclude i2c support run make noi2c
+
+OBJS = pngwtran.o pngrtran.o pngset.o pngrio.o pngwio.o pngtrans.o pngrutil.o pngwutil.o\
+ pngread.o pngwrite.o png.o pngerror.o pngget.o pngmem.o APRSIconData.o AISCommon.o\
+ upnp.o APRSStdPages.o HSMODEM.o WinRPR.o KISSHF.o TNCEmulators.o bpqhdlc.o SerialPort.o\
+ adif.o WebMail.o utf8Routines.o VARA.o LzFind.o Alloc.o LzmaDec.o LzmaEnc.o LzmaLib.o \
+ Multicast.o ARDOP.o IPCode.o FLDigi.o linether.o CMSAuth.o APRSCode.o BPQtoAGW.o KAMPactor.o\
+ AEAPactor.o HALDriver.o MULTIPSK.o BBSHTMLConfig.o ChatHTMLConfig.o BBSUtilities.o bpqaxip.o\
+ BPQINP3.o BPQNRR.o cMain.o Cmd.o CommonCode.o HTMLCommonCode.o compatbits.o config.o datadefs.o \
+ FBBRoutines.o HFCommon.o Housekeeping.o HTTPcode.o kiss.o L2Code.o L3Code.o L4Code.o lzhuf32.o \
+ MailCommands.o MailDataDefs.o LinBPQ.o MailRouting.o MailTCP.o MBLRoutines.o md5.o Moncode.o \
+ NNTPRoutines.o RigControl.o TelnetV6.o WINMOR.o TNCCode.o UZ7HODrv.o WPRoutines.o \
+ SCSTrackeMulti.o SCSPactor.o SCSTracker.o HanksRT.o  UIRoutines.o AGWAPI.o AGWMoncode.o \
+ DRATS.o FreeDATA.o base64.o Events.o nodeapi.o mailapi.o mqtt.o
+
+# Configuration:
+
+CC = gcc
+		                       
+all: CFLAGS = -DLINBPQ -MMD -g -fcommon
+all: LDFLAGS = -l:libpaho-mqtt3a.a -l:libjansson.a
+all: linbpq
+
+
+nomqtt: CFLAGS = -DLINBPQ -MMD -fcommon -g -DNOMQTT
+nomqtt: linbpq
+
+noi2c: CFLAGS = -DLINBPQ -MMD -DNOI2C -g -fcommon
+noi2c: linbpq
+
+
+linbpq: $(OBJS)
+	gcc $(OBJS) -Xlinker -Map=output.map -l:libminiupnpc.a -lrt -lm -lz $(LDFLAGS) -lpthread -lconfig -lpcap -o linbpq
+	sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq		
+
+-include *.d
+
+clean :
+	rm *.d
+	rm linbpq $(OBJS)
+

nodeapi-skigdebian.c

@@ -0,0 +1,858 @@
+// basic JASON API to BPQ Node
+
+// Authentication is via Telnet USER records.
+
+
+#define _CRT_SECURE_NO_DEPRECATE
+
+#include "cheaders.h"
+#include <stdlib.h>
+#include "tncinfo.h"
+#include "asmstrucs.h"
+#include "kiss.h"
+
+// Constants
+#define TOKEN_SIZE 32 // Length of the authentication token
+#define TOKEN_EXPIRATION 7200 // Token expiration time in seconds (2 hours)
+
+// Token data structure
+typedef struct Token {
+	char token[TOKEN_SIZE + 1];
+	time_t expiration_time;
+	struct Token* next;
+} Token;
+
+typedef struct API
+{
+	char *URL;
+	int URLLen;
+	int (* APIRoutine)(char * response, char * token, char * param);
+	int Auth;
+} API;
+
+// Auth defines
+
+#define AuthNone 0
+#define AuthUser 1
+#define Auth BBSUser 2
+#define AuthSysop 4
+
+// Function prototypes
+void handle_request(SOCKET client_socket, char * request, char * response);
+int verify_token(const char* token);
+void remove_expired_tokens();
+char* fetch_data(const char* endpoint);
+int  request_token(char * response);
+int send_http_response(char * response, const char* msg);
+int create_json_response(char * response, char* access_token, int expires_in, char* scope);
+void add_token_to_list(Token* token);
+
+Token* find_token(const char* token);
+Token* generate_token();
+
+int sendPortList(char * response, char * token, char * Rest);
+int sendNodeList(char * response, char * token, char * Rest);
+int sendUserList(char * response, char * token, char * Rest);
+int sendInfo(char * response, char * token, char * Rest);
+int sendLinks(char * response, char * token, char * Rest);
+int sendPortMHList(char * response, char * token, char * Rest);
+int sendWhatsPacState(char * response, char * token, char * param);
+int sendWhatsPacConfig(char * response, char * token, char * param);
+
+void BuildPortMH(char * MHJSON, struct PORTCONTROL * PORT);
+DllExport struct PORTCONTROL * APIENTRY GetPortTableEntryFromSlot(int portslot);
+
+// Token list
+Token* token_list = NULL;
+
+
+struct API APIList[] =
+{
+	"/api/ports", 10, sendPortList, 0,
+	"/api/nodes", 10, sendNodeList, 0,
+	"/api/info", 9, sendInfo, 0,
+	"/api/links", 10, sendLinks, 0,
+	"/api/users", 10, sendUserList, 0,
+	"/api/mheard", 11, sendPortMHList, 0,
+	"/api/v1/config", 14, sendWhatsPacConfig, 0,
+	"/api/v1/state", 13, sendWhatsPacState, 0
+};
+
+int APICount = sizeof(APIList) / sizeof(struct API);
+
+extern int HTTPPort;
+
+
+int xx()
+{
+	while (1) 
+	{
+		// Remove expired tokens
+		remove_expired_tokens();
+
+		// Handle the client request
+		//      handle_request();
+	}
+	return 0;
+}
+
+int APIProcessHTTPMessage(char * response, char * Method, char * URL, char * request, BOOL LOCAL, BOOL COOKIE)
+{
+	const char * auth_header = "Authorization: Bearer ";
+	char * token_begin = strstr(request, auth_header);
+	char token[TOKEN_SIZE + 1]= "";
+	int Flags = 0, n;
+
+	// Node Flags isn't currently used
+
+	char * Tok;
+	char * param;
+
+	if (token_begin)
+	{
+		// Using Auth Header
+
+		// Extract the token from the request (assuming it's present in the request headers)
+
+		if (token_begin == NULL)
+		{		
+			Debugprintf("Invalid request: No authentication token provided.\n");
+			return send_http_response(response, "403 (Forbidden)");
+		}
+
+		token_begin += strlen(auth_header); // Move to the beginning of the token
+		strncpy(token, token_begin, TOKEN_SIZE);
+		token[TOKEN_SIZE] = '\0'; // Null-terminate the token
+
+		param = strlop(URL, '?');
+	}
+	else
+	{
+		// There may be a token as first param, but if auth not needed may be misisng
+
+		Tok = strlop(URL, '?');
+		param = strlop(Tok, '&');
+
+		if (Tok && strlen(Tok) == TOKEN_SIZE)
+		{
+			// assume auth token
+
+			strcpy(token, Tok);
+		}
+		else param = Tok;
+	}
+
+	remove_expired_tokens();			// Tidy up
+
+	// Check if the request is for token generation
+
+	if (strcmp(Method, "OPTIONS") == 0)
+	{
+		// CORS Request
+
+		char Resp[] =
+			"HTTP/1.1 200 OK\r\n"
+			"Access-Control-Allow-Origin: *\r\n"
+			"Access-Control-Allow-Methods: POST, GET, OPTIONS\r\n"
+			"Access-Control-Allow-Headers: authorization";
+
+		return send_http_response(response, Resp);
+	}
+
+	if (strcmp(Method, "GET") != 0)
+		return send_http_response(response, "403 (Bad Method)");
+
+	if (_stricmp(URL, "/api/request_token") == 0)
+		return request_token(response);
+	
+/*
+if (token[0] == 0)
+	{
+		// Extract the token from the request (assuming it's present in the request headers)
+		if (token_begin == NULL)
+		{		
+			Debugprintf("Invalid request: No authentication token provided.\n");
+			return send_http_response(response, "403 (Forbidden)");
+		}
+		token_begin += strlen(auth_header); // Move to the beginning of the token
+		strncpy(token, token_begin, TOKEN_SIZE);
+		token[TOKEN_SIZE] = '\0'; // Null-terminate the token
+	}
+
+	// Verify the token
+	if (!verify_token(token))
+	{
+		Debugprintf("Invalid authentication token.\n");
+		return  send_http_response(response, "401 Unauthorized");
+	}
+
+	*/
+
+	// Determine the requested API endpoint
+
+	for (n = 0; n < APICount; n++)
+	{
+		struct API * APIEntry;
+		char * rest;
+		
+		APIEntry = &APIList[n];
+
+		if (_memicmp(URL, APIEntry->URL, APIEntry->URLLen) == 0)
+		{
+			rest = &request[4 + APIEntry->URLLen];	// Anything following?
+
+			if (rest[0] == ' ' || rest[0] == '/' || rest[0] == '?')
+				return APIEntry->APIRoutine(response, token, rest);
+		}
+
+	}
+
+	return send_http_response(response, "401 Invalid API Call");
+}
+
+int request_token(char * response) 
+{
+	Token * token = generate_token();
+	char scope[] = "create";
+
+	printf("Token generated: %s\n", token->token);
+
+	sprintf(response, "{\"access_token\":\"%s\", \"expires_at\":%ld,\"scope\":\"create\"}\r\n",
+		token->token, token->expiration_time);
+
+	return strlen(response);
+}
+
+Token * generate_token() 
+{
+	// Generate a random authentication token
+
+	int i;
+
+	Token * token = malloc(sizeof(Token));
+	for (i = 0; i < TOKEN_SIZE; i++)
+	{
+		token->token[i] = 'A' + rand() % 26; // Random uppercase alphabet character
+	}
+	token->token[TOKEN_SIZE] = '\0'; // Null-terminate the token
+	token->expiration_time = time(NULL) + TOKEN_EXPIRATION; // Set token expiration time
+	add_token_to_list(token);
+	return token;
+}
+
+// Function to add the token to the token_list
+
+void add_token_to_list(Token* token)
+{
+	if (token_list == NULL)
+	{
+		token_list = token;
+		token->next = NULL;
+	}
+	else
+	{
+		Token* current = token_list;
+		
+		while (current->next != NULL) 
+			current = current->next;
+
+		current->next = token;
+		token->next = NULL;
+	}
+}
+
+int verify_token(const char* token)
+{
+	// Find the token in the token list
+	Token * existing_token = find_token(token);
+
+	if (existing_token != NULL)
+	{
+		// Check if the token has expired
+		time_t current_time = time(NULL);
+		if (current_time > existing_token->expiration_time)
+		{
+			// Token has expired, remove it from the token list
+			remove_expired_tokens();
+			return 0;
+		}
+		// Token is valid
+		return 1;
+	}
+
+	// Token doesn't exist in the token list
+	return 0;
+}
+
+void remove_expired_tokens()
+{
+	time_t current_time = time(NULL);
+	Token* current_token = token_list;
+	Token* prev_token = NULL;
+	Token* next_token;
+
+	while (current_token != NULL)
+	{
+		if (current_time > current_token->expiration_time) 
+		{
+			// Token has expired, remove it from the token list
+			if (prev_token == NULL)
+			{
+				token_list = current_token->next;
+			} else {
+				prev_token->next = current_token->next;
+			}
+			next_token = current_token->next;
+			free(current_token);
+			current_token = next_token;
+		} else {
+			prev_token = current_token;
+			current_token = current_token->next;
+		}
+	}
+}
+
+Token * find_token(const char* token) 
+{
+	Token* current_token = token_list;
+	while (current_token != NULL) 
+	{
+		if (strcmp(current_token->token, token) == 0) 
+		{
+			return current_token;
+		}
+		current_token = current_token->next;
+	}
+	return NULL;
+}
+
+int send_http_response(char * response, const char* msg)
+{
+	return sprintf(response, "HTTP/1.1 %s\r\nContent-Length: 0\r\nConnection: close\r\n\r\n", msg);
+}
+
+/*
+{
+"access_token":"MTQ0NjJkZmQ5OTM2NDE1ZTZjNGZmZjI3",
+"expires_in":3600,
+"scope":"create"
+}
+*/
+
+/*
+{"ports":[
+{"ID":"My Port", "Driver":"KISS", "Number":2, "State":"Active"),
+{ ...},
+{...}
+]}
+*/
+
+extern int MasterPort[MAXBPQPORTS+1];	// Pointer to first BPQ port for a specific MPSK or UZ7HO host
+
+int sendPortList(char * response, char * token, char * param)
+{
+	char * Array = 0;
+	int ArrayLen = 0;
+	int ArrayPtr = 0;
+	
+	struct _EXTPORTDATA * ExtPort;
+	struct PORTCONTROL * Port;
+	struct PORTCONTROL * SAVEPORT;
+	int PortNo;
+
+	int count;
+	char DLL[20];
+	char Status[32]="Unknown";
+	char ID[33];
+	char * ptr;
+
+	ArrayPtr += sprintf(&response[ArrayPtr], "{\"ports\":[\r\n");
+
+	for (count = 1; count <= NUMBEROFPORTS; count++)
+	{
+		Port = GetPortTableEntryFromSlot(count);
+		ExtPort = (struct _EXTPORTDATA *)Port;
+		PortNo = Port->PORTNUMBER;
+
+		if (Port->PORTTYPE == 0x10)
+		{	
+			strcpy(DLL, ExtPort->PORT_DLL_NAME);
+			strlop(DLL, '.');
+			strlop(DLL, ' ');
+		}
+		else if (Port->PORTTYPE == 0)
+			strcpy(DLL, "ASYNC");
+
+		else if (Port->PORTTYPE == 22)
+			strcpy(DLL, "I2C");
+
+		else if (Port->PORTTYPE == 14)
+			strcpy(DLL, "INTERNAL");
+
+		else if (Port->PORTTYPE > 0 && Port->PORTTYPE < 14)
+			strcpy(DLL, "HDLC");
+
+
+		if (Port->PortStopped)
+		{
+			strcpy(Status, "Stopped");
+
+		}
+		else
+		{
+			if (Port->PORTTYPE == 0)
+			{
+				struct KISSINFO * KISS = (struct KISSINFO *)Port;
+				NPASYINFO KPort;
+
+				SAVEPORT = Port;
+
+				if (KISS->FIRSTPORT && KISS->FIRSTPORT != KISS)
+				{
+					// Not first port on device
+
+					Port = (struct PORTCONTROL *)KISS->FIRSTPORT;
+					KPort = KISSInfo[PortNo];
+				}
+
+				KPort = KISSInfo[PortNo];
+
+				if (KPort)
+				{
+					// KISS like - see if connected 
+
+					if (Port->PORTIPADDR.s_addr || Port->KISSSLAVE)
+					{
+						// KISS over UDP or TCP
+
+						if (Port->KISSTCP)
+						{
+							if (KPort->Connected)
+								strcpy(Status, "Open  ");
+							else
+								if (Port->KISSSLAVE)
+									strcpy(Status, "Listen");
+								else
+									strcpy(Status, "Closed");
+						}
+						else
+							strcpy(Status, "UDP");
+					}
+					else
+						if (KPort->idComDev)			// Serial port Open
+							strcpy(Status, "Open  ");
+						else
+							strcpy(Status, "Closed");
+
+
+					Port = SAVEPORT;
+				}		
+			}
+
+			if (Port->PORTTYPE == 14)		// Loopback 
+				strcpy(Status, "Open  ");
+
+			else if (Port->PORTTYPE == 16)		// External
+			{
+				if (Port->PROTOCOL == 10)		// 'HF' Port
+				{
+					struct TNCINFO * TNC = TNCInfo[PortNo];
+
+					if (TNC)
+					{
+						switch (TNC->Hardware)				// Hardware Type
+						{
+						case H_SCS:
+						case H_KAM:
+						case H_AEA:
+						case H_HAL:
+						case H_TRK:
+						case H_SERIAL:
+
+							// Serial
+
+							if (TNC->hDevice)
+								strcpy(Status, "Open  ");
+							else
+								strcpy(Status, "Closed");
+
+							break;
+
+						case H_UZ7HO:
+
+							if (TNCInfo[MasterPort[PortNo]]->CONNECTED)
+								strcpy(Status, "Open  ");
+							else
+								strcpy(Status, "Closed");
+
+							break;
+
+						case H_WINMOR:
+						case H_V4:
+
+						case H_MPSK:
+						case H_FLDIGI:
+						case H_UIARQ:
+						case H_ARDOP:
+						case H_VARA:
+						case H_KISSHF:
+						case H_WINRPR:
+						case H_FREEDATA:
+
+							// TCP
+
+							if (TNC->CONNECTED)
+							{
+								if (TNC->Streams[0].Attached)
+									strcpy(Status, "In Use");
+								else
+									strcpy(Status, "Open  ");
+							}
+							else
+								strcpy(Status, "Closed");
+
+							break;
+
+						case H_TELNET:
+
+							strcpy(Status, "Open  ");
+						}
+					}
+				}
+				else
+				{
+					// External but not HF - AXIP, BPQETHER VKISS, ??
+
+					struct _EXTPORTDATA * EXTPORT = (struct _EXTPORTDATA *)Port;
+
+					strcpy(Status, "Open  ");
+				}
+			}
+		}
+
+		strlop(Status, ' ');
+		strcpy(ID, Port->PORTDESCRIPTION);
+		ptr = &ID[29];
+		while (*(ptr) == ' ')
+		{
+			*(ptr--) = 0;
+		}
+
+		ArrayPtr += sprintf(&response[ArrayPtr], " {\"ID\":\"%s\", \"Driver\":\"%s\", \"Number\":%d,\"State\":\"%s\"},\r\n",
+			ID, DLL, Port->PORTNUMBER, Status);
+	}
+
+	ArrayPtr -= 3;		// remove trailing comma
+	ArrayPtr += sprintf(&response[ArrayPtr], "\r\n]}\r\n");
+
+	return ArrayPtr;
+}
+
+/*
+{"Nodes":[
+{"Call":"xx", "Alias":"xx", "Nbour1 ":"xx", "Quality":192),
+{ ...},
+{...}
+]}
+*/
+
+extern int MaxNodes;
+extern struct DEST_LIST * DESTS;		// NODE LIST
+extern int DEST_LIST_LEN;
+
+
+int sendNodeList(char * response, char * token, char * param)
+{
+	int ArrayPtr = 0;
+	
+	int count, len, i;
+	char Normcall[10], Portcall[10];
+	char Alias[7];
+	struct DEST_LIST * Dests = DESTS ;
+	//	struct ROUTE * Routes;
+
+	Dests = DESTS;
+	MaxNodes = MAXDESTS;
+
+	ArrayPtr += sprintf(&response[ArrayPtr], "{\"nodes\":[\r\n");
+
+	Dests-=1;
+
+	for (count = 0; count < MaxNodes; count++)
+	{
+		Dests+=1;
+
+		if (Dests->DEST_CALL[0] == 0)
+			continue;
+
+		len = ConvFromAX25(Dests->DEST_CALL, Normcall);
+		Normcall[len] = 0;
+
+		memcpy(Alias, Dests->DEST_ALIAS, 6);
+
+		Alias[6]=0;
+
+		for (i=0;i<6;i++)
+		{
+			if (Alias[i] == ' ')
+				Alias[i] = 0;
+		}
+
+
+		ArrayPtr += sprintf(&response[ArrayPtr], " {\"Call\":\"%s\", \"Alias\":\"%s\", \"Routes\":[", Normcall, Alias);
+
+
+		// Add an array  with up to 6 objects (3 NR + 3 INP3 Neighbours
+
+		if (Dests->NRROUTE[0].ROUT_NEIGHBOUR != 0 && Dests->NRROUTE[0].ROUT_NEIGHBOUR->INP3Node == 0)
+		{
+			len = ConvFromAX25(Dests->NRROUTE[0].ROUT_NEIGHBOUR->NEIGHBOUR_CALL,Portcall);
+			Portcall[len] = 0;
+
+			ArrayPtr += sprintf(&response[ArrayPtr], "{\"Call\":\"%s\", \"Port\":%d, \"Quality\":%d},",
+				Portcall, Dests->NRROUTE[0].ROUT_NEIGHBOUR->NEIGHBOUR_PORT, Dests->NRROUTE[0].ROUT_QUALITY);
+
+
+			//				if (Dests->NRROUTE[0].ROUT_OBSCOUNT > 127)
+			//				{
+			//					len=sprintf(&line[cursor],"! ");
+			//					cursor+=len;
+			//				}
+
+
+			if (Dests->NRROUTE[1].ROUT_NEIGHBOUR != 0 && Dests->NRROUTE[1].ROUT_NEIGHBOUR->INP3Node == 0)
+			{
+			len=ConvFromAX25(Dests->NRROUTE[1].ROUT_NEIGHBOUR->NEIGHBOUR_CALL,Portcall);
+			Portcall[len]=0;
+
+	
+
+			ArrayPtr += sprintf(&response[ArrayPtr], " {\"Call\":\"%s\", \"Port\":%d, \"Quality\":%d},",
+				Portcall, Dests->NRROUTE[1].ROUT_NEIGHBOUR->NEIGHBOUR_PORT, Dests->NRROUTE[1].ROUT_QUALITY);
+			//if (Dests->NRROUTE[1].ROUT_OBSCOUNT > 127)
+			//{
+			//len=sprintf(&line[cursor],"! ");
+			//cursor+=len;
+			//}
+
+			}
+
+			if (Dests->NRROUTE[2].ROUT_NEIGHBOUR != 0 && Dests->NRROUTE[2].ROUT_NEIGHBOUR->INP3Node == 0)
+			{
+			len=ConvFromAX25(Dests->NRROUTE[2].ROUT_NEIGHBOUR->NEIGHBOUR_CALL,Portcall);
+			Portcall[len]=0;
+
+
+			ArrayPtr += sprintf(&response[ArrayPtr], " {\"Call\":\"%s\", \"Port\":%d, \"Quality\":%d},",
+				Portcall, Dests->NRROUTE[1].ROUT_NEIGHBOUR->NEIGHBOUR_PORT, Dests->NRROUTE[1].ROUT_QUALITY);
+
+			//if (Dests->NRROUTE[2].ROUT_OBSCOUNT > 127)
+			//{
+			//len=sprintf(&line[cursor],"! ");
+			//cursor+=len;
+
+			}
+			ArrayPtr -= 1;		// remove comma
+		}
+
+		ArrayPtr += sprintf(&response[ArrayPtr], "]},\r\n");
+	}	
+
+	ArrayPtr -= 3;		// remove comma
+	ArrayPtr += sprintf(&response[ArrayPtr], "\r\n]}");
+	
+	return ArrayPtr;
+}
+
+
+int sendUserList(char * response, char * token, char * param)
+{
+	int ArrayPtr = 0;
+	int n = MAXCIRCUITS;
+	TRANSPORTENTRY * L4 = L4TABLE;
+//	TRANSPORTENTRY * Partner;
+	int MaxLinks = MAXLINKS;
+	char State[12] = "", Type[12] = "Uplink";
+	char LHS[50] = "", MID[10] = "", RHS[50] = "";
+//	char Line[100];
+	char Normcall[10];
+	int len;
+		
+	ArrayPtr += sprintf(&response[ArrayPtr], "{\"users\":[\r\n");
+
+	while (n--)
+	{
+		if (L4->L4USER[0])
+		{
+			RHS[0] = MID[0] = 0;
+
+			len = ConvFromAX25(L4->L4USER, Normcall);
+			Normcall[len] = 0;
+
+			ArrayPtr += sprintf(&response[ArrayPtr], " {\"Call\": \"%s\"},\r\n", Normcall);
+			L4++;
+		}
+	}
+
+	if (ArrayPtr == 12)			//empty list
+	{
+		ArrayPtr -=2;
+		ArrayPtr += sprintf(&response[ArrayPtr], "]}\r\n");
+	}
+	else
+	{
+		ArrayPtr -= 3;		// remove trailing comma
+		ArrayPtr += sprintf(&response[ArrayPtr], "\r\n]}\r\n");
+	}
+	return ArrayPtr;
+}
+
+extern char MYALIASLOPPED[];
+extern char TextVerstring[];
+extern char LOCATOR[];
+
+int sendInfo(char * response, char * token, char * param)
+{
+	char call[10];
+
+	memcpy(call, MYNODECALL, 10);
+	strlop(call, ' ');
+
+	sprintf(response, "{\"info\":{\"NodeCall\":\"%s\", \"Alias\":\"%s\", \"Locator\":\"%s\", \"Version\":\"%s\"}}\r\n",
+		call, MYALIASLOPPED, LOCATOR, TextVerstring);
+
+	return strlen(response);
+}
+
+int sendLinks(char * response, char * token, char * param)
+{
+	struct _LINKTABLE * Links = LINKS;
+	int MaxLinks = MAXLINKS;
+	int count;
+	char Normcall1[10];
+	char Normcall2[10];
+	char State[12] = "", Type[12] = "Uplink";
+	int axState;
+	int cctType;
+	int ReplyLen = 0;
+	ReplyLen += sprintf(&response[ReplyLen],"{\"links\":[\r\n");
+
+	for (count=0; count<MaxLinks; count++)
+	{
+		if (Links->LINKCALL[0] != 0)
+		{
+			int len = ConvFromAX25(Links->LINKCALL, Normcall1);
+			Normcall1[len] = 0;
+
+			len = ConvFromAX25(Links->OURCALL, Normcall2);
+			Normcall2[len] = 0;
+
+
+			axState = Links->L2STATE;
+
+			if (axState == 2)
+				strcpy(State, "Connecting");
+			else if (axState == 3)
+				strcpy(State, "FRMR");
+			else if (axState == 4)
+				strcpy(State, "Closing");
+			else if (axState == 5)
+				strcpy(State, "Active");
+			else if (axState == 6)
+				strcpy(State, "REJ Sent");
+
+			cctType = Links->LINKTYPE;
+
+			if (cctType == 1)
+				strcpy(Type, "Uplink");
+			else if (cctType == 2)
+				strcpy(Type, "Downlink");
+			else if (cctType == 3)
+				strcpy(Type, "Node-Node");
+
+
+
+			ReplyLen += sprintf(&response[ReplyLen], "{\"farCall\": \"%s\",\"ourCall\": \"%s\", \"port\": \"%d\", \"state\": \"%s\", \"linkType\": \"%s\", \"ax25Version\": \"%d\"},\r\n",
+				Normcall1, Normcall2, Links->LINKPORT->PORTNUMBER,
+				State, Type, 2 - Links->VER1FLAG );
+			Links+=1;
+		}
+	}
+
+	if (ReplyLen < 13)
+		ReplyLen -= 2;          // no links
+	else
+		ReplyLen -= 3;         // remove trailing comma
+
+	ReplyLen+= sprintf(&response[ReplyLen], "\r\n]}\r\n");
+
+	return ReplyLen;
+}
+
+int sendPortMHList(char * response, char * token, char * param)
+{
+        struct PORTCONTROL * PORTVEC ;
+		int n;
+		int port = 0;
+
+		if (param[0] = '?' || param[0] == '/')
+			port = atoi(&param[1]);
+
+		PORTVEC = GetPortTableEntryFromPortNum(port);
+		response[0] = 0;
+
+		if (PORTVEC == 0)
+			return send_http_response(response, "401 Invalid API Call");
+
+		n = sprintf(response,"{\"mheard\":[\r\n");
+
+        BuildPortMH(&response[n], PORTVEC );
+
+		if (response[n] == 0)		// No entries
+		{
+			response[strlen(response) - 2] = '\0';          // remove \r\n
+			strcat(response, "]}\r\n");
+		}
+		else
+		{
+			response[strlen(response)-3 ] = '\0';          // remove ,\r\n
+			strcat(response, "\r\n]}\r\n");
+//      printf("MH for port %d:\r\n%s\r\n", PORTVEC->PORTNUMBER, response);
+		}
+		return strlen(response);
+}
+
+// WhatsPac configuration interface
+// WhatsPac also uses Paula's Remote Host Protocol (RHP). This is in a separate module
+
+extern int WhatsPacConfigured;
+
+
+int sendWhatsPacState(char * response, char * token, char * param)
+{
+	if (WhatsPacConfigured)
+		sprintf(response, "{\"configured\": true}\r\n");
+	else
+		sprintf(response, "{\"configured\": false}\r\n");
+
+	return strlen(response);
+}
+
+
+int sendWhatsPacConfig(char * response, char * token, char * param)
+{
+	char Template[] =
+	"{\"MODE\": 0,"
+	"\"RHPPORT\": \"%d\","
+	"\"AGWPORT\": \"7000\","
+	"\"INTERFACES\": [{\"INTERFACE\": 1,\"PROTOCOL\": \"KISS\",\"TYPE\": \"TCP\",\"IOADDR\": \"127.0.0.1\",\"INTNUM\": 8100}],"
+	"\"PORTS\": [{\"PORT\": 1,\"ID\": \"RHPPORT\", \"INTERFACENUM\": 1}]}";
+
+	sprintf(response, Template, HTTPPort);
+
+	return strlen(response);
+}
+
+
+
+

nodeapi.c

@@ -26,7 +26,7 @@ typedef struct API
 {
 	char *URL;
 	int URLLen;
-	int (* APIRoutine)(char * response, char * token, char * param, int Local);
+	int (* APIRoutine)(char * response, char * token, char * param);
 	int Auth;
 } API;
 
@@ -34,7 +34,7 @@ typedef struct API
 
 #define AuthNone 0
 #define AuthUser 1
-#define AuthBBSUser 2
+#define Auth BBSUser 2
 #define AuthSysop 4
 
 // Function prototypes
@@ -50,14 +50,14 @@ void add_token_to_list(Token* token);
 Token* find_token(const char* token);
 Token* generate_token();
 
-int sendPortList(char * response, char * token, char * Rest, int Local);
+int sendPortList(char * response, char * token, char * Rest);
-int sendNodeList(char * response, char * token, char * Rest, int Local);
+int sendNodeList(char * response, char * token, char * Rest);
-int sendUserList(char * response, char * token, char * Rest, int Local);
+int sendUserList(char * response, char * token, char * Rest);
-int sendInfo(char * response, char * token, char * Rest, int Local);
+int sendInfo(char * response, char * token, char * Rest);
-int sendLinks(char * response, char * token, char * Rest, int Local);
+int sendLinks(char * response, char * token, char * Rest);
-int sendPortMHList(char * response, char * token, char * Rest, int Local);
+int sendPortMHList(char * response, char * token, char * Rest);
-int sendWhatsPacState(char * response, char * token, char * param, int Local);
+int sendWhatsPacState(char * response, char * token, char * param);
-int sendWhatsPacConfig(char * response, char * token, char * param, int Local);
+int sendWhatsPacConfig(char * response, char * token, char * param);
 
 void BuildPortMH(char * MHJSON, struct PORTCONTROL * PORT);
 DllExport struct PORTCONTROL * APIENTRY GetPortTableEntryFromSlot(int portslot);
@@ -74,8 +74,8 @@ struct API APIList[] =
 	"/api/links", 10, sendLinks, 0,
 	"/api/users", 10, sendUserList, 0,
 	"/api/mheard", 11, sendPortMHList, 0,
-	"/api/v1/config", 14, sendWhatsPacConfig, AuthSysop,
+	"/api/v1/config", 14, sendWhatsPacConfig, 0,
-	"/api/v1/state", 13, sendWhatsPacState, AuthSysop
+	"/api/v1/state", 13, sendWhatsPacState, 0
 };
 
 int APICount = sizeof(APIList) / sizeof(struct API);
@@ -159,14 +159,6 @@ int APIProcessHTTPMessage(char * response, char * Method, char * URL, char * req
 		return send_http_response(response, Resp);
 	}
 
-	if (strcmp(Method, "POST") == 0)
-	{
-		if (_stricmp(URL, "/api/v1/config") == 0)
-		{
-			return send_http_response(response, "200 (OK)");
-		}
-	}
-
 	if (strcmp(Method, "GET") != 0)
 		return send_http_response(response, "403 (Bad Method)");
 
@@ -210,7 +202,7 @@ if (token[0] == 0)
 			rest = &request[4 + APIEntry->URLLen];	// Anything following?
 
 			if (rest[0] == ' ' || rest[0] == '/' || rest[0] == '?')
-				return APIEntry->APIRoutine(response, token, rest, LOCAL);
+				return APIEntry->APIRoutine(response, token, rest);
 		}
 
 	}
@@ -336,7 +328,7 @@ Token * find_token(const char* token)
 
 int send_http_response(char * response, const char* msg)
 {
-	return sprintf(response, "HTTP/1.1 %s\r\nAccess-Control-Allow-Origin: *\r\nContent-Length: 0\r\nConnection: close\r\n\r\n", msg);
+	return sprintf(response, "HTTP/1.1 %s\r\nContent-Length: 0\r\nConnection: close\r\n\r\n", msg);
 }
 
 /*
@@ -357,7 +349,7 @@ int send_http_response(char * response, const char* msg)
 
 extern int MasterPort[MAXBPQPORTS+1];	// Pointer to first BPQ port for a specific MPSK or UZ7HO host
 
-int sendPortList(char * response, char * token, char * param, int Local)
+int sendPortList(char * response, char * token, char * param)
 {
 	char * Array = 0;
 	int ArrayLen = 0;
@@ -569,7 +561,7 @@ extern struct DEST_LIST * DESTS;		// NODE LIST
 extern int DEST_LIST_LEN;
 
 
-int sendNodeList(char * response, char * token, char * param, int Local)
+int sendNodeList(char * response, char * token, char * param)
 {
 	int ArrayPtr = 0;
 	
@@ -673,7 +665,7 @@ int sendNodeList(char * response, char * token, char * param, int Local)
 }
 
 
-int sendUserList(char * response, char * token, char * param, int Local)
+int sendUserList(char * response, char * token, char * param)
 {
 	int ArrayPtr = 0;
 	int n = MAXCIRCUITS;
@@ -719,7 +711,7 @@ extern char MYALIASLOPPED[];
 extern char TextVerstring[];
 extern char LOCATOR[];
 
-int sendInfo(char * response, char * token, char * param, int Local)
+int sendInfo(char * response, char * token, char * param)
 {
 	char call[10];
 
@@ -732,7 +724,7 @@ int sendInfo(char * response, char * token, char * param, int Local)
 	return strlen(response);
 }
 
-int sendLinks(char * response, char * token, char * param, int Local)
+int sendLinks(char * response, char * token, char * param)
 {
 	struct _LINKTABLE * Links = LINKS;
 	int MaxLinks = MAXLINKS;
@@ -797,7 +789,7 @@ int sendLinks(char * response, char * token, char * param, int Local)
 	return ReplyLen;
 }
 
-int sendPortMHList(char * response, char * token, char * param, int Local)
+int sendPortMHList(char * response, char * token, char * param)
 {
         struct PORTCONTROL * PORTVEC ;
 		int n;
@@ -836,11 +828,8 @@ int sendPortMHList(char * response, char * token, char * param, int Local)
 extern int WhatsPacConfigured;
 
 
-int sendWhatsPacState(char * response, char * token, char * param, int Local)
+int sendWhatsPacState(char * response, char * token, char * param)
 {
-	if (Local == 0)
-		return send_http_response(response, "401 Not Authorised");
-
 	if (WhatsPacConfigured)
 		sprintf(response, "{\"configured\": true}\r\n");
 	else
@@ -850,7 +839,7 @@ int sendWhatsPacState(char * response, char * token, char * param, int Local)
 }
 
 
-int sendWhatsPacConfig(char * response, char * token, char * param, int Local)
+int sendWhatsPacConfig(char * response, char * token, char * param)
 {
 	char Template[] =
 	"{\"MODE\": 0,"
@@ -859,9 +848,6 @@ int sendWhatsPacConfig(char * response, char * token, char * param, int Local)
 	"\"INTERFACES\": [{\"INTERFACE\": 1,\"PROTOCOL\": \"KISS\",\"TYPE\": \"TCP\",\"IOADDR\": \"127.0.0.1\",\"INTNUM\": 8100}],"
 	"\"PORTS\": [{\"PORT\": 1,\"ID\": \"RHPPORT\", \"INTERFACENUM\": 1}]}";
 
-	if (Local == 0)
-		return send_http_response(response, "401 Not Authorised");
-
 	sprintf(response, Template, HTTPPort);
 
 	return strlen(response);

tncinfo.h

@@ -871,10 +871,9 @@ typedef struct TNCINFO
 
 VOID * zalloc(int len);
 
-BOOL ReadConfigFile(int Port, int ProcLine(char * buf, int Port));
+BOOL ReadConfigFile(int Port, int ProcLine());
 int GetLine(char * buf);
-BOOL CreatePactorWindow(struct TNCINFO * TNC, char * ClassName, char * WindowTitle, int RigControlRow, WNDPROC WndProc,
+BOOL CreatePactorWindow(struct TNCINFO * TNC, char * ClassName, char * WindowTitle, int RigControlRow, WNDPROC WndProc, int Width, int Height, VOID ForcedCloseProc());
-						int Width, int Height, VOID ForcedCloseProc(struct TNCINFO * TNC, int Stream));
 char * CheckAppl(struct TNCINFO * TNC, char * Appl);
 BOOL SendReporttoWL2K(struct TNCINFO * TNC);
 struct WL2KInfo * DecodeWL2KReportLine(char *  buf);