APRSCode.c

@@ -7693,7 +7693,7 @@ VOID APRSProcessHTTPMessage(SOCKET sock, char * MsgPtr,	BOOL LOCAL, BOOL COOKIE)
 		while (ptr)
 		{
 			char ToLopped[11] = "";
-
+		
 			if (ptr->Acked)
 				strcpy(Retries, "A");
 			else if (ptr->Retries == 0)
@@ -7701,26 +7701,26 @@ VOID APRSProcessHTTPMessage(SOCKET sock, char * MsgPtr,	BOOL LOCAL, BOOL COOKIE)
 			else
 				sprintf(Retries, "%d", ptr->Retries);
 
-			memcpy(ToLopped, ptr->ToCall, 10);
+				memcpy(ToLopped, ptr->ToCall, 10);
-			strlop(ToLopped, ' ');
+				strlop(ToLopped, ' ');
 
-			OutputLen += sprintf(&OutBuffer[OutputLen], WebTXLine,
+				OutputLen += sprintf(&OutBuffer[OutputLen], WebTXLine,
-				ptr->ToCall, ptr->Seq, ptr->Time, Retries, ptr->Text);
+					ptr->ToCall, ptr->Seq, ptr->Time, Retries, ptr->Text);
-			ptr = ptr->Next;
+				ptr = ptr->Next;
 
-			if (OutputLen > 99000)
+				if (OutputLen > 99000)
-				break;
+					break;
 
-		}
+			}
 
-		OutputLen += sprintf(&OutBuffer[OutputLen], "%s", WebTrailer);
+			OutputLen += sprintf(&OutBuffer[OutputLen], "%s", WebTrailer);
 
-		HeaderLen = sprintf(Header, "HTTP/1.0 200 OK\r\nContent-Length: %d\r\nContent-Type: text/html\r\n\r\n", OutputLen);
+			HeaderLen = sprintf(Header, "HTTP/1.0 200 OK\r\nContent-Length: %d\r\nContent-Type: text/html\r\n\r\n", OutputLen);
-		sendandcheck(sock, Header, HeaderLen);
+			sendandcheck(sock, Header, HeaderLen);
-		sendandcheck(sock, OutBuffer, OutputLen);
+			sendandcheck(sock, OutBuffer, OutputLen);
-
-		return;
 
+			return;
+		
 	}
 
 

ARDOP.c

@@ -466,107 +466,107 @@ static int ProcessLine(char * buf, int Port)
 	else
 		return FALSE;						// Must start with ADDR
 
-	TNC->InitScript = malloc(1000);
+		TNC->InitScript = malloc(1000);
-	TNC->InitScript[0] = 0;
+		TNC->InitScript[0] = 0;
 
-	ptr = strtok(NULL, " \t\n\r");
+		ptr = strtok(NULL, " \t\n\r");
 
-	if (ptr)
-	{
-		if (_stricmp(ptr, "PTT") == 0)
-		{
-			ptr = strtok(NULL, " \t\n\r");
-
-			if (ptr)
-			{
-				DecodePTTString(TNC, ptr);
-				ptr = strtok(NULL, " \t\n\r");
-			}
-		}
-	}
-
-	if (ptr)
-	{
-		if (_memicmp(ptr, "PATH", 4) == 0)
-		{
-			p_cmd = strtok(NULL, "\n\r");
-			if (p_cmd) TNC->ProgramPath = _strdup(p_cmd);
-		}
-	}
-
-	TNC->MaxConReq = 10;		// Default
-	TNC->OldMode = FALSE;		// Default 
-
-	// Read Initialisation lines
-
-	while(TRUE)
-	{
-		if (GetLine(buf) == 0)
-			return TRUE;
-
-		strcpy(errbuf, buf);
-
-		if (memcmp(buf, "****", 4) == 0)
-			return TRUE;
-
-		ptr = strchr(buf, ';');
 		if (ptr)
 		{
-			*ptr++ = 13;
+			if (_stricmp(ptr, "PTT") == 0)
-			*ptr = 0;
+			{
+				ptr = strtok(NULL, " \t\n\r");
+
+				if (ptr)
+				{
+					DecodePTTString(TNC, ptr);
+					ptr = strtok(NULL, " \t\n\r");
+				}
+			}
+		}
+		
+		if (ptr)
+		{
+			if (_memicmp(ptr, "PATH", 4) == 0)
+			{
+				p_cmd = strtok(NULL, "\n\r");
+				if (p_cmd) TNC->ProgramPath = _strdup(p_cmd);
+			}
 		}
 
-		if ((_memicmp(buf, "CAPTURE", 7) == 0) || (_memicmp(buf, "PLAYBACK", 8) == 0))
+		TNC->MaxConReq = 10;		// Default
-		{}		// Ignore
+		TNC->OldMode = FALSE;		// Default 
-		else
+
-			/*
+		// Read Initialisation lines
+
+		while(TRUE)
+		{
+			if (GetLine(buf) == 0)
+				return TRUE;
+
+			strcpy(errbuf, buf);
+
+			if (memcmp(buf, "****", 4) == 0)
+				return TRUE;
+
+			ptr = strchr(buf, ';');
+			if (ptr)
+			{
+				*ptr++ = 13;
+				*ptr = 0;
+			}
+				
+			if ((_memicmp(buf, "CAPTURE", 7) == 0) || (_memicmp(buf, "PLAYBACK", 8) == 0))
+			{}		// Ignore
+			else
+/*
 			if (_memicmp(buf, "PATH", 4) == 0)
 			{
-			char * Context;
+				char * Context;
-			p_cmd = strtok_s(&buf[5], "\n\r", &Context);
+				p_cmd = strtok_s(&buf[5], "\n\r", &Context);
-			if (p_cmd) TNC->ProgramPath = _strdup(p_cmd);
+				if (p_cmd) TNC->ProgramPath = _strdup(p_cmd);
 			}
 			else
-			*/
+*/
 
 			if (_memicmp(buf, "PACKETCHANNELS", 14) == 0)	// Packet Channels
 				TNC->PacketChannels = atoi(&buf[14]);
 			else
-				if (_memicmp(buf, "MAXCONREQ", 9) == 0)		// Hold Time for Busy Detect
+			if (_memicmp(buf, "MAXCONREQ", 9) == 0)		// Hold Time for Busy Detect
-					TNC->MaxConReq = atoi(&buf[9]);
+				TNC->MaxConReq = atoi(&buf[9]);
 
-				else
+			else
-					if (_memicmp(buf, "STARTINROBUST", 13) == 0)
+			if (_memicmp(buf, "STARTINROBUST", 13) == 0)
-						TNC->StartInRobust = TRUE;
+				TNC->StartInRobust = TRUE;
+			
+			else
+			if (_memicmp(buf, "ROBUST", 6) == 0)
+			{
+				if (_memicmp(&buf[7], "TRUE", 4) == 0)
+					TNC->Robust = TRUE;
+				
+				strcat (TNC->InitScript, buf);
+			}
+			else
+			if (_memicmp(buf, "LOGDIR ", 7) == 0)
+				TNC->LogPath = _strdup(&buf[7]);
+			else
+			if (_memicmp(buf, "ENABLEPACKET", 12) == 0)
+			{
+				if (TNC->PacketChannels == 0)
+					TNC->PacketChannels = 5;
+			//	AddVirtualKISSPort(TNC, Port, buf);
+			}
 
-					else
+//			else if (_memicmp(buf, "PAC ", 4) == 0 && _memicmp(buf, "PAC MODE", 8) != 0)
-						if (_memicmp(buf, "ROBUST", 6) == 0)
+//			{
-						{
+				// PAC MODE goes to TNC, others are parsed locally
-							if (_memicmp(&buf[7], "TRUE", 4) == 0)
+//
-								TNC->Robust = TRUE;
+//				ConfigVirtualKISSPort(TNC, buf);
-
+//			}
-							strcat (TNC->InitScript, buf);
+			else if (standardParams(TNC, buf) == FALSE)
-						}
+				strcat(TNC->InitScript, buf);
-						else
+		}
-							if (_memicmp(buf, "LOGDIR ", 7) == 0)
-								TNC->LogPath = _strdup(&buf[7]);
-							else
-								if (_memicmp(buf, "ENABLEPACKET", 12) == 0)
-								{
-									if (TNC->PacketChannels == 0)
-										TNC->PacketChannels = 5;
-									//	AddVirtualKISSPort(TNC, Port, buf);
-								}
-
-								//			else if (_memicmp(buf, "PAC ", 4) == 0 && _memicmp(buf, "PAC MODE", 8) != 0)
-								//			{
-								// PAC MODE goes to TNC, others are parsed locally
-								//
-								//				ConfigVirtualKISSPort(TNC, buf);
-								//			}
-								else if (standardParams(TNC, buf) == FALSE)
-									strcat(TNC->InitScript, buf);
-	}
 
 
 	return (TRUE);	
@@ -1041,10 +1041,8 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 			{
 				TNC->Busy--;
 				if (TNC->Busy == 0)
-				{
 					MySetWindowText(TNC->xIDC_CHANSTATE, "Clear");
 					strcpy(TNC->WEB_CHANSTATE, "Clear");
-				}
 			}
 		}
 

BBSUtilities.c

@@ -3701,10 +3701,10 @@ void DoKillCommand(CIRCUIT * conn, struct UserInfo * user, char * Cmd, char * Ar
 		if (conn->sysop)
 		{
 			if (Arg1)
-				if (KillMessagesFrom(conn, user, Arg1) == 0)
+				if (KillMessagesFrom(conn, user, Arg1) == 0);
 					BBSputs(conn, "No Messages found\r");
 
-			return;
+					return;
 		}
 	}
 
@@ -6556,7 +6556,7 @@ nextline:
 	{
 		char APRS[128];
 		char Call[16];
-		int SSID = (user->flags >> 28) & 15;	// on some platforms this is treated as signed ??
+		int SSID = user->flags >> 28;
 
 		if (SSID)
 			sprintf(Call, "%s-%d", Msg->to, SSID);
@@ -13395,7 +13395,7 @@ int DeleteRedundantMessages()
 	{ 
 		while(n--)
 		{
-			if (stat(namelist[n]->d_name, &STAT) == 0)
+			if (stat(namelist[n]->d_name, &STAT) == 0);
 			{
 				Msgno = atoi(&namelist[n]->d_name[2]);
 

BPQINP3.c

@@ -35,6 +35,8 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #include <fcntl.h>					 
 //#include "vmm.h"
 
+uint64_t INP3timeLoadedMS = 0;
+
 extern int DEBUGINP3;
 
 VOID SendNegativeInfo();
@@ -62,16 +64,11 @@ static VOID SendNetFrame(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Frame)
 
 typedef struct _RTTMSG
 {
-	UCHAR ID[6];
+	UCHAR ID[7];
-	UCHAR Space1;
+	UCHAR TXTIME[11];
-	UCHAR TXTIME[10];
+	UCHAR SMOOTHEDRTT[11];
-	UCHAR Space2;
+	UCHAR LASTRTT[11];
-	UCHAR SMOOTHEDRTT[10];
+	UCHAR POINTER[11];
-	UCHAR Space3;
-	UCHAR LASTRTT[10];
-	UCHAR Space4;
-	UCHAR RTTID[10];
-	UCHAR Space5;
 	UCHAR ALIAS[7];
 	UCHAR VERSION[12];
 	UCHAR SWVERSION[9];
@@ -113,8 +110,6 @@ extern int RTTInterval;			// 4 Minutes
 int RTTRetries = 2;
 int RTTTimeout = 6;				// 1 Min (Horizon is 1 min)
 
-uint32_t RTTID = 1;
-
 VOID InitialiseRTT()
 {
 	UCHAR temp[256] = "";
@@ -166,11 +161,10 @@ VOID DeleteINP3Routes(struct ROUTE * Route)
 	Route->BCTimer = 0;
 	Route->Status = 0;
 	Route->Timeout = 0;
-	Route->NeighbourSRTT = 0;
 
 	Dest--;
 
-	// Delete any Dest entries via this Route 
+	// Delete any Dest entries via this Route
 
 	for (i=0; i < MAXDESTS; i++)
 	{
@@ -346,8 +340,8 @@ VOID TellINP3LinkSetupFailed(struct ROUTE * Route)
 
 VOID ProcessRTTReply(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Buff)
 {
-	uint32_t RTT;
+	int RTT;
-	uint32_t OrigTime;
+	unsigned int OrigTime;
 
 	char Normcall[10];
 
@@ -355,10 +349,10 @@ VOID ProcessRTTReply(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Buff)
 
 	Route->Timeout = 0;			// Got Response
 	
-	sscanf(&Buff->L4DATA[6], "%u", &OrigTime);
+	sscanf(&Buff->L4DATA[6], "%d", &OrigTime);
-	RTT = GetTickCountINP3() - OrigTime;		// We work internally in mS
+	RTT = (int)((GetTickCount() - INP3timeLoadedMS) / 10 - (OrigTime));		// We work internally in mS
 
-	if (RTT > 60000 || RTT < 0)
+	if (RTT > 60000)
 		return;					// Ignore if more than 60 secs (why ??)
 
 	Route->RTT = RTT;
@@ -753,9 +747,6 @@ VOID SortRoutes(struct DEST_LIST * Dest)
 {
 	 char Call1[10], Call2[10], Call3[10];
 
-	 // force route re-evaluation
-
-	 Dest->DEST_ROUTE = 0;
 
 	// May now be out of order
 
@@ -896,8 +887,8 @@ VOID UpdateRoute(struct DEST_LIST * Dest, struct INP3_DEST_ROUTE_ENTRY * ROUTEPT
 
 VOID ProcessRTTMsg(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Buff, int Len, int Port)
 {
-	uint32_t OtherRTT;
+	int OtherRTT;
-	uint32_t Dummy;
+	int Dummy;
 	char * ptr;
 	struct _RTTMSG * RTTMsg = (struct _RTTMSG *)&Buff->L4DATA[0];
 	char Normcall[10];
@@ -926,28 +917,18 @@ VOID ProcessRTTMsg(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Buff, int Len
 		return;						// We don't want to use INP3
 	}
 
-	// Basic Validation - look for spaces in the right place
+	// Extract other end's SRTT
 
-	if ((RTTMsg->Space1 | RTTMsg->Space2 | RTTMsg->Space3 | RTTMsg->Space4 | RTTMsg->Space5) != ' ')
+	// Get SWVERSION to see if other end is old (Buggy) BPQ
-	{
+
-		Debugprintf("Corrupt INP3 RTT Message %s", &Buff->L4DATA[0]);
+	if (memcmp(RTTMsg->SWVERSION, "BPQ32001 ", 9) == 0)
-	}
+		Route->OldBPQ = 1;
 	else
-	{
+		Route->OldBPQ = 0;
-		// Extract other end's SRTT
 
-		// Get SWVERSION to see if other end is old (Buggy) BPQ
+	sscanf(&Buff->L4DATA[6], "%d %d", &Dummy, &OtherRTT);
 
-		if (memcmp(RTTMsg->SWVERSION, "BPQ32001 ", 9) == 0)
+	Route->NeighbourSRTT = OtherRTT;
-			Route->OldBPQ = 1;
-		else
-			Route->OldBPQ = 0;
-
-		sscanf(&Buff->L4DATA[6], "%u %u", &Dummy, &OtherRTT);
-
-		if (OtherRTT < 60000)		// Don't save suspect values
-			Route->NeighbourSRTT = OtherRTT;
-	}
 
 	// Look for $M and $H (MAXRTT MAXHOPS)
 
@@ -961,8 +942,6 @@ VOID ProcessRTTMsg(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Buff, int Len
 	if (ptr)
 		Route->RemoteMAXHOPS = atoi(ptr + 2);
 
-
-
 	// Echo Back to sender
 
 	SendNetFrame(Route, Buff);
@@ -983,8 +962,7 @@ VOID SendRTTMsg(struct ROUTE * Route)
 	char Stamp[50];
 	char Normcall[10];
 	unsigned char temp[256];
-	uint32_t sendTime;
+	uint64_t sendTime;
-	int n;
 
 	Normcall[ConvFromAX25(Route->NEIGHBOUR_CALL, Normcall)] = 0;
 
@@ -1004,21 +982,14 @@ VOID SendRTTMsg(struct ROUTE * Route)
 	Msg->L4TXNO = 0;
 	Msg->L4FLAGS = L4INFO;
 
-	// Windows GetTickCount wraps every 54 days or so. INP3 doesn't care, so long as the edge
+	// The timestamp can possibly exceed 10 digits. INP3 only works on differece between send and received, so base can be reset safely.
-	// case where timer wraps between sending msg and getting response is ignored 
-	// For platform independence use GetTickCountINP3() and map as appropriate
 
-	sendTime = GetTickCountINP3();	// 10mS units
+	sendTime = ((uint64_t)GetTickCount() - INP3timeLoadedMS) / 10;	// 10mS units
 
-	sprintf(Stamp, "%10u %10d %10d %10d ", sendTime, Route->SRTT, Route->RTT, RTTID++);
+	if (sendTime > 9999999999)
+		sendTime = INP3timeLoadedMS = 0;
 
-	n = strlen(Stamp);
+	sprintf(Stamp, "%10llu %10d %10d %10d ", sendTime, Route->SRTT, Route->RTT, 0);
-
-	if (n != 44)
-	{
-		Debugprintf("Trying to send corrupt RTT message %s", Stamp);
-		return;
-	}
 	
 	memcpy(RTTMsg.TXTIME, Stamp, 44);
 
@@ -1235,7 +1206,6 @@ int SendRIPTimer()
 				}
 
 				L2SETUPCROSSLINKEX(Route, 2);		// Only try SABM twice
-				Route->NeighbourSRTT = 0;			// just in case!
 
 				Route->LastConnectAttempt = REALTIMETICKS;
 				

Bpq32.c

@@ -1298,10 +1298,6 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 //	Add Paula's Netromx (allows connects to different applications using Node call) (8)
 //	Add Netrom over TCP (8)
 //	Fix FRMR caused by sending SREJ when no frames outstanding (8)
-//	Fix some issues with NetromX connects and Route Selection when running INP3 and NODES routing (9)
-//	Fix connecting to a netrom node with c p node command (10)
-//	Add validation of INP3 RTT messages and various INP3 fixes (12)
-//	Change NetromX connect syntax to Service@Node to fix passing commands to local applications (12)
 
 
 #define CKernel
@@ -1410,7 +1406,6 @@ void initAIS();
 void initADSB();
 int CloseAllSessions();
 int CloseAllLinks();
-void NETROMTCPResolve();
 
 extern BOOL ADIFLogEnabled;
 
@@ -1418,8 +1413,6 @@ int CloseOnError = 0;
 
 char UIClassName[]="UIMAINWINDOW";					// the main window class name
 
-char ClosingClassName[]="CLOSING";					// the main window class name
-
 HWND UIhWnd;
 
 extern char AUTOSAVE;
@@ -1542,6 +1535,7 @@ extern char ReportDest[7];
 
 extern UCHAR ConfigDirectory[260];
 
+extern uint64_t INP3timeLoadedMS;
 
 VOID __cdecl Debugprintf(const char * format, ...);
 VOID __cdecl Consoleprintf(const char * format, ...);
@@ -2222,8 +2216,6 @@ VOID TimerProcX()
 	
 			Start();
 
-			NETROMTCPResolve();
-
 			INITIALISEPORTS();			// Restart Ports
 
 			SetApplPorts();
@@ -2406,7 +2398,7 @@ VOID TimerProcX()
 		if (CloseAllSessions() == 0)
 		{
 			if (CloseAllLinks() == 0)			// No sessions closed so close links now
-				CloseAllTimer = 1;				// No Links so close now
+				CloseAllTimer = 0;				// No Links so close now
 			else
 				CloseAllTimer = 39;				// ~4 secs for links to close
 		}
@@ -2482,6 +2474,8 @@ FirstInit()
 		EnumProcessesPtr = (FARPROCX)GetProcAddress(ExtDriver,"EnumProcesses");
 	}
 
+	INP3timeLoadedMS = GetTickCount();
+
 	srand(time(NULL));
 	
 	INITIALISEPORTS();
@@ -2638,7 +2632,6 @@ Check_Timer()
 
 		WSAStartup(MAKEWORD(2, 0), &WsaData);
 
-
 		// Load Psapi.dll if possible
 
 		ExtDriver = LoadLibrary("Psapi.dll");
@@ -2653,8 +2646,6 @@ Check_Timer()
 			
 		Start();
 	
-		NETROMTCPResolve();
-
 		INITIALISEPORTS();
 
 		OpenReportingSockets();
@@ -2978,8 +2969,6 @@ BOOL APIENTRY DllMain(HANDLE hInst, DWORD ul_reason_being_called, LPVOID lpReser
 			}
 			else
 			{
-				NETROMTCPResolve();
-
 				SetApplPorts();
 
 				GetUIConfig();
@@ -5978,96 +5967,14 @@ DllExport VOID APIENTRY CreateNewTrayIcon()
 
 void hookNodeClosing(char * Reason);
 
-BOOL CALLBACK ClosaAllProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) 
-{
-	int wmId, wmEvent;
-
- 	switch (message)
-	{ 
-	case WM_INITDIALOG:
-		return (INT_PTR)TRUE;
-
-	case WM_CTLCOLORDLG:
-		return (LONG)bgBrush;
-
-	case WM_CTLCOLORSTATIC:
-	{
-		HDC hdcStatic = (HDC)wParam;
-		SetTextColor(hdcStatic, RGB(0, 0, 0));
-		SetBkMode(hdcStatic, TRANSPARENT);
-
-		return (LONG)bgBrush;
-	}
-
-	case WM_COMMAND:
-
-			return 0;
-
-	case WM_SYSCOMMAND:
-
-		wmId    = LOWORD(wParam); // Remember, these are...
-		wmEvent = HIWORD(wParam); // ...different for Win32!
-
-		switch (wmId)
-		{
-		case SC_RESTORE:
-
-			return (DefWindowProc(hWnd, message, wParam, lParam));
-
-		case  SC_MINIMIZE: 
-			
-			if (MinimizetoTray)
-				return ShowWindow(hWnd, SW_HIDE);
-			else
-				return (DefWindowProc(hWnd, message, wParam, lParam));
-						
-			break;
-		
-		default:
-				return (DefWindowProc(hWnd, message, wParam, lParam));
-		}
-
-		case WM_CLOSE:
-			return(DestroyWindow(hWnd));
-
-		default:
-			return (DefWindowProc(hWnd, message, wParam, lParam));
-
-	}
-
-	return (0);
-}
-
-
-HWND hwndClosing = NULL;  // Window handle of dialog box 
-
 
 DllExport VOID APIENTRY CloseAllPrograms()
 {
-	WNDCLASS  wc;	
 	CLOSING = TRUE;
 
 	// Tell BG to shut when all links are gone or after 5 secs
 
 	CloseAllTimer = 50;
-
-
-	wc.style = CS_HREDRAW | CS_VREDRAW;
-	wc.lpfnWndProc = ClosaAllProc;       
-	wc.cbClsExtra = 0;                
-	wc.cbWndExtra = DLGWINDOWEXTRA;
-	wc.hInstance = hInstance;
-	wc.hIcon = LoadIcon( hInstance, MAKEINTRESOURCE(BPQICON) );
-	wc.hCursor = LoadCursor(NULL, IDC_ARROW);
-	wc.hbrBackground = bgBrush; 
-
-	wc.lpszMenuName = NULL;	
-	wc.lpszClassName = ClosingClassName; 
-
-	RegisterClass(&wc);
-
-	hwndClosing = CreateDialog(hInstance, ClosingClassName, NULL, (DLGPROC)ClosaAllProc); 
-	ShowWindow(hwndClosing, SW_SHOW); 
 }
 
 VOID RealCloseAllPrograms()

Cmd.c

@@ -130,8 +130,6 @@ int NOBUFFCOUNT = 0;
 int BUFFERWAITS = 0;
 int MAXDESTS = 0;
 int NUMBEROFNODES = 0;
-int L2CONNECTSOUT = 0;
-int L2CONNECTSIN = 0;
 int L4CONNECTSOUT = 0;
 int L4CONNECTSIN = 0;
 int L4FRAMESTX = 0;
@@ -838,14 +836,13 @@ BOOL cATTACHTOBBS(TRANSPORTENTRY * Session, UINT Mask, int Paclen, int * AnySess
 	return FALSE;
 }
 
-void ConnecttoService(TRANSPORTENTRY * Session, char * Bufferptr, int Service, char * Node, int Stay)
+void ConnecttoService(TRANSPORTENTRY * Session, char * Bufferptr, int ServiceIndex, char * Node, int Stay)
 {
 	struct DEST_LIST * Dest = DESTS;
 	int n = MAXDESTS;
 	int gotDest = 0;
 	unsigned char axcall[7];
-	char cmdName[80];
+	int Service = -1;
-	int i;
 
 	// Make Sure Node is Known
 
@@ -890,20 +887,9 @@ void ConnecttoService(TRANSPORTENTRY * Session, char * Bufferptr, int Service, c
 
 	Session->STAYFLAG = Stay;
 
-	// Get command name if a named command
+	Service = SERVICES[ServiceIndex].ServiceNo;
 
-	sprintf(cmdName, "%d", Service);	// default to number
+	Bufferptr = Cmdprintf(Session, Bufferptr, "Connecting to Service %s on Node %s \r", SERVICES[ServiceIndex].ServiceName, Node);
-
-	for (i = 0; i < NUMBEROFSSERVICES; i++)
-	{
-		if (SERVICES[i].ServiceNo == Service)
-		{
-			strcpy(cmdName, SERVICES[i].ServiceName);
-			break;
-		}
-	}
-
-	Bufferptr = Cmdprintf(Session, Bufferptr, "Connecting to Service %s on Node %s \r", cmdName, Node);
 
 	DoNetromConnect(Session, Bufferptr, Dest, 0, Service);
 
@@ -917,12 +903,8 @@ int checkifService(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, s
 	BOOL Stay = FALSE;
 	char * ptr, *Context;
 	int i;
-	char TailCopy[256];
 
-	strcpy(TailCopy, CmdTail);
+	ptr = strtok_s(CmdTail, " ", &Context);
-
-
-	ptr = strtok_s(TailCopy, " ", &Context);
 
 	// see if any param. if longer than two chars treat as remote node
 
@@ -942,7 +924,7 @@ int checkifService(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, s
 	{
 		if (strcmp(APPName, SERVICES[i].ServiceName) == 0)
 		{
-			ConnecttoService(Session, Bufferptr, SERVICES[i].ServiceNo, ptr, Stay);
+			ConnecttoService(Session, Bufferptr, i, ptr, Stay);
 			return 1;
 		}
 	}
@@ -960,6 +942,7 @@ VOID APPLCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct
 	char * ptr1, *ptr2;
 	int n = 12;
 	BOOL Stay = FALSE;
+	char * ptr, *Context;
 
 	//	Copy Appl and Null Terminate
 
@@ -978,17 +961,14 @@ VOID APPLCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct
 		return;
 	}
 
+	ptr = strtok_s(CmdTail, " ", &Context);
 
-	if (CmdTail[0] == 'S')
+	// ptr is first param. Context is rest of string;
-		Stay = TRUE;
 
-	// could be Node for NETROMX connect or S flag
-		
-	// We now use service@node, so can't get here
-
-/*
 	if (ptr)
 	{
+		// could be Node for NETROMX connect or S flag
+		
 		int i;
 		
 		if (strlen(ptr) > 1)
@@ -997,8 +977,6 @@ VOID APPLCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct
 				Session->STAYFLAG = Stay;
 
 			// See if APPL is one of Paula's service
-
-
 			
 			for (i = 0; i < NUMBEROFSSERVICES; i++)
 			{
@@ -1019,7 +997,7 @@ VOID APPLCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct
 		else if (ptr[0] == 'S')
 			Session->STAYFLAG = Stay;
 	}
-*/		
+		
 	memcpy(Session->APPL, CMD->String, 12);
 
 	//	SEE IF THERE IS AN ALIAS DEFINDED FOR THIS COMMAND
@@ -2588,56 +2566,6 @@ VOID CMDC00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct C
 		return;
 	}
 
-	// See if NETROMX connect c service@node
-
-	if (strchr(ptr, '@'))
-	{
-		// We now use service@node, unlike xr
-
-		char * Context1;
-		
-		char * Cmd = strtok_s(ptr, "@", &Context1);
-		char * Node = strtok_s(NULL, " ", &Context1);
-		int i;
-		int Stay = 0;
-
-		if (Context1 && Context1[0] == 'S')
-			Session->STAYFLAG = Stay;
-				
-		for (i = 0; i < NUMBEROFSSERVICES; i++)
-		{
-			if (strcmp(Cmd, SERVICES[i].ServiceName) == 0)
-			{
-				if (Node)
-				{
-					ConnecttoService(Session, Bufferptr, SERVICES[i].ServiceNo, Node, Stay);
-					return;
-				}
-			}
-		}
-
-		// May be numeric service
-
-		for (i = 0; i < strlen(Cmd); i++)
-		{
-			if (!isdigit(Cmd[i]))
-				break;
-		}
-
-		if (i == strlen(Cmd))
-		{
-			if (Node)
-			{
-				ConnecttoService(Session, Bufferptr, atoi(Cmd), Node, Stay);
-				return;
-			}
-		}
-
-		Bufferptr = Cmdprintf(Session, Bufferptr, "Invalid NetromX command\r");
-		SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
-		return;
-	}
-
 	Port = atoi(ptr);
 	
 	if (Port)
@@ -2737,7 +2665,7 @@ NoPort:
 
 	//	SEE IF CALL TO ANY OF OUR HOST SESSIONS - UNLESS DIGIS SPECIFIED
 
-	if (axcalls[7] == 0)
+	if (axcalls[7] == 0 && axcalls[9] )
 	{
 		//	If this connect is as a result of a command alias, don't check appls or we will loop
 
@@ -2788,7 +2716,28 @@ NoPort:
 		}
 	}
 
-	if (axcalls[7] == 0)
+	// if no digis see if connect to known node. But now could have a single numeric param as a service number (Paula's Netromx)
+	// cmdCopy is command tail (after call)
+
+	// Make sure field is numeric
+
+	i = 0;
+
+	while (cmdCopy[i] >= '0' && cmdCopy[i]<= '9')
+		i++;
+
+	if (cmdCopy[i] != ' ')
+		goto Downlink;
+	else
+	{
+		if (i > 0)			// Some digits
+		{
+			haveService = 1;
+			Service = atoi(cmdCopy);
+		}
+	}
+
+	if (axcalls[7] == 0 || haveService)
 	{
 		//	SEE IF CALL TO ANOTHER NODE 
 
@@ -2831,6 +2780,9 @@ Downlink:
 		//	L2 NEEDS PORT NUMBER
 
 		Bufferptr = Cmdprintf(Session, Bufferptr, "Downlink connect needs port number - C P CALLSIGN\r");
+
+		// Send Port List
+
 		SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 		return;
 	}
@@ -5118,7 +5070,6 @@ VOID DoTheCommand(TRANSPORTENTRY * Session)
 	int n;
 	int i, Service = -1;
 	char * Cmd, *Node, *Context;
-	int Stay = 0;
 
 	ptr1 = &COMMANDBUFFER[0];		//
 
@@ -5213,47 +5164,28 @@ VOID DoTheCommand(TRANSPORTENTRY * Session)
 
 	// See if a NETROMX Service
 
-	// We now use service@node, unlike xr
+	Cmd = strtok_s(ptr1, " ", &Context);
-
+	Node = strtok_s(NULL, " ", &Context);
-	if (strchr(ptr1, '@'))
+		
+	for (i = 0; i < NUMBEROFSSERVICES; i++)
 	{
-		Cmd = strtok_s(ptr1, "@", &Context);
+		if (strcmp(Cmd, SERVICES[i].ServiceName) == 0)
-		Node = strtok_s(NULL, " ", &Context);
-
-		if (Cmd && Node)
 		{
+			int Stay = 0;
+			
 			if (Context && Context[0] == 'S')
 				Session->STAYFLAG = Stay;
 
-			for (i = 0; i < NUMBEROFSSERVICES; i++)
+			if (Node)
 			{
-				if (strcmp(Cmd, SERVICES[i].ServiceName) == 0)
+				ConnecttoService(Session, ReplyPointer, i, Node, Stay);
-				{
-					ConnecttoService(Session, ReplyPointer, SERVICES[i].ServiceNo, Node, Stay);
-					return;
-				}
-			}
-
-			// May be numeric service
-
-			for (i = 0; i < strlen(Cmd); i++)
-			{
-				if (!isdigit(Cmd[i]))
-					break;
-			}
-
-			if (i == strlen(Cmd))
-			{
-				ConnecttoService(Session, ReplyPointer, atoi(Cmd), Node, Stay);
 				return;
 			}
+		
+			// Connecting to service on local node - msy be possible sometime
 		}
-
-		ReplyPointer = Cmdprintf(Session, ReplyPointer, "Invalid NetromX command\r");
-		SendCommandReply(Session, REPLYBUFFER, (int)(ReplyPointer - (char *)REPLYBUFFER));
-		return;
-
 	}
+
 	Session->BADCOMMANDS++;
 
 	if (Session->BADCOMMANDS > 6)			// TOO MANY ERRORS
@@ -5270,19 +5202,19 @@ VOID DoTheCommand(TRANSPORTENTRY * Session)
 	ptr1 += CMDERRLEN;
 
 	SendCommandReply(Session, Buffer, (int)(ptr1 - (char *)Buffer));
-	}
+}
 
 
-	VOID StatsTimer()
+VOID StatsTimer()
+{
+	struct PORTCONTROL * PORT = PORTTABLE;
+	uint64_t sum, sum2;
+
+	// Interval is 60 secs
+
+	while(PORT)
 	{
-		struct PORTCONTROL * PORT = PORTTABLE;
+		int index = PORT->StatsPointer++;
-		uint64_t sum, sum2;
-
-		// Interval is 60 secs
-
-		while(PORT)
-		{
-			int index = PORT->StatsPointer++;
 
 		if (index == 1439)
 			PORT->StatsPointer = 0;		// Cyclic through 24 hours (1440 Mins)

CommonCode.c

@@ -75,7 +75,6 @@ void printStack(void);
 char * FormatMH(PMHSTRUC MH, char Format);
 void WriteConnectLog(char * fromCall, char * toCall, UCHAR * Mode);
 void SendDataToPktMap();
-void NETROMTCPResolve();
 
 extern BOOL LogAllConnects;
 extern BOOL M0LTEMap;
@@ -3740,14 +3739,15 @@ VOID ResolveUpdateThread(void * Unused)
 				LastNodeStatus = time(NULL);
 			}
 		}
-
-		NETROMTCPResolve();
 		
 		if (HostEnt1 && HostEnt2)
 		{		
-			Sleep(1000 * 60 * 15);	
+			Sleep(1000 * 60 * 30);	
 			continue;
 		}
+		
+		Debugprintf("Resolve Failed for update.g8bpq.net or chatmap.g8bpq.net");
+		Sleep(1000 * 60 * 5);
 	}
 }
 

DRATS.c

@@ -568,19 +568,18 @@ void DRATSConnectionLost(struct ConnectionInfo * sockptr)
 
 int doinflate(unsigned char * source, unsigned char * dest, int Len, int destlen, int * outLen)
 {
-	int ret;
+    int ret;
-	z_stream strm;
+    z_stream strm;
 
-	strm.zalloc = Z_NULL;
+    strm.zalloc = Z_NULL;
-	strm.zfree = Z_NULL;
+    strm.zfree = Z_NULL;
-	strm.opaque = Z_NULL;
+    strm.opaque = Z_NULL;
-	strm.avail_in = 0;
+    strm.avail_in = 0;
-	strm.next_in = Z_NULL;
+    strm.next_in = Z_NULL;
 
-	ret = inflateInit(&strm);
+    ret = inflateInit(&strm);
-
+    if (ret != Z_OK)
-	if (ret != Z_OK)
+        return ret;
-		return ret;
 
 	strm.avail_in = Len;
 	strm.next_in = source;

Events.c

@@ -26,7 +26,6 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #include "asmstrucs.h"
 #include "tncinfo.h"
 #include "cheaders.h"
-#include "kiss.h"
 
 VOID __cdecl Debugprintf(const char * format, ...);
 
@@ -45,9 +44,7 @@ void MQTTReportSession(char * Msg);
 extern int MQTT;
 extern time_t TimeLoaded;
 
-uint16_t UDPSeq = 1;
+int UDPSeq = 1;
-int linkSeq = 1;
-int cctSeq = 1;
 
 extern SOCKET NodeAPISocket;
 extern SOCKADDR_IN UDPreportdest;
@@ -60,8 +57,6 @@ extern char	LOC[7];
 extern char VersionString[50];
 extern double LatFromLOC;
 extern double LonFromLOC;
-extern int NUMBEROFNODES, MAXDESTS, L4CONNECTSOUT, L4CONNECTSIN, L4FRAMESTX, L4FRAMESRX, L4FRAMESRETRIED, OLDFRAMES;
-extern int  L2CONNECTSOUT, L2CONNECTSIN;
 
 void hookL2SessionClosed(struct _LINKTABLE * LINK, char * Reason, char * Direction);
 int ConvFromAX25(unsigned char * incall, unsigned char * outcall);
@@ -71,7 +66,6 @@ int decodeNETROMUIMsg(unsigned char * Msg, int iLen, char * Buffer, int BufferLe
 int decodeNETROMIFrame(unsigned char * Msg, int iLen, char * Buffer, int BufferLen);
 int decodeINP3RIF(unsigned char * Msg, int iLen, char * Buffer, int BufferLen);
 int decodeRecordRoute(L3MESSAGE * L3, int iLen, char * Buffer, int BufferLen);
-char * byte_base64_encode(char *str, int len);
 
 // Runs use specified routine on certain event
 
@@ -151,12 +145,9 @@ void hookL2SessionAccepted(int Port, char * remotecall, char * ourcall, struct _
 	char UDPMsg[1024];	
 	int udplen;
 
-	L2CONNECTSIN++;
+	LINK->ConnectTime = time(NULL);
-	LINK->apiSeq = linkSeq++;
-
-	LINK->lastStatusSentTime = LINK->ConnectTime = time(NULL);
 	LINK->bytesTXed = LINK->bytesRXed = LINK->framesResent = LINK->framesRXed = LINK->framesTXed = 0;
-	LINK->LastStatusbytesTXed = LINK->LastStatusbytesRXed = 0;
+
 	strcpy(LINK->callingCall, remotecall);
 	strcpy(LINK->receivingCall, ourcall);
 	strcpy(LINK->Direction, "In");
@@ -165,8 +156,8 @@ void hookL2SessionAccepted(int Port, char * remotecall, char * ourcall, struct _
 	{
 		LINK->lastStatusSentTime = time(NULL);
 
-		udplen = sprintf(UDPMsg, "{\"@type\":\"LinkUpEvent\", \"node\": \"%s\", \"id\": %d, \"direction\": \"incoming\", \"port\": \"%d\", \"remote\": \"%s\", \"local\": \"%s\", \"isRF\": %s}",
+		udplen = sprintf(UDPMsg, "{\"@type\":\"LinkUpEvent\", \"node\": \"%s\", \"id\": %d, \"direction\": \"incoming\", \"port\": \"%d\", \"remote\": \"%s\", \"local\": \"%s\"}",
-			NODECALLLOPPED, LINK->apiSeq, LINK->LINKPORT->PORTNUMBER, LINK->callingCall, LINK->receivingCall, (LINK->LINKPORT->isRF)?"true":"false");
+			NODECALLLOPPED, UDPSeq++, LINK->LINKPORT->PORTNUMBER, LINK->callingCall, LINK->receivingCall);
 
 //		Debugprintf(UDPMsg);
 
@@ -226,9 +217,9 @@ void hookL2SessionDeleted(struct _LINKTABLE * LINK)
 
 void hookL2SessionAttempt(int Port, char * ourcall, char * remotecall, struct _LINKTABLE * LINK)
 {
-	LINK->lastStatusSentTime = LINK->ConnectTime = time(NULL);
+	LINK->ConnectTime = time(NULL);
 	LINK->bytesTXed = LINK->bytesRXed = LINK->framesResent = LINK->framesRXed = LINK->framesTXed = 0;
-	LINK->LastStatusbytesTXed = LINK->LastStatusbytesRXed = 0;
+
 	strcpy(LINK->callingCall, ourcall);
 	strcpy(LINK->receivingCall, remotecall);
 	strcpy(LINK->Direction, "Out");
@@ -241,15 +232,12 @@ void hookL2SessionConnected(struct _LINKTABLE * LINK)
 	char UDPMsg[1024];	
 	int udplen;
 
-	L2CONNECTSOUT++;
-	LINK->apiSeq = linkSeq++;
-
 	if (NodeAPISocket)
 	{
 		LINK->lastStatusSentTime = time(NULL);
 
-		udplen = sprintf(UDPMsg, "{\"@type\":\"LinkUpEvent\", \"node\": \"%s\", \"id\": %d, \"direction\": \"outgoing\", \"port\": \"%d\", \"remote\": \"%s\", \"local\": \"%s\", \"isRF\": %s}",
+		udplen = sprintf(UDPMsg, "{\"@type\":\"LinkUpEvent\", \"node\": \"%s\", \"id\": %d, \"direction\": \"outgoing\", \"port\": \"%d\", \"remote\": \"%s\", \"local\": \"%s\"}",
-			NODECALLLOPPED, LINK->apiSeq, LINK->LINKPORT->PORTNUMBER, LINK->callingCall, LINK->receivingCall, (LINK->LINKPORT->isRF)?"true":"false");
+			NODECALLLOPPED, UDPSeq++, LINK->LINKPORT->PORTNUMBER, LINK->callingCall, LINK->receivingCall);
 
 //		Debugprintf(UDPMsg);
 
@@ -263,7 +251,6 @@ void hookL2SessionClosed(struct _LINKTABLE * LINK, char * Reason, char * Directi
 
 	char UDPMsg[1024];	
 	int udplen;
-	time_t Now = time(NULL);
 
 	if (NodeAPISocket)
 	{
@@ -272,18 +259,14 @@ void hookL2SessionClosed(struct _LINKTABLE * LINK, char * Reason, char * Directi
 
 		if (strcmp(Direction, "Out") == 0)
 			udplen = sprintf(UDPMsg, "{\"@type\":\"LinkDownEvent\", \"node\": \"%s\", \"id\": %d, \"direction\": \"outgoing\", \"port\": \"%d\", \"remote\": \"%s\", \"local\": \"%s\","
-			"\"bytesSent\": %d, \"bytesRcvd\": %d, \"frmsSent\": %d, \"frmsRcvd\": %d, \"frmsQueued\": %d, \"frmsResent\": %d, \"reason\": \"%s\","
+			"\"bytesSent\": %d, \"bytesRcvd\": %d, \"frmsSent\": %d, \"frmsRcvd\": %d, \"frmsQueued\": %d, \"frmsResent\": %d, \"reason\": \"%s\"}",
-			" \"time\": %d, \"upForSecs\": %d, \"frmsQdPeak\": %d, \"isRF\": %s}",
+			NODECALLLOPPED, UDPSeq++, LINK->LINKPORT->PORTNUMBER, LINK->receivingCall, LINK->callingCall,
-			NODECALLLOPPED, LINK->apiSeq, LINK->LINKPORT->PORTNUMBER, LINK->receivingCall, LINK->callingCall,
+			LINK->bytesTXed , LINK->bytesRXed, LINK->framesTXed, LINK->framesRXed, COUNT_AT_L2(LINK), LINK->framesResent, Reason);
-			LINK->bytesTXed , LINK->bytesRXed, LINK->framesTXed, LINK->framesRXed, COUNT_AT_L2(LINK), LINK->framesResent, Reason,
-			(int)Now, (int)Now - LINK->ConnectTime, LINK->maxQueued, (LINK->LINKPORT->isRF)?"true":"false");
 		else
 			udplen = sprintf(UDPMsg, "{\"@type\":\"LinkDownEvent\", \"node\": \"%s\", \"id\": %d, \"direction\": \"incoming\", \"port\": \"%d\", \"remote\": \"%s\", \"local\": \"%s\","
-			"\"bytesSent\": %d, \"bytesRcvd\": %d, \"frmsSent\": %d, \"frmsRcvd\": %d, \"frmsQueued\": %d, \"frmsResent\": %d, \"reason\": \"%s\","
+			"\"bytesSent\": %d, \"bytesRcvd\": %d, \"frmsSent\": %d, \"frmsRcvd\": %d, \"frmsQueued\": %d, \"frmsResent\": %d, \"reason\": \"%s\"}",
-			" \"time\": %d, \"upForSecs\": %d, \"frmsQdPeak\": %d, \"isRF\": %s}",
+			NODECALLLOPPED, UDPSeq++, LINK->LINKPORT->PORTNUMBER, LINK->callingCall, LINK->receivingCall,
-			NODECALLLOPPED, LINK->apiSeq, LINK->LINKPORT->PORTNUMBER, LINK->callingCall, LINK->receivingCall,
+			LINK->bytesTXed , LINK->bytesRXed, LINK->framesTXed, LINK->framesRXed, COUNT_AT_L2(LINK), LINK->framesResent, Reason);
-			LINK->bytesTXed , LINK->bytesRXed, LINK->framesTXed, LINK->framesRXed, COUNT_AT_L2(LINK), LINK->framesResent, Reason,
-			(int)Now, (int)Now - LINK->ConnectTime, LINK->maxQueued, (LINK->LINKPORT->isRF)?"true":"false");
 
 //		Debugprintf(UDPMsg);
 
@@ -297,37 +280,24 @@ void hookL2SessionStatus(struct _LINKTABLE * LINK)
 
 	char UDPMsg[1024];	
 	int udplen;
-	time_t Now = time(NULL);
-	int bpsTx, bpsRx, interval;
 
 	if (NodeAPISocket)
 	{
-		interval = Now - (int)LINK->lastStatusSentTime;
+		LINK->lastStatusSentTime = time(NULL);
-		bpsTx = (LINK->bytesTXed - LINK->LastStatusbytesTXed) / interval; 
-		bpsRx = (LINK->bytesRXed - LINK->LastStatusbytesRXed) / interval; 
-		
-		LINK->lastStatusSentTime = Now;
-		LINK->LastStatusbytesTXed = LINK->bytesTXed;
-		LINK->LastStatusbytesRXed = LINK->bytesRXed;
 
 		if (strcmp(LINK->Direction, "Out") == 0)
 			udplen = sprintf(UDPMsg, "{\"@type\":\"LinkStatus\", \"node\": \"%s\", \"id\": %d, \"direction\": \"outgoing\", \"port\": \"%d\", \"remote\": \"%s\", \"local\": \"%s\","
-				"\"bytesSent\": %d, \"bytesRcvd\": %d, \"frmsSent\": %d, \"frmsRcvd\": %d, \"frmsQueued\": %d, \"frmsResent\": %d,"
+			"\"bytesSent\": %d, \"bytesRcvd\": %d, \"frmsSent\": %d, \"frmsRcvd\": %d, \"frmsQueued\": %d, \"frmsResent\": %d}",
-				"\"upForSecs\": %d, \"frmsQdPeak\": %d, \"bpsTxMean\": %d, \"bpsRxMean\": %d, \"frmQMax\": %d, \"l2rttMs\": %d, \"isRF\": %s}",
+			NODECALLLOPPED, UDPSeq++, LINK->LINKPORT->PORTNUMBER, LINK->receivingCall, LINK->callingCall,
-				NODECALLLOPPED, LINK->apiSeq, LINK->LINKPORT->PORTNUMBER, LINK->receivingCall, LINK->callingCall,
+			LINK->bytesTXed , LINK->bytesRXed, LINK->framesTXed, LINK->framesRXed, 0, LINK->framesResent);
-				LINK->bytesTXed, LINK->bytesRXed, LINK->framesTXed, LINK->framesRXed, 0, LINK->framesResent,
-				(int)Now - LINK->ConnectTime, LINK->maxQueued, bpsTx, bpsRx, LINK->intervalMaxQueued, LINK->RTT, (LINK->LINKPORT->isRF)?"true":"false");
 		else
 			udplen = sprintf(UDPMsg, "{\"@type\":\"LinkStatus\", \"node\": \"%s\", \"id\": %d, \"direction\": \"incoming\", \"port\": \"%d\", \"remote\": \"%s\", \"local\": \"%s\","
-				"\"bytesSent\": %d, \"bytesRcvd\": %d, \"frmsSent\": %d, \"frmsRcvd\": %d, \"frmsQueued\": %d, \"frmsResent\": %d,"
+			"\"bytesSent\": %d, \"bytesRcvd\": %d, \"frmsSent\": %d, \"frmsRcvd\": %d, \"frmsQueued\": %d, \"frmsResent\": %d}",
-				"\"upForSecs\": %d, \"frmsQdPeak\": %d, \"bpsTxMean\": %d, \"bpsRxMean\": %d, \"frmQMax\": %d, \"l2rttMs\": %d, \"isRF\": %s}",
+			NODECALLLOPPED, UDPSeq++, LINK->LINKPORT->PORTNUMBER, LINK->callingCall, LINK->receivingCall,
-				NODECALLLOPPED, LINK->apiSeq, LINK->LINKPORT->PORTNUMBER, LINK->callingCall, LINK->receivingCall,
+			LINK->bytesTXed , LINK->bytesRXed, LINK->framesTXed, LINK->framesRXed, COUNT_AT_L2(LINK), LINK->framesResent);
-				LINK->bytesTXed, LINK->bytesRXed, LINK->framesTXed, LINK->framesRXed, 0, LINK->framesResent,
-				(int)Now - LINK->ConnectTime, LINK->maxQueued, bpsTx, bpsRx, LINK->intervalMaxQueued, LINK->RTT, (LINK->LINKPORT->isRF)?"true":"false");
-
-		LINK->intervalMaxQueued = 0;
 
 //		Debugprintf(UDPMsg);
+
 		sendto(NodeAPISocket, UDPMsg, udplen, 0, (struct sockaddr *)&UDPreportdest, sizeof(UDPreportdest));
 	}
 }
@@ -442,9 +412,8 @@ void hookNodeClosing(char * Reason)
 
 	if (NodeAPISocket)
 	{
-		udplen = sprintf(UDPMsg, "{\"@type\": \"NodeDownEvent\", \"nodeCall\": \"%s\", \"nodeAlias\": \"%s\", \"reason\": \"%s\", \"uptimeSecs\": %d,"
+		udplen = sprintf(UDPMsg, "{\"@type\": \"NodeDownEvent\", \"nodeCall\": \"%s\", \"nodeAlias\": \"%s\", \"reason\": \"%s\"}",
-			"\"linksIn\": %d, \"linksOut\": %d, \"cctsIn\": %d, \"cctsOut\": %d, \"l3Relayed\": %d}",
+			NODECALLLOPPED, MYALIASLOPPED, Reason);
-			NODECALLLOPPED, MYALIASLOPPED, Reason, time(NULL) - TimeLoaded, L2CONNECTSIN, L2CONNECTSOUT, L4CONNECTSIN, L4CONNECTSOUT, L3FRAMES);
    
 //		Debugprintf(UDPMsg);
 
@@ -469,10 +438,9 @@ void hookNodeRunning()
 	{
 
 		udplen = sprintf(UDPMsg, "{\"@type\": \"NodeStatus\", \"nodeCall\": \"%s\", \"nodeAlias\": \"%s\", \"locator\": \"%s\","
-			"\"latitude\": %f, \"longitude\": %f, \"software\": \"%s\", \"version\": \"%s\", \"uptimeSecs\": %d,"
+			"\"latitude\": %f, \"longitude\": %f, \"software\": \"%s\", \"version\": \"%s\", \"uptimeSecs\": %d}",
-			"\"linksIn\": %d, \"linksOut\": %d, \"cctsIn\": %d, \"cctsOut\": %d, \"l3Relayed\": %d}",
+			NODECALLLOPPED, MYALIASLOPPED, LOC, LatFromLOC, LonFromLOC, Software, VersionString, time(NULL) - TimeLoaded);
-			NODECALLLOPPED, MYALIASLOPPED, LOC, LatFromLOC, LonFromLOC, Software, VersionString, time(NULL) - TimeLoaded,
+   
-			L2CONNECTSIN, L2CONNECTSOUT, L4CONNECTSIN, L4CONNECTSOUT, L3FRAMES);
 
 //		Debugprintf(UDPMsg);
 
@@ -488,17 +456,11 @@ void IncomingL4ConnectionEvent(TRANSPORTENTRY * L4)
 	char remotecall[64];
 	char ourcall[64];
 	char circuitinfo[32];
-	int Service = L4->Service;
 
 	// CACK sent to CREQ
 
-	L4->apiSeq = cctSeq++;
-	strcpy(L4->Direction, "incoming");
-
 	if (NodeAPISocket)
 	{
-		L4->lastStatusSentTime = time(NULL);
-
 		remotecall[ConvFromAX25(L4->L4TARGET.DEST->DEST_CALL, remotecall)] = 0;
 	//	remotecall[ConvFromAX25(L4->L4USER, remotecall)] = 0;
 		ourcall[ConvFromAX25(L4->L4MYCALL, ourcall)] = 0;
@@ -508,16 +470,10 @@ void IncomingL4ConnectionEvent(TRANSPORTENTRY * L4)
 
 		sprintf(circuitinfo, ":%02x%02x", L4->CIRCUITINDEX, L4->CIRCUITID);
 		strcat(ourcall, circuitinfo);
-
+		
-		if (Service == -1)
+		udplen = sprintf(UDPMsg, "{\"@type\": \"CircuitUpEvent\", \"node\": \"%s\", \"id\": %d, \"direction\": \"incoming\","
-			udplen = sprintf(UDPMsg, "{\"@type\": \"CircuitUpEvent\", \"node\": \"%s\", \"id\": %d, \"direction\": \"incoming\", "
-			"\"remote\": \"%s\", \"local\": \"%s\"}",
-			NODECALLLOPPED, L4->apiSeq, remotecall, ourcall);
-		else
-			udplen = sprintf(UDPMsg, "{\"@type\": \"CircuitUpEvent\", \"node\": \"%s\", \"id\": %d, \"direction\": \"incoming\", "
 			"\"service\": %d, \"remote\": \"%s\", \"local\": \"%s\"}",
-			NODECALLLOPPED, L4->apiSeq, Service, remotecall, ourcall);
+			NODECALLLOPPED, UDPSeq++, L4->Service, remotecall, ourcall);
-
 
 //		Debugprintf(UDPMsg);
 		sendto(NodeAPISocket, UDPMsg, udplen, 0, (struct sockaddr *)&UDPreportdest, sizeof(UDPreportdest));
@@ -532,18 +488,11 @@ void OutgoingL4ConnectionEvent(TRANSPORTENTRY * L4)
 	char remotecall[64];
 	char ourcall[64];
 	char circuitinfo[32];
-	int Service = L4->Service;
 
 	// CACK received
 
-	strcpy(L4->Direction, "outgoing");
-
-	L4->apiSeq = cctSeq++;
-
 	if (NodeAPISocket)
 	{
-		L4->lastStatusSentTime = time(NULL);
-
 		remotecall[ConvFromAX25(L4->L4TARGET.DEST->DEST_CALL, remotecall)] = 0;
 	//	remotecall[ConvFromAX25(L4->L4USER, remotecall)] = 0;
 		ourcall[ConvFromAX25(L4->L4MYCALL, ourcall)] = 0;
@@ -554,14 +503,9 @@ void OutgoingL4ConnectionEvent(TRANSPORTENTRY * L4)
 		sprintf(circuitinfo, ":%02x%02x", L4->CIRCUITID, L4->CIRCUITINDEX);
 		strcat(ourcall, circuitinfo);
 
-		if (Service == -1)
+		udplen = sprintf(UDPMsg, "{\"@type\": \"CircuitUpEvent\", \"node\": \"%s\", \"id\": %d, \"direction\": \"outgoing\","
-			udplen = sprintf(UDPMsg, "{\"@type\": \"CircuitUpEvent\", \"node\": \"%s\", \"id\": %d, \"direction\": \"outgoing\", "
-			"\"remote\": \"%s\", \"local\": \"%s\"}",
-			NODECALLLOPPED, L4->apiSeq, remotecall, ourcall);
-		else
-			udplen = sprintf(UDPMsg, "{\"@type\": \"CircuitUpEvent\", \"node\": \"%s\", \"id\": %d, \"direction\": \"outgoing\", "
 			"\"service\": %d, \"remote\": \"%s\", \"local\": \"%s\"}",
-			NODECALLLOPPED, L4->apiSeq, Service, remotecall, ourcall);
+			NODECALLLOPPED, UDPSeq++, L4->Service, remotecall, ourcall);
 
 //		Debugprintf(UDPMsg);
 		sendto(NodeAPISocket, UDPMsg, udplen, 0, (struct sockaddr *)&UDPreportdest, sizeof(UDPreportdest));
@@ -619,7 +563,7 @@ void L4DisconnectEvent(TRANSPORTENTRY * L4, char * Direction, char * Reason)
 
 		udplen = sprintf(UDPMsg, "{\"@type\": \"CircuitDownEvent\", \"node\": \"%s\", \"id\": %d, \"direction\": \"%s\","
 			"\"service\": %d, \"remote\": \"%s\", \"local\": \"%s\", \"segsSent\": %d, \"segsRcvd\": %d, \"segsResent\": %d, \"segsQueued\": %d, \"reason\": \"%s\"}",
-			NODECALLLOPPED, L4->apiSeq, Direction, 0, remotecall, ourcall,L4->segsSent, L4->segsRcvd, L4->segsResent, Count, Reason);
+			NODECALLLOPPED, UDPSeq++, Direction, 0, remotecall, ourcall,L4->segsSent, L4->segsRcvd, L4->segsResent, Count, Reason);
 
 //		Debugprintf(UDPMsg);
 		sendto(NodeAPISocket, UDPMsg, udplen, 0, (struct sockaddr *)&UDPreportdest, sizeof(UDPreportdest));
@@ -635,16 +579,11 @@ void L4StatusSeport(TRANSPORTENTRY * L4)
 	char nodecall[16];
 	char circuitinfo[32];
 	int Count;
-	time_t Now = time(NULL);
-	int Service = L4->Service;
 
-
+	// CACK received
-
-	// Regular Status reports
 
 	if (NodeAPISocket)
 	{
-		L4->lastStatusSentTime = Now;
 		nodecall[ConvFromAX25(L4->L4TARGET.DEST->DEST_CALL, nodecall)] = 0;
 		remotecall[ConvFromAX25(L4->L4USER, remotecall)] = 0;
 		ourcall[ConvFromAX25(L4->L4MYCALL, ourcall)] = 0;
@@ -660,15 +599,10 @@ void L4StatusSeport(TRANSPORTENTRY * L4)
 			Count = CountFramesQueuedOnSession(L4->L4CROSSLINK);
 		else
 			Count = CountFramesQueuedOnSession(L4);
-
+		
-		if (Service == -1)
+		udplen = sprintf(UDPMsg, "{\"@type\": \"CircuitStatus\", \"node\": \"%s\", \"id\": %d, \"direction\": \"outgoing\","
-			udplen = sprintf(UDPMsg, "{\"@type\": \"CircuitStatus\", \"node\": \"%s\", \"id\": %d, \"direction\": \"%s\","
+			"\"service\": %d, \"remote\": %s, \"local\": \"%s\", \"segsSent\": %d, \"segsRcvd\": %d, \"segsResent\": %d, \"segsQueued\": %d}",
-			"\"upForSecs\": %d,\"remote\": \"%s\", \"local\": \"%s\", \"segsSent\": %d, \"segsRcvd\": %d, \"segsResent\": %d, \"segsQueued\": %d}",
+			NODECALLLOPPED, UDPSeq++, 0, remotecall, ourcall,L4->segsSent, L4->segsRcvd, L4->segsResent, Count);
-			NODECALLLOPPED, L4->apiSeq, L4->Direction, Now - L4->ConnectTime, remotecall, ourcall,L4->segsSent, L4->segsRcvd, L4->segsResent, Count);
-		else
-			udplen = sprintf(UDPMsg, "{\"@type\": \"CircuitStatus\", \"node\": \"%s\", \"id\": %d, \"direction\": \"%s\","
-			"\"upForSecs\": %d, \"service\": %d, \"remote\": \"%s\", \"local\": \"%s\", \"segsSent\": %d, \"segsRcvd\": %d, \"segsResent\": %d, \"segsQueued\": %d}",
-			NODECALLLOPPED, L4->apiSeq, L4->Direction, Now - L4->ConnectTime, Service, remotecall, ourcall,L4->segsSent, L4->segsRcvd, L4->segsResent, Count);
 
 //		Debugprintf(UDPMsg);
 		sendto(NodeAPISocket, UDPMsg, udplen, 0, (struct sockaddr *)&UDPreportdest, sizeof(UDPreportdest));
@@ -699,42 +633,7 @@ char * PIDtoText(int PID)
 	return "?";
 }
 
-void dumpDuffPacket(char * call, char * Buffer, int Len)
+void APIL2Trace(struct _MESSAGE * Message, char Dirn)
-{
-	// log to syslog in base64
-
-	char * Base64;
-
-	Base64 = byte_base64_encode(Buffer, Len);
-
-	Debugprintf("Trace Error %s %s", call, Base64);
-	free(Base64);
-}
-
-int checkCall(char * call, unsigned char * Buffer, int Len)
-{
-	char c;
-	int i;
-
-	// Validate source and dest calls - if duff, dump packet
-
-	for (i = 0; i < strlen(call); i++)
-	{
-		c = call[i];
-		
-		if (isalnum(c) || c == '-' || c == '@')
-			continue;
-
-		dumpDuffPacket(call, Buffer, Len);
-		return 0;
-	}
-
-	return 1;
-}
-
-
-
-void APIL2Trace(struct _MESSAGE * Message, char * Dirn)
 {
 	char UDPMsg[2048];	
 	int udplen;
@@ -750,12 +649,6 @@ void APIL2Trace(struct _MESSAGE * Message, char * Dirn)
 	int UFlag = 0;
 	int NS;
 	int NR;
-	struct PORTCONTROL * PORT = GetPortTableEntryFromPortNum(Message->PORT);
-	time_t Now = time(NULL);
-
-
-	if (PORT == 0)
-		return;
 
 	if ((Message->ORIGIN[6] & 1) == 0)	// Digis
 		return;
@@ -763,19 +656,12 @@ void APIL2Trace(struct _MESSAGE * Message, char * Dirn)
 	destcall[ConvFromAX25(Message->DEST, destcall)] = 0;
 	srcecall[ConvFromAX25(Message->ORIGIN, srcecall)] = 0;
 
-	// Validate source and dest calls - if duff, dump packet
+	// See if any Digis
-
-	if (!checkCall(destcall,(char *) Message, Message->LENGTH))
-		return;
-
-	if (!checkCall(srcecall, (char *) Message, Message->LENGTH))
-		return;
-			
-	// see if any Digis
 
 	if ((Message->ORIGIN[6] & 1) == 0)	// Digis - ignore for now
 		return;
 
+
 	if ((Message->DEST[6] & 0x80) == 0 && (Message->ORIGIN[6] & 0x80) == 0)
 		strcpy(CR, "V1");
 	else if ((Message->DEST[6] & 0x80))
@@ -898,9 +784,9 @@ void APIL2Trace(struct _MESSAGE * Message, char * Dirn)
 	// Common to all frame types
 
 	udplen = snprintf(UDPMsg, 2048, 
-		"{\"@type\": \"L2Trace\", \"serial\": %d, \"time\": %d, \"dirn\": \"%s\", \"isRF\": %s, \"reportFrom\": \"%s\", \"port\": \"%d\", \"srce\": \"%s\", \"dest\": \"%s\", \"ctrl\": %d,"
+		"{\"@type\": \"L2Trace\", \"reportFrom\": \"%s\", \"port\": \"%d\", \"srce\": \"%s\", \"dest\": \"%s\", \"ctrl\": %d,"
-		"\"l2Type\": \"%s\", \"modulo\": 8, \"cr\": \"%s\"",
+		"\"l2type\": \"%s\", \"modulo\": 8, \"cr\": \"%s\"",
-		UDPSeq++, (int)Now, Dirn, (PORT->isRF)?"true":"false", NODECALLLOPPED, Message->PORT, srcecall, destcall, Message->CTL, Type, CR);
+	  NODECALLLOPPED, Message->PORT, srcecall, destcall, Message->CTL, Type, CR);
 
 	if (UIFlag)
 	{
@@ -944,9 +830,9 @@ void APIL2Trace(struct _MESSAGE * Message, char * Dirn)
 		// supervisory
 
 		if (PF[0])
-			udplen += snprintf(&UDPMsg[udplen], 2048 - udplen, ", \"pf\": \"%s\", \"rseq\": %d", PF, NR);
+			udplen += snprintf(&UDPMsg[udplen], 2048 - udplen, ", \"pf\": \"%s\", \"rseq\": %d, \"tseq\": %d", PF, NR, NS);
 		else
-			udplen += snprintf(&UDPMsg[udplen], 2048 - udplen, ", \"rseq\": %d", NR);
+			udplen += snprintf(&UDPMsg[udplen], 2048 - udplen, ", \"rseq\": %d, \"tseq\": %d", NR, NS);
 	}
 
 
@@ -958,48 +844,6 @@ void APIL2Trace(struct _MESSAGE * Message, char * Dirn)
 }
 
 
- //"@type" = @L3Trace, reportFrom, time, dirn, 
-
-void NetromTCPTrace(struct _MESSAGE * Message, char * Dirn)
-{
-	char UDPMsg[2048];	
-	int udplen;
-	time_t Now = time(NULL);
-	int iLen = Message->LENGTH - (15 + MSGHDDRLEN);
-	int isRF = 0;
-
-
-	udplen = snprintf(UDPMsg, 2048, 
-		"{\"@type\": \"L3Trace\", \"serial\": %d, \"time\": %d, \"dirn\": \"%s\", \"isRF\": %s, \"reportFrom\": \"%s\", \"port\": %d",
-		UDPSeq++, (int)Now, Dirn, (isRF)?"true":"false", NODECALLLOPPED, Message->PORT);
-
-
-	udplen += snprintf(&UDPMsg[udplen], 2048 - udplen,
-		", \"ilen\": %d, \"pid\": %d, \"ptcl\": \"%s\"",
-		iLen, Message->PID, PIDtoText(Message->PID));
-
-	if (Message->PID == NETROM_PID)
-	{
-		int n = decodeNETROMIFrame(Message->L2DATA, iLen, &UDPMsg[udplen], 2048 - udplen);
-
-		if (n == 0)
-			return;				// Can't decode so don't trace anything;
-
-		udplen += n;
-	}
-
-
-
-	UDPMsg[udplen++] = '}';
-	UDPMsg[udplen] = 0;
-//	Debugprintf(UDPMsg);
-	sendto(NodeAPISocket, UDPMsg, udplen, 0, (struct sockaddr *)&UDPreportdest, sizeof(UDPreportdest));
-
-}
-
-
-
-
 int decodeNETROMUIMsg(unsigned char * Msg, int iLen, char * Buffer, int BufferLen)
 {
 	int Len = 0;
@@ -1026,7 +870,7 @@ int decodeNETROMUIMsg(unsigned char * Msg, int iLen, char * Buffer, int BufferLe
 
 	Msg += 7;			// to first field
 
-	Len = snprintf(Buffer, BufferLen, ", \"l3Type\": \"Routing info\", \"type\": \"NODES\", \"fromAlias\": \"%s\", \"nodes\": [", Alias);
+	Len = snprintf(Buffer, BufferLen, ", \"l3Type\": \"Routing info\", \"type\": \"NODES\", \"nodes\": [");
 
 	iLen -= 7;					//Header, mnemonic and signature length
 
@@ -1077,13 +921,6 @@ int decodeNETROMIFrame(unsigned char * Msg, int iLen, char * Buffer, int BufferL
 	destcall[ConvFromAX25(L3MSG->L3DEST, destcall)] = 0;
 	srcecall[ConvFromAX25(L3MSG->L3SRCE, srcecall)] = 0;
 
-	if (!checkCall(destcall, Msg, iLen))
-		return 0;
-
-	if (!checkCall(srcecall, Msg, iLen))
-		return 0;
-
-
 	if (strcmp(destcall, "KEEPLI") == 0)
 		return 0;
 
@@ -1118,14 +955,6 @@ int decodeNETROMIFrame(unsigned char * Msg, int iLen, char * Buffer, int BufferL
 		srcUser[ConvFromAX25(&L3MSG->L4DATA[1], srcUser)] = 0;
 		srcNode[ConvFromAX25(&L3MSG->L4DATA[8], srcNode)] = 0;
 
-		if (!checkCall(srcUser, Msg, iLen))
-			return 0;
-
-
-		if (!checkCall(srcNode, Msg, iLen))
-			return 0;
-
-
 		if (netromx)
 			Len += snprintf(&Buffer[Len], BufferLen - Len, ", \"l4Type\": \"CONN REQX\", \"fromCct\": %d, \"srcUser\": \"%s\", \"srcNode\": \"%s\", \"window\": %d, \"service\": %d",
 				(L3MSG->L4INDEX << 8) | L3MSG->L4ID, srcUser, srcNode, L3MSG->L4DATA[0], service);
@@ -1140,7 +969,7 @@ int decodeNETROMIFrame(unsigned char * Msg, int iLen, char * Buffer, int BufferL
 		// Can be ACK or NACK depending on Choke flag
 
 		if (L3MSG->L4FLAGS & L4BUSY)	
-			Len += snprintf(&Buffer[Len], BufferLen - Len, ", \"l4Type\": \"CONN NAK\", \"toCct\": %d",
+			Len += snprintf(&Buffer[Len], BufferLen - Len, ", \"l4Type\": \"CONN NACK\", \"toCct\": %d",
 				(L3MSG->L4INDEX << 8) | L3MSG->L4ID);
 		else
 			Len += snprintf(&Buffer[Len], BufferLen - Len, ", \"l4Type\": \"CONN ACK\", \"toCct\": %d, \"fromCct\": %d, \"accWin\": %d",
@@ -1244,7 +1073,7 @@ int decodeRecordRoute(L3MESSAGE * L3, int iLen, char * Buffer, int BufferLen)
 		Len += snprintf(&Buffer[Len], BufferLen - Len, ", \"l4Type\": \"NRR Request\", \"nrrId\": %d, \"nrrRoute\": \"%s\"", 
 			(L3->L4TXNO << 8) | L3->L4RXNO, callList);
 
-//	Debugprintf(Buffer);
+	Debugprintf(Buffer);
 
 	return Len;
 }

KernelScript1.rc

@@ -50,19 +50,6 @@ BEGIN
     LTEXT           "Enable IGate",IDC_STATIC,5,2,49,10
 END
 
-CLOSING DIALOG DISCARDABLE  300, 300, 200, 50
-STYLE DS_3DLOOK | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU | 
-    WS_THICKFRAME
-CAPTION "BPQ32 Close All"
-CLASS "CLOSING"
-FONT 8, "Fixedsys"
-BEGIN
-    LTEXT "Closing Links - Please wait....",IDC_BACKGROUND,22,20,337,273
-
-END
-
-
-
 CONFIG DIALOGEX 249, 200, 160, 118
 STYLE DS_MODALFRAME | DS_3DLOOK | WS_POPUP | WS_CAPTION
 EXSTYLE WS_EX_DLGMODALFRAME | WS_EX_WINDOWEDGE

L2Code.c

@@ -2346,9 +2346,6 @@ VOID SFRAME(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, UCHAR CTL, UCHA
 
 				LINK->L2TIMER = ONEMINUTE;	// (RE)SET TIMER
 
-
-				LINK->framesResent++;
-
 				PORT = LINK->LINKPORT;
 
 				if (PORT)
@@ -2455,20 +2452,6 @@ treatasRR:
 
 	LINK->L2FLAGS &= ~POLLSENT;			// CLEAR I(P) or RR(P) SET
 
-	// ?? is this the place to do RTT?
-
-	if (LINK->lastPSent)
-	{
-		int RTT = GetTickCount() - LINK->lastPSent;
-
-		if (LINK->RTT)
-			LINK->RTT = ((LINK->RTT * 90) / 100) + RTT /10;		// Smooth - 90% of old + 10% of new
-		else 
-			LINK->RTT = RTT;
-
-		LINK->lastPSent = 0;
-	}
-
 	if ((CTL & 0xf) == RNR)
 	{
 		//	Dont Clear timer on receipt of RNR(F), spec says should poll for clearing of busy,
@@ -2944,8 +2927,6 @@ VOID RESETNS(struct _LINKTABLE * LINK, UCHAR NS)
 {
 	int Resent = (LINK->LINKNS - NS) & 7;	// FRAMES TO RESEND
 
-	LINK->framesResent += Resent;
-
 	LINK->LINKNS = NS;			// RESET N(S)
 
 	if (LINK->LINKTYPE == 3)	// mode-Node
@@ -3169,11 +3150,6 @@ VOID SDETX(struct _LINKTABLE * LINK)
 		LINK->LASTFRAMESENT = time(NULL);
 		LINK->LASTSENTQCOUNT = COUNT_AT_L2(LINK);
 
-		if (LINK->LASTSENTQCOUNT > LINK->maxQueued)
-			LINK->maxQueued = LINK->LASTSENTQCOUNT;
-
-		if (LINK->LASTSENTQCOUNT > LINK->intervalMaxQueued)
-			LINK->intervalMaxQueued = LINK->LASTSENTQCOUNT;
 
 		if (LINK->AllowCompress && Msg->LENGTH > 20  && LINK->TX_Q && Msg->PID == 240)			// if short and no more not worth trying compression
 		{
@@ -3376,7 +3352,6 @@ VOID SDETX(struct _LINKTABLE * LINK)
 				// FLAG BUFFER TO CAUSE TIMER TO BE RESET AFTER SEND (or ACK if ACKMODE)
 
 				Buffer->Linkptr = LINK;
-				LINK->lastPSent = GetTickCount();
 			}
 		}
 	

L3Code.c

@@ -236,7 +236,7 @@ BOOL ACTIVATE_DEST(struct DEST_LIST * DEST)
 		return L2SETUPCROSSLINK(ROUTE);
 	}
 	
-	// We must be waiting for link to come up
+	// We umst be waiting for link to come up
 	
 	return TRUE;
 
@@ -627,6 +627,9 @@ VOID PROCROUTES(struct DEST_LIST * DEST, struct ROUTE * ROUTE, int Qual)
 			if (Index == 0)
 			{
 				//	THIS IS A REFRESH OF BEST - IF THIS ISNT ACTIVE ROUTE, MAKE IT ACTIVE
+	
+				if (DEST->DEST_ROUTE > 1)	// LEAVE IT IF NOT SELECTED OR ALREADY USING BEST
+					DEST->DEST_ROUTE = 1;
 			}
 
 			goto UpdatateThisEntry;
@@ -725,8 +728,6 @@ SORTROUTES:
 		
 		goto SORTROUTES;			//  1 AND 2 MAY NOW BE WRONG!	
 	}
-
-	DEST->DEST_ROUTE = 0;			// OForce re-evaluation.
 }
 
 int COUNTNODES(struct ROUTE * ROUTE)
@@ -1041,8 +1042,7 @@ VOID L3TimerProc()
 		LINK = LINKS;
 		i = MAXLINKS;
 
-		
+		while (i--);
-		while (i--)
 		{
 			if (LINK->LINKTYPE == 3)		// Only if Internode
 			{
@@ -1310,9 +1310,6 @@ VOID REMOVENODE(dest_list * DEST)
 	while (DEST->DEST_Q)
 		ReleaseBuffer(Q_REM(&DEST->DEST_Q));
 
-	if (DEST->DEST_STATE & 0x80)	// LOCKED DESTINATION
-		return;
-
 	//	MAY NEED TO CHECK FOR L4 CIRCUITS USING DEST, BUT PROBABLY NOT,
 	//	 AS THEY SHOULD HAVE TIMED OUT LONG AGO
 

L4Code.c

@@ -73,7 +73,6 @@ void OutgoingL4ConnectionEvent(TRANSPORTENTRY * L4);
 void IncomingL4ConnectionEvent(TRANSPORTENTRY * L4);
 void L4DisconnectEvent(TRANSPORTENTRY * L4, char * Direction, char * Reason);
 VOID TCPNETROMSend(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Frame);
-void L4StatusSeport(TRANSPORTENTRY * L4);
 
 static UINT APPLMASK;
 
@@ -90,8 +89,6 @@ extern int L2Compress;
 extern int L2CompMaxframe;
 extern int L2CompPaclen;
 
-int sessionStatusInterval = 300;		// 5 mins
-
 // L4 Flags Values
 
 #define DISCPENDING	8		// SEND DISC WHEN ALL DATA ACK'ED
@@ -1131,7 +1128,6 @@ VOID L4TimerProc()
 	TRANSPORTENTRY * L4 = L4TABLE;
 	TRANSPORTENTRY * Partner;
 	int MaxLinks = MAXLINKS;
-	time_t Now = time(NULL);
 
 	while (n--)
 	{
@@ -1140,12 +1136,6 @@ VOID L4TimerProc()
 			L4++;
 			continue;
 		}
-	
-		// Check for Status report time
-
-		if (L4->lastStatusSentTime && (Now - L4->lastStatusSentTime) > sessionStatusInterval)
-			L4StatusSeport(L4);
-
 		
 		//	CHECK FOR L4BUSY SET AND NO LONGER BUSY
 
@@ -1611,8 +1601,7 @@ VOID CONNECTREQUEST(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, UINT Appl
 	int Index;
 	char APPLCMD[13] = "";
 
-	if (APPL)
+	memcpy(APPLCMD, APPL->APPLCMD, 13);
-		memcpy(APPLCMD, APPL->APPLCMD, 13);
 
 	memcpy(BPQPARAMS, &L4T1, 2);	// SET DEFAULT T1 IN CASE NOT FROM ANOTHER BPQ NODE
 
@@ -1685,8 +1674,6 @@ VOID CONNECTREQUEST(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, UINT Appl
 					{
 						// At the moment I only handle connects to appls. May support other node commands later.
 
-						memcpy(APPLCMD, CMD->String, 13);
-
 						if (n < APPL1 + NumberofAppls)
 							goto doAPPLConnect;
 					}
@@ -1929,34 +1916,19 @@ void L3SWAPADDRESSES(L3MESSAGEBUFFER * L3MSG)
 
 void SendConNAK(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG)
 {
-	struct TNCINFO * TNC;
-
 	L3MSG->L4FLAGS = L4CACK | L4BUSY;			// REJECT
 	L3MSG->L4DATA[0] = 0;						// WINDOW
 
 	L3SWAPADDRESSES(L3MSG);	
 	L3MSG->L3TTL = L3LIVES;
 
-	TNC = LINK->LINKPORT->TNC;
+	C_Q_ADD(&LINK->TX_Q, L3MSG);
-
-	if (LINK->NEIGHBOUR && LINK->NEIGHBOUR->TCPPort)
-	{
-		TCPNETROMSend(LINK->NEIGHBOUR, L3MSG);
-		ReleaseBuffer(L3MSG);
-	}
-	else if (TNC && TNC->NetRomMode)
-		SendVARANetromMsg(TNC, L3MSG);
-	else
-		C_Q_ADD(&LINK->TX_Q, L3MSG);
-
 }
 
 VOID SendL4RESET(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG)
 {
 	// Paula's extension
 
-	struct TNCINFO * TNC;
-
 	L3MSG->L4RXNO = L3MSG->L4ID;
 	L3MSG->L4TXNO = L3MSG->L4INDEX;
 
@@ -1966,19 +1938,7 @@ VOID SendL4RESET(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG)
 	L3MSG->L3TTL = L3LIVES;
 
 	L3MSG->LENGTH = (int)(&L3MSG->L4DATA[0] - (UCHAR *)L3MSG);
-
+	C_Q_ADD(&LINK->TX_Q, L3MSG);
-	TNC = LINK->LINKPORT->TNC;
-
-	if (LINK->NEIGHBOUR && LINK->NEIGHBOUR->TCPPort)
-	{
-		TCPNETROMSend(LINK->NEIGHBOUR, L3MSG);
-		ReleaseBuffer(L3MSG);
-	}
-	else if (TNC && TNC->NetRomMode)
-		SendVARANetromMsg(TNC, L3MSG);
-	else
-		C_Q_ADD(&LINK->TX_Q, L3MSG);
-
 }
 
 
@@ -2068,7 +2028,7 @@ TryAgain:
 
 		while (n--)
 		{
-			if (DEST->DEST_COUNT == 0 && DEST->DEST_RTT == 0 && (DEST->DEST_STATE & 0x80) == 0)		// Not used and not INP3 and not Appl
+			if (DEST->DEST_COUNT == 0 && DEST->DEST_RTT == 0)		// Not used and not INP3
 			{
 				if (DEST->NRROUTE[0].ROUT_QUALITY < WorstQual)
 				{
@@ -2298,14 +2258,6 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 			return;
 		}
 
-		// if connect to service don't send connected to node messsage as service will send own message
-
-//		if (L4->Service)
-//		{
-//			ReleaseBuffer(L3MSG);
-//			return;
-//		}
-
 		Msg = (PDATAMESSAGE)L3MSG;					// reuse input buffer
 
 		Msg->PID = 0xf0;

LinBPQ.c

@@ -85,7 +85,8 @@ VOID GetPGConfig();
 void SendBBSDataToPktMap();
 void CloseAllLinks();
 void hookNodeClosing(char * Reason);
-void NETROMTCPResolve();
+
+extern uint64_t INP3timeLoadedMS;
 
 BOOL IncludesMail = FALSE;
 BOOL IncludesChat = FALSE;
@@ -859,6 +860,8 @@ int main(int argc, char * argv[])
 	if (!isatty(STDOUT_FILENO) || !isatty(STDIN_FILENO))
 		Redirected = 1;
 
+	 INP3timeLoadedMS = GetTickCount();
+
 #endif
 
 	 printf("G8BPQ AX25 Packet Switch System Version %s %s\n", TextVerstring, Datestring);
@@ -1012,8 +1015,6 @@ int main(int argc, char * argv[])
 		return (0);
 	}
 
-	NETROMTCPResolve();
-
 	for (i=0;PWTEXT[i] > 0x20;i++); //Scan for cr or null
 
 	PWLen=i;
@@ -1545,8 +1546,6 @@ int main(int argc, char * argv[])
 			Consoleprintf(VerCopyright);
 
 			Start();
-			
-			NETROMTCPResolve();
 
 			INITIALISEPORTS();
 

MailTCP.c

@@ -2092,19 +2092,20 @@ int CreateSMTPMessage(SocketConn * sockptr, int i, char * MsgTitle, time_t Date,
 		struct tm * tm;
 
 		tm = gmtime(&Date);	
-
+	
 		sprintf(DateString, "%04d/%02d/%02d %02d:%02d",
 			tm->tm_year+1900, tm->tm_mon+1, tm->tm_mday, tm->tm_hour, tm->tm_min);
 
 
 		if (strcmp(Msg->to, "RMS") == 0)		// Address is in via
-			strcpy(B2To, Msg->via);
+		strcpy(B2To, Msg->via);
+	else
+		if (Msg->via[0])
+			sprintf(B2To, "%s@%s", Msg->to, Msg->via);
 		else
-			if (Msg->via[0])
+			strcpy(B2To, Msg->to);
-				sprintf(B2To, "%s@%s", Msg->to, Msg->via);
-			else
-				strcpy(B2To, Msg->to);
 
+		
 		Msg->B2Flags = B2Msg | Attachments;
 
 		if (Msg->type == 'P')
@@ -3933,12 +3934,12 @@ int CreatePOP3Message(char * From, char * To, char * MsgTitle, time_t Date, char
 
 
 		if (strcmp(Msg->to, "RMS") == 0)		// Address is in via
-			strcpy(B2To, Msg->via);
+		strcpy(B2To, Msg->via);
+	else
+		if (Msg->via[0])
+			sprintf(B2To, "%s@%s", Msg->to, Msg->via);
 		else
-			if (Msg->via[0])
+			strcpy(B2To, Msg->to);
-				sprintf(B2To, "%s@%s", Msg->to, Msg->via);
-			else
-				strcpy(B2To, Msg->to);
 
 		
 		Msg->B2Flags = B2Msg | Attachments;

TelnetV6.c

@@ -3874,14 +3874,12 @@ MsgLoop:
 	LFPtr=memchr(MsgPtr, 10, InputLen);
 
 	if (LFPtr == 0)
-	{
 		if (CRPtr)
 		{
 			LFPtr = ++CRPtr;
 			InputLen++;
 		}
-	}
+		if (LFPtr == 0)
-	if (LFPtr == 0)
 	{
 		// Check Paclen
 
@@ -3897,7 +3895,7 @@ MsgLoop:
 			}
 
 			// Send to Node
-
+    
 			// Line could be up to 500 chars if coming from a program rather than an interative user
 			// Limit send to node to 255
 
@@ -3909,16 +3907,16 @@ MsgLoop:
 
 				memmove(MsgPtr,MsgPtr+255,InputLen);
 			}
-
+	           
 			SendtoNode(TNC, sockptr->Number, MsgPtr, InputLen);
 
 			sockptr->InputLen = 0;
-
+		
 		} // PACLEN
 
 		return 0;	// No CR
 	}
-
+	
 	// Got a LF
 
 	// Process data up to the cr
@@ -3931,7 +3929,7 @@ MsgLoop:
 	case 2:
 
 		// Normal Data State
-
+			
 		STREAM->bytesRXed += MsgLen;
 		SendIndex = 0;
 
@@ -3946,7 +3944,7 @@ MsgLoop:
 		}
 
 		SendtoNode(TNC, sockptr->Number, MsgPtr + SendIndex, MsgLen);
-
+		
 		MsgLen += SendIndex;
 
 		// If anything left, copy down buffer, and go back
@@ -3965,20 +3963,20 @@ MsgLoop:
 		return 0;
 
 	case 0:
-
+		
-		//   Check Username
+        //   Check Username
-		//
+        //
 
 		*(LFPtr-1)=0;				 // remove cr
+        
+  //      send(sock, NLMsg, 2, 0);
 
-		//      send(sock, NLMsg, 2, 0);
+        if (LogEnabled)
-
-		if (LogEnabled)
 		{
 			char Addr[256];
-
+			
 			Tel_Format_Addr(sockptr, Addr);
-
+			
 			if (strlen(MsgPtr) > 64)
 			{
 				MsgPtr[64] = 0;
@@ -4573,8 +4571,7 @@ MsgLoop:
 
 				if (P8 == 1)
 					SendPortsForMonitor(sock, sockptr->UserPointer->Secure);
-				
+					sockptr->InputLen = 0;
-				sockptr->InputLen = 0;
 				return 0;
 			}
 		}
@@ -6389,10 +6386,10 @@ VOID SaveCMSHostInfo(int port, struct TCPINFO * TCP, int CMSNo)
 		char ip[256];
 		int n;
 
-		if (sizeof(time_t) == 4)
+	if (sizeof(time_t) == 4)
-			n = sscanf(buf,"%s %d %s", addr, (int *)&t, ip);
+		n = sscanf(buf,"%s %d %s", addr, (int *)&t, ip);
-		else
+	else
-			n = sscanf(buf, "%s %lld %s", addr, &t, ip);
+		n = sscanf(buf, "%s %lld %s", addr, &t, ip);
 
 		if (n == 3)
 		{

UZ7HODrv.c

@@ -1586,81 +1586,81 @@ static int ProcessLine(char * buf, int Port)
 	if (TNC->TCPPort == 0)
 		TNC->TCPPort = 8000;
 
-	TNC->destaddr.sin_family = AF_INET;
+		TNC->destaddr.sin_family = AF_INET;
-	TNC->destaddr.sin_port = htons(TNC->TCPPort);
+		TNC->destaddr.sin_port = htons(TNC->TCPPort);
-	TNC->HostName = malloc(strlen(p_ipad)+1);
+		TNC->HostName = malloc(strlen(p_ipad)+1);
 
-	if (TNC->HostName == NULL) return TRUE;
+		if (TNC->HostName == NULL) return TRUE;
 
-	strcpy(TNC->HostName,p_ipad);
+		strcpy(TNC->HostName,p_ipad);
 
-	ptr = strtok(NULL, " \t\n\r");
+		ptr = strtok(NULL, " \t\n\r");
 
-	if (ptr)
+		if (ptr)
-	{
-		if (_stricmp(ptr, "PTT") == 0)
 		{
-			ptr = strtok(NULL, " \t\n\r");
+			if (_stricmp(ptr, "PTT") == 0)
-
-			if (ptr)
 			{
-				DecodePTTString(TNC, ptr);
 				ptr = strtok(NULL, " \t\n\r");
+
+				if (ptr)
+				{
+					DecodePTTString(TNC, ptr);
+					ptr = strtok(NULL, " \t\n\r");
+				}
+			}
+		
+			if (ptr &&_memicmp(ptr, "PATH", 4) == 0)
+			{
+				p_cmd = strtok(NULL, "\n\r");
+				if (p_cmd) TNC->ProgramPath = _strdup(p_cmd);
 			}
 		}
 
-		if (ptr &&_memicmp(ptr, "PATH", 4) == 0)
+		// Read Initialisation lines
+
+		while(TRUE)
 		{
-			p_cmd = strtok(NULL, "\n\r");
+			if (GetLine(buf) == 0)
-			if (p_cmd) TNC->ProgramPath = _strdup(p_cmd);
+				return TRUE;
-		}
-	}
 
-	// Read Initialisation lines
+			strcpy(errbuf, buf);
 
-	while(TRUE)
+			if (memcmp(buf, "****", 4) == 0)
-	{
+				return TRUE;
-		if (GetLine(buf) == 0)
-			return TRUE;
 
-		strcpy(errbuf, buf);
+			ptr = strchr(buf, ';');
-
+			if (ptr)
-		if (memcmp(buf, "****", 4) == 0)
+			{
-			return TRUE;
+				*ptr++ = 13;
-
+				*ptr = 0;
-		ptr = strchr(buf, ';');
+			}
-		if (ptr)
+			
-		{
+			if (_memicmp(buf, "MAXSESSIONS", 11) == 0)
-			*ptr++ = 13;
+			{
-			*ptr = 0;
+				AGW->MaxSessions = atoi(&buf[12]);
-		}
+				if (AGW->MaxSessions > 26 ) AGW->MaxSessions = 26;
-
+			}
-		if (_memicmp(buf, "MAXSESSIONS", 11) == 0)
+			if (_memicmp(buf, "CONTIMEOUT", 10) == 0)
-		{
+				AGW->ConnTimeOut = atoi(&buf[11]) * 10;
-			AGW->MaxSessions = atoi(&buf[12]);
+			else
-			if (AGW->MaxSessions > 26 ) AGW->MaxSessions = 26;
-		}
-		if (_memicmp(buf, "CONTIMEOUT", 10) == 0)
-			AGW->ConnTimeOut = atoi(&buf[11]) * 10;
-		else
 			if (_memicmp(buf, "UPDATEMAP", 9) == 0)
 				TNC->PktUpdateMap = TRUE;
 			else
-				if (_memicmp(buf, "BEACONAFTERSESSION", 18) == 0) // Send Beacon after each session 
+			if (_memicmp(buf, "BEACONAFTERSESSION", 18) == 0) // Send Beacon after each session 
-					TNC->RPBEACON = TRUE;
+				TNC->RPBEACON = TRUE;
-				else
+			else
-					if (_memicmp(buf, "WINDOW", 6) == 0)
+			if (_memicmp(buf, "WINDOW", 6) == 0)
-						TNC->Window = atoi(&buf[7]);
+				TNC->Window = atoi(&buf[7]);
-					else
+			else
-						if (_memicmp(buf, "DEFAULTMODEM", 12) == 0) 
+			if (_memicmp(buf, "DEFAULTMODEM", 12) == 0) 
-							TNC->AGWInfo->Modem = atoi(&buf[13]);
+				TNC->AGWInfo->Modem = atoi(&buf[13]);
-						else
+			else
-							if (_memicmp(buf, "MODEMCENTER", 11) == 0 || _memicmp(buf, "MODEMCENTRE", 11) == 0)
+			if (_memicmp(buf, "MODEMCENTER", 11) == 0 || _memicmp(buf, "MODEMCENTRE", 11) == 0)
-								TNC->AGWInfo->CenterFreq = atoi(&buf[12]);
+				TNC->AGWInfo->CenterFreq = atoi(&buf[12]);
-							else
+			else
-								if (standardParams(TNC, buf) == FALSE)
+			if (standardParams(TNC, buf) == FALSE)
-									strcat(TNC->InitScript, buf);
+				strcat(TNC->InitScript, buf);
-	}
+		}
 
 
 	return (TRUE);	

VARA.c

@@ -423,9 +423,8 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 			{
 				TNC->Busy--;
 				if (TNC->Busy == 0)
-				{	SetWindowText(TNC->xIDC_CHANSTATE, "Clear");
+					SetWindowText(TNC->xIDC_CHANSTATE, "Clear");
 					strcpy(TNC->WEB_CHANSTATE, "Clear");
-				}
 			}
 		}
 

Versions.h

@@ -10,8 +10,8 @@
 
 #endif
 
-#define KVers 6,0,25,12
+#define KVers 6,0,25,8
-#define KVerstring "6.0.25.12\0"
+#define KVerstring "6.0.25.8\0"
 
 
 #ifdef CKernel

WINMOR.c

@@ -618,10 +618,8 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 			{
 				TNC->Busy--;
 				if (TNC->Busy == 0)
-				{
 					SetWindowText(TNC->xIDC_CHANSTATE, "Clear");
 					strcpy(TNC->WEB_CHANSTATE, "Clear");
-				}
 			}
 		}
 

WebMail.c

@@ -3311,7 +3311,7 @@ char * xxReadTemplate(char * FormSet, char * DirName, char *FileName)
     while ((entry = readdir(dir)) != NULL)
 	{
         if (entry->d_type == DT_DIR)
-			continue;
+                continue;
 	
 		if (stristr(entry->d_name, FileName))
 		{
@@ -5609,7 +5609,7 @@ char * CheckFile(struct HtmlFormDir * Dir, char * FN)
     while ((entry = readdir(dir)) != NULL)
 	{
         if (entry->d_type == DT_DIR)
-			continue;
+                continue;
 	
 		if (stricmp(entry->d_name, FN) == 0)
 		{

asmstrucs.h

@@ -184,13 +184,7 @@ typedef struct _TRANSPORTENTRY
 	int NRRID;
 	time_t NRRTime;
 
-	time_t ConnectTime;
-	char Direction[16];		// In or Out
-
 	int Service;			// For Paula's Connnect to Service
-	int apiSeq;				// for OARC event reporting
-	time_t lastStatusSentTime;
-
 
 } TRANSPORTENTRY;
 
@@ -256,8 +250,7 @@ typedef struct ROUTE
 
 	char * TCPHost;			// For NETROM over TCP
 	int TCPPort;
-	struct NRTCPSTRUCT * TCPSession;	
+	struct NRTCPSTRUCT * TCPSession;			
-	struct addrinfo * TCPAddress;		// Resolved Address
 
 } *PROUTE;
 
@@ -743,7 +736,6 @@ typedef struct PORTCONTROL
 	UCHAR * BUSY;				// % Active (Normally DCD active or TX)
 
 	int Hardware;				// TNC H_TYPE. Copied here for access from application context
-	int isRF;					// For API reporting. -1  is unspecified
 
 
 }	PORTCONTROLX, *PPORTCONTROL;
@@ -985,15 +977,6 @@ typedef struct _LINKTABLE
 	int framesRXed;
 	int framesTXed;
 	int framesResent;
-	time_t LastStatusTime;		
-	int LastStatusbytesRXed;
-	int LastStatusbytesTXed;
-	int	maxQueued;
-	int intervalMaxQueued;
-
-	uint64_t lastPSent;		// Time last I frame with P bit sent in mS (for RTT Measurements)
-	int RTT;
-
 
 	//	Now support compressing L2 Sessions.
 	//	We collect as much data as possible before compressing and re-packetizing
@@ -1011,7 +994,6 @@ typedef struct _LINKTABLE
 
 	char ApplName[16];
 	time_t lastStatusSentTime;
-	int apiSeq;						// for OARC event reporting
 
 } LINKTABLE;
 

bpqaxip.c

@@ -444,7 +444,7 @@ static size_t ExtProc(int fn, int port, PMESSAGE buff)
 									From[ConvFromAX25(call, &From[1]) + 1] = 0;
 									if (strstr(CantReplyList, From) == 0)
 									{
-										if (strlen(CantReplyList) < 500)
+										if (strlen(CantReplyList) < 500);
 											strcat(CantReplyList, From);
 										Debugprintf("AXIP Packet from %s dropped - can't reply", &From[1]);
 									}
@@ -557,7 +557,7 @@ static size_t ExtProc(int fn, int port, PMESSAGE buff)
 								From[ConvFromAX25(call, &From[1]) + 1] = 0;
 								if (strstr(CantReplyList, From) == 0)
 								{
-									if (strlen(CantReplyList) < 500)
+									if (strlen(CantReplyList) < 500);
 										strcat(CantReplyList, From);
 									Debugprintf("AXIP Packet from %s dropped - can't reply", &From[1]);
 								}

cMain.c

@@ -38,7 +38,6 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #include "cheaders.h"
 #include "tncinfo.h"
 #include "mqtt.h"
-#include "kiss.h"
 
 VOID L2Routine(struct PORTCONTROL * PORT, PMESSAGE Buffer);
 VOID ProcessIframe(struct _LINKTABLE * LINK, PDATAMESSAGE Buffer);
@@ -58,7 +57,7 @@ VOID L2SENDCOMMAND(struct _LINKTABLE * LINK, int CMD);
 void WritePacketLogThread(void * param);
 void hookNodeStarted();
 void hookNodeRunning();
-void APIL2Trace(struct _MESSAGE * Message, char * Dirn);
+void APIL2Trace(struct _MESSAGE * Message, char Dirn);
 
 #include "configstructs.h"
 
@@ -1018,7 +1017,6 @@ BOOL Start()
 		PORT->INP3ONLY = PortRec->INP3ONLY;
 		PORT->ALLOWINP3 = PortRec->AllowINP3;
 		PORT->ENABLEINP3 = PortRec->EnableINP3;
-		PORT->isRF = PortRec->isRF;
 
 		PORT->PORTWINDOW = (UCHAR)PortRec->MAXFRAME;
 
@@ -1418,15 +1416,12 @@ BOOL Start()
 		{
 			ROUTE->TCPHost = Rcfg->tcphost;
 			ROUTE->TCPPort = Rcfg->tcpport;
-
-			ROUTE->TCPAddress = (struct addrinfo *)zalloc(sizeof(struct addrinfo));
-			ROUTE->TCPAddress->ai_addr = (struct sockaddr *) zalloc(sizeof(struct sockaddr));
 		}
 		
 		Rcfg++;
 		ROUTE++;
 	}
-	
+
 	//	SET UP INFO MESSAGE
 
 	ptr2 = &cfg->C_INFOMSG[0];
@@ -2033,7 +2028,7 @@ VOID ReadNodes()
 			ptr = strtok_s(NULL, seps, &Context);	// INP3
 			if (ptr == NULL) continue;
 
-			if (ROUTE->NEIGHBOUR_FLAG == 0 || ROUTE->OtherendLocked == 0)		// Not LOCKED ROUTE
+			if (ROUTE->NEIGHBOUR_FLAG == 0 || ROUTE->OtherendLocked == 0);		// Not LOCKED ROUTE
 				ROUTE->OtherendsRouteQual = atoi(ptr);
 
 			ptr = strtok_s(NULL, seps, &Context);	// INP3
@@ -2284,7 +2279,7 @@ VOID TIMERINTERRUPT()
 		Message = (struct _MESSAGE *)Buffer;
 
 		if(NodeAPISocket)
-			APIL2Trace(Message, "sent");
+			APIL2Trace(Message, 'T');
 
 		Message->PORT |= 0x80;			// Set TX Bit
 	
@@ -2399,7 +2394,7 @@ L2Packet:
 				MQTTKISSRX(Buffer);
 
 			if(NodeAPISocket &&PORT->PROTOCOL == 0)
-				APIL2Trace(Message, "rcvd");
+				APIL2Trace(Message, 'R');
 			
 			// Bridge if requested
 
@@ -2770,7 +2765,6 @@ VOID INITIALISEPORTS()
 {
 	char INITMSG[80];
 	struct PORTCONTROL * PORT = PORTTABLE;
-	struct PORTCONTROL * SAVEPORT;
 	
 	while (PORT)
 	{
@@ -2778,68 +2772,7 @@ VOID INITIALISEPORTS()
 		WritetoConsoleLocal(INITMSG);
 
 		PORT->PORTINITCODE(PORT);
-		SAVEPORT=PORT;
+		PORT = PORT->PORTPOINTER;
-
-		// See if it is an RF port
-
-		if (PORT->isRF == -1)			// Not set
-		{
-			// Try to determine if RF
-
-			if (PORT->PORTTYPE == 0)
-			{
-				struct KISSINFO * KISS = (struct KISSINFO *)PORT;
-				NPASYINFO Port;
-
-				if (KISS->FIRSTPORT && KISS->FIRSTPORT != KISS)
-				{
-					// Not first port on device
-
-					PORT = (struct PORTCONTROL *)KISS->FIRSTPORT;
-				}
-
-				Port = KISSInfo[PORT->PORTNUMBER];
-
-				if (Port)
-				{
-					// KISS like
-
-					if (PORT->PORTIPADDR.s_addr || PORT->KISSSLAVE)
-					{
-						// KISS over UDP or TCP
-
-						if (PORT->KISSTCP)
-							PORT->isRF = 1;				// Assume TCP is RF (software modem)
-						else
-							PORT->isRF = 0;				// Assuem UDP is Internet
-					}
-					else
-						PORT->isRF = 1;		// Serial port
-				}		
-			}
-			else if (PORT->PORTTYPE == 14)		// Loopback 
-				PORT->isRF = 0;
-
-			else if (PORT->PORTTYPE == 16)		// External
-			{
-				if (PORT->PROTOCOL == 10)		// 'HF' Port
-				{
-					struct TNCINFO * TNC = TNCInfo[PORT->PORTNUMBER];
-
-					if (TNC && TNC->Hardware == H_TELNET)
-						PORT->isRF = 0;
-					else
-						PORT->isRF = 1;		// ARDOP etc
-				}
-				else
-				{
-					// External but not HF - AXIP, BPQETHER VKISS, ??
-
-					PORT->isRF = 0;
-				}
-			}
-		}
-		PORT = SAVEPORT->PORTPOINTER;
 	}
 }
 

compatbits.c

@@ -25,8 +25,6 @@ Stuff to make compiling on WINDOWS and LINUX easier
 
 #ifdef WIN32
 
-#include <windows.h>
-
 typedef unsigned int       uint32_t;
 
 #define pthread_t uint32_t
@@ -43,7 +41,6 @@ int pthread_equal(pthread_t T1, pthread_t T2)
 #include <syslog.h>
 #include <stdarg.h>
 #include <unistd.h>
-#include <stdint.h>
 
 #define BOOL int
 
@@ -191,27 +188,3 @@ void closesocket(int sock)
 }
 
 #endif
-
-#ifdef WIN32
-
-uint32_t GetTickCountINP3()
-{
-	// Returns system uptime in 10 mS, lower 20 bits only
-
-	return (GetTickCount() / 10) & 0xfffff;
-}
-#else
-
-uint64_t GetTickCount();
-
-uint32_t GetTickCountINP3()
-{
-	uint64_t Ticks = GetTickCount();
-
-	// Returns system uptime in 10 mS, lower 20 bits only
-
-	return (Ticks / 10) & 0xfffff;
-}
-
-#endif
-

compatbits.h

@@ -24,7 +24,6 @@ Stuff to make compiling on WINDOWS and LINUX easier
 
 #define strtoll _strtoi64
 
-
 #ifdef _WIN64
 #include "stdint.h"
 #else
@@ -220,7 +219,7 @@ typedef struct tagRECT
 
 #endif
 
-uint32_t GetTickCountINP3();		
+
 
 #ifdef LINBPQ
 

config.c

@@ -379,8 +379,7 @@ 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", 
+"SMARTID", "KISSCOMMAND", "SendtoM0LTEMap", "PortFreq", "M0LTEMapInfo", "QTSMPort", "ALLOWINP3", "ENABLEINP3"};         /* parameter keywords */
-"ALLOWINP3", "ENABLEINP3", "isRF"};         /* parameter keywords */
 
 static void * poffset[] =
 {
@@ -394,8 +393,7 @@ static void * poffset[] =
 &xxp.BCALL, &xxp.DIGIMASK, &xxp.DefaultNoKeepAlives, &xxp.IOADDR, &xxp.DLLNAME, &xxp.WL2K, &xxp.UIONLY,
 &xxp.IOADDR, &xxp.IPADDR, &xxp.INTLEVEL, &xxp.IOADDR, &xxp.IOADDR, &xxp.ListenPort, &xxp.NoNormalize,
 &xxp.IGNOREUNLOCKED, &xxp.INP3ONLY, &xxp.TCPPORT, &xxp.RIGPORT, &xxp.PERMITTEDAPPLS, &xxp.Hide,
-&xxp.SmartID, &xxp.KissParams, &xxp.SendtoM0LTEMap, &xxp.PortFreq, &xxp.M0LTEMapInfo, &xxp.QtSMPort, 
+&xxp.SmartID, &xxp.KissParams, &xxp.SendtoM0LTEMap, &xxp.PortFreq, &xxp.M0LTEMapInfo, &xxp.QtSMPort, &xxp.AllowINP3, &xxp.EnableINP3};	/* offset for corresponding data in config file */
-&xxp.AllowINP3, &xxp.EnableINP3, &xxp.isRF};	/* offset for corresponding data in config file */
 
 static int proutine[] = 
 {
@@ -409,8 +407,7 @@ static int proutine[] =
 0, 1, 2, 18, 15, 16, 2,
 1, 17, 1, 1, 1, 1, 2,
 2, 2, 1, 1, 19, 2,
-1, 20, 1, 21, 22, 1, 
+1, 20, 1, 21, 22, 1, 1, 1};							/* routine to process parameter */
-1, 1, 1};							/* routine to process parameter */
 
 int PPARAMLIM = sizeof(proutine)/sizeof(int);
 
@@ -638,8 +635,6 @@ BOOL ProcessConfig()
 	paramok[93]=1;			// ONLYVer2point0
 	paramok[94]=1;			// DEBUGINP3
 	paramok[95]=1;			// EnableOARCAPI
-	paramok[96]=1;			// OARCAPI
-
 
 	for (i=0; i < PARAMLIM; i++)
 	{
@@ -1823,7 +1818,6 @@ int ports(int i)
 	}
 
 	xxp.SendtoM0LTEMap = 1;			// Default to enabled
-	xxp.isRF = -1;					// Default to undefined
 
 	while (endport == 0 && !feof(fp1))
 	{

configstructs.h

@@ -83,7 +83,6 @@ struct PORTCONFIG
 	int QtSMPort;
 	int AllowINP3;
 	int EnableINP3;
-	short isRF;
 };
 
 struct ROUTECONFIG

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,342 +0,0 @@
-linbpq (6.0.25.12+repack-1~hibbian13+1) trixie-hibbian-unstable; urgency=medium
-
-  * New upstream version 6.0.25.12+repack
-  * 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>  Sat, 22 Nov 2025 15:11:09 +0000
-
-linbpq (6.0.25.11+repack-1~hibbian13+1) trixie-hibbian-unstable; urgency=medium
-
-  * New upstream version 6.0.25.11+repack
-  * 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 Nov 2025 21:52:58 +0000
-
-linbpq (6.0.25.9+repack-1~hibbian13+1) trixie-hibbian-unstable; urgency=medium
-
-  * New upstream version 6.0.25.9+repack
-  * Refresh patches
-  * 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>  Sun, 09 Nov 2025 22:45:07 +0000
-
-linbpq (6.0.25.8+repack-1~hibbian13+1) trixie-hibbian-unstable; urgency=medium
-
-  * Build on latest gcc standards
-  * New upstream version 6.0.25.8+repack
-  * Refresh patches with gbp pq!
-  * 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>  Fri, 24 Oct 2025 00:45:16 +0100
-
-linbpq (6.0.25.06+repack-1~hibbian13+1) trixie-hibbian-unstable; urgency=medium
-
-  * New upstream version 6.0.25.06+repack
-  * 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>  Fri, 10 Oct 2025 23:42:04 +0100
-
-linbpq (6.0.25.1+repack-1~hibbian13+1) trixie-hibbian-unstable; urgency=medium
-
-   * New upstream version 6.0.25.1+repack
-   * 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>  Sat, 20 Sep 2025 15:43:32 +0100
-
-linbpq (6.0.24.82+repack-1~hibbian13+1) trixie-hibbian-unstable; urgency=medium
-
-  * New upstream version 6.0.24.82+repack
-  * 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>  Sun, 17 Aug 2025 22:36:49 +0100
-
-linbpq (6.0.24.78+repack-1~hibbian~TRIXIE+1) trixie-hibbian-unstable; urgency=medium
-
-  * New Upstream
-  * New files excluded
-    - No binaries in this release at all maybe!
-  * 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>  Thu, 31 Jul 2025 01:31:38 +0100
-
-linbpq (6.0.24.77+repack-1~hibbian~TRIXIE+1) trixie-hibbian-unstable; urgency=medium
-
-  * New upstream version 6.0.24.77+repack
-  * 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, 22 Jul 2025 21:46:13 +0100
-
-linbpq (6.0.24.75+repack-1~hibbian~TRIXIE+2) trixie-hibbian-unstable; urgency=medium
-
-  * First trixie release
-  * Drop hard-dep on hibbian-archive-keyring
-
- -- Dave Hibberd <hibby@debian.org>  Wed, 16 Jul 2025 19:10:33 +0100
-
-linbpq (6.0.24.75+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New upstream version 6.0.25.75+repack
-  * 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, 15 Jul 2025 01:10:43 +0100
-
-linbpq (6.0.24.71+repack-1~hibbian+1) bookworm-hibbian-unstable; urgency=medium
-
-  * New upstream version 6.0.24.67+repack
-  * New upstream version 6.0.24.69+repack
-  * New upstream version 6.0.24.69.1+repack
-  * New upstream version 6.0.24.71+repack
-  * Okay that's a lot of updates.
-  * Refreshed d/p/makefile to reflect new CFLAG
-  * 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>  Wed, 21 May 2025 21:45:59 +0100
-
-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.2
-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
-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,37 +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
-	*.svn-base *.db *.obj
-
-Files: *
-Copyright: 1990-2025 John Wiseman G8BPQ <john.wiseman@cantab.net>
-License: GPL-3
-
-Files: debian/*
-Copyright: 2016-2025 Dave Hibberd <d@vehibberd.com>
-License: GPL-3
-
-Files: debian/linbpq.service
-Copyright: 2024-2025 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,57 +0,0 @@
-From: Dave Hibberd <hibby@debian.org>
-Date: Sat, 20 Sep 2025 15:42:15 +0100
-Subject: makefile
-
----
- makefile | 22 ++++++++++------------
- 1 file changed, 10 insertions(+), 12 deletions(-)
-
-diff --git a/makefile b/makefile
-index 26403e5..0f15cc0 100644
---- 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\
-@@ -17,12 +16,12 @@ OBJS = pngwtran.o pngrtran.o pngset.o pngrio.o pngwio.o pngtrans.o pngrutil.o pn
- 
- # Configuration:
- 
--#Default to Linux
--	CC = gcc    
--	LDFLAGS = -Xlinker -Map=output.map -lrt 
-+CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
-+CFLAGS+=$(shell dpkg-buildflags --get CPPFLAGS)
-+LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
- 
--all: CFLAGS = -DLINBPQ  -MMD -g -fcommon -fasynchronous-unwind-tables $(EXTRA_CFLAGS)	
--all: LIBS = -lpaho-mqtt3a -ljansson -lminiupnpc -lm -lz -lpthread -lconfig -lpcap                       
-+all: CFLAGS += -DLINBPQ -MMD -g -rdynamic -fcommon -fasynchronous-unwind-tables
-+all: LIBS = -lpaho-mqtt3a -ljansson -lminiupnpc -lrt -lm -lz -lpthread -lconfig -lpcap -lpng
- all: linbpq
- 
- #other OS
-@@ -74,12 +73,11 @@ noi2c: linbpq
- 
- 
- linbpq: $(OBJS)
--	cc $(OBJS) $(CFLAGS) $(LDFLAGS) $(LIBS) -o linbpq
--	sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq		
-+	$(CC) $(OBJS) $(CFLAGS) $(LDFLAGS) $(LIBS) -o 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
- 

debian/patches/series

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

debian/patches/spelling-fixes.patch

@@ -1,21 +0,0 @@
-From: Dave Hibberd <hibby@debian.org>
-Date: Sat, 20 Sep 2025 15:42:15 +0100
-Subject: spelling-fixes
-
----
- UZ7HODrv.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/UZ7HODrv.c b/UZ7HODrv.c
-index 2adfe12..75e40ee 100644
---- a/UZ7HODrv.c
-+++ b/UZ7HODrv.c
-@@ -387,7 +387,7 @@ int UZ7HOSetFreq(int port, struct TNCINFO * TNC, struct AGWINFO * AGW, PDATAMESS
- 
- 	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)))

lzhuf32.c

@@ -487,124 +487,124 @@ static void reconst(void)
 
 static void update(int c)
 {
-	int i, j, l;
+    int i, j, l;
 	unsigned int k;
 
-	if (freq[R] == MAX_FREQ) {
+        if (freq[R] == MAX_FREQ) {
-		reconst();
+                reconst();
-	}
+        }
-	c = prnt[c + T];
+        c = prnt[c + T];
-	do {
+        do {
-		k = ++freq[c];
+                k = ++freq[c];
 
-		/* if the order is disturbed, exchange nodes */
+                /* if the order is disturbed, exchange nodes */
-
-		l = c + 1;
 
+        l = c + 1;
+		
 		if ((unsigned)k > freq[l]) 
 		{
-			while ((unsigned)k > freq[++l]);
+            while ((unsigned)k > freq[++l]);
-			l--;
+                        l--;
-			freq[c] = freq[l];
+                        freq[c] = freq[l];
-			freq[l] = k;
+                        freq[l] = k;
 
-			i = son[c];
+                        i = son[c];
-			prnt[i] = l;
+                        prnt[i] = l;
-			if (i < T) prnt[i + 1] = l;
+                        if (i < T) prnt[i + 1] = l;
 
-			j = son[l];
+                        j = son[l];
-			son[l] = i;
+                        son[l] = i;
 
-			prnt[j] = c;
+                        prnt[j] = c;
-			if (j < T) prnt[j + 1] = c;
+                        if (j < T) prnt[j + 1] = c;
-			son[c] = j;
+                        son[c] = j;
 
-			c = l;
+                        c = l;
-		}
+                }
-	} while ((c = prnt[c]) != 0);   /* repeat up to root */
+        } while ((c = prnt[c]) != 0);   /* repeat up to root */
 }
 
 unsigned code, len;
 
 static void EncodeChar(unsigned int c)
 {
-	unsigned int i;
+    unsigned int i;
-	int j, k;
+    int j, k;
 
-	i = 0;
+        i = 0;
-	j = 0;
+        j = 0;
-	k = prnt[c + T];
+        k = prnt[c + T];
 
-	/* travel from leaf to root */
+        /* travel from leaf to root */
-	do {
+        do {
-		i >>= 1;
+                i >>= 1;
 
-		/* if node's address is odd-numbered, choose bigger brother node */
+                /* if node's address is odd-numbered, choose bigger brother node */
-		if (k & 1) i += 0x8000;
+                if (k & 1) i += 0x8000;
 
-		j++;
+                j++;
-	} while ((k = prnt[k]) != R);
+        } while ((k = prnt[k]) != R);
-	Putcode(j, i);
+        Putcode(j, i);
-	code = i;
+        code = i;
-	len = j;
+        len = j;
-	update(c);
+        update(c);
 }
 
 static void EncodePosition(unsigned int c)
 {
-	unsigned int i;
+    unsigned int i;
 
-	/* output upper 6 bits by table lookup */
+        /* output upper 6 bits by table lookup */
-	i = c >> 6;
+        i = c >> 6;
-	Putcode(p_len[i], (unsigned)p_code[i] << 8);
+        Putcode(p_len[i], (unsigned)p_code[i] << 8);
 
-	/* output lower 6 bits verbatim */
+        /* output lower 6 bits verbatim */
-	Putcode(6, (c & 0x3f) << 10);
+        Putcode(6, (c & 0x3f) << 10);
 }
 
 static void EncodeEnd(void)
 {
-	if (putlen) {
+        if (putlen) {
-		if (crc_fputc(putbuf >> 8) == EOF) {
+				if (crc_fputc(putbuf >> 8) == EOF) {
-			Error(wterr);
+                        Error(wterr);
-		}
+                }
-		codesize++;
+                codesize++;
-	}
+        }
 }
 
 int DecodeChar(void)
 {
-	unsigned int c;
+    unsigned int c;
 
-	c = son[R];
+        c = son[R];
 
-	/* travel from root to leaf, */
+        /* travel from root to leaf, */
-	/* choosing the smaller child node (son[]) if the read bit is 0, */
+        /* choosing the smaller child node (son[]) if the read bit is 0, */
-	/* the bigger (son[]+1} if 1 */
+        /* the bigger (son[]+1} if 1 */
-	while (c < T) {
+        while (c < T) {
-		c += GetBit();
+                c += GetBit();
-		c = son[c];
+                c = son[c];
-	}
+        }
-	c -= T;
+        c -= T;
-	update(c);
+        update(c);
-	return (int)c;
+    return (int)c;
 }
 
 int DecodePosition(void)
 {
-	unsigned int i, j, c;
+    unsigned int i, j, c;
 
-	/* recover upper 6 bits from table */
+		/* recover upper 6 bits from table */
-	i = GetByte();
+		i = GetByte();
-	c = (unsigned)d_code[i] << 6;
+		c = (unsigned)d_code[i] << 6;
-	j = d_len[i];
+		j = d_len[i];
 
-	/* read lower 6 bits verbatim */
+		/* read lower 6 bits verbatim */
-	j -= 2;
+		j -= 2;
-	while (j--) {
+		while (j--) {
-		i = (i << 1) + GetBit();
+				i = (i << 1) + GetBit();
-	}
+		}
-	return (int)(c | (i & 0x3f));
+    return (int)(c | (i & 0x3f));
 }
 
 /* compression */

pngwutil.c

@@ -350,11 +350,10 @@ png_write_compressed_data_out(png_structp png_ptr, compression_state *comp)
       comp->output_ptr[i]=NULL;
    }
    if (comp->max_output_ptr != 0)
-	   png_free(png_ptr, comp->output_ptr);
+      png_free(png_ptr, comp->output_ptr);
-   comp->output_ptr=NULL;
+      comp->output_ptr=NULL;
    /* write anything left in zbuf */
    if (png_ptr->zstream.avail_out < (png_uint_32)png_ptr->zbuf_size)
-
       png_write_chunk_data(png_ptr, png_ptr->zbuf,
          png_ptr->zbuf_size - png_ptr->zstream.avail_out);