Release!

Update to upstream version '6.0.25.12+repack'
with Debian dir 0b59d86e0b

AGWAPI.c

@@ -36,7 +36,8 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 struct AGWHeader
 {
-    unsigned int Port;
+    uint8_t Port;
+	uint8_t filler1[3];
 	unsigned char DataKind;
     unsigned char filler2;
 	unsigned char PID;
@@ -128,7 +129,7 @@ int DataSocket_Write(struct AGWSocketConnectionInfo * sockptr, SOCKET sock);
 int AGWGetSessionKey(char * key, struct AGWSocketConnectionInfo * sockptr);
 int ProcessAGWCommand(struct AGWSocketConnectionInfo * sockptr);
 int SendDataToAppl(int Stream, byte * Buffer, int Length);
-int InternalAGWDecodeFrame(char * msg, char * buffer, time_t Stamp, int * FrameType, int useLocalTime, int doNodes);
+int InternalAGWDecodeFrame(MESSAGE * msg, char * buffer, time_t Stamp, int * FrameType, int useLocalTime, int doNodes);
 int AGWDataSocket_Disconnect( struct AGWSocketConnectionInfo * sockptr);
 int SendRawPacket(struct AGWSocketConnectionInfo * sockptr, char *txmsg, int Length);
 int ShowApps();
@@ -720,7 +721,7 @@ int AGWDoMonitorData()
 
 		RawLen = monbuff->LENGTH;
 
-		if (RawLen < 7 || RawLen > 350)
+		if (RawLen < MSGHDDRLEN || RawLen > 350)
 		{	
 			ReleaseBuffer(monbuff);
 			FreeSemaphore(&Semaphore);
@@ -734,12 +735,16 @@ int AGWDoMonitorData()
 		ReleaseBuffer(monbuff);
 
 		FreeSemaphore(&Semaphore);
+
+		// Set monbuff to point to the copy
+
+		monbuff = (MESSAGE *)Buffer;
 	
 //'   4 byte chain
 //'   1 byte port - top bit = transmit
 //'   2 byte length (LO-HI)
 
-		Port = Buffer[4];
+		Port = monbuff->PORT;
 
 		if (Port > 127)
 		{
@@ -751,6 +756,12 @@ int AGWDoMonitorData()
 		    RXFlag = TRUE;
 		}
 
+		if (Port == 0)
+		{
+			Debugprintf("AGWMON Port number is zero");
+			return 0;
+		}
+
 		// Can now have different mon flags per connection, so need to run decode for each socket
 
 		for (n = 1; n<= CurrentSockets; n++)
@@ -759,7 +770,7 @@ int AGWDoMonitorData()
 
 			if (sockptr->SocketActive && sockptr->MonFlag && (RXFlag || LoopMonFlag))
 			{
-				Length = InternalAGWDecodeFrame(Buffer, AGWBuffer, Stamp, &Frametype, sockptr->useLocalTime, sockptr->doNodes);
+				Length = InternalAGWDecodeFrame(monbuff, AGWBuffer, Stamp, &Frametype, sockptr->useLocalTime, sockptr->doNodes);
 
 				if (Length > 0)
 				{
@@ -803,7 +814,7 @@ int AGWDoMonitorData()
 			}
 		}
 
-		RawLen = RawLen - 6;
+		RawLen = RawLen - (MSGHDDRLEN - 1);		// One more for KISS control
  
 		if (RXFlag || Loopflag) // Send transmitted frames if requested
 		{
@@ -811,8 +822,12 @@ int AGWDoMonitorData()
         //
         //  Send raw data to any sockets that have requested Raw frames
         //
-        
-			Buffer[6]=0;
+
+		// Format is ax.25 packet prceeded by a KISS command byte 00 for channel 1 0x10 for channel 2 etc
+		// As this is an application API I think all should go as Port 1
+
+
+			Buffer[MSGHDDRLEN - 1] = 0;			// Just in case big-endian
        
 			AGWTXHeader.Port = Port - 1;       // AGW Ports start from 0
 			AGWTXHeader.DataKind = 'K';
@@ -824,14 +839,12 @@ int AGWDoMonitorData()
 				sockptr=&Sockets[n];
        
 				if (sockptr->SocketActive && sockptr->RawFlag)
-					SendRawPacket(sockptr, &Buffer[6], RawLen);
+					SendRawPacket(sockptr, &Buffer[MSGHDDRLEN - 1], RawLen);
         
 			}
 		}		
    }
-
-	return 0;
-
+   return 0;
 }
 
 int DeleteConnection(struct BPQConnectionInfo * Con)
@@ -1128,6 +1141,7 @@ int AGWDataSocket_Read(struct AGWSocketConnectionInfo * sockptr, SOCKET sock)
 int ProcessAGWCommand(struct AGWSocketConnectionInfo * sockptr)
 {
 	int AGWVersion[2]={2003,999};
+	byte AGWPortCaps[12] = { 0, 255, 30, 10, 63, 10, 4, 0, 1, 0, 0, 0 };
 	char AGWRegReply[1];
 	struct BPQConnectionInfo * Connection;
 	int Stream;
@@ -1195,7 +1209,7 @@ int ProcessAGWCommand(struct AGWSocketConnectionInfo * sockptr)
 
 			// Need to convert port index (used by AGW) to port number
 
-			conport=GetPortNumber(VisiblePortToRealPort[key[0]-48]);
+			conport=GetPortNumber(VisiblePortToRealPort[key[0]-49] + 1);
 
 			n = sprintf(ConnectMsg,"C %d %s",conport,ToCall);
 
@@ -1293,9 +1307,7 @@ int ProcessAGWCommand(struct AGWSocketConnectionInfo * sockptr)
     //   Version
     
         memset(&AGWTXHeader,0,36);
-    
         AGWTXHeader.DataKind = 'R';
-
         AGWTXHeader.DataLength = 8;       // Length
     
         SendtoSocket(sockptr->socket, (char *)&AGWVersion[0]);
@@ -1309,15 +1321,27 @@ int ProcessAGWCommand(struct AGWSocketConnectionInfo * sockptr)
         
         
         memset(&AGWTXHeader,0,36);
-
         AGWTXHeader.DataKind = 'G';
-
         AGWTXHeader.DataLength =(int)strlen(AGWPorts)+1;     // Length
     
         SendtoSocket(sockptr->socket, AGWPorts);
 
 		return 0;
 
+		     
+	case 'g':
+
+        //   Port capabilities. Currently hard-coded.
+
+		AGWTXHeader.Port = sockptr->AGWRXHeader.Port;
+		AGWTXHeader.DataKind = 'g';
+		AGWTXHeader.DataLength = 12;
+
+		SendtoSocket(sockptr->socket, (char *)&AGWPortCaps[0]);
+
+		return 0;
+
+
     
 	case 'k':
 
@@ -1416,6 +1440,8 @@ int ProcessAGWCommand(struct AGWSocketConnectionInfo * sockptr)
 
         AGWTXHeader.DataKind = 'X';
         
+        memcpy(&AGWTXHeader.callfrom, RegCall, 10);
+
         AGWTXHeader.DataLength = 1;      // Length
              
         AGWRegReply[0] = 1;

AGWMoncode.c

@@ -49,9 +49,14 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #define	DM	0x0F
 #define	UA	0x63
 #define	FRMR 0x87
+#define XID     0xAF
+#define TEST    0xE3
 #define	RR	1
 #define	RNR	5
 #define	REJ	9
+#define	SREJ 0x0D
+#define SABME 0x6F
+
 
 #define	PFBIT 0x10		// POLL/FINAL BIT IN CONTROL BYTE
 
@@ -261,6 +266,18 @@ int InternalAGWDecodeFrame(MESSAGE * msg, char * buffer, time_t Stamp, int * Fra
 			strcpy(SUP, "FRMR");
 			FRMRFLAG = 1;
 			break;
+
+		case XID:
+
+			strcpy(SUP, "XID");
+			XIDFLAG = 1;
+			break;
+
+		case TEST:
+
+			strcpy(SUP, "TEST");
+			TESTFLAG = 1;
+			break;
 		}
 
 		Output += sprintf((char *)Output, "<%s%s%s>", SUP, CRCHAR, PFCHAR);
@@ -270,7 +287,7 @@ int InternalAGWDecodeFrame(MESSAGE * msg, char * buffer, time_t Stamp, int * Fra
 		// Super
 
 		int NR = (CTL >> 5) & 7;
-		char SUP[4] = "??";
+		char SUP[5] = "??";
 
 		switch (CTL & 0x0F)
 		{
@@ -288,6 +305,13 @@ int InternalAGWDecodeFrame(MESSAGE * msg, char * buffer, time_t Stamp, int * Fra
 
 			strcpy(SUP, "REJ");
 			break;
+
+
+		case SREJ:
+
+			strcpy(SUP, "SREJ");
+			break;
+
 		}
 
 		Output += sprintf((char *)Output, "<%s%s%s R%d>", SUP, CRCHAR, PFCHAR, NR);
@@ -300,6 +324,72 @@ int InternalAGWDecodeFrame(MESSAGE * msg, char * buffer, time_t Stamp, int * Fra
 	if (FRMRFLAG)
 		Output += sprintf((char *)Output, "%02X %02X %02X", ADJBUFFER->PID, ADJBUFFER->L2DATA[0], ADJBUFFER->L2DATA[1]); 
 
+	if (XIDFLAG)
+	{
+		// Decode and display XID
+
+		UCHAR * ptr = &ADJBUFFER->PID;
+
+		if (*ptr++ == 0x82 && *ptr++ == 0x80)
+		{
+			int Type;
+			int Len;
+			unsigned int value;
+			int xidlen = *(ptr++) << 8;
+			xidlen += *ptr++;
+		
+			// XID is set of Type, Len, Value n-tuples
+
+// G8BPQ-2>G8BPQ:(XID cmd, p=1) Half-Duplex SREJ modulo-128 I-Field-Length-Rx=256 Window-Size-Rx=32 Ack-Timer=3000 Retries=10
+
+
+			while (xidlen > 0)
+			{
+				Type = *ptr++;
+				Len = *ptr++;
+
+				value = 0;
+				xidlen -= (Len + 2);
+
+				while (Len--)
+				{
+					value <<=8;
+					value += *ptr++;
+				}
+				switch(Type)
+				{
+				case 2:				//Bin fields
+				case 3:
+
+					Output += sprintf((char *)Output, " %d=%x", Type, value);
+					break;
+
+				case 6:				//RX Size
+
+					Output += sprintf((char *)Output, " RX Paclen=%d", value / 8);
+					break;
+
+				case 8:				//RX Window
+
+					Output += sprintf((char *)Output, " RX Window=%d", value);
+					break;
+
+				case 16:
+
+					Output += sprintf((char *)Output, " Can Compress");
+					break;
+
+				case 17:
+
+					Output += sprintf((char *)Output, " Compress ok");
+					break;
+				}
+			}	
+		}
+	}
+
+
+
 	if (Info)
 	{
 		// We have an info frame
@@ -419,6 +509,14 @@ UCHAR * DISPLAY_NETROM(MESSAGE * ADJBUFFER, UCHAR * Output, int MsgLen, int DoNo
 		return Output;
 	}
 
+	if (ADJBUFFER->L2DATA[0] == 0xfe)			// Paula's Nodes Poll
+	{
+		memcpy(Alias, ++ptr, 6);
+		Output += sprintf((char *)Output, " NODES POLL from %s\r", Alias);
+		return Output;
+	}
+
+
 	//	Display normal NET/ROM transmissions 
 
 	Output += sprintf((char *)Output, " NET/ROM\r  ");

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);
-				strlop(ToLopped, ' ');
+			memcpy(ToLopped, ptr->ToCall, 10);
+			strlop(ToLopped, ' ');
 
-				OutputLen += sprintf(&OutBuffer[OutputLen], WebTXLine,
-					ptr->ToCall, ptr->Seq, ptr->Time, Retries, ptr->Text);
-				ptr = ptr->Next;
+			OutputLen += sprintf(&OutBuffer[OutputLen], WebTXLine,
+				ptr->ToCall, ptr->Seq, ptr->Time, Retries, ptr->Text);
+			ptr = ptr->Next;
 
-				if (OutputLen > 99000)
-					break;
+			if (OutputLen > 99000)
+				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);
-			sendandcheck(sock, Header, HeaderLen);
-			sendandcheck(sock, OutBuffer, 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, OutBuffer, OutputLen);
+
+		return;
 
-			return;
-		
 	}
 
 

ARDOP.c

@@ -62,6 +62,12 @@ int (WINAPI FAR *EnumProcessesPtr)();
 #include "tncinfo.h"
 
 
+void hookL4SessionAttempt(struct STREAMINFO * , char * remotecall, char * ourcall);
+void hookL4SessionAccepted(struct STREAMINFO * , char * remotecall, char * ourcall);
+void hookL4SessionDeleted(struct TNCINFO * TNC, void * STREAM);
+
+
+
 #define WSA_ACCEPT WM_USER + 1
 #define WSA_DATA WM_USER + 2
 #define WSA_CONNECT WM_USER + 3
@@ -460,114 +466,114 @@ static int ProcessLine(char * buf, int Port)
 	else
 		return FALSE;						// Must start with ADDR
 
-		TNC->InitScript = malloc(1000);
-		TNC->InitScript[0] = 0;
+	TNC->InitScript = malloc(1000);
+	TNC->InitScript[0] = 0;
 
-		ptr = strtok(NULL, " \t\n\r");
+	ptr = strtok(NULL, " \t\n\r");
 
-		if (ptr)
+	if (ptr)
+	{
+		if (_stricmp(ptr, "PTT") == 0)
 		{
-			if (_stricmp(ptr, "PTT") == 0)
-			{
-				ptr = strtok(NULL, " \t\n\r");
+			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;
-				*ptr = 0;
+				DecodePTTString(TNC, ptr);
+				ptr = strtok(NULL, " \t\n\r");
 			}
-				
-			if ((_memicmp(buf, "CAPTURE", 7) == 0) || (_memicmp(buf, "PLAYBACK", 8) == 0))
-			{}		// Ignore
-			else
-/*
+		}
+	}
+
+	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;
+			*ptr = 0;
+		}
+
+		if ((_memicmp(buf, "CAPTURE", 7) == 0) || (_memicmp(buf, "PLAYBACK", 8) == 0))
+		{}		// Ignore
+		else
+			/*
 			if (_memicmp(buf, "PATH", 4) == 0)
 			{
-				char * Context;
-				p_cmd = strtok_s(&buf[5], "\n\r", &Context);
-				if (p_cmd) TNC->ProgramPath = _strdup(p_cmd);
+			char * Context;
+			p_cmd = strtok_s(&buf[5], "\n\r", &Context);
+			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
-				TNC->MaxConReq = atoi(&buf[9]);
+				if (_memicmp(buf, "MAXCONREQ", 9) == 0)		// Hold Time for Busy Detect
+					TNC->MaxConReq = atoi(&buf[9]);
 
-			else
-			if (_memicmp(buf, "STARTINROBUST", 13) == 0)
-				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
+					if (_memicmp(buf, "STARTINROBUST", 13) == 0)
+						TNC->StartInRobust = TRUE;
 
-//			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);
-		}
+					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 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);	
 }
 
 
-void ARDOPThread(struct TNCINFO * TNC);
+void ARDOPThread(VOID * Param);
 VOID ARDOPProcessDataSocketData(int port);
 int ConnecttoARDOP(struct TNCINFO * TNC);
 static VOID ARDOPProcessReceivedData(struct TNCINFO * TNC);
@@ -1035,8 +1041,10 @@ 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");
+				}
 			}
 		}
 
@@ -2061,21 +2069,12 @@ VOID * ARDOPExtInit(EXTPORTDATA * PortEntry)
 	strcat(TempScript, "ARQTIMEOUT 90\r");
 //	strcat(TempScript, "ROBUST False\r");
 
-	strcat(TempScript, TNC->InitScript);
-
-	free(TNC->InitScript);
-	TNC->InitScript = TempScript;
-
-	// Set MYCALL
-
-//	strcat(TNC->InitScript,"FECRCV True\r");
-//	strcat(TNC->InitScript,"AUTOBREAK True\r");
+	// Make MYAUX and MYCALL overridable
 
+	
 	sprintf(Msg, "MYCALL %s\r", TNC->NodeCall);
-	strcat(TNC->InitScript, Msg);
-//	strcat(TNC->InitScript,"PROCESSID\r");
-//	strcat(TNC->InitScript,"CODEC TRUE\r");
-//	strcat(TNC->InitScript,"LISTEN TRUE\r");
+	strcat(TempScript, Msg);
+
 
 	for (i = 0; i < 32; i++)
 	{
@@ -2099,9 +2098,25 @@ VOID * ARDOPExtInit(EXTPORTDATA * PortEntry)
 	if (strlen(Aux) > 8)
 	{
 		Aux[strlen(Aux) - 1] = '\r';
-		strcat(TNC->InitScript, Aux);
+		strcat(TempScript, Aux);
 	}
 
+
+	strcat(TempScript, TNC->InitScript);
+
+	free(TNC->InitScript);
+	TNC->InitScript = TempScript;
+
+
+
+//	strcat(TNC->InitScript,"FECRCV True\r");
+//	strcat(TNC->InitScript,"AUTOBREAK True\r");
+//	strcat(TNC->InitScript,"PROCESSID\r");
+//	strcat(TNC->InitScript,"CODEC TRUE\r");
+//	strcat(TNC->InitScript,"LISTEN TRUE\r");
+
+
+
 	strcpy(TNC->CurrentMYC, TNC->NodeCall);
 
 	if (TNC->WL2K == NULL)
@@ -2305,12 +2320,13 @@ int ConnecttoARDOP(struct TNCINFO * TNC)
 	return 0;
 }
 
-VOID ARDOPThread(struct TNCINFO * TNC)
+VOID ARDOPThread(VOID * Param)
 {
 	// Opens sockets and looks for data on control and data sockets.
 	
 	// Socket may be TCP/IP or Serial
 
+    struct TNCINFO * TNC = (struct TNCINFO *) Param;
 	char Msg[255];
 	int err, i, ret;
 	u_long param=1;
@@ -5751,8 +5767,7 @@ VOID ARDOPSCSPoll(struct TNCINFO * TNC)
 
 // Probably only for Teensy with ESP01. Runs SCS Emulator over a TCP Link
 
-
-VOID SerialConnecttoTCPThread(struct TNCINFO * TNC);
+VOID SerialConnecttoTCPThread(VOID *  Param);
 
 int SerialConnecttoTCP(struct TNCINFO * TNC)
 {
@@ -5760,9 +5775,9 @@ int SerialConnecttoTCP(struct TNCINFO * TNC)
 
 	return 0;
 }
-
-VOID SerialConnecttoTCPThread(struct TNCINFO * TNC)
+VOID SerialConnecttoTCPThread(VOID *  Param)
 {
+	struct TNCINFO * TNC = (struct TNCINFO *) Param;
 	char Msg[255];
 	int i;
 	u_long param = 1;

BBSHTMLConfig.c

@@ -118,6 +118,7 @@ void ReleaseWebMailStruct(WebMailInfo * WebMail);
 VOID TidyWelcomeMsg(char ** pPrompt);
 int MailAPIProcessHTTPMessage(struct HTTPConnectionInfo * Session, char * response, char * Method, char * URL, char * request, BOOL LOCAL, char * Param, char * Token);
 void UndoTransparency(char * input);
+int GetMessageSlotFromMessageNumber(int msgno);
 
 char UNC[] = "";
 char CHKD[] = "checked=checked ";
@@ -2442,8 +2443,8 @@ VOID ProcessMsgFwdUpdate(struct HTTPConnectionInfo * Session, char * MsgPtr, cha
 			set_fwd_bit(Msg->fbbs, BBSNumber);
 			User->ForwardingInfo->MsgCount++;
 			clear_fwd_bit(Msg->forw, BBSNumber);
-			if (FirstMessageIndextoForward > Msg->number)
-				FirstMessageIndextoForward = Msg->number;
+			if (FirstMessageIndextoForward > GetMessageSlotFromMessageNumber(Msg->number))
+				FirstMessageIndextoForward = GetMessageSlotFromMessageNumber(Msg->number);
 
 		}
 		*RLen = SendMessageDetails(Msg, Reply, Session->Key);

BBSUtilities.c

@@ -69,6 +69,10 @@ extern BPQVECSTRUC ** BPQHOSTVECPTR;
 UCHAR * GetLogDirectory();
 DllExport int APIENTRY SessionStateNoAck(int stream, int * state);
 int RefreshWebMailIndex();
+struct PORTCONTROL * GetPortTableEntryFromSlot(int portslot);
+int GetPortHardwareType(struct PORTCONTROL *PORT);
+int GetNumberofPorts();
+
 #else
 __declspec(dllimport) BPQVECSTRUC ** BPQHOSTVECPTR;
 typedef char * (WINAPI FAR *FARPROCZ)();
@@ -527,7 +531,20 @@ struct MsgInfo * GetMsgFromNumber(int msgno)
 	
 	return MsgnotoMsg[msgno];
 }
-		
+
+int GetMessageSlotFromMessageNumber(int msgno)
+{
+	int i;
+
+	for (i=1; i <= NumberofMessages; i++)
+	{
+		if (MsgHddrPtr[i]->number == msgno)
+			return i;
+	}
+
+	return 0;
+}
+
 struct UserInfo * AllocateUserRecord(char * Call)
 {
 	struct UserInfo * User = zalloc(sizeof (struct UserInfo));
@@ -3684,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;
 		}
 	}
 
@@ -5252,7 +5269,6 @@ char * CheckToAddress(CIRCUIT * conn, char * Addr)
 					return NewAddr;
 				}
 			}
-			else
 			{
 				WPRecP WP = LookupWP(Addr);
 
@@ -5473,7 +5489,18 @@ BOOL DecodeSendParams(CIRCUIT * conn, char * Context, char ** From, char *To, ch
 				}
 				else
 				{
-					conn->LocalMsg = TRUE;
+					// See if a WP entry
+
+					WP = LookupWP(To);
+
+					if (WP)
+					{
+						*ATBBS = WP->first_homebbs;
+						nodeprintf(conn, "Address @%s added from WP\r", *ATBBS);
+						conn->LocalMsg = FALSE;
+					}
+					else
+						conn->LocalMsg = TRUE;
 				}
 			}
 			else
@@ -6529,7 +6556,7 @@ nextline:
 	{
 		char APRS[128];
 		char Call[16];
-		int SSID = user->flags >> 28;
+		int SSID = (user->flags >> 28) & 15;	// on some platforms this is treated as signed ??
 
 		if (SSID)
 			sprintf(Call, "%s-%d", Msg->to, SSID);
@@ -9052,6 +9079,10 @@ CheckForSID:
 	return TRUE;
 }
 
+#ifndef LINBPQ
+extern FARPROCX pGetPortHardwareType;
+#endif
+
 VOID Parse_SID(CIRCUIT * conn, char * SID, int len)
 {
 	ChangeSessionIdletime(conn->BPQStream, BBSIDLETIME);		// Default Idletime for BBS Sessions
@@ -9108,10 +9139,44 @@ VOID Parse_SID(CIRCUIT * conn, char * SID, int len)
 	{
 		// We should really only do this on Telnet Connections, as OpenBCM flag is used to remove relnet transparency
 
+		// See if Telnet	
+
+		struct PORTCONTROL * PORT;
+		char Call[11] = "";
+		int port, dummy;
+
+		GetConnectionInfo(conn->BPQStream, Call, &port, &dummy, &dummy, &dummy, &dummy);
+
+		PORT = GetPortTableEntryFromSlot(0);		// Get first entry
+
+		do
+		{
+			if (PORT->PORTNUMBER == port)
+				break;
+
+			PORT=PORT->PORTPOINTER;
+			
+		} while (PORT);
+
+#define H_TELNET 6
+
+#ifndef LINBPQ
+
+		if (pGetPortHardwareType)	
+		{
+			if (PORT && GetPortHardwareType(PORT) == H_TELNET)
+				conn->OpenBCM = TRUE;
+		}
+		else
+			conn->OpenBCM = TRUE;			// Old Node version so follow old behavoiur and treat all as telnet
+#else
+		if (PORT && GetPortHardwareType(PORT) == H_TELNET)
+			conn->OpenBCM = TRUE;
+#endif
 
-		conn->OpenBCM = TRUE;
 	}
 
+
 	if (_memicmp(SID, "PMS-3.2", 7) == 0)
 	{
 		// Paccom TNC that doesn't send newline prompt ater receiving subject
@@ -13330,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,16 +35,24 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #include <fcntl.h>					 
 //#include "vmm.h"
 
-uint64_t timeLoadedMS = 0;
+extern int DEBUGINP3;
 
 VOID SendNegativeInfo();
 VOID SortRoutes(struct DEST_LIST * Dest);
 VOID SendRTTMsg(struct ROUTE * Route);
+VOID TCPNETROMSend(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Frame);
 
 static VOID SendNetFrame(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Frame)
 {
 	// INP3 should only ever send over an active link, so just queue the message
-	
+
+	if (Route->TCPPort)			// NETROM over TCP
+	{
+		TCPNETROMSend(Route, Frame);
+		ReleaseBuffer(Frame);
+		return;
+	}
+
 	if (Route->NEIGHBOUR_LINK)
 		C_Q_ADD(&Route->NEIGHBOUR_LINK->TX_Q, Frame);
 	else
@@ -54,16 +62,21 @@ static VOID SendNetFrame(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Frame)
 
 typedef struct _RTTMSG
 {
-	UCHAR ID[7];
-	UCHAR TXTIME[11];
-	UCHAR SMOOTHEDRTT[11];
-	UCHAR LASTRTT[11];
-	UCHAR POINTER[11];
+	UCHAR ID[6];
+	UCHAR Space1;
+	UCHAR TXTIME[10];
+	UCHAR Space2;
+	UCHAR SMOOTHEDRTT[10];
+	UCHAR Space3;
+	UCHAR LASTRTT[10];
+	UCHAR Space4;
+	UCHAR RTTID[10];
+	UCHAR Space5;
 	UCHAR ALIAS[7];
 	UCHAR VERSION[12];
 	UCHAR SWVERSION[9];
-	UCHAR FLAGS[10];
-	UCHAR PADDING[147];
+	UCHAR FLAGS[20];
+	UCHAR PADDING[137];
 
 } RTTMSG;
 
@@ -100,16 +113,18 @@ 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[sizeof(RTTMsg.FLAGS) + 4];
+	UCHAR temp[256] = "";
 
 	memset(&RTTMsg, ' ', sizeof(struct _RTTMSG));
 	memcpy(RTTMsg.ID, "L3RTT: ", 7);
 	memcpy(RTTMsg.VERSION, "LEVEL3_V2.1 ", 12);
-	memcpy(RTTMsg.SWVERSION, "BPQ32001 ", 9);
-	_snprintf(temp, sizeof(temp), "$M%d $N      ", MAXRTT); // trailing spaces extend to ensure padding if the length of characters for MAXRTT changes.
-	memcpy(RTTMsg.FLAGS, temp, 10);                 // But still limit the actual characters copied.
+	memcpy(RTTMsg.SWVERSION, "BPQ32002 ", 9);
+	_snprintf(temp, sizeof(temp), "$M%d $N $H%d            ", MAXRTT, MaxHops); // trailing spaces extend to ensure padding if the length of characters for MAXRTT changes.
+	memcpy(RTTMsg.FLAGS, temp, 20);                 // But still limit the actual characters copied.
 	memcpy(RTTMsg.ALIAS, &MYALIASTEXT, 6);
 	RTTMsg.ALIAS[6] = ' ';
 }
@@ -125,10 +140,11 @@ VOID TellINP3LinkGone(struct ROUTE * Route)
 	if (Route->NEIGHBOUR_LINK)
 		Debugprintf("BPQ32 Neighbour_Link not cleared");
 
+	// Link can have both NETROM and INP3 links
 
-	if (Route->INP3Node == 0)
+//	if (Route->INP3Node == 0)
 		DecayNETROMRoutes(Route);
-	else
+//	else
 		DeleteINP3Routes(Route);
 }
 
@@ -141,7 +157,7 @@ VOID DeleteINP3Routes(struct ROUTE * Route)
 
 	Call1[ConvFromAX25(Route->NEIGHBOUR_CALL, Call1)] = 0;
 
-	Debugprintf("Deleting INP3 routes via %s", Call1);
+	if (DEBUGINP3) Debugprintf("Deleting INP3 routes via %s", Call1);
 
 	// Delete any INP3 Dest entries via this Route
 
@@ -150,10 +166,11 @@ 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++)
 	{
@@ -177,7 +194,7 @@ VOID DeleteINP3Routes(struct ROUTE * Route)
 
 			// If we are cleaning up after a sabm on an existing link (frmr or other end reloaded) then we don't need to tell anyone - the routes should be reestablished very quickly
 
-			Debugprintf("Deleting First INP3 Route to %s", Call2);
+			if (DEBUGINP3) Debugprintf("Deleting First INP3 Route to %s", Call2);
 
 			if (Dest->INP3ROUTE[1].ROUT_NEIGHBOUR == 0)
 			{
@@ -186,7 +203,7 @@ VOID DeleteINP3Routes(struct ROUTE * Route)
 				Dest->INP3ROUTE[0].SRTT = 60000;
 				Dest->INP3ROUTE[0].Hops = 255;
 
-				Debugprintf("Was the only INP3 route");
+				if (DEBUGINP3) Debugprintf("Was the only INP3 route");
 
 				if (Dest->DEST_ROUTE == 4)			// we were using it
 					Dest->DEST_ROUTE = 0;
@@ -206,7 +223,7 @@ VOID DeleteINP3Routes(struct ROUTE * Route)
 		
 		if (Dest->INP3ROUTE[1].ROUT_NEIGHBOUR == Route)
 		{
-			Debugprintf("Deleting 2nd INP3 Route to %s", Call2);
+			if (DEBUGINP3) Debugprintf("Deleting 2nd INP3 Route to %s", Call2);
 			memcpy(&Dest->INP3ROUTE[1], &Dest->INP3ROUTE[2], sizeof(struct INP3_DEST_ROUTE_ENTRY));
 			memset(&Dest->INP3ROUTE[2], 0, sizeof(struct INP3_DEST_ROUTE_ENTRY));
 
@@ -215,7 +232,7 @@ VOID DeleteINP3Routes(struct ROUTE * Route)
 
 		if (Dest->INP3ROUTE[2].ROUT_NEIGHBOUR == Route)
 		{
-			Debugprintf("Deleting 3rd INP3 Route to %s", Call2);
+			if (DEBUGINP3) Debugprintf("Deleting 3rd INP3 Route to %s", Call2);
 			memset(&Dest->INP3ROUTE[2], 0, sizeof(struct INP3_DEST_ROUTE_ENTRY));
 			continue;
 		}
@@ -329,8 +346,8 @@ VOID TellINP3LinkSetupFailed(struct ROUTE * Route)
 
 VOID ProcessRTTReply(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Buff)
 {
-	int RTT;
-	unsigned int OrigTime;
+	uint32_t RTT;
+	uint32_t OrigTime;
 
 	char Normcall[10];
 
@@ -338,11 +355,11 @@ VOID ProcessRTTReply(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Buff)
 
 	Route->Timeout = 0;			// Got Response
 	
-	sscanf(&Buff->L4DATA[6], "%d", &OrigTime);
-	RTT = (GetTickCount() - timeLoadedMS) - OrigTime;
+	sscanf(&Buff->L4DATA[6], "%u", &OrigTime);
+	RTT = GetTickCountINP3() - OrigTime;		// We work internally in mS
 
-	if (RTT > 60000)
-		return;					// Ignore if more than 60 secs
+	if (RTT > 60000 || RTT < 0)
+		return;					// Ignore if more than 60 secs (why ??)
 
 	Route->RTT = RTT;
 
@@ -351,11 +368,13 @@ VOID ProcessRTTReply(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Buff)
 	else
 		Route->SRTT = ((Route->SRTT * 80)/100) + ((RTT * 20)/100);
 
+	Route->RTTIncrement = Route->SRTT / 2;		// Half for one way time.
+
 	if ((Route->Status & GotRTTResponse) == 0)
 	{
 		// Link is just starting
 
-		Debugprintf("INP3 got first RTT reply from %s - Link is (Re)staring", Normcall);
+		if (DEBUGINP3) Debugprintf("INP3 got first RTT reply from %s - Link is (Re)staring", Normcall);
 
 		Route->Status |= GotRTTResponse;
 	}
@@ -374,10 +393,10 @@ VOID ProcessINP3RIF(struct ROUTE * Route, UCHAR * ptr1, int msglen, int Port)
 	char Normcall[10];
 
 	Normcall[ConvFromAX25(Route->NEIGHBOUR_LINK->LINKCALL, Normcall)] = 0;
-	Debugprintf("Processing RIF from %s INP3Node %d Route SRTT %d", Normcall, Route->INP3Node, Route->SRTT);
+	if (DEBUGINP3) Debugprintf("Processing RIF from %s INP3Node %d Route SRTT %d", Normcall, Route->INP3Node, Route->SRTT);
 
 	if (Route->SRTT == 0)
-		Debugprintf("INP3 Zero SRTT");
+		if (DEBUGINP3) Debugprintf("INP3 Zero SRTT");
 
 
 #ifdef NOINP3
@@ -403,7 +422,7 @@ VOID ProcessINP3RIF(struct ROUTE * Route, UCHAR * ptr1, int msglen, int Port)
 	{
 		if (msglen < 10)
 		{
-			Debugprintf("Corrupt INP3 Message");
+			if (DEBUGINP3) Debugprintf("Corrupt INP3 Message");
 			return;
 		}
 
@@ -421,7 +440,12 @@ VOID ProcessINP3RIF(struct ROUTE * Route, UCHAR * ptr1, int msglen, int Port)
 
 		// rtt is value from remote node. Add our RTT to that node
 
-		rtt += Route->SRTT;
+		// if other end is old bpq then value is mS otherwise 10 mS unita
+
+		if (Route->OldBPQ)
+			rtt /= 10;
+
+//		rtt += Route->SRTT;		// Don't do this - other end has added linkrtt
 
 		msglen -= 10;
 
@@ -439,7 +463,7 @@ VOID ProcessINP3RIF(struct ROUTE * Route, UCHAR * ptr1, int msglen, int Port)
 					memcpy(alias, ptr1+2, len-2);
 				else
 				{
-					Debugprintf("Corrupt INP3 Message");
+					if (DEBUGINP3) Debugprintf("Corrupt INP3 Message");
 					return;
 				}
 			}
@@ -477,13 +501,13 @@ VOID UpdateNode(struct ROUTE * Route, UCHAR * axcall, UCHAR * alias, int  hops,
 
 	if (CompareCalls(axcall, NETROMCALL))
 	{
-		Debugprintf("INP3 for our Nodecall - discarding");
+		if (DEBUGINP3) Debugprintf("INP3 for our Nodecall - discarding");
 		return;
 	}
 
 	if (CheckExcludeList(axcall) == 0)
 	{
-		Debugprintf("INP3 excluded - discarding");
+		if (DEBUGINP3) Debugprintf("INP3 excluded - discarding");
 		return;
 	}
 	
@@ -491,9 +515,9 @@ VOID UpdateNode(struct ROUTE * Route, UCHAR * axcall, UCHAR * alias, int  hops,
 	{
 		APPL=&APPLCALLTABLE[App];
 
-		if (APPL->APPLHASALIAS == 0 && CompareCalls(axcall, APPL->APPLCALL))
+		if (CompareCalls(axcall, APPL->APPLCALL))
 		{
-			Debugprintf("INP3 for an APPLCALL - discarding");
+			if (DEBUGINP3) Debugprintf("INP3 for an APPLCALL - discarding");
 			return;
 		}
 	}
@@ -502,20 +526,20 @@ VOID UpdateNode(struct ROUTE * Route, UCHAR * axcall, UCHAR * alias, int  hops,
 	if (hops > MaxHops && hops < 255)
 	{
 		ConvFromAX25(axcall, call);
-		Debugprintf("INP3 Node %s Hops %d RTT %d Ignored - Hop Count too high", call, hops, rtt);
+		if (DEBUGINP3) Debugprintf("INP3 Node %s Hops %d RTT %d Ignored - Hop Count too high", call, hops, rtt);
 		return;
 	}
 
 	if (rtt > MAXRTT  && rtt < 60000)
 	{
 		ConvFromAX25(axcall, call);
-		Debugprintf("INP3 Node %s Hops %d RTT %d Ignored - rtt too high", call, hops, rtt);
+		if (DEBUGINP3) Debugprintf("INP3 Node %s Hops %d RTT %d Ignored - rtt too high", call, hops, rtt);
 		return;
 	}
 
 	if (rtt >= 60000)
 	{
-		Debugprintf("INP3 RTT > 60000 - discarding");
+		if (DEBUGINP3) Debugprintf("INP3 RTT > 60000 - discarding");
 		return;	
 	}
 
@@ -524,7 +548,7 @@ VOID UpdateNode(struct ROUTE * Route, UCHAR * axcall, UCHAR * alias, int  hops,
 
 	if (Dest == NULL)
 	{
-		Debugprintf("INP3 Table Full - discarding");
+		if (DEBUGINP3) Debugprintf("INP3 Table Full - discarding");
 		return;	// Table Full
 	}
 	
@@ -548,7 +572,7 @@ VOID UpdateNode(struct ROUTE * Route, UCHAR * axcall, UCHAR * alias, int  hops,
 	NUMBEROFNODES++;
 
 	ConvFromAX25(Dest->DEST_CALL, call);
-	Debugprintf("INP3 Adding New Node %s Hops %d RTT %d", call, hops, rtt);
+	if (DEBUGINP3) Debugprintf("INP3 Adding New Node %s Hops %d RTT %d", call, hops, rtt);
 
 	return;
 
@@ -556,15 +580,14 @@ Found:
 
 	if (Dest->DEST_STATE & 0x80)	// Application Entry
 	{
-		Debugprintf("INP3 Application Entry - discarding");
-		return;	// Tsble Full
+		if (DEBUGINP3) Debugprintf("INP3 Application Entry - discarding");
+		return;	
 	}
 
 	// Update ALIAS
 
 	ConvFromAX25(Dest->DEST_CALL, call);
-	Debugprintf("INP3 Updating Node %s Hops %d RTT %d", call, hops, rtt);
-
+	if (DEBUGINP3) Debugprintf("INP3 Updating Node %s Hops %d RTT %d", call, hops, rtt);
 
 	if (alias[0] > ' ')
 		memcpy(Dest->DEST_ALIAS, alias, 6);
@@ -575,7 +598,7 @@ Found:
 
 	if (ROUTEPTR->ROUT_NEIGHBOUR == Route)
 	{
-		Debugprintf("INP3 Already have as route[0] - updating");
+		if (DEBUGINP3) Debugprintf("INP3 Already have as route[0] - updating");
 		UpdateRoute(Dest, ROUTEPTR, hops, rtt);
 		return;
 	}
@@ -584,7 +607,7 @@ Found:
 
 	if (ROUTEPTR->ROUT_NEIGHBOUR == Route)
 	{
-		Debugprintf("INP3 Already have as route[1] - updating");
+		if (DEBUGINP3) Debugprintf("INP3 Already have as route[1] - updating");
 		UpdateRoute(Dest, ROUTEPTR, hops, rtt);
 		return;
 	}
@@ -593,7 +616,7 @@ Found:
 
 	if (ROUTEPTR->ROUT_NEIGHBOUR == Route)
 	{
-		Debugprintf("INP3 Already have as route[2] - updating");
+		if (DEBUGINP3) Debugprintf("INP3 Already have as route[2] - updating");
 		UpdateRoute(Dest, ROUTEPTR, hops, rtt);
 		return;
 	}
@@ -609,7 +632,7 @@ Found:
 		{
 			// Add here
 
-			Debugprintf("INP3 adding as route[%d]", i);
+			if (DEBUGINP3) Debugprintf("INP3 adding as route[%d]", i);
 			AddHere(ROUTEPTR, Route, hops, rtt);
 			SortRoutes(Dest);
 			return;
@@ -617,7 +640,7 @@ Found:
 		ROUTEPTR++;
 	}
 
-	Debugprintf("INP3 All entries in use - see if this is better than existing");
+	if (DEBUGINP3) Debugprintf("INP3 All entries in use - see if this is better than existing");
 
 	// Full, see if this is better
 
@@ -627,7 +650,7 @@ Found:
 	{
 		// We are better. Move others down and add on front
 
-		Debugprintf("INP3 Replacing route 0");
+		if (DEBUGINP3) Debugprintf("INP3 Replacing route 0");
 
 		memcpy(&Dest->INP3ROUTE[2], &Dest->INP3ROUTE[1], sizeof(struct INP3_DEST_ROUTE_ENTRY));
 		memcpy(&Dest->INP3ROUTE[1], &Dest->INP3ROUTE[0], sizeof(struct INP3_DEST_ROUTE_ENTRY));
@@ -639,7 +662,7 @@ Found:
 	{
 		// We are better. Move  2nd down and add
 
-		Debugprintf("INP3 Replacing route 1");
+		if (DEBUGINP3) Debugprintf("INP3 Replacing route 1");
 		memcpy(&Dest->INP3ROUTE[2], &Dest->INP3ROUTE[1], sizeof(struct INP3_DEST_ROUTE_ENTRY));
 		AddHere(&Dest->INP3ROUTE[1], Route, hops, rtt);
 		return;
@@ -649,13 +672,13 @@ Found:
 	{
 		// We are better. Add here
 
-		Debugprintf("INP3 Replacing route 2");
+		if (DEBUGINP3) Debugprintf("INP3 Replacing route 2");
 		AddHere(&Dest->INP3ROUTE[2], Route, hops, rtt);
 		return;
 	}
 
 
-	Debugprintf("INP3 Worse that any existing route");
+	if (DEBUGINP3) Debugprintf("INP3 Worse that any existing route");
 
 
 	// Worse than any - ignore
@@ -730,13 +753,16 @@ 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
 
 	if (Dest->INP3ROUTE[1].ROUT_NEIGHBOUR == 0)
 	{
 		Call1[ConvFromAX25(Dest->INP3ROUTE[0].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, Call1)] = 0;
-		Debugprintf("INP3 1 route %d %s",  Dest->INP3ROUTE[0].SRTT, Call1);
+		if (DEBUGINP3) Debugprintf("INP3 1 route %d %s",  Dest->INP3ROUTE[0].SRTT, Call1);
 		return;						// Only One, so cant be out of order
 	}
 	if (Dest->INP3ROUTE[2].ROUT_NEIGHBOUR == 0)
@@ -746,7 +772,7 @@ VOID SortRoutes(struct DEST_LIST * Dest)
 		Call1[ConvFromAX25(Dest->INP3ROUTE[0].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, Call1)] = 0;
 		Call2[ConvFromAX25(Dest->INP3ROUTE[1].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, Call2)] = 0;
 	
-		Debugprintf("INP3 2 routes %d %s %d %s",  Dest->INP3ROUTE[0].SRTT, Call1, Dest->INP3ROUTE[1].SRTT, Call2);
+		if (DEBUGINP3) Debugprintf("INP3 2 routes %d %s %d %s",  Dest->INP3ROUTE[0].SRTT, Call1, Dest->INP3ROUTE[1].SRTT, Call2);
 
 		if (Dest->INP3ROUTE[0].SRTT <= Dest->INP3ROUTE[1].SRTT)
 			return;
@@ -760,7 +786,7 @@ VOID SortRoutes(struct DEST_LIST * Dest)
 		Call1[ConvFromAX25(Dest->INP3ROUTE[0].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, Call1)] = 0;
 		Call2[ConvFromAX25(Dest->INP3ROUTE[1].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, Call2)] = 0;
 	
-		Debugprintf("INP3 2 routes %d %s %d %s",  Dest->INP3ROUTE[0].SRTT, Call1, Dest->INP3ROUTE[1].SRTT, Call2);
+		if (DEBUGINP3) Debugprintf("INP3 2 routes %d %s %d %s",  Dest->INP3ROUTE[0].SRTT, Call1, Dest->INP3ROUTE[1].SRTT, Call2);
 		return;
 	}
 
@@ -771,7 +797,7 @@ VOID SortRoutes(struct DEST_LIST * Dest)
 	Call2[ConvFromAX25(Dest->INP3ROUTE[1].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, Call2)] = 0;
 	Call3[ConvFromAX25(Dest->INP3ROUTE[2].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, Call3)] = 0;
 
-	Debugprintf("INP3 3 routes %d %s %d %s %d %s",  Dest->INP3ROUTE[0].SRTT, Call1, Dest->INP3ROUTE[1].SRTT, Call2, Dest->INP3ROUTE[2].SRTT, Call3);
+	if (DEBUGINP3) Debugprintf("INP3 3 routes %d %s %d %s %d %s",  Dest->INP3ROUTE[0].SRTT, Call1, Dest->INP3ROUTE[1].SRTT, Call2, Dest->INP3ROUTE[2].SRTT, Call3);
 		
 	// In order?
 
@@ -792,7 +818,7 @@ VOID SortRoutes(struct DEST_LIST * Dest)
 	Call2[ConvFromAX25(Dest->INP3ROUTE[1].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, Call2)] = 0;
 	Call3[ConvFromAX25(Dest->INP3ROUTE[2].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, Call3)] = 0;
 
-	Debugprintf("INP3 3 routes %d %s %d %s %d %s",  Dest->INP3ROUTE[0].SRTT, Call1, Dest->INP3ROUTE[1].SRTT, Call2, Dest->INP3ROUTE[2].SRTT, Call3);
+	if (DEBUGINP3) Debugprintf("INP3 3 routes %d %s %d %s %d %s",  Dest->INP3ROUTE[0].SRTT, Call1, Dest->INP3ROUTE[1].SRTT, Call2, Dest->INP3ROUTE[2].SRTT, Call3);
 
 	// if 3 is better than 2 swap them. As two is worse than one. three will then be worst
 
@@ -808,7 +834,7 @@ VOID SortRoutes(struct DEST_LIST * Dest)
 	Call2[ConvFromAX25(Dest->INP3ROUTE[1].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, Call2)] = 0;
 	Call3[ConvFromAX25(Dest->INP3ROUTE[2].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, Call3)] = 0;
 
-	Debugprintf("INP3 3 routes %d %s %d %s %d %s",  Dest->INP3ROUTE[0].SRTT, Call1, Dest->INP3ROUTE[1].SRTT, Call2, Dest->INP3ROUTE[2].SRTT, Call3);
+	if (DEBUGINP3) Debugprintf("INP3 3 routes %d %s %d %s %d %s",  Dest->INP3ROUTE[0].SRTT, Call1, Dest->INP3ROUTE[1].SRTT, Call2, Dest->INP3ROUTE[2].SRTT, Call3);
 
 	// 3 is now slowest. 2 could still be better than 1
 
@@ -825,14 +851,14 @@ VOID SortRoutes(struct DEST_LIST * Dest)
 	Call2[ConvFromAX25(Dest->INP3ROUTE[1].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, Call2)] = 0;
 	Call3[ConvFromAX25(Dest->INP3ROUTE[2].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, Call3)] = 0;
 
-	Debugprintf("INP3 3 routes %d %s %d %s %d %s",  Dest->INP3ROUTE[0].SRTT, Call1, Dest->INP3ROUTE[1].SRTT, Call2, Dest->INP3ROUTE[2].SRTT, Call3);
+	if (DEBUGINP3) Debugprintf("INP3 3 routes %d %s %d %s %d %s",  Dest->INP3ROUTE[0].SRTT, Call1, Dest->INP3ROUTE[1].SRTT, Call2, Dest->INP3ROUTE[2].SRTT, Call3);
 
 	if (Dest->INP3ROUTE[0].SRTT <= Dest->INP3ROUTE[1].SRTT && Dest->INP3ROUTE[1].SRTT <= Dest->INP3ROUTE[2].SRTT)// In order?
 		return;
 
 	// Something went wrong
 
-	Debugprintf("INP3 Sort Failed");
+	if (DEBUGINP3) Debugprintf("INP3 Sort Failed");
 
 }
 
@@ -870,11 +896,15 @@ VOID UpdateRoute(struct DEST_LIST * Dest, struct INP3_DEST_ROUTE_ENTRY * ROUTEPT
 
 VOID ProcessRTTMsg(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Buff, int Len, int Port)
 {
-	int OtherRTT;
-	int Dummy;
-
+	uint32_t OtherRTT;
+	uint32_t Dummy;
+	char * ptr;
+	struct _RTTMSG * RTTMsg = (struct _RTTMSG *)&Buff->L4DATA[0];
 	char Normcall[10];
 
+	if (Route->NEIGHBOUR_LINK == 0)
+		return;
+
 	Normcall[ConvFromAX25(Route->NEIGHBOUR_LINK->LINKCALL, Normcall)] = 0;
 
 	// See if a reply to our message, or a new request
@@ -886,20 +916,52 @@ VOID ProcessRTTMsg(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Buff, int Len
 		return;
 	}
 
-	if (Route->NEIGHBOUR_LINK->LINKPORT->ALLOWINP3)
+	if (Route->NEIGHBOUR_LINK->LINKPORT && (Route->NEIGHBOUR_LINK->LINKPORT->ALLOWINP3 || Route->NEIGHBOUR_LINK->LINKPORT->ENABLEINP3))
 		Route->INP3Node = 1;
 
 	if (Route->INP3Node == 0)
 	{
-		Debugprintf("Ignoring RTT Msg from %s - not using INP3", Normcall);
+		if (DEBUGINP3) Debugprintf("Ignoring RTT Msg from %s - not using INP3", Normcall);
 		ReleaseBuffer(Buff);
 		return;						// We don't want to use INP3
 	}
 
-	// Extract other end's SRTT
+	// Basic Validation - look for spaces in the right place
+
+	if ((RTTMsg->Space1 | RTTMsg->Space2 | RTTMsg->Space3 | RTTMsg->Space4 | RTTMsg->Space5) != ' ')
+	{
+		Debugprintf("Corrupt INP3 RTT Message %s", &Buff->L4DATA[0]);
+	}
+	else
+	{
+		// Extract other end's SRTT
+
+		// Get SWVERSION to see if other end is old (Buggy) BPQ
+
+		if (memcmp(RTTMsg->SWVERSION, "BPQ32001 ", 9) == 0)
+			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)
+
+	ptr = strstr(RTTMsg->FLAGS, "$M");
+
+	if (ptr)
+		Route->RemoteMAXRTT = atoi(ptr + 2);
+
+	ptr = strstr(RTTMsg->FLAGS, "$H");
+
+	if (ptr)
+		Route->RemoteMAXHOPS = atoi(ptr + 2);
+
 
-	sscanf(&Buff->L4DATA[6], "%d %d", &Dummy, &OtherRTT);
-	Route->NeighbourSRTT = OtherRTT * 10;  // We store in mS
 
 	// Echo Back to sender
 
@@ -909,20 +971,8 @@ VOID ProcessRTTMsg(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Buff, int Len
 	{
 		// Link is just starting
 
-		Debugprintf("INP3 Processing first RTT frame from %s - link is (re)starting", Normcall);
+		if (DEBUGINP3) Debugprintf("INP3 Processing first RTT frame from %s - link is (re)starting", Normcall);
 		Route->Status |= GotRTTRequest;
-
-		// I don't think we should send RIF until we get an RTT response.
-
-		if ((Route->Status & SentRTTRequest) == 0)			// Not sent one yet so send it
-			SendRTTMsg(Route);
-
-		// No, it's the other end that must have an rrt response and we've just sent it
-
-		Route->Status |= SentOurRIF;	
-		SendOurRIF(Route);
-		SendRIPToNeighbour(Route);
-
 	}
 }
 
@@ -932,6 +982,9 @@ VOID SendRTTMsg(struct ROUTE * Route)
 	struct _L3MESSAGEBUFFER * Msg;
 	char Stamp[50];
 	char Normcall[10];
+	unsigned char temp[256];
+	uint32_t sendTime;
+	int n;
 
 	Normcall[ConvFromAX25(Route->NEIGHBOUR_CALL, Normcall)] = 0;
 
@@ -951,13 +1004,32 @@ 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
+	// case where timer wraps between sending msg and getting response is ignored 
+	// For platform independence use GetTickCountINP3() and map as appropriate
 
-	sprintf(Stamp, "%10llu %10d %10d %10d ", (GetTickCount() - timeLoadedMS), Route->SRTT/10, Route->RTT/10, 0);
+	sendTime = GetTickCountINP3();	// 10mS units
+
+	sprintf(Stamp, "%10u %10d %10d %10d ", sendTime, Route->SRTT, Route->RTT, RTTID++);
+
+	n = strlen(Stamp);
+
+	if (n != 44)
+	{
+		Debugprintf("Trying to send corrupt RTT message %s", Stamp);
+		return;
+	}
+	
 	memcpy(RTTMsg.TXTIME, Stamp, 44);
 
+	// We now allow MAXRTT and MAXHOPS to be reconfigured so should update header each time
+
+	sprintf(temp, "$M%d $N $H%d            ", MAXRTT, MaxHops); // trailing spaces extend to ensure padding if the length of characters for MAXRTT changes.
+	memcpy(RTTMsg.FLAGS, temp, 20);                 // But still limit the actual characters copied.
+
 	memcpy(Msg->L4DATA, &RTTMsg, 236);
 
-	Msg->LENGTH = 256 + 1 + 7;
+	Msg->LENGTH = 256 + 1 + MSGHDDRLEN;
 
 	Route->Timeout = RTTTimeout;
 
@@ -968,7 +1040,7 @@ VOID SendRTTMsg(struct ROUTE * Route)
 
 	Route->Status |= SentRTTRequest;	
 
-	Debugprintf("INP3 Sending first RTT Msg to %s", Normcall);
+	if (DEBUGINP3) Debugprintf("INP3 Sending first RTT Msg to %s", Normcall);
 
 }
 
@@ -1032,12 +1104,13 @@ int BuildRIF(UCHAR * RIF, UCHAR * Call, UCHAR * Alias, int Hops, int RTT)
 		RIF[12+AliasLen] = 0;
 
 		RIFLen = 13 + AliasLen;
-		Debugprintf("INP3 sending RIF Entry %s:%s %d %d", AliasCopy, Normcall, Hops, RTT);
+		if (DEBUGINP3) Debugprintf("INP3 sending RIF Entry %s:%s %d %d", AliasCopy, Normcall, Hops, RTT);
 		return RIFLen;
 	}
+
 	RIF[10] = 0;
 
-	Debugprintf("INP3 sending RIF Entry %s %d %d", Normcall, Hops, RTT);
+	if (DEBUGINP3) Debugprintf("INP3 sending RIF Entry %s %d %d", Normcall, Hops, RTT);
 	
 	return (11);
 }
@@ -1058,14 +1131,18 @@ VOID SendOurRIF(struct ROUTE * Route)
 
 
 	Normcall[ConvFromAX25(Route->NEIGHBOUR_LINK->LINKCALL, Normcall)] = 0;
-	Debugprintf("INP3 Sending Initial RIF to %s ", Normcall);
+	if (DEBUGINP3) Debugprintf("INP3 Sending Initial RIF to %s ", Normcall);
 
 
 	Msg->L3SRCE[0] = 0xff;
 
 	// send a RIF for our Node and all our APPLCalls
 
-	RIFLen = BuildRIF(&Msg->L3SRCE[totLen], MYCALL, MYALIASTEXT, 1, 0);
+	if (Route->OldBPQ)
+		RIFLen = BuildRIF(&Msg->L3SRCE[totLen], MYCALL, MYALIASTEXT, 1, Route->RTTIncrement * 10);
+	else
+		RIFLen = BuildRIF(&Msg->L3SRCE[totLen], MYCALL, MYALIASTEXT, 1, Route->RTTIncrement);
+
 	totLen += RIFLen;
 
 	for (App = 0; App < NumberofAppls; App++)
@@ -1074,7 +1151,11 @@ VOID SendOurRIF(struct ROUTE * Route)
 
 		if (APPL->APPLQUAL > 0)
 		{
-			RIFLen = BuildRIF(&Msg->L3SRCE[totLen], APPL->APPLCALL, APPL->APPLALIAS_TEXT, 1, 0);
+			if (Route->OldBPQ)
+				RIFLen = BuildRIF(&Msg->L3SRCE[totLen], APPL->APPLCALL, APPL->APPLALIAS_TEXT, 1, Route->RTTIncrement * 10);
+			else
+				RIFLen = BuildRIF(&Msg->L3SRCE[totLen], APPL->APPLCALL, APPL->APPLALIAS_TEXT, 1, Route->RTTIncrement);
+			
 			totLen += RIFLen;
 		}
 	}
@@ -1127,27 +1208,34 @@ int SendRIPTimer()
 
 				// Delay more if Locked - they could be retrying for a long time
 
-				if ((Route->NEIGHBOUR_FLAG))	 // LOCKED ROUTE
-					INP3Delay = 1200;
+				if (Route->ConnectionAttempts < 5)
+					INP3Delay = 30;
 				else
-					INP3Delay = 600;
- 
-				if (Route->LastConnectAttempt &&
-					(REALTIMETICKS - Route->LastConnectAttempt) < INP3Delay) 
+				{
+					if ((Route->NEIGHBOUR_FLAG))	 // LOCKED ROUTE
+						INP3Delay = 300;
+					else
+						INP3Delay = 120;
+				}
+
+				if (Route->LastConnectAttempt && (REALTIMETICKS - Route->LastConnectAttempt) < INP3Delay) 
 				{
 					Route++;
-					continue;						// No room for link
+					continue;		// Not yet
 				}
 
 				// Try to activate link
 
+				Route->ConnectionAttempts++;
+
 				if (Route->INP3Node)
 				{
 					Normcall[ConvFromAX25(Route->NEIGHBOUR_CALL, Normcall)] = 0;
-					Debugprintf("INP3 Activating link to %s", Normcall);
+					if (DEBUGINP3) Debugprintf("INP3 Activating link to %s", Normcall);
 				}
 
 				L2SETUPCROSSLINKEX(Route, 2);		// Only try SABM twice
+				Route->NeighbourSRTT = 0;			// just in case!
 
 				Route->LastConnectAttempt = REALTIMETICKS;
 				
@@ -1208,7 +1296,7 @@ int SendRIPTimer()
 							char Call [11] = "";
 
 							ConvFromAX25(Route->NEIGHBOUR_CALL, Call);
-							Debugprintf("BPQ32 INP3 Neighbour %s Lost", Call);
+							if (DEBUGINP3) Debugprintf("BPQ32 INP3 Neighbour %s Lost", Call);
 
 							Route->Status = 0;	// Down
 						}
@@ -1223,7 +1311,7 @@ int SendRIPTimer()
 				}
 				else
 				{
-					Route->BCTimer = RTTInterval;
+					Route->BCTimer = RTTInterval + rand() % 4;
 					Route->Retries = RTTRetries;
 					SendRTTMsg(Route);
 				}
@@ -1262,7 +1350,7 @@ VOID SendRIF(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Msg)
 
 	Msg->LENGTH += MSGHDDRLEN + 1;		// PID
 
-	Debugprintf("Sending INP3 RIF length %d to %s", Msg->LENGTH, Normcall);
+	if (DEBUGINP3) Debugprintf("Sending INP3 RIF length %d to %s", Msg->LENGTH, Normcall);
 	SendNetFrame(Route, Msg);
 }
 
@@ -1272,10 +1360,11 @@ VOID SendRIPToOtherNeighbours(UCHAR * axcall, UCHAR * alias, struct INP3_DEST_RO
 	struct _L3MESSAGEBUFFER * Msg;
 	int count, MaxRoutes = MAXNEIGHBOURS;
 	char Normcall[10];
+	int sendHops, sendTT;
 
 	Normcall[ConvFromAX25(axcall, Normcall)] = 0;
 
-	Debugprintf("INP3 SendRIPToOtherNeighbours for %s", Normcall);
+	if (DEBUGINP3) Debugprintf("INP3 SendRIPToOtherNeighbours for %s", Normcall);
 
 	for (count=0; count<MaxRoutes; count++)
 	{
@@ -1283,26 +1372,39 @@ VOID SendRIPToOtherNeighbours(UCHAR * axcall, UCHAR * alias, struct INP3_DEST_RO
 			(Routes->Status) && 
 			(Routes != Entry->ROUT_NEIGHBOUR))	// Dont send to originator of route
 		{
-			Msg = Routes->Msg;
-			
-			if (Msg == NULL) 
-			{
-				Normcall[ConvFromAX25(Routes->NEIGHBOUR_CALL, Normcall)] = 0;
-				Debugprintf("INP3 Building RIF to send to %s", Normcall);
-				Msg = Routes->Msg = CreateRIFHeader(Routes);
-			}
+			sendHops = Entry->Hops + 1;
+			sendTT = Entry->SRTT +  Entry->ROUT_NEIGHBOUR->RTTIncrement;
 
-			if (Msg)
+		// send, but only if within their constraints
+
+			if ((Routes->RemoteMAXHOPS == 0 || Routes->RemoteMAXHOPS >= Entry->Hops) && 
+				(Routes->RemoteMAXRTT == 0 || Routes->RemoteMAXRTT >= Entry->SRTT  || Entry->SRTT == 60000))
 			{
 
-				Msg->LENGTH += BuildRIF(&Msg->L3SRCE[Msg->LENGTH],
-					axcall, alias, Entry->Hops + 1, Entry->SRTT + Entry->ROUT_NEIGHBOUR->SRTT/10);
+				Msg = Routes->Msg;
 
-				if (Msg->LENGTH > 250 - 15)
-//				if (Msg->LENGTH > Routes->NBOUR_PACLEN - 11)
+				if (Msg == NULL) 
 				{
-					SendRIF(Routes, Msg);
-					Routes->Msg = NULL;
+					Normcall[ConvFromAX25(Routes->NEIGHBOUR_CALL, Normcall)] = 0;
+					if (DEBUGINP3) Debugprintf("INP3 Building RIF to send to %s", Normcall);
+					Msg = Routes->Msg = CreateRIFHeader(Routes);
+				}
+
+				if (Msg)
+				{
+					if (Routes->OldBPQ)
+						Msg->LENGTH += BuildRIF(&Msg->L3SRCE[Msg->LENGTH],
+							axcall, alias, sendHops, sendTT + 10);
+					else
+						Msg->LENGTH += BuildRIF(&Msg->L3SRCE[Msg->LENGTH],
+							axcall, alias, sendHops, sendTT);
+					
+					if (Msg->LENGTH > 250 - 15)
+						//				if (Msg->LENGTH > Routes->NBOUR_PACLEN - 11)
+					{
+						SendRIF(Routes, Msg);
+						Routes->Msg = NULL;
+					}
 				}
 			}
 		}
@@ -1316,11 +1418,12 @@ VOID SendRIPToNeighbour(struct ROUTE * Route)
 	struct DEST_LIST * Dest =  DESTS;
 	struct INP3_DEST_ROUTE_ENTRY * Entry;
 	struct _L3MESSAGEBUFFER * Msg;
+	int sendHops, sendTT;
 
 	char Normcall[10];
 
 	Normcall[ConvFromAX25(Route->NEIGHBOUR_LINK->LINKCALL, Normcall)] = 0;
-	Debugprintf("INP3 Sending Our Table to %s ", Normcall);
+	if (DEBUGINP3) Debugprintf("INP3 Sending Our Table to %s ", Normcall);
 
 	Dest--;
 
@@ -1332,23 +1435,35 @@ VOID SendRIPToNeighbour(struct ROUTE * Route)
 
 		Entry = &Dest->INP3ROUTE[0];
 
+
 		if (Entry->ROUT_NEIGHBOUR && Entry->Hops && Route != Entry->ROUT_NEIGHBOUR)	
 		{
-			// Best Route not via this neighbour - send
-		
-			Msg = Route->Msg;
-			
-			if (Msg == NULL) 
-				Msg = Route->Msg = CreateRIFHeader(Route);
-			
-			Msg->LENGTH += BuildRIF(&Msg->L3SRCE[Msg->LENGTH],
-				Dest->DEST_CALL, Dest->DEST_ALIAS,
-				Entry->Hops + 1, Entry->SRTT + Entry->ROUT_NEIGHBOUR->SRTT/10);
+			// Best Route not via this neighbour - send, but only if within their constraints
 
-			if (Msg->LENGTH > 250 - 15)
+			sendHops = Entry->Hops + 1;
+			sendTT = Entry->SRTT +  Entry->ROUT_NEIGHBOUR->RTTIncrement;
+
+			if ((Route->RemoteMAXHOPS == 0 || Route->RemoteMAXHOPS >= Entry->Hops) && 
+				(Route->RemoteMAXRTT == 0 || Route->RemoteMAXRTT >= Entry->SRTT || Entry->SRTT == 60000))
 			{
-				SendRIF(Route, Msg);
-				Route->Msg = NULL;
+				Msg = Route->Msg;
+
+				if (Msg == NULL) 
+					Msg = Route->Msg = CreateRIFHeader(Route);
+
+				if (Msg == NULL) 
+					return;
+
+				if (Route->OldBPQ)
+					Msg->LENGTH += BuildRIF(&Msg->L3SRCE[Msg->LENGTH], Dest->DEST_CALL, Dest->DEST_ALIAS, sendHops, sendTT * 10);	// old bpq bug - send mS not 10 mS units
+				else
+					Msg->LENGTH += BuildRIF(&Msg->L3SRCE[Msg->LENGTH], Dest->DEST_CALL, Dest->DEST_ALIAS, sendHops, sendTT);
+
+				if (Msg->LENGTH > 250 - 15)
+				{
+					SendRIF(Route, Msg);
+					Route->Msg = NULL;
+				}
 			}
 		}
 	}
@@ -1366,6 +1481,15 @@ VOID FlushRIFs()
 
 	for (count=0; count<MaxRoutes; count++)
 	{
+		// Make sure we've sent our local calls
+
+		if ((Routes->Status & GotRTTRequest) && (Routes->Status & GotRTTResponse) && ((Routes->Status & SentOurRIF) == 0))
+		{	
+			Routes->Status |= SentOurRIF;
+			SendOurRIF(Routes);
+			SendRIPToNeighbour(Routes);
+		}
+		
 		if (Routes->Msg)
 		{
 			char Normcall[10];
@@ -1373,7 +1497,7 @@ VOID FlushRIFs()
 			Normcall[ConvFromAX25(Routes->NEIGHBOUR_CALL, Normcall)] = 0;
 			SendRIF(Routes, Routes->Msg);
 			Routes->Msg = NULL;
-			Debugprintf("INP3 Flushing RIF to  %s", Normcall); 
+			if (DEBUGINP3) Debugprintf("INP3 Flushing RIF to  %s", Normcall); 
 		}
 		Routes+=1;
 	}
@@ -1424,7 +1548,7 @@ VOID SendNegativeInfo()
 			{
 				char call[11]="";
 				ConvFromAX25(Dest->DEST_CALL, call);
-				Debugprintf("INP3 Deleting Node %s", call);
+				if (DEBUGINP3) Debugprintf("INP3 Deleting Node %s", call);
 				REMOVENODE(Dest);			// Clear buffers, Remove from Sorted Nodes chain, and zap entry	
 			}
 			else
@@ -1542,7 +1666,7 @@ VOID INP3TIMER()
 }
 
 
-UCHAR * DisplayINP3RIF(UCHAR * ptr1, UCHAR * ptr2, unsigned int msglen)
+UCHAR * DisplayINP3RIF(UCHAR * ptr1, UCHAR * ptr2, int msglen)
 {
 	char call[10];
 	int calllen;
@@ -1583,7 +1707,9 @@ UCHAR * DisplayINP3RIF(UCHAR * ptr1, UCHAR * ptr2, unsigned int msglen)
 
 		msglen -= 10;
 
-		while (*ptr1 && msglen > 0)
+		// Process optional fields
+
+		while (*ptr1 && msglen > 0)			//  Have an option
 		{
 			len = *ptr1;
 			opcode = *(ptr1+1);
@@ -1597,18 +1723,20 @@ UCHAR * DisplayINP3RIF(UCHAR * ptr1, UCHAR * ptr2, unsigned int msglen)
 			{
 				memcpy(&alias[6 - (len - 2)], ptr1+2, len-2);		// Right Justiify
 			}
-			else
-				if (opcode == 1 && len < 8)
-				{
-					memcpy(IP, ptr1+2, len-2);
-				}
-				ptr2+=sprintf(ptr2, " %s:%s %d %4.2d\r", alias, call, hops, rtt);
+			else if (opcode == 1 && len < 8)
+			{
+				memcpy(IP, ptr1+2, len-2);
+			}
 
-				ptr1++;
-				msglen--;		// EOP
+			ptr1 += len;
+			msglen -= len;
 		}
 
-		return ptr2;
+		ptr2+=sprintf(ptr2, " %s:%s %d %4.2d\r", alias, call, hops, rtt);
+
+		ptr1++;
+		msglen--;		// Over EOP
+
 	}
 	return ptr2;
 }

BPQMail.c

@@ -1153,6 +1153,9 @@
 //	Save FBB transfer restart data over program restarts (69) 
 //	Add Send and Receive byte counts to status displays (69)
 //	Validate Mode and Frequency and fix formatting in Connected Message (71)
+//	Fix using OpenBCM on other than Telnet connections (75)
+//	Fix sending + in Webmail (80)
+//	Fix forwarding problem when using Web interface to change message routing (73)
 
 #include "bpqmail.h"
 #include "winstdint.h"
@@ -1173,6 +1176,7 @@ FARPROCX pRunEventProgram;
 FARPROCX pGetPortFrequency;
 FARPROCX pSendWebRequest;
 FARPROCX pGetLatLon;
+FARPROCX pGetPortHardwareType;
 
 BOOL WINE = FALSE;
 
@@ -1956,6 +1960,8 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
 		pGetPortFrequency = GetProcAddress(ExtDriver,"_GetPortFrequency@8");
 		pSendWebRequest = GetProcAddress(ExtDriver,"_SendWebRequest@16");
 		pGetLatLon = GetProcAddress(ExtDriver,"_GetLatLon@8");
+		pGetPortHardwareType = GetProcAddress(ExtDriver,"_GetPortHardwareType@4");
+
 		
 
 		if (pGetLOC)

BPQNRR.c

@@ -45,6 +45,8 @@ extern VOID Q_ADD();
 VOID __cdecl Debugprintf(const char * format, ...);
 
 TRANSPORTENTRY * NRRSession;
+int NRRID = 1;			// Id to correlate requests and responses
+
 
 /*
 datagrams (and other things) to be transported in Netrom L3 frames. 
@@ -75,7 +77,9 @@ VOID NRRecordRoute(UCHAR * Buff, int Len)
 	{
 		UCHAR * BUFFER = GetBuff();
 		UCHAR * ptr1;
-		struct _MESSAGE * Msg;
+		struct _MESSAGE * Msg1;
+		time_t Now = time(NULL);
+		int ID = (Msg->L4TXNO << 8) | Msg->L4RXNO;
 
 		if (BUFFER == NULL)
 			return;
@@ -84,7 +88,18 @@ VOID NRRecordRoute(UCHAR * Buff, int Len)
 		
 		*ptr1++ = 0xf0;			// PID
 
-		ptr1 += sprintf(ptr1, "NRR Response:");
+
+		if (BUFFER == NULL)
+			return;
+
+		ptr1 = &BUFFER[MSGHDDRLEN];
+		
+		*ptr1++ = 0xf0;			// PID
+
+	if (ID == NRRSession->NRRID)
+			ptr1 += sprintf(ptr1, "NRR Response in %d Secs:", (int)(Now - NRRSession->NRRTime));
+		else
+			ptr1 += sprintf(ptr1, "NRR Response:", (int)(Now - NRRSession->NRRTime));
 
 		Buff += 21 + MSGHDDRLEN;
 		Len -= (21 + MSGHDDRLEN);
@@ -97,7 +112,7 @@ VOID NRRecordRoute(UCHAR * Buff, int Len)
 			if ((Buff[7] & 0x80) == 0x80)			// Check turnround bit
 				*ptr1++ = '*';
 	
-			Buff+=8;
+			Buff += 8;
 			Len -= 8;
 		}
 
@@ -111,11 +126,11 @@ VOID NRRecordRoute(UCHAR * Buff, int Len)
 
 		Len = (int)(ptr1 - BUFFER);
 
-		Msg = (struct _MESSAGE *)BUFFER;
+		Msg1 = (struct _MESSAGE *)BUFFER;
 		
-		Msg->LENGTH = Len;
+		Msg1->LENGTH = Len;
 
-		Msg->CHAIN = NULL;
+		Msg1->CHAIN = NULL;
 
 		C_Q_ADD(&NRRSession->L4TX_Q, (UINT *)BUFFER);
 
@@ -183,11 +198,16 @@ VOID SendNRRecordRoute(struct DEST_LIST * DEST, TRANSPORTENTRY * Session)
 	Msg->L4ID = 1;
 	Msg->L4INDEX = 0;
 	Msg->L4FLAGS = 0;
+	Msg->L4TXNO = NRRID << 8;
+	Msg->L4RXNO = NRRID & 0xff;
 
 	memcpy(Msg->L4DATA, MYCALL, 7);
 	Msg->L4DATA[7] = Stream + 28;
 		
 	Msg->LENGTH = 8 + 21 + MSGHDDRLEN;
-	
+
+	Session->NRRTime = time(NULL);
+	Session->NRRID = NRRID++;
+
 	C_Q_ADD(&DEST->DEST_Q, Msg);
 }

BPQTermMDI.c

@@ -2973,6 +2973,30 @@ LRESULT APIENTRY InputProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 			return 0; 
 		}
+
+		if (wParam == 0x7)  // BEL (Ctrl/G)
+		{
+			// Get buffer, append 07 and write back
+
+			Cinfo->kbptr = SendMessage(Cinfo->hwndInput, WM_GETTEXT, INPUTLEN-1, 
+				(LPARAM) (LPCSTR)Cinfo->kbbuf);
+
+
+			Cinfo->kbbuf[Cinfo->kbptr++] = 7;
+			Cinfo->kbbuf[Cinfo->kbptr] = 0;
+
+			SendMessage(Cinfo->hwndInput,WM_SETTEXT,0,(LPARAM)(LPCSTR) Cinfo->kbbuf);
+
+			// Send cursor right
+
+			for (i = 0; i < strlen(Cinfo->kbbuf); i++)
+			{
+				SendMessage(Cinfo->hwndInput, WM_KEYDOWN, VK_RIGHT, 0);
+				SendMessage(Cinfo->hwndInput, WM_KEYUP, VK_RIGHT, 0);
+			}
+
+			return 0;
+		}
  
 	}
 

Bpq32.c

@@ -1180,7 +1180,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 //	Fix processing of the Winlink API /account/exists response (82)
 //	Fix sending CTEXT to L4 connects to Node when FULL_CTEXT is not set
 
-//  Version 6.0.25.? 
+//  Version 6.0.25.1 Sept 2025
 
 //	Fix 64 bit compatibility problems in SCSTracker and UZ7HO drivers
 //	Add Chat PACLEN config (5)
@@ -1267,6 +1267,42 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 //	Add MHUV and MHLV commands (Verbose listing with timestamps in clock time) (70)
 //	Improvements to INP3 (71)
 //	Improvements to KAM driver including support for GTOR connects (71)
+//	Support IPv6 for Telnet outward connects (72)
+//	Fix decaying NETROM routes (72)
+//	Add OnlyVer2point0 config command (72)
+//	Add option to allow AX/UDP on a network using NAT (72)
+//	Include AGWAPI fixes from Martin KD6YAM to enable use with Paracon terminal (72)
+//	Fix 64 bit compatiblility issues with AGWAPI (73)
+//	Fix KAM Pactor Interlock (73)
+//	Fix Node map reporting, broken in .73 (74)
+//	Fixes to build on FreeBSD and NetBSD from jg1uaa (77)
+//	Fix to L4Compress from Steve G7TAJ (77)
+//	Fix possible FRMR when RNR is cleared by SREJ (78)
+//	Fix error in .77 L4Compress fix (mine, not Steve's!) (78)
+//	Fix possible stuck L2 session when handling SREJ (79)
+//	Allow sending CTRL/G From console (Windows) (80)
+//	Fix Webmail autorefresh extra threads problem (websock connection lost handling) (82)
+//	Fix overwriting application alias (83)
+
+
+//  Version 6.0.26.?
+
+//	Fix for compiling with gcc15 (2)
+//	Fix possble stuck L2 session caused by window being set to zero (3)
+//	Improvments to INP3 (4, 5)
+//	Add Node API /api/tcpqueues (5)
+//	Add sending link events to OARC API (disabled by default) (6)
+//	Fix possible program error in Telnet_Connected (7)
+//	Close links when program is closed down (7)
+//	Fix possible problem with deleting routes when using both NODES and INP3 routing on same link (7)
+//	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
 
@@ -1361,6 +1397,8 @@ void * HSMODEMExtInit(EXTPORTDATA * PortEntry);
 void * FreeDataExtInit(EXTPORTDATA * PortEntry);
 void * SIXPACKExtInit(EXTPORTDATA * PortEntry);
 
+VOID RealCloseAllPrograms();
+
 extern char * ConfigBuffer;	// Config Area
 VOID REMOVENODE(dest_list * DEST);
 DllExport int ConvFromAX25(unsigned char * incall,unsigned char * outcall);
@@ -1370,6 +1408,9 @@ VOID ADIFWriteFreqList();
 void SaveAIS();
 void initAIS();
 void initADSB();
+int CloseAllSessions();
+int CloseAllLinks();
+void NETROMTCPResolve();
 
 extern BOOL ADIFLogEnabled;
 
@@ -1377,6 +1418,8 @@ int CloseOnError = 0;
 
 char UIClassName[]="UIMAINWINDOW";					// the main window class name
 
+char ClosingClassName[]="CLOSING";					// the main window class name
+
 HWND UIhWnd;
 
 extern char AUTOSAVE;
@@ -1428,7 +1471,8 @@ extern char MYCALL[];			// 7 chars, ax.25 format
 extern HWND hIPResWnd;
 extern BOOL IPMinimized;
 
-extern int	NODESINPROGRESS;
+extern int NODESINPROGRESS;
+extern int NODESToOnePort;
 extern VOID * CURRENTNODE;
 
 
@@ -1498,7 +1542,6 @@ extern char ReportDest[7];
 
 extern UCHAR ConfigDirectory[260];
 
-extern uint64_t timeLoadedMS;
 
 VOID __cdecl Debugprintf(const char * format, ...);
 VOID __cdecl Consoleprintf(const char * format, ...);
@@ -1616,6 +1659,8 @@ BOOL IGateEnabled = TRUE;
 extern int ISDelayTimer;			// Time before trying to reopen APRS-IS link
 extern int ISPort;
 
+int CLOSING = 0;
+
 UINT * WINMORTraceQ = NULL;
 UINT * SetWindowTextQ = NULL;
 
@@ -1671,6 +1716,8 @@ BOOL ReconfigFlag = FALSE;
 BOOL RigReconfigFlag = FALSE;
 BOOL APRSReconfigFlag = FALSE;
 BOOL CloseAllNeeded = FALSE;
+int CloseAllTimer = 0;
+
 BOOL NeedWebMailRefresh = FALSE;
 
 int AttachedPIDList[100] = {0};
@@ -2175,6 +2222,8 @@ VOID TimerProcX()
 	
 			Start();
 
+			NETROMTCPResolve();
+
 			INITIALISEPORTS();			// Restart Ports
 
 			SetApplPorts();
@@ -2352,6 +2401,52 @@ VOID TimerProcX()
 
 	CheckGuardZone();
 
+	if (CloseAllTimer == 50)			// First entry
+	{
+		if (CloseAllSessions() == 0)
+		{
+			if (CloseAllLinks() == 0)			// No sessions closed so close links now
+				CloseAllTimer = 1;				// No Links so close now
+			else
+				CloseAllTimer = 39;				// ~4 secs for links to close
+		}
+	}
+
+	if (CloseAllTimer == 40)			// First entry
+		CloseAllLinks();				// No sessions closed so close links now
+	
+	if (CloseAllTimer)
+	{
+		// See if any links left
+
+		struct _LINKTABLE * LINK = LINKS;
+		int i = MAXLINKS;
+
+		if (CloseAllTimer == 0)
+			RealCloseAllPrograms();	
+
+		while (i--)
+		{
+			if (LINK->LINKCALL[0])
+			{
+				break;
+			}
+
+			if (i == 0)
+			{
+				CloseAllTimer = 0;
+				RealCloseAllPrograms();
+				return;
+			}
+			LINK++;
+			continue;
+		}
+
+		CloseAllTimer--;
+
+		if(CloseAllTimer == 0)
+			RealCloseAllPrograms();	
+	}
 	return;
 }
 
@@ -2387,8 +2482,6 @@ FirstInit()
 		EnumProcessesPtr = (FARPROCX)GetProcAddress(ExtDriver,"EnumProcesses");
 	}
 
-	timeLoadedMS = GetTickCount();
-
 	srand(time(NULL));
 	
 	INITIALISEPORTS();
@@ -2545,6 +2638,7 @@ Check_Timer()
 
 		WSAStartup(MAKEWORD(2, 0), &WsaData);
 
+
 		// Load Psapi.dll if possible
 
 		ExtDriver = LoadLibrary("Psapi.dll");
@@ -2559,6 +2653,8 @@ Check_Timer()
 			
 		Start();
 	
+		NETROMTCPResolve();
+
 		INITIALISEPORTS();
 
 		OpenReportingSockets();
@@ -2882,6 +2978,8 @@ BOOL APIENTRY DllMain(HANDLE hInst, DWORD ul_reason_being_called, LPVOID lpReser
 			}
 			else
 			{
+				NETROMTCPResolve();
+
 				SetApplPorts();
 
 				GetUIConfig();
@@ -5878,13 +5976,106 @@ DllExport VOID APIENTRY CreateNewTrayIcon()
 	trayMenu = NULL;
 }
 
+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()
 {
-//	HANDLE hProc;
+	WNDCLASS  wc;	
+	CLOSING = TRUE;
 
-	// Close all attached BPQ32 programs
+	// Tell BG to shut when all links are gone or after 5 secs
 
-	Closing  = TRUE;
+	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()
+{
+	hookNodeClosing("Shutdown");
+	Sleep(500);
+
+	Closing = 1;
 
 	ShowWindow(FrameWnd, SW_RESTORE);
 

ChatHTMLConfig.c

@@ -590,7 +590,7 @@ VOID SendChatStatusPage(char * Reply, int * ReplyLen, char * Key)
 		{
 			if (conn->Flags & CHATLINK)
 			{
-				if (conn->BPQStream > 64 || conn->u.link == 0)
+				if (conn->BPQStream > 64 || conn->u.link == 0 || conn->u.link->alias == 0)
 					Len += sprintf(&Streams[Len], "<tr><td onclick= SelectRow(%d) id=cell_%d>** Corrupt ChatLink **</td>"
 					"<td>&nbsp;&nbsp;</td><td>&nbsp;&nbsp;</td><td>&nbsp;&nbsp;</td><td>&nbsp;&nbsp;</td></tr>", i, i);
 				else
@@ -600,7 +600,7 @@ VOID SendChatStatusPage(char * Reply, int * ReplyLen, char * Key)
 						"", conn->OutputQueueLength - conn->OutputGetPointer);
 			}
 			else
-			if ((conn->Flags & CHATMODE) && conn->topic)
+			if ((conn->Flags & CHATMODE) && conn->topic && conn->u.user && conn->u.user->call)
 			{
 				Len += sprintf(&Streams[Len],  "<tr><td onclick='SelectRow(%d)' id='cell_%d'>%s</td><td>%s</td><td>%d</td><td>%s</td><td>%d</td></tr>",
 					i, i, conn->u.user->name, conn->u.user->call, conn->BPQStream,

ChatMultiConsole.c

@@ -983,7 +983,30 @@ LRESULT APIENTRY InputProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 			return 0; 
 		}
- 
+
+		if (wParam == 0x7)  // BEL (Ctrl/G)
+		{
+			// Get buffer, append 07 and write back
+
+			Cinfo->kbptr = SendMessage(Cinfo->hwndInput, WM_GETTEXT, INPUTLEN-1, 
+				(LPARAM) (LPCSTR)Cinfo->kbbuf);
+
+
+			Cinfo->kbbuf[Cinfo->kbptr++] = 7;
+			Cinfo->kbbuf[Cinfo->kbptr] = 0;
+
+			SendMessage(Cinfo->hwndInput,WM_SETTEXT,0,(LPARAM)(LPCSTR) Cinfo->kbbuf);
+
+			// Send cursor right
+
+			for (i = 0; i < strlen(Cinfo->kbbuf); i++)
+			{
+				SendMessage(Cinfo->hwndInput, WM_KEYDOWN, VK_RIGHT, 0);
+				SendMessage(Cinfo->hwndInput, WM_KEYUP, VK_RIGHT, 0);
+			}
+
+			return 0;
+		}
 	}
 
     return CallWindowProc(Cinfo->wpOrigInputProc, hwnd, uMsg, wParam, lParam); 

Cmd.c

@@ -17,9 +17,7 @@ You should have received a copy of the GNU General Public License
 along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 */	
 
-//
-//	C replacement for cmd.asm
-//
+
 #define Kernel
 
 #define _CRT_SECURE_NO_DEPRECATE 
@@ -44,8 +42,6 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 #include "tncinfo.h"
 #include "telnetserver.h"
 
-
-
 //#include "GetVersion.h"
 
 //#define DllImport	__declspec( dllimport )
@@ -73,7 +69,8 @@ int seeifInterlockneeded(struct PORTCONTROL * PORT);
 int CompareNode(const void *a, const void *b);
 int CompareAlias(const void *a, const void *b);
 int CompareRoutes(const void * a, const void * b);
-
+void SendVARANetromNodes(struct TNCINFO * TNC, MESSAGE *Buffer);
+VOID DoNetromConnect(TRANSPORTENTRY * Session, char * Bufferptr, struct DEST_LIST * Dest, BOOL Spy, int Service);
 
 extern VOID KISSTX(struct KISSINFO * KISS, PMESSAGE Buffer);
 
@@ -86,6 +83,7 @@ UCHAR SAVEDAPPLFLAGS = 0;
 
 UCHAR ALIASINVOKED = 0;
 
+extern int MONTOFILEFLAG;
 
 VOID * CMDPTR = 0;
 
@@ -132,6 +130,8 @@ 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;
@@ -155,13 +155,15 @@ char * ALIASPTR	= &CMDALIAS[0][0];
 
 extern int RigReconfigFlag;
 
+extern int DEBUGINP3;
+extern int PREFERINP3ROUTES;
 
 
 struct CMDX COMMANDS[];
 
 int CMDXLEN	= sizeof (struct CMDX);
 
-VOID SENDNODESMSG();
+VOID SENDNODESMSG(int Portnum);
 VOID KISSCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
 VOID STOPCMS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
 VOID STARTCMS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD);
@@ -187,6 +189,54 @@ VOID QTSMCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct
 void hookL2SessionAttempt(int Port, char * fromCall, char * toCall, struct _LINKTABLE * LINK);
 
 
+/* Paula's NetROMX includes a service number in a CREQX message which allows a node to host lots of applications without
+   filling the Nodes table with SSID's
+
+I could make these (or some of them) BPQ Commands but some will clash (eg INFO) or match an existing APPL (eg BBS)
+
+I could use C APPL@CALL for an extended call to a node
+
+Maybe I can detect APPL NODE so Paula's syntax will work
+
+or both??
+
+Standard Services are:
+*/
+
+struct NETROMX SERVICES[] = {
+	{0, "CMD"},		// Normal connection to Node's command line
+	{1, "INFO"},	// Standard Information server
+	{2, "PMS"},		// Personal Message System
+	{3, "BBS"},		// (reserved for Bulletin Board System)
+	{4, "DX"},		// (reserved for DX cluster/dx-spot feed)
+	{5, "TPP"},		// (reserved for "Tampa Ping-Pong" chat)
+	{7, "ECHO"},	// Echoes data back to sender
+	{8, "XRCHAT"},	// XRChat server 
+	{9, "DISCARD"},	// Data sink
+	{10, "RMS"},	// (reserved for winlink RMS}
+	{11, "CHAT"},	// (reserved for BPQ chat server)
+	{13, "DAYTIME"},	// Local date/time (similar to RFC867)
+	{14, "APRS"},	// APRS Server
+	{15, "CUSTINF"},// (reserved for custom information file server)
+	{16, "WX"},		// Local weather information
+	{17, "TELEM"},	// (reserved for Telemetry server)
+	{18, "SMS"},	// Short Message System server
+	{19, "CHARGEN"},// Generates a test pattern
+	{20, "NDATA"},	// (reserved for NFTP extension)
+	{21, "NFTP"},	// Netrom File Transfer Protocol
+	{22, "NSSH"},	// (reserved for secure login - if legal?)
+	{23, "TELNET"},	// Normal L4 login (same as 0)
+	{25, "SMTP"},	// (reserved for Simple Mail Transfer Protocol)
+	{26, "MHEARD"},	// MHEARD server (shows MH lists)
+	{27, "DXLIST"},	// DX List server (shows DX lists)
+	{79, "FINGER"},	// Finger server
+	{80, "HTTP"},	// NetromWeb (HTTP over Netrom) server
+	{87, "NTTY"},	// Netrom TTY - Keyboard to keyboard chat
+	{1883, "MQTT"}	// MQTT server
+};
+
+int NUMBEROFSSERVICES = sizeof(SERVICES)/sizeof(struct NETROMX);
+
 
 char * __cdecl Cmdprintf(TRANSPORTENTRY * Session, char * Bufferptr, const char * format, ...)
 {
@@ -249,10 +299,81 @@ char * __cdecl Cmdprintf(TRANSPORTENTRY * Session, char * Bufferptr, const char
 	return Bufferptr + MsgLen;
 }
 
+VOID POLLNODES(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
+{
+	int Portnum = atoi(CmdTail);
+	struct PORTCONTROL * PORT = 0;
+	MESSAGE * Buffer;
+	UCHAR * ptr1;
 
+	if (Portnum)
+		PORT = GetPortTableEntryFromPortNum(Portnum);
+		
+	if (Portnum == 0 || PORT == 0)
+	{
+		Bufferptr = Cmdprintf(Session, Bufferptr, "Invalid Port\r");			
+		SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
+		return;
+	}
+
+	if (PORT->PORTQUALITY == 0 || PORT->INP3ONLY)
+	{
+		Bufferptr = Cmdprintf(Session, Bufferptr, "Quality = 0 or INP3 Port\r");			
+		SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
+		return;
+	}
+	Buffer = GetBuff();
+
+	if (Buffer == 0)
+		return;
+
+	Buffer->PORT = Portnum;
+
+	memcpy(Buffer->ORIGIN, NETROMCALL, 7);
+	memcpy(Buffer->DEST, NODECALL, 7);
+
+	Buffer->ORIGIN[6] |= 0x61;		// SET CMD END AND RESERVED BITS
+
+	Buffer->CTL = UI;
+	Buffer->PID = 0xCF;				// Netrom
+
+	ptr1 = &Buffer->L2DATA[0];
+	
+	*(ptr1++) = 0xfe;				// Nodes Poll Flag
+
+	memcpy(ptr1, MYALIASTEXT, 6);
+
+	ptr1+= 6;
+
+	Buffer->LENGTH = (int)(ptr1 - (UCHAR *)Buffer);
+
+	if (PORT->TNC && PORT->TNC->Hardware == H_VARA)
+		SendVARANetromNodes(PORT->TNC, Buffer);
+	else
+		PUT_ON_PORT_Q(PORT, Buffer);
+
+	strcpy(Bufferptr, OKMSG);
+	Bufferptr += (int)strlen(OKMSG);
+						
+	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
+}
 VOID SENDNODES(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
-	SENDNODESMSG();
+	int Portnum = atoi(CmdTail);
+	struct PORTCONTROL * PORT;
+
+	if (Portnum)
+	{
+		PORT = GetPortTableEntryFromPortNum(Portnum);
+		if (PORT == 0)
+		{
+			Bufferptr = Cmdprintf(Session, Bufferptr, "Invalid Port\r");			
+			SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
+			return;
+		}
+	}
+
+	SENDNODESMSG(Portnum);
 
 	strcpy(Bufferptr, OKMSG);
 	Bufferptr += (int)strlen(OKMSG);
@@ -717,6 +838,120 @@ BOOL cATTACHTOBBS(TRANSPORTENTRY * Session, UINT Mask, int Paclen, int * AnySess
 	return FALSE;
 }
 
+void ConnecttoService(TRANSPORTENTRY * Session, char * Bufferptr, int Service, char * Node, int Stay)
+{
+	struct DEST_LIST * Dest = DESTS;
+	int n = MAXDESTS;
+	int gotDest = 0;
+	unsigned char axcall[7];
+	char cmdName[80];
+	int i;
+
+	// Make Sure Node is Known
+
+	strcat(Node, "     ");			// Node table has 6 byte Aliases
+	
+	while (n--)
+	{
+		if (memcmp(Dest->DEST_ALIAS, Node, 6) == 0)	
+		{
+			gotDest = 1;
+			break;
+		}
+		Dest++;
+	}
+
+	if (gotDest == 0)
+	{
+		Dest = DESTS;
+		n = MAXDESTS;
+
+		ConvToAX25(Node, axcall);
+			
+		while (n--)
+		{
+			if (CompareCalls(Dest->DEST_CALL, axcall))	
+			{
+				gotDest = 1;
+				break;
+			}
+			Dest++;
+		}
+	}
+
+	strlop(Node, ' ');
+
+	if (gotDest == 0)
+	{
+		Bufferptr = Cmdprintf(Session, Bufferptr, "Node %s not found\r", Node);
+		SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
+		return;
+	}
+
+	Session->STAYFLAG = Stay;
+
+	// Get command name if a named command
+
+	sprintf(cmdName, "%d", Service);	// default to number
+
+	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);
+
+	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
+}
+
+int checkifService(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
+{
+	char APPName[13];
+	int n = 12;
+	BOOL Stay = FALSE;
+	char * ptr, *Context;
+	int i;
+	char TailCopy[256];
+
+	strcpy(TailCopy, CmdTail);
+
+
+	ptr = strtok_s(TailCopy, " ", &Context);
+
+	// see if any param. if longer than two chars treat as remote node
+
+	if (ptr == 0 || strlen(ptr) < 3)
+		return 0;
+
+	memcpy(APPName, CMD->String, 13);
+
+	strlop(APPName, ' ');
+		
+	 if (Context && Context[0] == 'S')
+		Session->STAYFLAG = Stay;
+
+	// See if APPL is one of Paula's service
+			
+	for (i = 0; i < NUMBEROFSSERVICES; i++)
+	{
+		if (strcmp(APPName, SERVICES[i].ServiceName) == 0)
+		{
+			ConnecttoService(Session, Bufferptr, SERVICES[i].ServiceNo, ptr, Stay);
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+
+
 VOID APPLCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {		
 	BOOL CONFAILED = 0;
@@ -746,9 +981,45 @@ VOID APPLCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct
 
 	if (CmdTail[0] == 'S')
 		Stay = TRUE;
-	
-	Session->STAYFLAG = Stay;
 
+	// could be Node for NETROMX connect or S flag
+		
+	// We now use service@node, so can't get here
+
+/*
+	if (ptr)
+	{
+		int i;
+		
+		if (strlen(ptr) > 1)
+		{
+			 if (Context && Context[0] == 'S')
+				Session->STAYFLAG = Stay;
+
+			// See if APPL is one of Paula's service
+
+
+			
+			for (i = 0; i < NUMBEROFSSERVICES; i++)
+			{
+				if (strcmp(APPName, SERVICES[i].ServiceName) == 0)
+				{
+					ConnecttoService(Session, Bufferptr, i, ptr, Stay);
+					return;
+				}
+			}
+
+			// Not a service that can be accessed remotely
+
+			Bufferptr = Cmdprintf(Session, Bufferptr, "Connection to %s on a remote node is not possible\r", APPName);
+			SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
+			return;
+		}
+
+		else if (ptr[0] == 'S')
+			Session->STAYFLAG = Stay;
+	}
+*/		
 	memcpy(Session->APPL, CMD->String, 12);
 
 	//	SEE IF THERE IS AN ALIAS DEFINDED FOR THIS COMMAND
@@ -830,6 +1101,9 @@ VOID APPLCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct
 
 VOID CMDI00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
+	if (checkifService(Session, Bufferptr, CmdTail, CMD))		// See can be used remotely
+		return;
+		
 	Bufferptr = Cmdprintf(Session, Bufferptr, "%s", INFOMSG);
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 }
@@ -1300,6 +1574,17 @@ VOID CMDL00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct C
 				else
 					Bufferptr = Cmdprintf(Session, Bufferptr, " S=%d P=%d T=%d V=%d Q=%d\r",
 					LINK->L2STATE, LINK->LINKPORT->PORTNUMBER, LINK->LINKTYPE, 2 - LINK->VER1FLAG, Count);
+			
+				if (Count > 16 || LINK->LINKWINDOW == 0)
+				{
+					// Dump Link State
+
+					int secs = time(NULL) - LINK->LASTFRAMESENT;
+						
+					Bufferptr = Cmdprintf(Session, Bufferptr, "  Debug Info: LINK->LINKNS %d LINK->LINKOWS %d SDTSLOT %d LINKWINDOW %d L2FLAGS %d\r", LINK->LINKNS, LINK->LINKOWS, LINK->SDTSLOT, LINK->LINKWINDOW, LINK->L2FLAGS);
+					Bufferptr = Cmdprintf(Session, Bufferptr, "  Debug Info: Slots %x %x %x %x %x %x %x %x\r", LINK->FRAMES[0], LINK->FRAMES[1], LINK->FRAMES[2], LINK->FRAMES[3],
+					LINK->FRAMES[4], LINK->FRAMES[5], LINK->FRAMES[6], LINK->FRAMES[7]);
+				}
 			}
 			LINK++;
 		}
@@ -1622,8 +1907,8 @@ char *  DisplayRoute(TRANSPORTENTRY * Session, char * Bufferptr, struct ROUTE *
 
 		if (Routes->INP3Node)		// INP3 Enabled?
 		{
-			double srtt = Routes->SRTT/1000.0;
-			double nsrtt = Routes->NeighbourSRTT/1000.0;
+			double srtt = Routes->SRTT/100.0;
+			double nsrtt = Routes->NeighbourSRTT/100.0;
 
 			Bufferptr = Cmdprintf(Session, Bufferptr, " %4.2fs %4.2fs", srtt, nsrtt);
 		}
@@ -2144,7 +2429,7 @@ TRANSPORTENTRY * SetupNewSession(TRANSPORTENTRY * Session, char * Bufferptr)
 }
 
 
-VOID DoNetromConnect(TRANSPORTENTRY * Session, char * Bufferptr, struct DEST_LIST * Dest, BOOL Spy)
+VOID DoNetromConnect(TRANSPORTENTRY * Session, char * Bufferptr, struct DEST_LIST * Dest, BOOL Spy, int Service)
 {
 	TRANSPORTENTRY * NewSess;
 	
@@ -2153,6 +2438,8 @@ VOID DoNetromConnect(TRANSPORTENTRY * Session, char * Bufferptr, struct DEST_LIS
 	if (NewSess == NULL)
 		return;						// Tables Full
 
+	NewSess->Service = Service;
+
 	NewSess->L4CIRCUITTYPE = SESSION + DOWNLINK;
 
 	NewSess->L4TARGET.DEST = Dest;
@@ -2160,15 +2447,41 @@ VOID DoNetromConnect(TRANSPORTENTRY * Session, char * Bufferptr, struct DEST_LIS
 
 	NewSess->SPYFLAG = Spy;
 
-	ReleaseBuffer((UINT *)REPLYBUFFER);
+	if (Service == -1)
+		ReleaseBuffer((UINT *)REPLYBUFFER);
 
-	SENDL4CONNECT(NewSess);
+	SENDL4CONNECT(NewSess, Service);
 
 	L4CONNECTSOUT++;
-
 	return;
 }
 
+BOOL CheckLink(UCHAR * LinkCall, UCHAR * OurCall, int Port)
+{
+	// Check if a link exists betwwn a pair of calls on a port. Return TRUE if found
+
+	struct _LINKTABLE * LINK = LINKS;
+	int n = MAXLINKS;
+
+	while (n--)
+	{
+		if (LINK->LINKCALL[0] == 0)		// Spare
+		{		
+			LINK++;
+			continue;
+		}
+
+		if ((LINK->LINKPORT->PORTNUMBER == Port) && CompareCalls(LINK->LINKCALL, LinkCall) && CompareCalls(LINK->OURCALL, OurCall))
+			return TRUE;
+
+		LINK++;
+	}
+
+	//	ENTRY NOT FOUND 
+
+	return FALSE;
+}
+
 BOOL FindLink(UCHAR * LinkCall, UCHAR * OurCall, int Port, struct _LINKTABLE ** REQLINK)
 {
 	struct _LINKTABLE * LINK = LINKS;
@@ -2194,6 +2507,7 @@ BOOL FindLink(UCHAR * LinkCall, UCHAR * OurCall, int Port, struct _LINKTABLE **
 
 		LINK++;
 	}
+
 	//	ENTRY NOT FOUND - FIRSTSPARE HAS FIRST FREE ENTRY, OR ZERO IF TABLE FULL
 
 	*REQLINK = FIRSTSPARE;
@@ -2224,6 +2538,9 @@ VOID CMDC00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct C
 	char PortString[10];
 	char cmdCopy[256];
 	struct _EXTPORTDATA * EXTPORT = (struct _EXTPORTDATA *)PORT;
+	int Service = -1;
+	int haveService = 0;
+	int i = 0;
 
 
 #ifdef EXCLUDEBITS
@@ -2271,6 +2588,56 @@ 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)
@@ -2388,6 +2755,9 @@ NoPort:
 
 					//	Convert to an APPL command, so any alias is actioned
 
+					memcpy(Session->APPL,APPL->APPLCMD, 12);
+
+
 					//	SEE IF THERE IS AN ALIAS DEFINDED FOR THIS COMMAND
 
 					if (APPL->APPLHASALIAS && APPL->APPLALIASVAL[0] != 0x20)
@@ -2420,7 +2790,7 @@ NoPort:
 
 	if (axcalls[7] == 0)
 	{
-		//	SEE IF CALL TO ANOTHER NODE
+		//	SEE IF CALL TO ANOTHER NODE 
 
 		struct DEST_LIST * Dest = DESTS;
 		int n = MAXDESTS;
@@ -2431,7 +2801,7 @@ NoPort:
 			{
 				if (memcmp(Dest->DEST_ALIAS, TextCall, 6) == 0)	
 				{
-					DoNetromConnect(Session, Bufferptr, Dest, Spy);
+					DoNetromConnect(Session, Bufferptr, Dest, Spy, Service);
 					return;
 				}
 				Dest++;
@@ -2445,7 +2815,7 @@ NoPort:
 		{
 			if (CompareCalls(Dest->DEST_CALL, axcalls))	
 			{
-				DoNetromConnect(Session, Bufferptr, Dest, Spy);
+				DoNetromConnect(Session, Bufferptr, Dest, Spy, Service);
 				return;
 			}
 			Dest++;
@@ -2461,9 +2831,6 @@ 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;
 	}
@@ -2939,7 +3306,7 @@ char * DoOneNode(TRANSPORTENTRY * Session, char * Bufferptr, struct DEST_LIST *
 
 		if (Neighbour)
 		{
-			double srtt = Route->SRTT/1000.0;
+			double srtt = Route->SRTT/100.0;
 
 			len = ConvFromAX25(Neighbour->NEIGHBOUR_CALL, Normcall);
 			Normcall[len] = 0;
@@ -2988,7 +3355,7 @@ int DoINP3ViaEntry(struct DEST_LIST * Dest, int n, char * line, int cursor)
 
 	if (Dest->INP3ROUTE[n].ROUT_NEIGHBOUR != 0)
 	{
-		srtt = Dest->INP3ROUTE[n].SRTT/1000.0;
+		srtt = Dest->INP3ROUTE[n].SRTT/100.0;
 
 		len=ConvFromAX25(Dest->INP3ROUTE[n].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, Portcall);
 		Portcall[len]=0;
@@ -3608,6 +3975,8 @@ VOID MHCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CM
 	int len;
 	char Digi = 0;
 
+	if (checkifService(Session, Bufferptr, CmdTail, CMD))		// See can be used remotely
+		return;
 
 	// Note that the MHDIGIS field may contain rubbish. You have to check End of Address bit to find
 	// how many digis there are
@@ -4258,6 +4627,7 @@ struct CMDX COMMANDS[] =
 	"RIGRECONFIG ",8, &RIGRECONFIG, 0,
 	"RESTART     ",7, &RESTART,0,
 	"RESTARTTNC  ",10,&RESTARTTNC,0,
+	"POLLNODES   ",8, &POLLNODES,0,
 	"SENDNODES   ",8, &SENDNODES,0,
 	"EXTRESTART  ",10, EXTPORTVAL, offsetof(EXTPORTDATA, EXTRESTART),
 	"TXDELAY     ",3, PORTVAL, offsetof(PORTCONTROLX, PORTTXDELAY),
@@ -4275,6 +4645,10 @@ struct CMDX COMMANDS[] =
 	"MAXUSERS    ",4,PORTVAL, offsetof(PORTCONTROLX, USERS),
 	"L3ONLY      ",6,PORTVAL, offsetof(PORTCONTROLX, PORTL3FLAG),
 	"BBSALIAS    ",4,PORTVAL, offsetof(PORTCONTROLX, PORTBBSFLAG),
+	"INP3ONLY    ",8,PORTVAL, offsetof(PORTCONTROLX, INP3ONLY),
+	"ALLOWINP3   ",9,PORTVAL, offsetof(PORTCONTROLX, ALLOWINP3),
+	"ENABLEINP3  ",10,PORTVAL, offsetof(PORTCONTROLX, ENABLEINP3),
+	"MONTOFILE   ",9,SWITCHVAL,(size_t)&MONTOFILEFLAG,
 	"VALIDCALLS  ",5,VALNODES,0,
 	"WL2KSYSOP   ",5,WL2KSYSOP,0,
 	"STOPPORT    ",4,STOPPORT,0,
@@ -4286,6 +4660,7 @@ struct CMDX COMMANDS[] =
 	"KISS        ",4,KISSCMD,0,
 	"GETPORTCTEXT",9,GetPortCTEXT, 0,
 
+
 #ifdef EXCLUDEBITS
 
 	"EXCLUDE     ",4,ListExcludedCalls,0,
@@ -4310,6 +4685,11 @@ struct CMDX COMMANDS[] =
 	"L4DELAY     ",7,SWITCHVAL,(size_t)&L4DELAY,
 	"L4WINDOW    ",6,SWITCHVAL,(size_t)&L4DEFAULTWINDOW,
 	"BTINTERVAL  ",5,SWITCHVAL,(size_t)&BTINTERVAL,
+	"DEBUGINP3   ",8,SWITCHVAL,(size_t)&DEBUGINP3,
+	"MAXHOPS     ",7,SWITCHVAL,(size_t)&MaxHops,
+	"PREFERINP3  ",10,SWITCHVAL,(size_t)&PREFERINP3ROUTES,
+	"MAXRTT      ",6,SWITCHVALW,(size_t)&MAXRTT,
+	"MAXTT       ",6,SWITCHVALW,(size_t)&MAXRTT,
 	"PASSWORD    ", 8, PWDCMD, 0,
 
 	"************", 12, APPLCMD, 0,
@@ -4343,7 +4723,7 @@ struct CMDX COMMANDS[] =
 	"************", 12, APPLCMD, 0,	
 	"************", 12, APPLCMD, 0,	
 	"************", 12, APPLCMD, 0,	
-	"************", 12, APPLCMD, 0,			// Apppl 32 is internal Terminal
+	"************", 12, APPLCMD, 0,			// Apppl 32 is internal Terminal on Windows
 	"*** LINKED  ",10,LINKCMD,0,
 	"CQ          ",2,CQCMD,0,
 	"CONNECT     ",1,CMDC00,0,
@@ -4736,6 +5116,9 @@ VOID DoTheCommand(TRANSPORTENTRY * Session)
 	struct DATAMESSAGE * Buffer = REPLYBUFFER;
 	char * ptr1, * ptr2;
 	int n;
+	int i, Service = -1;
+	char * Cmd, *Node, *Context;
+	int Stay = 0;
 
 	ptr1 = &COMMANDBUFFER[0];		//
 
@@ -4826,6 +5209,50 @@ VOID DoTheCommand(TRANSPORTENTRY * Session)
 
 		CMD++;
 	
+	}
+
+	// See if a NETROMX Service
+
+	// We now use service@node, unlike xr
+
+	if (strchr(ptr1, '@'))
+	{
+		Cmd = strtok_s(ptr1, "@", &Context);
+		Node = strtok_s(NULL, " ", &Context);
+
+		if (Cmd && Node)
+		{
+			if (Context && Context[0] == 'S')
+				Session->STAYFLAG = Stay;
+
+			for (i = 0; i < NUMBEROFSSERVICES; i++)
+			{
+				if (strcmp(Cmd, SERVICES[i].ServiceName) == 0)
+				{
+					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;
+			}
+		}
+
+		ReplyPointer = Cmdprintf(Session, ReplyPointer, "Invalid NetromX command\r");
+		SendCommandReply(Session, REPLYBUFFER, (int)(ReplyPointer - (char *)REPLYBUFFER));
+		return;
+
 	}
 	Session->BADCOMMANDS++;
 
@@ -4843,19 +5270,19 @@ VOID DoTheCommand(TRANSPORTENTRY * Session)
 	ptr1 += CMDERRLEN;
 
 	SendCommandReply(Session, Buffer, (int)(ptr1 - (char *)Buffer));
-}
+	}
 
 
-VOID StatsTimer()
-{
-	struct PORTCONTROL * PORT = PORTTABLE;
-	uint64_t sum, sum2;
-
-	// Interval is 60 secs
-
-	while(PORT)
+	VOID StatsTimer()
 	{
-		int index = PORT->StatsPointer++;
+		struct PORTCONTROL * PORT = PORTTABLE;
+		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

@@ -49,6 +49,12 @@ extern struct CONFIGTABLE xxcfg;
 
 #endif
 
+
+void hookL4SessionAttempt(struct STREAMINFO * , char * remotecall, char * ourcall);
+void hookL4SessionAccepted(struct STREAMINFO * , char * remotecall, char * ourcall);
+void hookL4SessionDeleted(struct TNCINFO * TNC, void * STREAM);
+
+
 struct TNCINFO * TNCInfo[71];		// Records are Malloc'd
 
 extern int ReportTimer;
@@ -69,6 +75,7 @@ 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;
@@ -79,6 +86,7 @@ extern VOID * ENDBUFFERPOOL;
 
 extern int PoolBuilt;
 
+extern int EnableOARCAPI;
 
 //	Read/Write length field in a buffer header
 
@@ -2142,7 +2150,16 @@ int CanPortDigi(int Port)
 	return TRUE;
 }
 
-struct PORTCONTROL * APIENTRY GetPortTableEntryFromPortNum(int portnum)
+DllExport int APIENTRY GetPortHardwareType(struct PORTCONTROL *PORT)
+{
+	if (PORT)
+		return PORT->Hardware;
+
+	return 0;
+}
+
+
+DllExport struct PORTCONTROL * APIENTRY GetPortTableEntryFromPortNum(int portnum)
 {
 	struct PORTCONTROL * PORTVEC = PORTTABLE;
 
@@ -3304,8 +3321,12 @@ SOCKADDR_IN reportdest = {0};
 
 SOCKET ReportSocket = 0;
 
+SOCKET NodeAPISocket = 0 ;
+
 SOCKADDR_IN Chatreportdest = {0};
 
+SOCKADDR_IN UDPreportdest = {0};
+
 extern char LOCATOR[];			// Locator for Reporting - may be Maidenhead or LAT:LON
 extern char MAPCOMMENT[];		// Locator for Reporting - may be Maidenhead or LAT:LON
 extern char LOC[7];				// Maidenhead Locator for Reporting
@@ -3661,11 +3682,22 @@ pthread_t ResolveUpdateThreadId = 0;
 
 char NodeMapServer[80] = "update.g8bpq.net";
 char ChatMapServer[80] = "chatupdate.g8bpq.net";
+char NodeAPIServer[80] = "node-api.packet.oarc.uk";
+
+int NodeAPIPort = 13579;
+
+int nodeStartedSent = 0;
+
+extern time_t LastNodeStatus;
+
+void hookNodeStarted();
 
 VOID ResolveUpdateThread(void * Unused)
 {
 	struct hostent * HostEnt1;
 	struct hostent * HostEnt2;
+	struct hostent * HostEnt3;
+
 
 	ResolveUpdateThreadId = GetCurrentThreadId();
 
@@ -3693,14 +3725,29 @@ VOID ResolveUpdateThread(void * Unused)
 		if (HostEnt2)
 			memcpy(&Chatreportdest.sin_addr.s_addr,HostEnt2->h_addr,4);
 
-		if (HostEnt1 && HostEnt2)
+		Debugprintf("Resolving %s", NodeAPIServer);
+		
+		HostEnt3 = gethostbyname(NodeAPIServer);
+	
+		if (HostEnt3)
 		{
-			Sleep(1000 * 60 * 30);
-			continue;
+			memcpy(&UDPreportdest.sin_addr.s_addr,HostEnt3->h_addr,4);
+
+			if (nodeStartedSent == 0)
+			{
+				hookNodeStarted();
+				nodeStartedSent = 1;
+				LastNodeStatus = time(NULL);
+			}
 		}
 
-		Debugprintf("Resolve Failed for update.g8bpq.net or chatmap.g8bpq.net");
-		Sleep(1000 * 60 * 5);
+		NETROMTCPResolve();
+		
+		if (HostEnt1 && HostEnt2)
+		{		
+			Sleep(1000 * 60 * 15);	
+			continue;
+		}
 	}
 }
 
@@ -3732,7 +3779,7 @@ VOID OpenReportingSockets()
 		reportdest.sin_port = htons(81);
 		ConvToAX25("DUMMY-1", ReportDest);
 	}
-
+	
 	// Set up Chat Report even if no LOCATOR	reportdest.sin_family = AF_INET;
 	// Socket must be opened in MailChat Process
 
@@ -5185,14 +5232,14 @@ skipit:
 	}
 }
 
-void SendDataToPktMapThread();
+void SendDataToPktMapThread(void * Param);
 
 void SendDataToPktMap()
 {
 	_beginthread(SendDataToPktMapThread,2048000,0);
 }
 
-void SendDataToPktMapThread()
+void SendDataToPktMapThread(void * Param)
 {
 	char Return[256] = "";
 	char Request[64];

DRATS.c

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

FLDigi.c

@@ -36,6 +36,12 @@ extern int (WINAPI FAR *EnumProcessesPtr)();
 
 #include "bpq32.h"
 
+
+void hookL4SessionAttempt(struct STREAMINFO * , char * remotecall, char * ourcall);
+void hookL4SessionAccepted(struct STREAMINFO * , char * remotecall, char * ourcall);
+void hookL4SessionDeleted(struct TNCINFO * TNC, void * STREAM);
+
+
 #define VERSION_MAJOR         2
 #define VERSION_MINOR         0
 
@@ -819,7 +825,7 @@ pollloop:
 				char outbuff[1000];
 				int newlen;
 
-				buff->L2DATA[-1] = 6;				// KISS Control
+				buff->PID = 6;				// KISS Control (PID is just before Data)
 
 				newlen = KissEncode(&buff->L2DATA[-1], outbuff, txlen);
 				sendto(TNC->TCPDataSock, outbuff, newlen, 0, (struct sockaddr *)&TNC->Datadestaddr, sizeof(struct sockaddr));

FreeDATA.c

@@ -43,6 +43,11 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 int KillTNC(struct TNCINFO * TNC);
 static int RestartTNC(struct TNCINFO * TNC);
 
+
+void hookL4SessionAttempt(struct STREAMINFO * , char * remotecall, char * ourcall);
+void hookL4SessionAccepted(struct STREAMINFO * , char * remotecall, char * ourcall);
+void hookL4SessionDeleted(struct TNCINFO * TNC, void * STREAM);
+
 extern int (WINAPI FAR *GetModuleFileNameExPtr)();
 extern int (WINAPI FAR *EnumProcessesPtr)();
 static int Socket_Data(int sock, int error, int eventcode);

HTTPcode.c

@@ -4839,7 +4839,14 @@ void ProcessWebmailWebSockThread(void * conn)
 
 	Sent = send(sockptr->socket, _REPLYBUFFER, ReplyLen, 0);
 
-	while (Sent != ReplyLen && Loops++ < 3000)					// 100 secs max
+	if (Sent == -1)		// Connecton lost
+	{
+		closesocket(sockptr->socket);
+		free(conn);
+		return;
+	}
+
+	while (Sent != ReplyLen && Loops++ < 3000)					// 90 secs max
 	{	
 		if (Sent > 0)					// something sent
 		{
@@ -4885,11 +4892,16 @@ void ProcessWebmailWebSockThread(void * conn)
 
 	CloseHandle(hPipe);
 
-	// ?? do we need a thread to handle write which may block
-
 	Sent = send(sockptr->socket, Reply, ReplyLen, 0);
 
-	while (Sent != ReplyLen && Loops++ < 3000)					// 100 secs max
+	if (Sent == -1)		// Connecton lost
+	{
+		free(conn);
+		closesocket(sockptr->socket);
+		return;
+	}
+
+	while (Sent != ReplyLen && Loops++ < 3000)					// 90 secs max
 	{	
 		//			Debugprintf("%d out of %d sent %d Loops", Sent, InputLen, Loops);
 

HanksRT.c

@@ -426,7 +426,7 @@ VOID ChatExpandAndSendMessage(ChatCIRCUIT * conn, char * Msg, int LOG)
 
 	len = RemoveLF(NewMessage, (int)strlen(NewMessage));
 
-	ChatWriteLogLine(conn, '>', NewMessage,  len, LOG);
+	ChatWriteLogLine(conn, '>', NewMessage,  len, LOG_CHAT);
 	ChatQueueMsg(conn, NewMessage, len);
 }
 
@@ -1229,7 +1229,7 @@ void chkctl(ChatCIRCUIT *ckt_from, char * Buffer, int Len)
 
 	for (i = 1; i < (Len - 1); i++)
 	{
-		if (Buffer[i] < 32)
+		if (Buffer[i] < 32 && Buffer[i] != 7)		// Accept BELL
 		{
 			if (Buffer[i] == 9)
 			{

IPCode.c

@@ -100,7 +100,10 @@ TODo	?Multiple Adapters
 #ifdef WIN32
 int pcap_sendpacket(pcap_t *p, u_char *buf, int size);
 #else
- PCAP_API int pcap_sendpacket(pcap_t *, const u_char *, int);
+#ifndef PCAP_API
+#define PCAP_API extern
+#endif
+PCAP_API int pcap_sendpacket(pcap_t *, const u_char *, int);
 #endif
 
 #ifndef LINBPQ

KAMPactor.c

@@ -915,24 +915,39 @@ VOID KAMPoll(int Port)
 				calllen = ConvFromAX25(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4USER, TNC->Streams[0].MyCall);
 				TNC->Streams[0].MyCall[calllen] = 0;
 		
-					EncodeAndSend(TNC, "X", 1);			// ??Return to packet mode??
-					if (TNC->VeryOldMode)
-						datalen = sprintf(TXMsg, "C20MYCALL %s", TNC->Streams[0].MyCall);
-					else
-						datalen = sprintf(TXMsg, "C20MYPTCALL %s", TNC->Streams[0].MyCall);
+				EncodeAndSend(TNC, "X", 1);			// ??Return to packet mode??
+				
+				if (TNC->VeryOldMode)
+				{
+					datalen = sprintf(TXMsg, "C20MYCALL %s", TNC->Streams[0].MyCall);	
 					EncodeAndSend(TNC, TXMsg, datalen);
-					TNC->InternalCmd = 'M';
+				}
+				else
+				{
+					datalen = sprintf(TXMsg, "C20MYPTCALL %s", TNC->Streams[0].MyCall);
+					EncodeAndSend(TNC, TXMsg, datalen);
+						
+					if (TNC->OldMode == 0)
+					{
+						EncodeAndSend(TNC, TXMsg, datalen);
+						datalen = sprintf(TXMsg, "C20MYGTCALL %s", TNC->Streams[0].MyCall);
+					}
+				}
+
+				TNC->InternalCmd = 'M';
 		
-					TNC->NeedPACTOR = 0;		// Cancel enter Pactor
+				TNC->NeedPACTOR = 0;		// Cancel enter Pactor
 
-					sprintf(TNC->WEB_TNCSTATE, "In Use by %s", TNC->Streams[0].MyCall);
-					SetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
+				SuspendOtherPorts(TNC);
 
-					// Stop Scanning
+				sprintf(TNC->WEB_TNCSTATE, "In Use by %s", TNC->Streams[0].MyCall);
+				SetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
 
-					sprintf(Msg, "%d SCANSTOP", TNC->Port);
+				// Stop Scanning
+
+				sprintf(Msg, "%d SCANSTOP", TNC->Port);
 		
-					Rig_Command( (TRANSPORTENTRY *) -1, Msg);
+				Rig_Command( (TRANSPORTENTRY *) -1, Msg);
 
 			}
 		}
@@ -1065,9 +1080,22 @@ VOID KAMPoll(int Port)
 			UCHAR TXMsg[80] = "D20";
 
 			if (TNC->VeryOldMode)
+			{
 				datalen = sprintf(TXMsg, "C20MYCALL %s", TNC->NodeCall);
+				EncodeAndSend(TNC, TXMsg, datalen);
+			}
 			else
+			{
 				datalen = sprintf(TXMsg, "C20MYPTCALL %s", TNC->NodeCall);
+				EncodeAndSend(TNC, TXMsg, datalen);
+
+				if (TNC->OldMode == 0)
+				{
+					datalen = sprintf(TXMsg, "C20MYGTCALL %s", TNC->NodeCall);
+					EncodeAndSend(TNC, TXMsg, datalen);	
+				}
+			}
+
 			EncodeAndSend(TNC, TXMsg, datalen);
 
 			if (TNC->OldMode)
@@ -1075,6 +1103,7 @@ VOID KAMPoll(int Port)
 			else
 				EncodeAndSend(TNC, "C20TOR", 6);			// Back to Listen
 
+
 			TNC->InternalCmd = 'T';
 			TNC->Timeout = 50;
 			TNC->IntCmdDelay--;
@@ -1758,6 +1787,76 @@ VOID ProcessKHOSTPacket(struct TNCINFO * TNC, UCHAR * Msg, int Len)
 	if (Msg[0] == '?')					// Status
 	{
 		TNC->Timeout = 0;
+
+/*
+    The response frame from the TNC will be:    
+           <FEND>?0MSXY<FEND> - where MSXY are coded as follows:    
+           M    One byte indicating the current mode of operation.    
+                A=Packet
+                B=RTTY
+                C=ASCII
+                D=AMTOR
+                E=FEC
+                F=SELFEC
+                G=LAMTOR
+                H=PACTOR
+                I=PTLISTEN
+                J=GTOR
+                K=NAVTEX
+                L=CW
+                M=TOR Standby     
+				N=GMON
+				O=PSK31
+           S    One byte indicating a sub-mode of operation. The byte
+                contains an ASCII character as follows:    
+                0=Standby
+                1=Phasing
+                2=Connected
+                3=Disconnecting
+                4=FEC
+                5=SELFEC
+                6=PTFEC    
+           X    One byte (called status byte X). This byte is bit-
+                encoded to indicate specific conditions as follows:    
+                Bit 0 =    (IDLE) set to 1 when receiving IDLE
+                          characters in a frame.
+                Bit 1 =   (ERR) set to 1 to indicate the received frame
+                          failed CRC check, or was not a valid CS
+                          response frame.
+                Bit 2 =   (Combined receive) set to 1 to indicate that
+                          the data was constructed through the use of
+                          error correction (i.e. Golay error correction
+                          for G-TOR or Memory ARQ for Pactor).
+                Bit 3 =   (RQ) set to 1 to indicate an RQ frame. If you
+                          are the ISS, it indicates that the receiving
+                          station has asked for a repeat of the last
+                          data due to received errors. When you are the
+                          IRS, it indicates that the transmitting
+                          station has sent the same data that you have
+                          already received. This means that the sending
+                          station did not properly copy your
+                          acknowledgement (CS code).
+                Bit 4 =   (Huffman) set to 1 to indicate that this
+                          frame contains data which uses Huffman
+                          compression.
+                Bit 5 =   (ISS) set to 1 to indicate that your station
+                          is currently the ISS.
+                Bit 6&7 = (Speed) these two bits indicate the current
+                          speed of an ARQ link or the PSK31 mode. The
+                          coding of the bits is:
+                          00 = 100 baud or BPSK31
+                          01 = 200 baud or QPSK31
+                          10 = 300 baud
+           Y    One byte (called status byte Y). This byte is bit-
+                encoded to indicate specific conditions as follows:    
+                Bit 0 =    reserved (set to 0).
+                Bit 1 =   (PTT) PTT is active.
+                Bit 2 =   (Changeover) changeover in progress
+                Bits 3-7 = reserved (set to 0).
+*/          
+
+
+
 		return;
 	}
 

KernelScript1.rc

@@ -50,6 +50,19 @@ 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

@@ -64,7 +64,7 @@ VOID L2SENDRESPONSE(struct _LINKTABLE * LINK, int CMD);
 VOID L2SENDCOMMAND(struct _LINKTABLE * LINK, int CMD);
 VOID ACKMSG(struct _LINKTABLE * LINK);
 VOID InformPartner(struct _LINKTABLE * LINK, int Reason);
-UINT RR_OR_RNR(struct _LINKTABLE * LINK);
+UINT RR_OR_RNR(struct _LINKTABLE * LINK, int CMD);
 VOID L2TIMEOUT(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT);
 VOID CLEAROUTLINK(struct _LINKTABLE * LINK);
 VOID SENDFRMR(struct _LINKTABLE * LINK);
@@ -99,6 +99,7 @@ VOID L2SENDXID(struct _LINKTABLE * LINK);
 VOID __cdecl Debugprintf(const char * format, ...);
 VOID Q_IP_MSG(MESSAGE * Buffer);
 VOID PROCESSNODEMESSAGE(MESSAGE * Msg, struct PORTCONTROL * PORT);
+VOID PROCESSNODESPOLL(struct PORTCONTROL * PORT);
 VOID L2LINKACTIVE(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * Buffer, MESSAGE * ADJBUFFER, UCHAR CTL, UCHAR MSGFLAG);
 BOOL CompareAliases(UCHAR * c1, UCHAR * c2);
 VOID L2FORUS(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * Buffer, MESSAGE * ADJBUFFER, UCHAR CTL, UCHAR MSGFLAG);
@@ -120,11 +121,18 @@ int CheckKissInterlock(struct PORTCONTROL * MYPORT, int Exclusive);
 void hookL2SessionAccepted(int Port, char * fromCall, char * toCall, struct _LINKTABLE * LINK);
 void hookL2SessionDeleted(struct _LINKTABLE * LINK);
 void hookL2SessionAttempt(int Port, char * fromCall, char * toCall, struct _LINKTABLE * LINK);
+void hookL2SessionConnected(struct _LINKTABLE * LINK);
 int L2Compressit(unsigned char * Out, int OutSize, unsigned char * In, int Len);
 VOID DeleteINP3Routes(struct ROUTE * Route);
+VOID SendRTTMsg(struct ROUTE * Route);
+void hookL2SessionStatus(struct _LINKTABLE * LINK);
+void hookL2SessionClosed(struct _LINKTABLE * LINK, char * Reason, char * Direction);
+int NETROMOpenConnection(struct ROUTE * Route);
 
 extern int REALTIMETICKS;
 
+int linkStatusInterval = 300;		// 5 mins
+
 //	MSGFLAG contains CMD/RESPONSE BITS
 
 #define	CMDBIT	4		// CURRENT MESSAGE IS A COMMAND
@@ -139,6 +147,7 @@ extern int REALTIMETICKS;
 extern int L2Compress;
 extern int L2CompMaxframe;
 extern int L2CompPaclen;
+extern BOOL CLOSING;
 
 UCHAR NO_CTEXT = 0;
 UCHAR ALIASMSG = 0;
@@ -154,6 +163,8 @@ extern BOOL LogAllConnects;
 
 APPLCALLS * APPL;
 
+int SUPPORT2point2 = 1;
+
 
 void SendL2ToMonMap(struct PORTCONTROL * PORT, char * ReportCall, char Mode, char Direction)
 {
@@ -443,6 +454,8 @@ TRYBBS:
 			if ((PORT->PERMITTEDAPPLS & APPLMASK) != 0)
 			{
 				ALIASMSG = 0;
+
+				strcpy(LINK->ApplName, APPL->APPLCMD);
 				
 				if (CompareCalls(Buffer->DEST, APPL->APPLCALL))
 					goto FORUS;
@@ -477,9 +490,9 @@ NOWTRY_NODES:
 	if (CompareCalls(Buffer->DEST, NODECALL))
 	{
 		if (Buffer->L2DATA[0] == 0xff)	// Valid NODES Broadcast
-		{
 			PROCESSNODEMESSAGE(Buffer, PORT);
-		}
+		else if (Buffer->L2DATA[0] == 0xfe)		// Paula's NODES Poll (request Nodes broadcast on port)
+			PROCESSNODESPOLL(PORT);
 	}
 
 	ReleaseBuffer(Buffer);
@@ -806,7 +819,15 @@ VOID L2FORUS(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * Buff
 
 	if (CTLlessPF == XID)
 	{
-		ProcessXIDCommand(LINK, PORT, Buffer, ADJBUFFER, CTL, MSGFLAG);
+		// We could possibly get an XID response if packet is badly delayed and we had timed out
+
+		if ((MSGFLAG & CMDBIT))			// Command 
+			ProcessXIDCommand(LINK, PORT, Buffer, ADJBUFFER, CTL, MSGFLAG);
+		else
+		{
+			Debugprintf("Unexpected XID response with no session");
+			ReleaseBuffer(Buffer);					// Ignore if not
+		}
 		return;
 	}
 
@@ -927,6 +948,7 @@ VOID ProcessXIDCommand(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESS
 		LINK->L2STATE = 1;			// XID received
 		LINK->Ver2point2 = TRUE;	// Must support 2.2 if sent XID
 		LINK->L2TIME = PORT->PORTT1;
+		LINK->LINKWINDOW = PORT->PORTWINDOW;	// Just in case!
 
 		LINK->LINKPORT = PORT;
 
@@ -1065,6 +1087,7 @@ VOID L2LINKACTIVE(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE *
 	if (CTLlessPF == DISC)
 	{
 		InformPartner(LINK, NORMALCLOSE);		// SEND DISC TO OTHER END
+		hookL2SessionClosed(LINK, "Normal", "In");
 		CLEAROUTLINK(LINK);
 		L2SENDUA(PORT, Buffer, ADJBUFFER);
 
@@ -1074,87 +1097,128 @@ VOID L2LINKACTIVE(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE *
 		return;
 	}
 
-
-	if (LINK->L2STATE == 1)
+	if (CTLlessPF == XID)
 	{
-		// XID State. Should be XID response if 2.2 ok or DM/FRMR if not
+		// XID command or response on active session.
+		
+		// if Command and state = 2 then other end missed XID Response. Process command again
 
-		if (MSGFLAG & RESP)
+		if ((MSGFLAG & CMDBIT))
 		{
-			if (CTLlessPF == DM || CTLlessPF == FRMR)
+			if (LINK->L2STATE == 2)
 			{
-				// Doesn't support XID - Send SABM
+				// I think we can just process as normal.
 
-				LINK->L2STATE = 2;
-				LINK->Ver2point2 = FALSE;
-				LINK->L2TIMER = 1;		// Use retry to send SABM
+				ProcessXIDCommand(LINK, PORT, Buffer, ADJBUFFER, CTL, MSGFLAG);
+				return;
 			}
-			else if (CTLlessPF == XID)
+
+			if (LINK->L2STATE == 1)			// We've just sent XID so is probably XID Collision
 			{
-				// Process response to make sure ok, Send SABM or DISC
+				// I think we can just process as normal. If we don't send a response the other end may not switch to 2.2
 
-				LINK->L2STATE = 2;
-				LINK->Ver2point2 = TRUE;// Must support 2.2 if responded to XID
-
-				// if Compress enabled set it
-
-				ptr = &ADJBUFFER->PID;
-
-				if (*ptr++ == 0x82 && *ptr++ == 0x80)
-				{
-					int Type;
-					int Len;
-					unsigned int value;
-					int xidlen = *(ptr++) << 8;	
-					xidlen += *ptr++;
-
-					// XID is set of Type, Len, Value n-tuples
-
-					while (xidlen > 0)
-					{
-						Type = *ptr++;
-						Len = *ptr++;
-
-						value = 0;
-						xidlen -= (Len + 2);
-
-						while (Len--)
-						{
-							value <<=8;
-							value += *ptr++;
-						}
-						switch(Type)
-						{
-						case 17:
-
-							// Compression
-
-							if (L2Compress)
-								LINK->AllowCompress = 1;
-
-						}
-					}
-
-				}
-
-				LINK->L2TIMER = 1;		// Use retry to send SABM
+				ProcessXIDCommand(LINK, PORT, Buffer, ADJBUFFER, CTL, MSGFLAG);
+				return;
 			}
 
+			// XID Command on active session. Other end may be restarting. Reset session
+
+			InformPartner(LINK, NORMALCLOSE);			// SEND DISC TO OTHER END
+			LINK->CIRCUITPOINTER = 0;
+
+			// I think it is safer to ignore it. The retry will be processed normally as XID command with no session
+
 			ReleaseBuffer(Buffer);
 			return;
 		}
-	
-		// Command on existing session. Could be due to other end missing
-		// the XID response, so if XID just resend response
 
+		// XID Response
+
+		// if Link State = 1 this is a normal response. Check it then send SABM
+
+		if (LINK->L2STATE == 1)	
+		{
+			LINK->L2STATE = 2;
+			LINK->Ver2point2 = TRUE;// Must support 2.2 if responded to XID
+
+			// if Compress enabled set it
+
+			ptr = &ADJBUFFER->PID;
+
+			if (*ptr++ == 0x82 && *ptr++ == 0x80)
+			{
+				int Type;
+				int Len;
+				unsigned int value;
+				int xidlen = *(ptr++) << 8;	
+				xidlen += *ptr++;
+
+				// XID is set of Type, Len, Value n-tuples
+
+				while (xidlen > 0)
+				{
+					Type = *ptr++;
+					Len = *ptr++;
+
+					value = 0;
+					xidlen -= (Len + 2);
+
+					while (Len--)
+					{
+						value <<=8;
+						value += *ptr++;
+					}
+					switch(Type)
+					{
+					case 17:
+
+						// Compression
+
+						if (L2Compress)
+							LINK->AllowCompress = 1;
+
+					}
+				}
+
+			}
+
+			LINK->LINKWINDOW = PORT->PORTWINDOW;	// Just in case!
+			LINK->L2TIMER = 1;		// Use retry to send SABM
+
+			ReleaseBuffer(Buffer);
+			return;
+		}
+
+		// XID response, not in state 1.
+
+		// This "shouldn't happen"
+
+		Debugprintf("Unexpected XID response, State = %d", LINK->L2STATE);
+
+		// Discard
+
+		ReleaseBuffer(Buffer);
+		return;
 	}
 
-	if (CTLlessPF == XID && (MSGFLAG & CMDBIT))
-	{
-		// XID Command on active session. Other end may be restarting. Send Response
 
-		ProcessXIDCommand(LINK, PORT, Buffer, ADJBUFFER, CTL, MSGFLAG);
-		return;
+	// Not XID
+
+	// if state = 1 then unexpected response to XID
+
+	if (LINK->L2STATE == 1)	
+	{
+		if (CTLlessPF == DM || CTLlessPF == FRMR)
+		{
+			// Doesn't support XID - Send SABM
+
+			LINK->L2STATE = 2;
+			LINK->Ver2point2 = FALSE;
+			LINK->L2TIMER = 1;		// Use retry to send SABM
+	
+			ReleaseBuffer(Buffer);
+			return;
+		}
 	}
 
 
@@ -1219,9 +1283,13 @@ VOID L2SABM(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * Buffe
 	int CONERROR;
 	struct ROUTE * ROUTE = NULL;
 
-
 	char toCall[12], fromCall[12];
 
+	if (CLOSING)
+	{
+		L2SENDDM(PORT, Buffer, ADJBUFFER);
+		return;
+	}
 
 	if (LINK == 0)			// NO LINK ENTRIES - SEND DM RESPONSE
 	{
@@ -1286,6 +1354,16 @@ VOID L2SABM(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * Buffe
 				Debugprintf("INP3 Incoming connect from %s", fromCall);
 				DeleteINP3Routes(ROUTE);
 			}
+			else
+			{
+				if (PORT->ENABLEINP3)
+				{
+					// We will offer INP3 by sending an RTT probe.
+
+					SendRTTMsg(ROUTE);
+
+				}
+			}
 		}
 
 		if (NO_CTEXT == 1)
@@ -1386,6 +1464,8 @@ VOID L2SABM(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * Buffe
 		return;
 	}
 
+	strcpy(Session->APPL, LINK->ApplName);
+
 	//	NOW TRY A BBS CONNECT
 	//	IF APPL CONNECT, SEE IF APPL HAS AN ALIAS
 
@@ -1770,6 +1850,16 @@ BOOL InternalL2SETUPCROSSLINK(PROUTE ROUTE, int Retries)
 	struct PORTCONTROL * PORT;
 	int FRACK;
 
+	// If it is NETROM Over TCP then check for existing connection
+
+	if (ROUTE->TCPPort)
+	{
+		if (strcmp(ROUTE->TCPHost, "0.0.0.0") == 0)		// listening connection so wait for other end to connect
+			return FALSE;
+
+		return NETROMOpenConnection(ROUTE);
+	}
+
 	if (FindLink(ROUTE->NEIGHBOUR_CALL, NETROMCALL, ROUTE->NEIGHBOUR_PORT, &LINK))
 	{
 		//	SESSION ALREADY EXISTS
@@ -1981,19 +2071,32 @@ VOID L2_PROCESS(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * B
 			
 			if (FindNeighbour(Buffer->ORIGIN, PORT->PORTNUMBER, &ROUTE))
 			{
+				ROUTE->ConnectionAttempts = 0;		// Reset counter
+				
 				if (ROUTE->INP3Node)
 				{
 					Debugprintf("INP3 Route to %s connected", fromCall);
 				}
+				else
+				{
+					if (PORT->ENABLEINP3)
+					{
+						// We will offer INP3 by sending an RTT probe.
+
+						SendRTTMsg(ROUTE);
+
+					}
+				}
 			}
 
+			hookL2SessionConnected(LINK);
 
 			SendL2ToMonMap(PORT, fromCall, '+', 'O');		
 	
 			LINK->L2STATE = 5;
 			LINK->L2TIMER = 0;		// CANCEL TIMER
 			LINK->L2RETRIES = 0;
-			LINK->L2SLOTIM, T3;		// SET FRAME SENT RECENTLY
+			LINK->L2SLOTIM = T3;	// SET FRAME SENT RECENTLY
 
 			//	IF VERSION 1 MSG, SET FLAG
 
@@ -2013,6 +2116,8 @@ VOID L2_PROCESS(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * B
 		if (LINK->L2STATE == 4)				// DISCONNECTING?
 		{
 			InformPartner(LINK, NORMALCLOSE);	// SEND DISC TO OTHER END
+			hookL2SessionClosed(LINK, "Normal", "Out");
+
 			CLEAROUTLINK(LINK);
 				
 			if (PORT->TNC && PORT->TNC->Hardware == H_KISSHF)
@@ -2174,7 +2279,16 @@ VOID SFRAME(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, UCHAR CTL, UCHA
 				int count;
 				MESSAGE * Msg;
 				MESSAGE * Buffer;
-						
+
+				// it shouldn't be possible to get srej when all are acked (NS = Link->NS) but just in case...
+
+				if (NS == LINK->LINKNS)
+				{
+					Debugprintf ("SREJ for our NS");
+					goto treatasRR;
+				}
+				LINK->L2FLAGS &= ~POLLSENT;			// CLEAR I(P) or RR(P) SET
+				
 				Msg = LINK->FRAMES[NS];	// is frame available?
 
 				if (Msg == NULL)
@@ -2232,6 +2346,9 @@ VOID SFRAME(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, UCHAR CTL, UCHA
 
 				LINK->L2TIMER = ONEMINUTE;	// (RE)SET TIMER
 
+
+				LINK->framesResent++;
+
 				PORT = LINK->LINKPORT;
 
 				if (PORT)
@@ -2250,6 +2367,9 @@ VOID SFRAME(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, UCHAR CTL, UCHA
 		return;
 	}
 
+treatasRR:
+
+
 	//	VALID RR/RNR RECEIVED
 
 	LINK->L2FLAGS &= ~RNRSET;		//CLEAR RNR
@@ -2270,7 +2390,7 @@ VOID SFRAME(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, UCHAR CTL, UCHA
 		if (LINK->LAST_F_TIME + 15 > REALTIMETICKS)
 			return;			// DISCARD
 
-		CTL = RR_OR_RNR(LINK);
+		CTL = RR_OR_RNR(LINK, FALSE);	// Sending response
 
 		CTL |= LINK->LINKNR << 5;	// SHIFT N(R) TO TOP 3 BITS
 		CTL |= PFBIT;
@@ -2335,6 +2455,20 @@ VOID SFRAME(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, UCHAR CTL, UCHA
 
 	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,
@@ -2582,6 +2716,7 @@ VOID PROC_I_FRAME(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE *
 
 	LINK->bytesRXed += Length;
 	LINK->Received += Length - 1;	// Exclude PID
+	LINK->framesRXed++;
 
 	// Adjust for DIGIS
 
@@ -2809,6 +2944,8 @@ 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
@@ -2975,6 +3112,43 @@ VOID SDETX(struct _LINKTABLE * LINK)
 //	if (LINK->L2RESEQ_Q)
 //		return;
 	
+	// **** Debug code **** look for stuck links
+
+	if (LINK->LINKWINDOW == 0 || LINK->LASTFRAMESENT == 0 || (time(NULL) - LINK->LASTFRAMESENT) > 60)			// No send for 60 secs
+	{
+		if (COUNT_AT_L2(LINK) > 16 || LINK->LINKWINDOW == 0)
+		{
+			// Dump Link State
+
+			char Normcall[11] = "";
+			char Normcall2[11] = "";
+
+			int Count = COUNT_AT_L2(LINK);
+			int secs = time(NULL) - LINK->LASTFRAMESENT;
+				
+			ConvFromAX25(LINK->LINKCALL, Normcall);
+			ConvFromAX25(LINK->OURCALL, Normcall2);
+
+			Debugprintf("*** Stuck L2 Session for %d Secs %s %s %d", secs, Normcall, Normcall2, Count);
+			Debugprintf("LINK->LINKNS %d LINK->LINKOWS %d SDTSLOT %d LINKWINDOW %d L2FLAGS %d", LINK->LINKNS, LINK->LINKOWS, LINK->SDTSLOT, LINK->LINKWINDOW, LINK->L2FLAGS);
+			Debugprintf("Slots %x %x %x %x %x %x %x %x", LINK->FRAMES[0], LINK->FRAMES[1], LINK->FRAMES[2], LINK->FRAMES[3],
+				LINK->FRAMES[4], LINK->FRAMES[5], LINK->FRAMES[6], LINK->FRAMES[7]);
+
+			// Reset Link
+
+
+			InformPartner(LINK, NORMALCLOSE);	// TELL OTHER END ITS GONE
+
+			LINK->L2RETRIES -= 1;		// Just send one DISC
+			LINK->L2STATE = 4;			// CLOSING
+
+			L2SENDCOMMAND(LINK, DISC | PFBIT);
+
+			return;
+		}
+	}
+
+
 	Outstanding = LINK->LINKNS - LINK->LINKOWS;			// Was WS not NS
 
 	if (Outstanding < 0)
@@ -2992,6 +3166,15 @@ VOID SDETX(struct _LINKTABLE * LINK)
 		Msg = Q_REM(&LINK->TX_Q);
 		Msg->CHAIN = NULL;
 
+		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
 		{
 			int complen = 0;
@@ -3016,6 +3199,7 @@ VOID SDETX(struct _LINKTABLE * LINK)
 			// I think I need to know how many slots are available, so I don't compress too much
 			// Then collect data, compressing after each frame to make sure will fit in available space
 
+
 			while (LINK->FRAMES[n] == NULL && slots < 8)
 			{
 				slots++;
@@ -3115,6 +3299,10 @@ VOID SDETX(struct _LINKTABLE * LINK)
 				LINK->FRAMES[LINK->SDTSLOT] = Msg;
 				LINK->SDTSLOT ++;
 				LINK->SDTSLOT &= 7;
+
+				LINK->framesTXed++;
+				LINK->bytesTXed += sendLen;
+
 				
 				compdata += sendLen;
 				complen -= sendLen;
@@ -3128,6 +3316,9 @@ VOID SDETX(struct _LINKTABLE * LINK)
 			LINK->FRAMES[LINK->SDTSLOT] = Msg;
 			LINK->SDTSLOT ++;
 			LINK->SDTSLOT &= 7;
+
+			LINK->framesTXed++;
+			LINK->bytesTXed += (Msg->LENGTH - (MSGHDDRLEN + 1));
 		}
 	}
 
@@ -3185,6 +3376,7 @@ 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();
 			}
 		}
 	
@@ -3226,6 +3418,7 @@ VOID L2TimerProc()
 	int i = MAXLINKS;
 	struct _LINKTABLE * LINK = LINKS;
 	struct PORTCONTROL * PORT = PORTTABLE;
+	time_t Now = time(NULL);
 
 	while (i--)
 	{
@@ -3233,8 +3426,14 @@ VOID L2TimerProc()
 		{
 			LINK++;
 			continue;
-		}		
+		}
 
+		// Check for Status report time
+
+		if (LINK->lastStatusSentTime && (Now - LINK->lastStatusSentTime) > linkStatusInterval)
+			hookL2SessionStatus(LINK);
+		
+		
 		//	CHECK FOR TIMER EXPIRY OR BUSY CLEARED  
 
 		PORT = LINK->LINKPORT;
@@ -3242,7 +3441,7 @@ VOID L2TimerProc()
 		if (PORT == NULL)
 		{
 			LINK++;
-			continue;				// just ion case!!
+			continue;				// just in case!!
 		}
 
 		if (LINK->L2TIMER)
@@ -3270,7 +3469,7 @@ VOID L2TimerProc()
 		{
 			//	Was busy
 
-			if (RR_OR_RNR(LINK) != RNR)		//  SEE IF STILL BUSY
+			if (RR_OR_RNR(LINK, 0) != RNR)		//  SEE IF STILL BUSY
 			{
 				// Not still busy - tell other end
 
@@ -3279,7 +3478,7 @@ VOID L2TimerProc()
 
 				LINK->L2ACKREQ = 0;					// CLEAR ANY DELAYED ACK TIMER
 	
-				if (LINK->L2RETRIES == 0)			// IF RR(P) OUTSTANDING WILl REPORT ANYWAY
+				if (LINK->L2RETRIES == 0)			// IF RR(P) OUTSTANDING WILL REPORT ANYWAY
 				{
 					SendSupervisCmd(LINK);
 					LINK++;
@@ -3329,7 +3528,7 @@ VOID L2TimerProc()
 			{
 				SendSupervisCmd(LINK);
 				LINK++;
-					continue;
+				continue;
 			}
 		}
 
@@ -3386,7 +3585,7 @@ VOID SendSupervisCmd(struct _LINKTABLE * LINK)
 
 	LINK->L2ACKREQ = 0;			// CLEAR ACK NEEDED
 
-	CTL = RR_OR_RNR(LINK);
+	CTL = RR_OR_RNR(LINK, TRUE);
 
 //	MOV	L2STATE[EBX],5			; CANCEL REJ - ACTUALLY GOING TO 'PENDING ACK'
 
@@ -3404,7 +3603,7 @@ void SEND_RR_RESP(struct _LINKTABLE * LINK, UCHAR PF)
 {
 	UCHAR CTL;
 	
-	CTL = RR_OR_RNR(LINK);
+	CTL = RR_OR_RNR(LINK, FALSE);
 
 //	MOV	L2STATE[EBX],5			; CANCEL REJ - ACTUALLY GOING TO 'PENDING ACK'
 
@@ -3597,6 +3796,8 @@ VOID L2TIMEOUT(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT)
 	{
 		//	RETRIED N TIMES SEND A COUPLE OF DISCS AND THEN CLOSE
 
+		hookL2SessionClosed(LINK, "Retried Out", "Out");
+
 		InformPartner(LINK, RETRIEDOUT);	// TELL OTHER END ITS GONE
 
 		LINK->L2RETRIES -= 1;		// Just send one DISC
@@ -3755,6 +3956,7 @@ VOID L2SENDXID(struct _LINKTABLE * LINK)
 
 	if (PORT)
 	{
+		LINK->LINKWINDOW = PORT->PORTWINDOW;			// Just in case!
 		Buffer->PORT = PORT->PORTNUMBER;
 		PUT_ON_PORT_Q(PORT, Buffer);
 	}
@@ -3898,10 +4100,11 @@ VOID InformPartner(struct _LINKTABLE * LINK, int Reason)
 }
 
 
-UINT RR_OR_RNR(struct _LINKTABLE * LINK)
+UINT RR_OR_RNR(struct _LINKTABLE * LINK, int CMD)
 {
 	UCHAR Temp;
 	TRANSPORTENTRY * Session;
+	int SaveRNRSent = LINK->L2FLAGS & RNRSENT;
 	
 	LINK->L2FLAGS &= ~RNRSENT;
 
@@ -3974,13 +4177,21 @@ stayinREJ2:
 			goto CheckNSLoop2;		// See if OK or we have another saved frame
 		}
 		if (LINK->L2STATE == 6)
+		{
+			// if we support SREJ send that instesd or REJ
 
-		// if we support SREJ send that instesd or REJ
+			// Dont send SREJ if clearing RNR - causes FRMR
 
-		if (LINK->Ver2point2)		// We only allow 2.2 with SREJ Multi
-			return SREJ;
-		else
-			return REJ;
+			// Latest Spec says shouldn't send SREJ as Command
+
+			if (SaveRNRSent || CMD == 1)
+				return REJ;
+
+			if (LINK->Ver2point2)		// We only allow 2.2 with SREJ Multi
+				return SREJ;
+			else
+				return REJ;
+		}
 	}
 	return RR;
 
@@ -4003,7 +4214,7 @@ VOID CONNECTREFUSED(struct _LINKTABLE * LINK)
 	ConnectFailedOrRefused(LINK, "Busy from");
 }
 
-VOID L3CONNECTFAILED(struct _LINKTABLE * LINK);
+
 VOID L3LINKSETUPFAILED(struct _LINKTABLE * LINK);
 
 
@@ -4575,5 +4786,32 @@ int L2Compressit(unsigned char * Out, int OutSize, unsigned char * In, int Len)
 }
 
 
+int CloseAllLinks()
+{
+	struct _LINKTABLE * LINK = LINKS;
+	int i = MAXLINKS;
+	int Closed = 0;
+
+	while (i--)
+	{
+		if (LINK->LINKCALL[0] == 0  || LINK->L2STATE !=5 )
+		{
+			LINK++;
+			continue;
+		}	
+			
+		// Close Link
+
+		InformPartner(LINK, NORMALCLOSE);	// TELL OTHER END ITS GONE
+
+		LINK->L2RETRIES -= 1;		// Just send one DISC
+		LINK->L2STATE = 4;			// CLOSING
+
+		L2SENDCOMMAND(LINK, DISC | PFBIT);
+
+		Closed++;
+	}
+	return Closed;
+}
 
 

L3Code.c

@@ -60,6 +60,12 @@ VOID L3TRYNEXTDEST(struct ROUTE * ROUTE);
 VOID SendNETROMRoute(struct PORTCONTROL * PORT, unsigned char * axcall);
 void SendVARANetromNodes(struct TNCINFO * TNC, MESSAGE *Buffer);
 void SendVARANetromMsg(struct TNCINFO * TNC,L3MESSAGEBUFFER * Buffer);
+VOID SENDNODESMSG(int Portnum);
+VOID TCPNETROMSend(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Frame);
+
+extern int NODESINPROGRESS;
+extern int NODESToOnePort;
+extern int CLOSING;
 
 extern BOOL NODESINPROGRESS ;;
 PPORTCONTROL L3CURRENTPORT;
@@ -94,7 +100,15 @@ VOID L3BG()
 				{
 					ROUTE = DEST->NRROUTE[ActiveRoute - 1].ROUT_NEIGHBOUR;
 
-					// if NetROM over VARA pass direct to the driver
+					// if NetROM over VARA or NetROM over TCP pass direct to the driver
+
+					if (ROUTE && ROUTE->TCPPort)
+					{
+						PL3MESSAGEBUFFER Frame = (PL3MESSAGEBUFFER)Q_REM(&DEST->DEST_Q);
+						TCPNETROMSend(ROUTE, Frame);
+						ReleaseBuffer(Frame);
+						continue;
+					}
 
 					if (ROUTE)
 					{
@@ -222,7 +236,7 @@ BOOL ACTIVATE_DEST(struct DEST_LIST * DEST)
 		return L2SETUPCROSSLINK(ROUTE);
 	}
 	
-	// We umst be waiting for link to come up
+	// We must be waiting for link to come up
 	
 	return TRUE;
 
@@ -241,6 +255,13 @@ char Call1[10];
 char Call2[10];
 char Call3[10];
 
+VOID PROCESSNODESPOLL(struct PORTCONTROL * PORT)
+{
+	// Pauls G8BPT's request NODES Broadcast
+
+	SENDNODESMSG(PORT->PORTNUMBER);
+	return;
+}
 VOID PROCESSNODEMESSAGE(MESSAGE * Msg, struct PORTCONTROL * PORT)
 {
 	//	PROCESS A NET/ROM 'NODES' MESSAGE
@@ -277,7 +298,7 @@ VOID PROCESSNODEMESSAGE(MESSAGE * Msg, struct PORTCONTROL * PORT)
 	{
 		APPL=&APPLCALLTABLE[App];
 
-		if (APPL->APPLHASALIAS == 0 && CompareCalls(Msg->ORIGIN, APPL->APPLCALL))
+		if (CompareCalls(Msg->ORIGIN, APPL->APPLCALL))
 			return;
 	}
 
@@ -386,7 +407,7 @@ VOID PROCESSNODEMESSAGE(MESSAGE * Msg, struct PORTCONTROL * PORT)
 		NUMBEROFNODES++;
 	}
 
-	//	ALWAYS UPDATE ALIAS IN CASE NOT PRESENT IN ORIGINAL TABLE
+	//	ALWAYS UPDATE ALIAS IN CASE NOT PRESENT IN ORIGINAL TABLE 
 
 	ptr1 = &Msg->L2DATA[1];
 	ptr2 = &DEST->DEST_ALIAS[0];
@@ -454,10 +475,10 @@ VOID PROCESSNODEMESSAGE(MESSAGE * Msg, struct PORTCONTROL * PORT)
 		if (CheckExcludeList(ptr1) == 0)			// Excluded
 			continue;
 
-		for (n = 0; n < 32; n++)
+		for (n = 0; n < NumberofAppls; n++)
 		{
 			if (CompareCalls(ptr1, APPLCALLTABLE[n].APPLCALL))
-				continue;
+				goto IgnoreNode;					// Don't update our applications
 		}
 
 		//	MAKE SURE ITS NOT CORRUPTED
@@ -566,7 +587,7 @@ VOID PROCESSNODEMESSAGE(MESSAGE * Msg, struct PORTCONTROL * PORT)
 
 		ptr1 += 7;
 	
-		//	UPDATE ALIAS
+		//	UPDATE ALIAS#
 
 		memcpy(DEST->DEST_ALIAS, ptr1, 6);
 
@@ -606,9 +627,6 @@ 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;
@@ -707,6 +725,8 @@ SORTROUTES:
 		
 		goto SORTROUTES;			//  1 AND 2 MAY NOW BE WRONG!	
 	}
+
+	DEST->DEST_ROUTE = 0;			// OForce re-evaluation.
 }
 
 int COUNTNODES(struct ROUTE * ROUTE)
@@ -744,12 +764,26 @@ VOID L3BG();
 
 VOID SENDNEXTNODESFRAGMENT();
 
-VOID SENDNODESMSG()
+VOID SENDNODESMSG(int Portnum)
 {
 	if (NODESINPROGRESS)
 		return;
 
-	L3CURRENTPORT = PORTTABLE;
+	NODESToOnePort = Portnum;
+
+	if (Portnum)			// Nodes to one port only
+	{
+		L3CURRENTPORT = GetPortTableEntryFromPortNum(Portnum);
+
+		if (L3CURRENTPORT == 0)
+		{
+			NODESToOnePort = 0;
+			return;
+		}
+	}
+	else
+		L3CURRENTPORT = PORTTABLE;
+	
 	SENDNEXTNODESFRAGMENT();
 }
 
@@ -785,16 +819,19 @@ VOID SENDNEXTNODESFRAGMENT()
 			// No NODES to this port, so go to next
 
 			PORT = PORT->PORTPOINTER;
-			if (PORT == NULL)
+
+			if (PORT == NULL || NODESToOnePort)
 			{
 				// Finished
 
+				NODESToOnePort = 0;
 				NODESINPROGRESS = 0;
 				return;
 			}
 		}
 
-		L3CURRENTPORT = PORT;
+		if (NODESToOnePort == 0)			// CurrentPort already set if NODESToOnePort
+			L3CURRENTPORT = PORT;
 
 		DEST = CURRENTNODE = DESTS;			// START OF LIST
 		NODESINPROGRESS = 1;
@@ -851,13 +888,24 @@ VOID SENDNEXTNODESFRAGMENT()
 		if (DEST >= ENDDESTLIST)
 		{
 			CURRENTNODE = 0;			// Finished on this port
-			L3CURRENTPORT = PORT->PORTPOINTER;
-			if (L3CURRENTPORT == NULL)
-			{
-				// Finished
 
+			// if sending to only one port then stop
+
+			if (NODESToOnePort)
+			{
+				NODESToOnePort = 0;
 				NODESINPROGRESS = 0;
 			}
+			else
+			{
+				L3CURRENTPORT = PORT->PORTPOINTER;
+				if (L3CURRENTPORT == NULL)
+				{
+					// Finished
+
+					NODESINPROGRESS = 0;
+				}
+			}
 			goto Sendit;
 		}
 
@@ -951,7 +999,9 @@ VOID CLEARACTIVEROUTE(struct ROUTE * ROUTE, int Reason)
 	dest_list * DEST;
 	int n;
 
-	if (Reason != NORMALCLOSE || ROUTE->INP3Node)
+	// If a link restarts and is no longer inp3 we must still clear any inp3 routes
+
+//	if (Reason != NORMALCLOSE || ROUTE->INP3Node)
 		TellINP3LinkGone(ROUTE);
 	
 	DEST = DESTS;
@@ -991,7 +1041,8 @@ VOID L3TimerProc()
 		LINK = LINKS;
 		i = MAXLINKS;
 
-		while (i--);
+		
+		while (i--)
 		{
 			if (LINK->LINKTYPE == 3)		// Only if Internode
 			{
@@ -1044,7 +1095,7 @@ VOID L3TimerProc()
 			
 			L3TIMER = L3INTERVAL;
 			UPDATEDESTLIST();
-			SENDNODESMSG();
+			SENDNODESMSG(0);
 		}
 	}
 
@@ -1082,6 +1133,11 @@ VOID L3FastTimer()
 	MESSAGE * Msg;
 	struct PORTCONTROL * PORT = PORTTABLE;
 
+	// Not if Node is closing
+
+	if (CLOSING)
+		return;
+
 	INP3TIMER();
 
 	// Send Node faster if VARA
@@ -1254,6 +1310,9 @@ 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
 
@@ -1332,34 +1391,6 @@ VOID L3LINKSETUPFAILED(struct _LINKTABLE * LINK)
 		Debugprintf("INP3 Route to %s connect failed", Normcall);
 	}
 
-	
-	ROUTE->NEIGHBOUR_LINK = 0;		// CLEAR IT
-
-	L3TRYNEXTDEST(ROUTE);			// RESET ASSOCIATED DEST ENTRIES
-}
-
-
-VOID L3CONNECTFAILED(struct _LINKTABLE * LINK)
-{
-	//	L2 LINK SETUP HAS FAILED - SEE IF ANOTHER NEIGHBOUR CAN BE USED
-
-	struct PORTCONTROL * PORT = PORTTABLE;
-	struct ROUTE * ROUTE;
-
-
-	ROUTE = LINK->NEIGHBOUR;		// TO NEIGHBOUR
-	
-	if (ROUTE == NULL)
-		return;						// NOTHING ???
-
-	if (ROUTE->INP3Node)
-	{
-		char Normcall[10];
-		Normcall[ConvFromAX25(ROUTE->NEIGHBOUR_CALL, Normcall)] = 0;
-		Debugprintf("INP3 Route to %s connect failed or refused", Normcall);
-	}
-
-	
 	TellINP3LinkSetupFailed(ROUTE);
 
 	ROUTE->NEIGHBOUR_LINK = 0;		// CLEAR IT
@@ -1368,6 +1399,7 @@ VOID L3CONNECTFAILED(struct _LINKTABLE * LINK)
 }
 
 
+
 VOID L3TRYNEXTDEST(struct ROUTE * ROUTE)
 {
 	//	FIND ANY DESINATIONS WITH ROUTE AS ACTIVE NEIGHBOUR, AND

L4Code.c

@@ -49,7 +49,7 @@ BOOL FINDCIRCUIT(L3MESSAGEBUFFER * L3MSG, TRANSPORTENTRY ** REQL4, int * NewInde
 int GETBUSYBIT(TRANSPORTENTRY * L4);
 BOOL cATTACHTOBBS(TRANSPORTENTRY * Session, UINT Mask, int Paclen, int * AnySessions);
 VOID SETUPNEWCIRCUIT(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, 
-		 TRANSPORTENTRY * L4, char * BPQPARAMS, int ApplMask, int * BPQNODE);
+		 TRANSPORTENTRY * L4, char * BPQPARAMS, int ApplMask, int * BPQNODE, int Service);
 extern char * ALIASPTR;
 void SendConACK(struct _LINKTABLE * LINK, TRANSPORTENTRY * L4, L3MESSAGEBUFFER * L3MSG, BOOL BPQNODE, UINT Applmask, UCHAR * ApplCall);
 void L3SWAPADDRESSES(L3MESSAGEBUFFER * L3MSG);
@@ -69,6 +69,12 @@ void WriteConnectLog(char * fromCall, char * toCall, UCHAR * Mode);
 void SendVARANetromMsg(struct TNCINFO * TNC, PL3MESSAGEBUFFER MSG);
 int doinflate(unsigned char * source, unsigned char * dest, int Len, int destlen, int * outLen);
 int L2Compressit(unsigned char * Out, int OutSize, unsigned char * In, int Len);
+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;
 
 extern BOOL LogL4Connects;
@@ -84,6 +90,8 @@ 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
@@ -131,6 +139,14 @@ VOID NETROMMSG(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG)
 		return;
 	}
 
+	//	IS IT INP3 (L3RTT)
+
+	if (CompareCalls(L3MSG->L3DEST, L3RTT))
+	{
+		ProcessRTTMsg(LINK->NEIGHBOUR, L3MSG, L3MSG->LENGTH, L3MSG->Port);
+		return;
+	}
+
 	APPLMASK = 0;		//	NOT APPLICATION 
 	
 	if (NODE)				// _NODE SUPPORT INCLUDED?
@@ -167,14 +183,6 @@ VOID NETROMMSG(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG)
 		APPL++;
 	}
 
-	//	IS IT INP3 (L3RTT)
-
-	if (CompareCalls(L3MSG->L3DEST, L3RTT))
-	{
-		ProcessRTTMsg(LINK->NEIGHBOUR, L3MSG, L3MSG->LENGTH, L3MSG->Port);
-		return;
-	}
-
 	L3MSG->L3TTL--;
 	
 	if (L3MSG->L3TTL == 0)
@@ -455,7 +463,7 @@ VOID Q_IP_MSG(MESSAGE * Buffer)
 	ReleaseBuffer(Buffer);
 }
 
-VOID SENDL4CONNECT(TRANSPORTENTRY * Session)
+VOID SENDL4CONNECT(TRANSPORTENTRY * Session, int Service)
 {
 	PL3MESSAGEBUFFER MSG = (PL3MESSAGEBUFFER)GetBuff();
 	struct DEST_LIST * DEST = Session->L4TARGET.DEST;
@@ -479,12 +487,21 @@ VOID SENDL4CONNECT(TRANSPORTENTRY * Session)
 
 	MSG->L4INDEX = Session->CIRCUITINDEX;
 	MSG->L4ID = Session->CIRCUITID;
-	MSG->L4TXNO = 0;
-	MSG->L4RXNO = 0;
-	MSG->L4FLAGS = L4CREQ;
+
+	if (Service == -1)				// Normal CREQ
+	{
+		MSG->L4RXNO = 0;
+		MSG->L4FLAGS = L4CREQ;
+	}
+	else
+	{
+		MSG->L4RXNO = Service << 8;			// Paula's extended connect
+		MSG->L4TXNO = (Service & 0xff);
+		MSG->L4FLAGS = L4CREQX;
+	}
 
 	MSG->L4DATA[0] = L4DEFAULTWINDOW;	// PROPOSED WINDOW
-
+	
 	memcpy(&MSG->L4DATA[1], Session->L4USER, 7);		// ORIG CALL
 	memcpy(&MSG->L4DATA[8], Session->L4MYCALL, 7);
 	
@@ -791,14 +808,12 @@ VOID L4BG()
 	
 					complen = L2Compressit(Compressed, 8192, toCompress, toCompressLen);
 
-					Debugprintf("%d %d %d%%", toCompressLen, complen, ((toCompressLen - complen) * 100) / toCompressLen);
+	//				Debugprintf("%d %d %d%%", toCompressLen, complen, ((toCompressLen - complen) * 100) / toCompressLen);
 
 					// Send compressed
 
 					// Fragment if more than L4CompPaclen
 
-					// Entered with  original first fragment in saveMsg;
-
 					// Check for too big a compressed frame size. Bigger compresses better but adds latency to link
 
 					maxCompSendLen = L4CompPaclen * L4CompMaxframe;
@@ -826,10 +841,9 @@ VOID L4BG()
 							int Len = bytesleft;
 							if (Len > ChunkSize)
 								Len = ChunkSize;
-
-							complen = L2Compressit(Compressed, 8192, toCompress, toCompressLen);
-
-							Debugprintf("Chunked %d %d %d%%", Len, complen, ((Len - complen) * 100) / Len);
+			
+							complen = L2Compressit(Compressed, 8192, CompressPtr, Len);
+//							Debugprintf("Chunked %d %d %d%%", Len, complen, ((Len - complen) * 100) / Len);
 
 							sendChunk(L4, Compressed, complen, savePort);
 
@@ -861,8 +875,6 @@ VOID L4BG()
 
 			Msglen = Msg->LENGTH - (MSGHDDRLEN + 1); //Dont include PID
 
-			LINK->bytesTXed += Msglen;
-
 			Paclen = L4->SESSPACLEN;
 
 			if (Paclen == 0)
@@ -1119,6 +1131,7 @@ VOID L4TimerProc()
 	TRANSPORTENTRY * L4 = L4TABLE;
 	TRANSPORTENTRY * Partner;
 	int MaxLinks = MAXLINKS;
+	time_t Now = time(NULL);
 
 	while (n--)
 	{
@@ -1127,6 +1140,12 @@ 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
 
@@ -1226,7 +1245,7 @@ VOID L4TIMEOUT(TRANSPORTENTRY * L4)
 
 		Debugprintf("Retrying L4 Connect Request");
 
-		SENDL4CONNECT(L4);				// Resend connect
+		SENDL4CONNECT(L4, L4->Service);				// Resend connect
 		return;
 	}
 
@@ -1261,10 +1280,13 @@ VOID L4TIMEOUT(TRANSPORTENTRY * L4)
 
 		// if compressed session display stats
 
+		L4DisconnectEvent(L4, "outgoing", "Retried Out");
+
 		CloseSessionPartner(L4);	// SEND CLOSE TO PARTNER (IF PRESENT)
 		return;
 	}
 
+
 	//	RESEND ALL OUTSTANDING FRAMES
 
 	L4->FLAGS &= 0x7F;				// CLEAR CHOKED
@@ -1571,19 +1593,26 @@ void WriteL4LogLine(UCHAR * mycall, UCHAR * call, UCHAR * node)
 	fclose(L4LogHandle);
 }
 
-VOID CONNECTREQUEST(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, UINT ApplMask, UCHAR * ApplCall)
+extern struct CMDX COMMANDS[];
+extern int NUMBEROFCOMMANDS;
+
+VOID CONNECTREQUEST(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, UINT ApplMask, UCHAR * ApplCall, int Service)
 {
 	//	CONNECT REQUEST - SEE IF EXISTING SESSION
 	//	IF NOT, GET AND FORMAT SESSION TABLE ENTRY
 	//	SEND CONNECT ACK
 
-	//	EDI = _BUFFER, EBX = LINK
+	//	Service is for Paula's CREQX - Connect to Service
 
 	TRANSPORTENTRY * L4;
 	int BPQNODE = 0;				// NOT ONE OF MINE
 	char BPQPARAMS[10];				// Extended Connect Params from BPQ Node
 	int CONERROR;
 	int Index;
+	char APPLCMD[13] = "";
+
+	if (APPL)
+		memcpy(APPLCMD, APPL->APPLCMD, 13);
 
 	memcpy(BPQPARAMS, &L4T1, 2);	// SET DEFAULT T1 IN CASE NOT FROM ANOTHER BPQ NODE
 
@@ -1611,8 +1640,9 @@ VOID CONNECTREQUEST(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, UINT Appl
 	}
 
 	L4->CIRCUITINDEX = Index;
+	L4->Service = Service;
 	
-	SETUPNEWCIRCUIT(LINK, L3MSG, L4, BPQPARAMS, ApplMask, &BPQNODE);
+	SETUPNEWCIRCUIT(LINK, L3MSG, L4, BPQPARAMS, ApplMask, &BPQNODE, Service);
 
 	if (L4->L4TARGET.DEST == 0)
 	{
@@ -1622,6 +1652,60 @@ VOID CONNECTREQUEST(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, UINT Appl
 		SendConNAK(LINK, L3MSG);
 		return;
 	}
+
+	// Check for NetromX Service
+
+	if (Service > 0 && Service != 23)		// 0 is CMD Hander 23 is TELNET which also connects to node
+	{
+		int i;
+
+		for (i = 0; i < NUMBEROFSSERVICES; i++)
+		{
+			if (SERVICES[i].ServiceNo == Service)
+			{
+				// Check if we have this application
+				struct CMDX * CMD = NULL;
+				int n;
+				char * APP = &SERVICES[i].ServiceName[0];
+				int APPlen = strlen(APP);
+
+				for (n = PASSCMD; n < NUMBEROFCOMMANDS; n++)		// Don't allow SYSOP Commands  
+				{
+					CMD = &COMMANDS[n];
+
+					if (n == APPL1)		// First APPL command
+					{
+						ApplMask = 1;	// FOR APPLICATION ATTACH REQUESTS
+						ALIASPTR = &CMDALIAS[0][0];
+					}
+
+					// ptr1 is input command
+
+					if (memcmp(CMD->String, APP, APPlen) == 0)
+					{
+						// 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;
+					}
+
+					ApplMask <<= 1;
+					ALIASPTR += ALIASLEN;
+
+				}
+			}
+		}
+
+		// Not one of our applications - refuse connect
+		
+		memset(L4, 0, sizeof (TRANSPORTENTRY));
+		SendConNAK(LINK, L3MSG);
+		return;
+	}
+
+	// 
 	//	IF CONNECT TO APPL, ALLOCATE BBS PORT
 
 	if (ApplMask == 0 || BPQPARAMS[2] == 'Z')		// Z is "Spy" Connect
@@ -1633,6 +1717,7 @@ VOID CONNECTREQUEST(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, UINT Appl
 
 	//	IF APPL CONNECT, SEE IF APPL HAS AN ALIAS
 
+doAPPLConnect:
 
 	if (ALIASPTR[0] > ' ')
 	{
@@ -1647,7 +1732,7 @@ VOID CONNECTREQUEST(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, UINT Appl
 		if (Msg)
 		{
 			Msg->PID = 0xf0;
-			memcpy(Msg->L2DATA, APPL->APPLCMD, 12);
+			memcpy(Msg->L2DATA, APPLCMD, 12);
 			Msg->L2DATA[12] = 13;
 			Msg->LENGTH = MSGHDDRLEN + 12 + 2;		// 2 for PID and CR
 
@@ -1750,10 +1835,17 @@ VOID SendConACK(struct _LINKTABLE * LINK, TRANSPORTENTRY * L4, L3MESSAGEBUFFER *
 
 	TNC = LINK->LINKPORT->TNC;
 
-	if (TNC && TNC->NetRomMode)
+	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);
+
+	IncomingL4ConnectionEvent(L4);
 }
 
 int FINDCIRCUIT(L3MESSAGEBUFFER * L3MSG, TRANSPORTENTRY ** REQL4, int * NewIndex)
@@ -1830,33 +1922,63 @@ void L3SWAPADDRESSES(L3MESSAGEBUFFER * L3MSG)
 	memcpy(L3MSG->L3SRCE, L3MSG->L3DEST, 7);
 	memcpy(L3MSG->L3DEST, Temp, 7);
 
-	L3MSG->L3DEST[6] &= 0x1E;		// Mack EOA and CMD
+	L3MSG->L3DEST[6] &= 0x1E;		// Mask EOA and CMD
 	L3MSG->L3SRCE[6] &= 0x1E;
 	L3MSG->L3SRCE[6] |= 1;			// Set Last Call
 }
 
 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;
 
-	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);
+
 }
 
 VOID SendL4RESET(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG)
 {
 	// Paula's extension
 
+	struct TNCINFO * TNC;
+
+	L3MSG->L4RXNO = L3MSG->L4ID;
+	L3MSG->L4TXNO = L3MSG->L4INDEX;
+
 	L3MSG->L4FLAGS = L4RESET;
 
 	L3SWAPADDRESSES(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);
+
 }
 
 
@@ -1866,7 +1988,7 @@ VOID SendL4RESET(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG)
 
 
 VOID SETUPNEWCIRCUIT(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, 
-					 TRANSPORTENTRY * L4, char * BPQPARAMS, int ApplMask, int * BPQNODE)
+					 TRANSPORTENTRY * L4, char * BPQPARAMS, int ApplMask, int * BPQNODE, int Service)
 {
 	struct DEST_LIST * DEST;
 	int Maxtries = 2;					// Just in case
@@ -1885,10 +2007,10 @@ VOID SETUPNEWCIRCUIT(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG,
 
 	L4->SESSIONT1 = L4T1;
 	
-	L4->L4WINDOW = (UCHAR)L4DEFAULTWINDOW;
-
+	L4->L4WINDOW = L3MSG->L4DATA[0];
+	
 	if (L3MSG->L4DATA[0] > L4DEFAULTWINDOW)
-		L4->L4WINDOW = L3MSG->L4DATA[0];
+		L4->L4WINDOW = L4DEFAULTWINDOW;
 		
 	memcpy(L4->L4USER, &L3MSG->L4DATA[1], 7);		// Originator's call from Call Request
 	
@@ -1946,7 +2068,7 @@ TryAgain:
 
 		while (n--)
 		{
-			if (DEST->DEST_COUNT == 0 && DEST->DEST_RTT == 0)		// Not used and not INP3
+			if (DEST->DEST_COUNT == 0 && DEST->DEST_RTT == 0 && (DEST->DEST_STATE & 0x80) == 0)		// Not used and not INP3 and not Appl
 			{
 				if (DEST->NRROUTE[0].ROUT_QUALITY < WorstQual)
 				{
@@ -2023,6 +2145,8 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 	char Call[10];
 	struct TNCINFO * TNC;
 
+	int Service = -1;		// Paula's connect to service
+
 	L4FRAMESRX++;
 
 	Opcode = L3MSG->L4FLAGS & 15;
@@ -2051,9 +2175,13 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 		ReleaseBuffer(L3MSG);
 		return;
 
+	case L4CREQX:			// Paula's connect to service
+
+		Service = (L3MSG->L4RXNO << 8) | L3MSG->L4TXNO;
+
 	case L4CREQ:
 
-		CONNECTREQUEST(LINK, L3MSG, ApplMask, ApplCall);
+		CONNECTREQUEST(LINK, L3MSG, ApplMask, ApplCall, Service);
 		return;
 	}
 
@@ -2070,7 +2198,8 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 
 		while (n--)
 		{
-			if (L4->L4USER[0] && L4->FARID == L3MSG->L4ID && L4->FARINDEX == L3MSG->L4INDEX)
+			if ((L4->L4USER[0] && L4->FARID == L3MSG->L4RXNO && L4->FARINDEX == L3MSG->L4TXNO) ||	// Paula returns session in RX/TXNO, I sent in ID/INDEX
+				(L4->L4USER[0] && L4->FARID == L3MSG->L4ID && L4->FARINDEX == L3MSG->L4INDEX))
 			{
 				//  Check L3 source call to be sure (should that be L4 source call??
 
@@ -2078,10 +2207,9 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 
 				if (memcmp(L3MSG->L3SRCE, L4->L4TARGET.DEST->DEST_CALL, 7) == 0)
 				{
+					L4DisconnectEvent(L4, "incoming", "RESET Received");
 					CloseSessionPartner(L4);				// SEND CLOSE TO PARTNER (IF PRESENT)
 				}
-				ReleaseBuffer(L3MSG);
-				return;
 			}
 			L4++;
 		}
@@ -2159,6 +2287,9 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 			L4->L4WINDOW = L3MSG->L4DATA[0];
 
 			strcpy(ReplyText, "Connected to");
+
+			OutgoingL4ConnectionEvent(L4);
+
 		}
 
 		if (Partner == 0)
@@ -2167,6 +2298,14 @@ 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;
@@ -2197,16 +2336,25 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 
 		TNC = LINK->LINKPORT->TNC;
 
-		if (TNC && TNC->NetRomMode)
+		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);
 
+
+		L4DisconnectEvent(L4, "incoming", "DREQ Received");
+
 		CloseSessionPartner(L4);				// SEND CLOSE TO PARTNER (IF PRESENT)
 		return;
 
 	case L4DACK:
 
+		L4DisconnectEvent(L4, "outgoing", "DACK Received");
 		CLEARSESSIONENTRY(L4);
 		ReleaseBuffer(L3MSG);
 		return;
@@ -2643,241 +2791,32 @@ VOID SENDL4IACK(TRANSPORTENTRY * Session)
 }
 
 
+int CloseAllSessions()
+{
+	int n = MAXCIRCUITS;
+	TRANSPORTENTRY * L4 = L4TABLE;
+	TRANSPORTENTRY * Partner;
+	int MaxLinks = MAXLINKS;
+	int Closed = 0;
 
+	while (n--)
+	{
+		if (L4->L4USER[0] == 0)
+		{
+			L4++;
+			continue;
+		}
 
-/*
-	PUBLIC	KILLSESSION
-KILLSESSION:
-
-	pushad
-	push	ebx
-	CALL	_CLEARSESSIONENTRY
-	pop	ebx
-	popad
-
-	JMP	L4CONN90		; REJECT
-
-	PUBLIC	CONNECTACK
-CONNECTACK:
-;
-;	EXTRACT EXTENDED PARAMS IF PRESENT
-;
-
-	CMP	BYTE PTR MSGLENGTH[EDI],L4DATA+1
-	JE SHORT NOTBPQ
-
-	MOV	AL,L4DATA+1[EDI]
-	SUB	AL,L3MONR[EDI]
-	ADD	AL,41H			; HOPS TO DEST + 40H
-
-	MOV	ESI,L4TARGET[EBX]
-	AND	DEST_STATE[ESI],80H
-	OR	DEST_STATE[ESI],AL	; SAVE
-
-	PUBLIC	NOTBPQ
-NOTBPQ:
-;
-;	SEE IF SUCCESS OR FAIL
-;
-	PUSH	EDI
-
-	MOV	ESI,L4TARGET[EBX]		; ADDR OF LINK/DEST ENTRY
-	LEA	ESI,DEST_CALL[ESI]
-
-	CALL	DECODENODENAME		; CONVERT TO ALIAS:CALL
-
-	MOV	EDI,OFFSET32 CONACKCALL
-	MOV	ECX,17
-	REP MOVSB
-
-
-	POP	EDI
-
-	TEST	L4FLAGS[EDI],L4BUSY
-	JNZ SHORT L4CONNFAILED
-
-	CMP	L4STATE[EBX],5
-	JE SHORT CONNACK05		; MUST BE REPEAT MSG - DISCARD
-
-	MOV	AX,WORD PTR L4TXNO[EDI]	; HIS INDEX
-	MOV	WORD PTR FARINDEX[EBX],AX
-
-	MOV	L4STATE[EBX],5		; ACTIVE
-	MOV	L4TIMER[EBX],0		; CANCEL TIMER
-	MOV	L4RETRIES[EBX],0		; CLEAR RETRY COUNT
- 
-	MOV	AL,L4DATA[EDI]		; WINDOW
-	MOV	L4WINDOW[EBX],AL		; SET WINDOW
-
-	MOV	EDX,L4CROSSLINK[EBX]	; POINT TO PARTNER
-;
-	MOV	ESI,OFFSET32 CONNECTEDMSG
-	MOV	ECX,LCONNECTEDMSG
-
-	JMP SHORT L4CONNCOMM
-
-	PUBLIC	L4CONNFAILED
-L4CONNFAILED:
-;
-	MOV	EDX,L4CROSSLINK[EBX]	; SAVE PARTNER
-	pushad
-	push	ebx
-	CALL	_CLEARSESSIONENTRY
-	pop	ebx
-	popad
-
-	PUSH	EBX
-
-	MOV	EBX,EDX
-	MOV	L4CROSSLINK[EBX],0	; CLEAR CROSSLINK
-	POP	EBX
-
-	MOV	ESI,OFFSET32 BUSYMSG	; ?? BUSY
-	MOV	ECX,LBUSYMSG
-
-	PUBLIC	L4CONNCOMM
-L4CONNCOMM:
-
-	OR	EDX,EDX
-	JNZ SHORT L4CONNOK10
-;
-;	CROSSLINK HAS GONE?? - JUST CHUCK MESSAGE
-;
-	PUBLIC	CONNACK05
-CONNACK05:
-
-	JMP	L4DISCARD
-
-	PUBLIC	L4CONNOK10
-L4CONNOK10:
-
-	PUSH	EBX
-	PUSH	ESI
-	PUSH	ECX
-
-	MOV	EDI,_BUFFER
-
-	ADD	EDI,7
-	MOV	AL,0F0H
-	STOSB				; PID
-
-	CALL	_SETUPNODEHEADER		; PUT IN _NODE ID
-
-
-	POP	ECX
-	POP	ESI
-	REP MOVSB
-
-	MOV	ESI,OFFSET32 CONACKCALL
-	MOV	ECX,17			; MAX LENGTH ALIAS:CALL
-	REP MOVSB
-
-	MOV	AL,0DH
-	STOSB
-
-	MOV	ECX,EDI
-	MOV	EDI,_BUFFER
-	SUB	ECX,EDI
-
-	MOV	MSGLENGTH[EDI],CX
-
-	MOV	EBX,EDX			; CALLER'S SESSION
-
-	LEA	ESI,L4TX_Q[EBX]
-	CALL	_Q_ADD			; SEND MESSAGE TO CALLER
-
-	CALL	_POSTDATAAVAIL
-	
-	POP	EBX			; ORIGINAL CIRCUIT TABLE
-	RET
-
-
-	PUBLIC	SENDCONNECTREPLY
-SENDCONNECTREPLY:
-;
-;	LINK SETUP COMPLETE - EBX = LINK, EDI = _BUFFER
-;
-	CMP	LINKTYPE[EBX],3
-	JNE SHORT CONNECTED00
-;
-;	_NODE - _NODE SESSION SET UP - DONT NEED TO DO ANYTHING (I THINK!)
-;
-	CALL	RELBUFF
-	RET
-
-;
-;	UP/DOWN LINK
-;
-	PUBLIC	CONNECTED00
-CONNECTED00:
-	CMP	CIRCUITPOINTER[EBX],0	
-	JNE SHORT CONNECTED01
-
-	CALL	RELBUFF			; UP/DOWN WITH NO SESSION - NOONE TO TELL
-	RET				; NO CROSS LINK
-	PUBLIC	CONNECTED01
-CONNECTED01:
-	MOV	_BUFFER,EDI
-	PUSH	EBX
-	PUSH	ESI
-	PUSH	ECX
-
-	ADD	EDI,7
-	MOV	AL,0F0H
-	STOSB				; PID
-
-	CALL	_SETUPNODEHEADER		; PUT IN _NODE ID
-
-	LEA	ESI,LINKCALL[EBX]
-
-	PUSH	EDI
-	CALL	CONVFROMAX25		; ADDR OF CALLED STATION
-	POP	EDI
-
-	MOV	EBX,CIRCUITPOINTER[EBX]
-
-	MOV	L4STATE[EBX],5		; SET LINK UP
-
-	MOV	EBX,L4CROSSLINK[EBX]	; TO INCOMING LINK
-	cmp	ebx,0
-	jne	xxx
-;
-;	NO LINK ??? 
-;
-	MOV		EDI,_BUFFER
-	CALL	RELBUFF	
+		Closed++;
 		
-	POP	ECX
-	POP	ESI
-	POP	EBX
-	
-	RET
+		Partner = L4->L4CROSSLINK;
 
-	PUBLIC	xxx
-xxx:
-			
-	POP	ECX
-	POP	ESI
-	REP MOVSB
+		CLOSECURRENTSESSION(L4);
+				
+		if (Partner)
+			CLOSECURRENTSESSION(Partner);	// CLOSE THIS ONE
 
-	MOV	ESI,OFFSET32 _NORMCALL
-	MOVZX	ECX,_NORMLEN
-	REP MOVSB
-
-	MOV	AL,0DH
-	STOSB
-
-	MOV	ECX,EDI
-	MOV	EDI,_BUFFER
-	SUB	ECX,EDI
-
-	MOV	MSGLENGTH[EDI],CX
-
-	LEA	ESI,L4TX_Q[EBX]
-	CALL	_Q_ADD			; SEND MESSAGE TO CALLER
-
-	CALL	_POSTDATAAVAIL
-
-	POP	EBX
-	RET
-*/
+		L4++;
+	}
+	return Closed;
+}

LinBPQ.c

@@ -83,8 +83,9 @@ void RHPPoll();
 
 VOID GetPGConfig();
 void SendBBSDataToPktMap();
-
-extern uint64_t timeLoadedMS;
+void CloseAllLinks();
+void hookNodeClosing(char * Reason);
+void NETROMTCPResolve();
 
 BOOL IncludesMail = FALSE;
 BOOL IncludesChat = FALSE;
@@ -262,9 +263,9 @@ extern char MailDir[MAX_PATH];
 extern time_t MaintClock;						// Time to run housekeeping
 
 #ifdef WIN32
-BOOL KEEPGOING = 30;					// 5 secs to shut down
+int KEEPGOING = 30;					// 5 secs to shut down
 #else
-BOOL KEEPGOING = 50;					// 5 secs to shut down
+int KEEPGOING = 50;					// 5 secs to shut down
 #endif
 BOOL Restarting = FALSE;
 BOOL CLOSING = FALSE;
@@ -337,6 +338,7 @@ BOOL CtrlHandler(DWORD fdwCtrlType)
     // Handle the CTRL-C signal.
     case CTRL_C_EVENT:
       printf( "Ctrl-C event\n\n" );
+	  CloseAllLinks();
 	  CLOSING = TRUE;
       Beep( 750, 300 );
       return( TRUE );
@@ -344,7 +346,8 @@ BOOL CtrlHandler(DWORD fdwCtrlType)
     // CTRL-CLOSE: confirm that the user wants to exit.
     case CTRL_CLOSE_EVENT:
 
-	  CLOSING = TRUE;
+	CloseAllLinks();
+	CLOSING = TRUE;
      printf( "Ctrl-Close event\n\n" );
 	 Sleep(20000);
        Beep( 750, 300 );
@@ -354,7 +357,8 @@ BOOL CtrlHandler(DWORD fdwCtrlType)
     case CTRL_BREAK_EVENT:
       Beep( 900, 200 );
       printf( "Ctrl-Break event\n\n" );
-	  CLOSING = TRUE;
+	CloseAllLinks();
+	CLOSING = TRUE;
       Beep( 750, 300 );
      return FALSE;
 
@@ -366,7 +370,8 @@ BOOL CtrlHandler(DWORD fdwCtrlType)
     case CTRL_SHUTDOWN_EVENT:
       Beep( 750, 500 );
       printf( "Ctrl-Shutdown event\n\n" );
-	  CLOSING = TRUE;
+	CloseAllLinks();
+	CLOSING = TRUE;
       Beep( 750, 300 );
     return FALSE;
 
@@ -399,6 +404,9 @@ static void segvhandler(int sig)
     write(STDOUT_FILENO, msg, strlen(msg));
     backtrace_symbols_fd(array, size, STDOUT_FILENO);
 
+	hookNodeClosing("sigsegv");
+	Sleep(500);
+
     exit(1);
 }
 
@@ -419,6 +427,9 @@ static void abrthandler(int sig)
     write(STDOUT_FILENO, msg, strlen(msg));
     backtrace_symbols_fd(array, size, STDOUT_FILENO);
 
+	hookNodeClosing("sigabrt");
+	Sleep(500);
+
     exit(1);
 }
 
@@ -427,12 +438,14 @@ static void sigterm_handler(int sig)
 {
 	syslog(LOG_INFO, "terminating on SIGTERM\n");
 	CLOSING = TRUE;
+	CloseAllLinks();
 }
 
 static void sigint_handler(int sig)
 {
 	printf("terminating on SIGINT\n");
 	CLOSING = TRUE;
+	CloseAllLinks();
 }
 
 
@@ -839,16 +852,13 @@ int main(int argc, char * argv[])
 #endif
 #endif
 
-	// Disable Console Terminal if stdout redirected
-
+// Disable Console Terminal if stdout redirected
 //	printf("STDOUT %d\n",isatty(STDOUT_FILENO));
 //	printf("STDIN %d\n",isatty(STDIN_FILENO));
 
 	if (!isatty(STDOUT_FILENO) || !isatty(STDIN_FILENO))
 		Redirected = 1;
 
-	 timeLoadedMS = GetTickCount();
-
 #endif
 
 	 printf("G8BPQ AX25 Packet Switch System Version %s %s\n", TextVerstring, Datestring);
@@ -913,7 +923,10 @@ int main(int argc, char * argv[])
 
 	Debugprintf("G8BPQ AX25 Packet Switch System Version %s %s", TextVerstring, Datestring);
 
-#ifndef MACBPQ
+#if defined(MACBPQ) || defined(FREEBSD)
+	time_t dummy;
+	_MYTIMEZONE = -localtime(&dummy)->tm_gmtoff;
+#else
 	_MYTIMEZONE = _timezone;
 #endif
 
@@ -999,6 +1012,8 @@ int main(int argc, char * argv[])
 		return (0);
 	}
 
+	NETROMTCPResolve();
+
 	for (i=0;PWTEXT[i] > 0x20;i++); //Scan for cr or null
 
 	PWLen=i;
@@ -1530,6 +1545,8 @@ int main(int argc, char * argv[])
 			Consoleprintf(VerCopyright);
 
 			Start();
+			
+			NETROMTCPResolve();
 
 			INITIALISEPORTS();
 
@@ -1680,6 +1697,9 @@ int main(int argc, char * argv[])
 			Slowtimer = 0;
 	}
 
+	hookNodeClosing("Shutdown");
+	Sleep(500);
+
 	printf("Closing Ports\n");
 
 	CloseTNCEmulator();

MailTCP.c

@@ -2092,20 +2092,19 @@ 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);
-	else
-		if (Msg->via[0])
-			sprintf(B2To, "%s@%s", Msg->to, Msg->via);
+			strcpy(B2To, Msg->via);
 		else
-			strcpy(B2To, Msg->to);
+			if (Msg->via[0])
+				sprintf(B2To, "%s@%s", Msg->to, Msg->via);
+			else
+				strcpy(B2To, Msg->to);
 
-		
 		Msg->B2Flags = B2Msg | Attachments;
 
 		if (Msg->type == 'P')
@@ -3934,12 +3933,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);
-	else
-		if (Msg->via[0])
-			sprintf(B2To, "%s@%s", Msg->to, Msg->via);
+			strcpy(B2To, Msg->via);
 		else
-			strcpy(B2To, Msg->to);
+			if (Msg->via[0])
+				sprintf(B2To, "%s@%s", Msg->to, Msg->via);
+			else
+				strcpy(B2To, Msg->to);
 
 		
 		Msg->B2Flags = B2Msg | Attachments;

Moncode.c

@@ -59,7 +59,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 #define	NODES_SIG	0xFF
 
-UCHAR * DisplayINP3RIF(UCHAR * ptr1, UCHAR * ptr2, unsigned int msglen);
+UCHAR * DisplayINP3RIF(UCHAR * ptr1, UCHAR * ptr2, int msglen);
 
 char * DISPLAY_NETROM(MESSAGE * ADJBUFFER, UCHAR * Output, int MsgLen);
 UCHAR * DISPLAYIPDATAGRAM(IPMSG * IP, UCHAR * Output, int MsgLen);
@@ -655,12 +655,13 @@ char * DISPLAY_NETROM(MESSAGE * ADJBUFFER, UCHAR * Output, int MsgLen)
 	char Node[10];
 	UCHAR TTL, Index, ID, TXNO, RXNO, OpCode, Flags, Window;
 	UCHAR * ptr = &ADJBUFFER->L2DATA[0];
+	int service = 0;
+	int netromx = 0;		// Set if Paula's connect to service
 
  	if (ADJBUFFER->L2DATA[0] == NODES_SIG)
 	{
 		// Display NODES
 
-
 		// If an INP3 RIF (type <> UI) decode as such
 	
 		if (ADJBUFFER->CTL != 3)		// UI
@@ -691,6 +692,14 @@ char * DISPLAY_NETROM(MESSAGE * ADJBUFFER, UCHAR * Output, int MsgLen)
 		return Output;
 	}
 
+	if (ADJBUFFER->L2DATA[0] == 0xfe)			// Paula's Nodes Poll
+	{
+		memcpy(Alias, ++ptr, 6);
+		Output += sprintf((char *)Output, " NODES POLL from %s\r", Alias);
+		return Output;
+	}
+
+
 	//	Display normal NET/ROM transmissions 
 
 	Output += sprintf((char *)Output, " NET/ROM\r  ");
@@ -714,6 +723,12 @@ char * DISPLAY_NETROM(MESSAGE * ADJBUFFER, UCHAR * Output, int MsgLen)
 
 	switch (OpCode)
 	{
+
+	case L4CREQX:			// Paula's connect to service
+
+		netromx = 1;
+		service = (RXNO << 8) | TXNO;
+
 	case L4CREQ:
 
 		Window = *(ptr++);
@@ -722,7 +737,10 @@ char * DISPLAY_NETROM(MESSAGE * ADJBUFFER, UCHAR * Output, int MsgLen)
 		Node[ConvFromAX25(ptr, Node)] = 0;
 		ptr +=7;
 
-		Output += sprintf((char *)Output, "<CON REQ> w=%d %s at %s", Window, Dest, Node);
+		if (netromx)
+			Output += sprintf((char *)Output, "<CON REQX> w=%d %d@%s at %s", Window, service, Dest, Node);
+		else
+			Output += sprintf((char *)Output, "<CON REQ> w=%d %s at %s", Window, Dest, Node);
 
 		if (MsgLen > 38)				// BPQ Extended Params
 		{
@@ -737,7 +755,7 @@ char * DISPLAY_NETROM(MESSAGE * ADJBUFFER, UCHAR * Output, int MsgLen)
 		if (Flags & L4BUSY)				// BUSY RETURNED
 			return Output + sprintf((char *)Output, " <CON NAK> - BUSY");
 
-		return Output + sprintf((char *)Output, " <CON ACK> w=%d my cct=%02X%02X", ptr[1], TXNO, RXNO);
+		return Output + sprintf((char *)Output, " <CON ACK> w=%d my cct=%02X%02X", ptr[0], TXNO, RXNO);
 
 	case L4DREQ:
 
@@ -985,3 +1003,87 @@ char * DISPLAYARPDATAGRAM(UCHAR * Datagram, UCHAR * Output)
 			ptr[15], ptr[16], ptr[17], ptr[18], Dest, ptr[26], ptr[27], ptr[28], ptr[29]);
 
 }
+
+char Lastpacketlog[256];
+
+int PacketLogDelay = 30000;
+
+extern BPQVECSTRUC * FILEMONVECTOR;
+extern UCHAR LogDirectory[260];
+
+void WritePacketLogThread(void * param)
+{
+	char FN[256];
+	time_t T;
+	struct tm * tm;
+	FILE * Handle;
+	int MsgLen;
+	MESSAGE * MSG;
+	MESSAGE * Q;
+	char buffer[512];
+
+
+	while(1)
+	{
+		BOOL SaveMTX = MTX;
+		BOOL SaveMCOM = MCOM;
+		BOOL SaveMUI = MUIONLY;
+
+		Sleep(PacketLogDelay);
+
+		// Get chain of queued packets under semaphore
+
+		GetSemaphore(&Semaphore, 101);
+
+		Q = FILEMONVECTOR->HOSTTRACEQ;
+		FILEMONVECTOR->HOSTTRACEQ = 0;
+
+		FreeSemaphore(&Semaphore);
+		
+		if (Q == 0)
+			continue;
+
+		// Open log file and write decoded packets
+
+		T = time(NULL);
+		tm = gmtime(&T);
+
+		if (LogDirectory[0] == 0)
+		{
+			strcpy(FN, "logs/PacketLog");
+		}
+		else
+		{
+			strcpy(FN, LogDirectory);
+			strcat(FN, "/");
+			strcat(FN, "logs/PacketLog");
+		}
+
+		sprintf(&FN[strlen(FN)], "_%04d%02d%02d.log", tm->tm_year +1900, tm->tm_mon+1, tm->tm_mday);
+
+		Handle = fopen(FN, "ab");
+
+		if (Handle == NULL)
+			return;
+
+		while (Q)
+		{
+			MSG = Q;
+			Q = MSG->CHAIN;			// get first
+
+			IntSetTraceOptionsEx(MMASK, 1, 1, 0);
+			MsgLen = IntDecodeFrame(MSG, buffer, MSG->Timestamp, 0xffffffffffffffff, FALSE, FALSE);
+			IntSetTraceOptionsEx(MMASK, SaveMTX, SaveMCOM, SaveMUI);
+
+			fwrite(buffer , 1, MsgLen, Handle);
+
+			GetSemaphore(&Semaphore, 101);
+			ReleaseBuffer(MSG);
+			FreeSemaphore(&Semaphore);
+		}
+		fclose(Handle);
+	}
+
+	return;
+}
+

MultiConsole.c

@@ -944,6 +944,30 @@ LRESULT APIENTRY InputProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 			return 0; 
 		}
+
+		if (wParam == 0x7)  // BEL (Ctrl/G)
+		{
+			// Get buffer, append 07 and write back
+
+			Cinfo->kbptr = SendMessage(Cinfo->hwndInput, WM_GETTEXT, INPUTLEN-1, 
+				(LPARAM) (LPCSTR)Cinfo->kbbuf);
+
+
+			Cinfo->kbbuf[Cinfo->kbptr++] = 7;
+			Cinfo->kbbuf[Cinfo->kbptr] = 0;
+
+			SendMessage(Cinfo->hwndInput,WM_SETTEXT,0,(LPARAM)(LPCSTR) Cinfo->kbbuf);
+
+			// Send cursor right
+
+			for (i = 0; i < strlen(Cinfo->kbbuf); i++)
+			{
+				SendMessage(Cinfo->hwndInput, WM_KEYDOWN, VK_RIGHT, 0);
+				SendMessage(Cinfo->hwndInput, WM_KEYUP, VK_RIGHT, 0);
+			}
+
+			return 0;
+		}
  
 	}
 

NETROMTCP.c

@@ -0,0 +1,608 @@
+/*
+Copyright 2001-2022 John Wiseman G8BPQ
+
+This file is part of LinBPQ/BPQ32.
+
+LinBPQ/BPQ32 is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+LinBPQ/BPQ32 is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
+*/	
+
+/*
+Netrom over TCP Support
+
+This is intended for operation over radio links with an IP interface, eg New Packet Radio or possibly microwave links
+
+To simplify interface to the rest of the oode dummy LINK and PORT records are created
+
+Packet Format is Length (2 byte little endian) Call (10 bytes ASCII) NETROM L3/4 Packet, starting 0xcf (to detect framing errors).
+
+A TCP message can contain multiple packets and/or partial packets
+
+It uses the Telnet Server, with port defined in NETROMPORT
+
+ROUTE definitions have an extra field, the TCP Port Number
+
+*/
+
+//#pragma data_seg("_BPQDATA")
+
+
+#define _CRT_SECURE_NO_DEPRECATE 
+
+#include "time.h"
+#include "stdio.h"
+#include <fcntl.h>					 
+//#include "vmm.h"
+
+#include "cheaders.h"
+#include "asmstrucs.h"
+#include "telnetserver.h"
+
+#define	NETROM_PID 0xCF
+
+void NETROMConnectionLost(struct ConnectionInfo * sockptr);
+int DataSocket_ReadNETROM(struct ConnectionInfo * sockptr, SOCKET sock, struct NRTCPSTRUCT * Info, int portNo);
+int NETROMTCPConnect(struct ROUTE * Route, struct ConnectionInfo * sockptr);
+void NETROMConnected(struct ConnectionInfo * sockptr, SOCKET sock, struct NRTCPSTRUCT * Info);
+VOID SendRTTMsg(struct ROUTE * Route);
+BOOL FindNeighbour(UCHAR * Call, int Port, struct ROUTE ** REQROUTE);
+VOID NETROMMSG(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG);
+int BPQTRACE(MESSAGE * Msg, BOOL TOAPRS);
+VOID L3LINKCLOSED(struct _LINKTABLE * LINK, int Reason);
+void NetromTCPTrace(struct _MESSAGE * Message, char * Dirn);
+
+extern SOCKET NodeAPISocket;
+
+struct NRTCPMsg
+{
+	short Length;
+	char Call[10];
+	unsigned char PID;
+	char Packet[1024];
+};
+
+struct NRTCPSTRUCT 
+{
+	struct ConnectionInfo * sockptr;
+	struct _LINKTABLE * LINK;				// Dummy Link Record for this ROUTE
+	struct ROUTE * Route;					// May need backlink
+	char Call[10];
+};
+
+struct NRTCPSTRUCT * NRTCPInfo[256] = {0};
+
+// Do we want to use normal TCP server connections, which are limited, or our own. Let's try our own for now
+
+struct ConnectionInfo * AllocateNRTCPRec()
+{
+	struct ConnectionInfo * sockptr = 0;
+	struct NRTCPSTRUCT * Info;
+	int i;
+
+	for (i = 0; i < 255; i++)
+	{
+		if (NRTCPInfo[i] == 0)
+		{
+			// only allocate as many as needed
+
+			Info = NRTCPInfo[i] = (struct NRTCPSTRUCT *)zalloc(sizeof(struct NRTCPSTRUCT));
+			Info->sockptr = (struct ConnectionInfo *)zalloc(sizeof(struct ConnectionInfo));
+			Info->LINK = (struct _LINKTABLE *)zalloc(sizeof(struct _LINKTABLE));
+			Info->sockptr->Number = i;
+		}
+		else 
+			Info = NRTCPInfo[i];
+
+		sockptr = Info->sockptr;
+
+		if (sockptr->SocketActive == FALSE)
+		{
+			sockptr->SocketActive = TRUE;
+			sockptr->ConnectTime = sockptr->LastSendTime = time(NULL);
+
+//			Debugprintf("NRTCP Allocated %d", i);
+			return sockptr;
+		}
+	}
+	return 0;
+}
+
+void checkNRTCPSockets(int portNo)
+{
+	SOCKET sock;
+	int Active = 0;
+	SOCKET maxsock;
+	int retval;
+	int i;
+
+	struct timeval timeout;
+	fd_set readfd, writefd, exceptfd;
+
+	struct ConnectionInfo * sockptr;
+
+	timeout.tv_sec = 0;
+	timeout.tv_usec = 0;				// poll
+
+	maxsock = 0;
+
+	FD_ZERO(&readfd);
+	FD_ZERO(&writefd);
+	FD_ZERO(&exceptfd);
+
+	for (i = 0; i < 255; i++)
+	{
+		if (NRTCPInfo[i] == 0)
+			break;					// only as many as have been used
+
+		sockptr = NRTCPInfo[i]->sockptr;
+
+		if (sockptr->SocketActive == 0)
+			continue;
+
+		if (sockptr->Connecting)
+		{
+				// look for complete or failed
+
+			FD_SET(sockptr->socket, &writefd);
+			FD_SET(sockptr->socket, &exceptfd);
+		}
+		else
+		{
+			FD_SET(sockptr->socket, &readfd);
+			FD_SET(sockptr->socket, &exceptfd);
+		}
+
+		Active++;
+
+		if (sockptr->socket > maxsock)
+			maxsock = sockptr->socket;
+	}
+
+	if (Active)
+	{
+		retval = select((int)maxsock + 1, &readfd, &writefd, &exceptfd, &timeout);
+
+		if (retval == -1)
+		{				
+			perror("data select");
+			Debugprintf("NRTCP Select Error %d Active %d", WSAGetLastError(), Active);
+		}
+		else
+		{
+			if (retval)
+			{
+				// see who has data
+
+				for (i = 0; i < 255; i++)
+				{
+					if (NRTCPInfo[i] == 0)
+						break;
+	
+					sockptr = NRTCPInfo[i]->sockptr;
+
+					if (sockptr->SocketActive == 0)
+						continue;
+
+					sock = sockptr->socket;
+
+					if (FD_ISSET(sock, &writefd))
+						NETROMConnected(sockptr, sock, NRTCPInfo[i]);
+	
+					if (FD_ISSET(sock, &readfd))
+						DataSocket_ReadNETROM(sockptr, sock, NRTCPInfo[i], portNo);
+				
+					if (FD_ISSET(sock, &exceptfd))
+						NETROMConnectionLost(sockptr);
+				}
+			}
+		}
+	}
+}
+
+int NETROMOpenConnection(struct ROUTE * Route)
+{
+	struct NRTCPSTRUCT * Info;
+	struct ConnectionInfo * sockptr;
+	char farCall[10];
+
+	farCall[ConvFromAX25(Route->NEIGHBOUR_CALL, farCall)] = 0;
+
+//	Debugprintf("Opening NRTCP Connection to %s", farCall);
+
+	if (Route->TCPSession)
+	{
+		//	SESSION ALREADY EXISTS
+
+		sockptr = Route->TCPSession->sockptr;
+		
+		if (sockptr->Connected || sockptr->Connecting)
+			return TRUE;
+
+		// previous connect failed
+	}
+	else
+	{
+		sockptr = AllocateNRTCPRec();
+
+		if (sockptr == NULL)
+			return 0;
+
+		Info = Route->TCPSession = NRTCPInfo[sockptr->Number];
+		memcpy(Info->Call, farCall, 10);
+		Route->NEIGHBOUR_LINK = Info->LINK;
+
+		Info->Route = Route;
+		Info->LINK->NEIGHBOUR = Route;
+		Info->LINK->LINKPORT = GetPortTableEntryFromPortNum(Route->NEIGHBOUR_PORT);
+	}
+
+	return NETROMTCPConnect(Route, sockptr);
+
+}
+
+void NETROMTCPResolve()
+{
+	struct ROUTE * Route = NEIGHBOURS;
+	int n = MAXNEIGHBOURS;
+	struct addrinfo hints, *res = 0;
+	char PortString[20];
+	int err;
+
+	while (n--)
+	{
+		if (Route->TCPAddress)
+		{
+			// try to resolve host
+
+			sprintf(PortString, "%d", Route->TCPPort);
+
+			memset(&hints, 0, sizeof hints);
+			hints.ai_family = AF_UNSPEC;  // use IPv4 or IPv6, whichever
+			hints.ai_socktype = SOCK_STREAM;
+	
+			getaddrinfo(Route->TCPHost, PortString, &hints, &res);
+
+			err = WSAGetLastError();
+
+			if (res)
+			{
+				Route->TCPAddress->ai_family = res->ai_family;
+				Route->TCPAddress->ai_socktype = res->ai_socktype;
+				Route->TCPAddress->ai_protocol = res->ai_protocol;
+				Route->TCPAddress->ai_addrlen = res->ai_addrlen;
+				memcpy(Route->TCPAddress->ai_addr, res->ai_addr, sizeof(struct sockaddr));
+				freeaddrinfo(res);
+			}
+		}
+		
+		Route++;
+	}
+}
+
+int NETROMTCPConnect(struct ROUTE * Route, struct ConnectionInfo * sockptr)
+{
+	int err;
+	u_long param=1;
+	BOOL bcopt=TRUE;
+	SOCKET sock;
+	struct sockaddr_in sinx; 
+	int addrlen=sizeof(sinx);
+	char PortString[20];
+	struct addrinfo * res = Route->TCPAddress;
+	int Port = Route->TCPPort;
+
+	sprintf(PortString, "%d", Port);
+
+	// get host info, make socket, and connect it
+
+	if (res->ai_family == 0)
+	{
+//		err = WSAGetLastError();
+//		Debugprintf("Resolve HostName %s Failed - Error %d", Route->TCPHost, err);
+		return FALSE;			// Resolve failed
+	}
+
+	sock = sockptr->socket = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
+
+	if (sock == INVALID_SOCKET)
+	{
+		Debugprintf, ("Netrom over TCP Create Socket Failed");
+		return FALSE;
+	}
+
+	ioctl(sock, FIONBIO, &param);
+
+	setsockopt(sock, SOL_SOCKET, SO_REUSEADDR, (const char FAR *)&bcopt,4);
+
+
+	if (connect(sock, res->ai_addr, (int)res->ai_addrlen) == 0)
+	{
+		//
+		//	Connected successful
+		//
+		
+		sockptr->Connected = TRUE;
+		return TRUE;
+	}
+	else
+	{
+		err=WSAGetLastError();
+
+		if (err == 10035 || err == 115 || err == 36)		//EWOULDBLOCK
+		{
+			//	Connect in Progress
+			
+			sockptr->Connecting = TRUE;
+			return TRUE;
+		}
+		else
+		{
+			//	Connect failed
+
+			closesocket(sockptr->socket);
+	
+			return FALSE;
+		}
+	}
+
+	return FALSE;
+}
+
+
+
+
+void NETROMConnectionAccepted(struct ConnectionInfo * sockptr)
+{
+	// Not sure we can do much here until first message arrives with callsign
+
+	sockptr->Connected = TRUE;
+//	Debugprintf("NRTCP Connection Accepted");
+}
+
+void NETROMConnected(struct ConnectionInfo * sockptr, SOCKET sock, struct NRTCPSTRUCT * Info)
+{
+	// Connection Complete
+
+//	Debugprintf("NRTCP Connected");
+
+	sockptr->Connecting = FALSE;
+	sockptr->Connected = TRUE;
+
+	Info->LINK->L2STATE = 5;
+
+	if (Info->Route->INP3Node)
+		SendRTTMsg(Info->Route);
+}
+
+int DataSocket_ReadNETROM(struct ConnectionInfo * sockptr, SOCKET sock, struct NRTCPSTRUCT * Info, int portNo)
+{
+	int len=0, maxlen;
+	struct NRTCPMsg * Msg;
+	struct _L3MESSAGEBUFFER * L3Msg;
+	struct ROUTE * Route;
+	UCHAR axCall[7];
+	PMESSAGE Buffer;
+	
+	ioctl(sock,FIONREAD,&len);
+
+	maxlen = InputBufferLen - sockptr->InputLen;
+	
+	if (len > maxlen) len = maxlen;
+
+	len = recv(sock, &sockptr->InputBuffer[sockptr->InputLen], len, 0);
+
+	if (len == SOCKET_ERROR || len == 0)
+	{
+		// Failed or closed - clear connection
+
+		NETROMConnectionLost(sockptr);
+		return 0;
+	}
+
+	sockptr->InputLen += len;
+
+	// Process data
+
+checkLen:
+
+	// See if we have a whole packet
+	
+	Msg = (struct NRTCPMsg *)&sockptr->InputBuffer[0];
+
+	if (Msg->Length > sockptr->InputLen)		// if not got whole frame wait
+		return 0;
+
+	if (Info->Call[0] == 0)
+	{
+		// first packet - do we need to do anything?
+
+		// This must be an incoming connection as Call is set before calling so need to find route record and set things up.
+
+//		Debugprintf("New NRTCP Connection from %s", Msg->Call);
+
+		memcpy(Info->Call, Msg->Call, 10);
+
+		ConvToAX25(Msg->Call, axCall);
+
+		if (FindNeighbour(axCall, portNo, &Route))
+		{
+			Info->Route = Route;
+			Route->NEIGHBOUR_LINK = Info->LINK;
+			Route->NEIGHBOUR_PORT = portNo;
+			Info->LINK->NEIGHBOUR = Route;
+			Info->LINK->LINKPORT = GetPortTableEntryFromPortNum(portNo);
+			Route->TCPSession = Info;
+			Info->LINK->L2STATE = 5;
+		
+			if (Info->Route->INP3Node)
+				SendRTTMsg(Info->Route);
+		}
+		else
+		{
+			Debugprintf("Neighbour %s port %d not found - closing connection", Msg->Call, portNo);
+			closesocket(sockptr->socket);
+			sockptr->SocketActive = FALSE;
+			memset(sockptr, 0, sizeof(struct ConnectionInfo)); 
+			Info->Call[0] = 0;
+			return 0;
+		}
+	}
+
+
+	if (memcmp(Info->Call, Msg->Call, 10) != 0)
+	{
+		Debugprintf("NRTCP Mismatch - closing connection");
+	
+		closesocket(sockptr->socket);
+		sockptr->SocketActive = FALSE;
+		memset(sockptr, 0, sizeof(struct ConnectionInfo)); 
+		Info->Call[0] = 0;
+		return 0;
+	}
+
+	// Format as if come from an ax.25 link
+
+	L3Msg = GetBuff();
+
+	if (L3Msg == 0)
+		goto seeifMore;
+
+	L3Msg->LENGTH = (Msg->Length - 12) + MSGHDDRLEN;
+	L3Msg->Next = 0;
+	L3Msg->Port = portNo;
+	L3Msg->L3PID = NETROM_PID;
+	memcpy(&L3Msg->L3SRCE, Msg->Packet, Msg->Length - 13);
+
+	// Create a dummy L2 message so we can trace it
+
+	Buffer = GetBuff();
+
+	if (Buffer)
+	{
+		Buffer->CHAIN = 0;
+		Buffer->CTL = 0;
+		Buffer->PORT = portNo;
+
+		ConvToAX25(Info->Call, Buffer->ORIGIN);
+		ConvToAX25(MYNETROMCALL, Buffer->DEST);
+
+		memcpy(Buffer->L2DATA, &L3Msg->L3SRCE[0], Msg->Length - 13);
+		Buffer->ORIGIN[6] |= 1;					// Set end of calls
+		Buffer->PID = NETROM_PID;
+		Buffer->LENGTH = Msg->Length + 10;
+		time(&Buffer->Timestamp);
+
+		BPQTRACE(Buffer, FALSE);
+		
+		if(NodeAPISocket)
+			NetromTCPTrace(Buffer, "rcvd");
+
+		ReleaseBuffer(Buffer);
+	}
+
+	NETROMMSG(Info->LINK, L3Msg);
+
+seeifMore:
+
+	 sockptr->InputLen -= Msg->Length;
+
+	 if (sockptr->InputLen > 0)
+	 {
+		 memmove(sockptr->InputBuffer, &sockptr->InputBuffer[Msg->Length], sockptr->InputLen);
+		 goto checkLen;
+	 }
+
+	return 0;
+}
+
+VOID TCPNETROMSend(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Frame)
+{
+	struct NRTCPMsg Msg;
+	unsigned char * Data = (unsigned char *)&Frame->L3SRCE[0];
+	int DataLen = Frame->LENGTH - (MSGHDDRLEN + 1); // Not including PID
+	int Ret;
+	PMESSAGE Buffer;
+
+	Msg.Length = DataLen + 13;				// include PID
+	memcpy(Msg.Call, MYNETROMCALL, 10);
+	Msg.PID = NETROM_PID;
+	memcpy(Msg.Packet, Data, DataLen);
+
+	if (Route->TCPSession == 0)
+		return;
+
+	Ret = send(Route->TCPSession->sockptr->socket, (char *)&Msg, DataLen + 13, 0);
+
+	// Create a dummy L2 message so we can trace it
+
+	Buffer = GetBuff();
+
+	if (Buffer)
+	{
+		Buffer->CHAIN = 0;
+		Buffer->CTL = 0;
+		Buffer->PORT = Route->NEIGHBOUR_PORT;
+
+		ConvToAX25(Route->TCPSession->Call, Buffer->DEST);
+		ConvToAX25(MYNETROMCALL, Buffer->ORIGIN);
+
+		memcpy(Buffer->L2DATA, &Frame->L3SRCE[0], DataLen);
+		Buffer->ORIGIN[6] |= 1;					// Set end of calls
+		Buffer->PID = NETROM_PID;
+		Buffer->LENGTH = DataLen + 15 + MSGHDDRLEN;
+		time(&Buffer->Timestamp);
+
+		if(NodeAPISocket)
+			NetromTCPTrace(Buffer, "sent");
+
+		Buffer->PORT = Route->NEIGHBOUR_PORT | 128;		// TX Flag
+		BPQTRACE(Buffer, FALSE);
+
+
+		ReleaseBuffer(Buffer);
+	}
+
+}
+
+
+void NETROMConnectionLost(struct ConnectionInfo * sockptr)
+{
+	struct NRTCPSTRUCT * Info = NRTCPInfo[sockptr->Number];
+	struct ROUTE * Route;
+
+	closesocket(sockptr->socket);
+
+	// If there is an attached route (there should be) clear all connections	
+	
+	if (Info)
+	{
+		Route = Info->Route;
+
+		if (sockptr->Connected)
+			L3LINKCLOSED(Info->LINK, LINKLOST);
+
+		if (sockptr->Connecting)
+			L3LINKCLOSED(Info->LINK, SETUPFAILED);
+
+		if (Route)
+			Route->TCPSession = 0;
+
+		Info->Call[0] = 0;
+		Info->LINK->L2STATE = 0;
+	}
+
+	sockptr->SocketActive = FALSE;
+
+	memset(sockptr, 0, sizeof(struct ConnectionInfo)); 
+}
+

RigControl.c

@@ -110,7 +110,7 @@ VOID ConnecttoFLRIG(struct RIGPORTINFO * PORT);
 int DecodeHAMLIBAddr(struct RIGPORTINFO * PORT, char * ptr);
 void ProcessHAMLIBFrame(struct RIGPORTINFO * PORT, int Length);
 VOID HAMLIBPoll(struct RIGPORTINFO * PORT);
-void HAMLIBSlaveThread(struct RIGINFO * RIG);
+void HAMLIBSlaveThread(VOID * Param);
 void CheckAndProcessRTLUDP(struct RIGPORTINFO * PORT);
 VOID RTLUDPPoll(struct RIGPORTINFO * PORT);
 VOID ConnecttoRTLUDP(struct RIGPORTINFO * PORT);
@@ -122,8 +122,8 @@ VOID ProcessSDRRadioFrame(struct RIGPORTINFO * PORT, int Length);
 VOID SDRRadioPoll(struct RIGPORTINFO * PORT);
 
 VOID SetupPortRIGPointers();
-VOID PTTCATThread(struct RIGINFO *RIG);
-VOID ConnecttoHAMLIB(struct RIGPORTINFO * PORT);
+VOID PTTCATThread(void * Param);
+
 
 // ----- G7TAJ ----
 VOID ConnecttoSDRANGEL(struct RIGPORTINFO * PORT);
@@ -2217,7 +2217,7 @@ int BittoInt(UINT BitMask)
 	return i;
 }
 
-extern char * RadioConfigMsg[36];
+extern char * RadioConfigMsg[70];
 
 struct TNCINFO RIGTNC;			// Dummy TNC Record for Rigcontrol without a corresponding TNC 
 
@@ -5450,7 +5450,26 @@ void DecodeCM108(int Port, char * ptr)
 	hid_device *handle = NULL;
 
 	if (strlen(ptr) > 16)
-		CM108Device = _strdup(ptr);
+	{
+		path_to_open = _strdup(ptr);
+
+		handle = hid_open_path(path_to_open);
+	
+		if (handle)
+		{
+			hid_close(handle);
+			CM108Device = _strdup(path_to_open);
+		}
+		else
+		{
+			char msg[128];
+			sprintf(msg,"Port %d Unable to open CM108 device %s", Port, path_to_open);
+			WritetoConsole(msg);
+		}
+	}
+
+	
+	
 	else
 	{
 		VID = strtol(ptr, &next, 0);
@@ -7465,8 +7484,9 @@ VOID SetupPortRIGPointers()
 
 #ifdef WIN32
 
-VOID PTTCATThread(struct RIGINFO *RIG)
+VOID PTTCATThread(void * Param)
 {
+	struct RIGINFO * RIG = 	(struct RIGINFO *)Param;
 	DWORD dwLength = 0;
 	int Length, ret, i;
 	UCHAR * ptr1;
@@ -8452,7 +8472,7 @@ int DecodeHAMLIBAddr(struct RIGPORTINFO * PORT, char * ptr)
 	return 1;
 }
 
-VOID HAMLIBThread(struct RIGPORTINFO * PORT);
+VOID HAMLIBThread(void * Param);
 
 VOID ConnecttoHAMLIB(struct RIGPORTINFO * PORT)
 {
@@ -8462,10 +8482,11 @@ VOID ConnecttoHAMLIB(struct RIGPORTINFO * PORT)
 	return ;
 }
 
-VOID HAMLIBThread(struct RIGPORTINFO * PORT)
+VOID HAMLIBThread(void * Param)
 {
 	// Opens sockets and looks for data
-	
+
+	struct RIGPORTINFO * PORT = (struct RIGPORTINFO * )Param;
 	char Msg[255];
 	int err, i, ret;
 	u_long param=1;
@@ -8587,10 +8608,11 @@ Lost:
 
 
 
-void HAMLIBSlaveThread(struct RIGINFO * RIG)
+void HAMLIBSlaveThread(VOID * Param)
 {
 	// Wait for connections and messages from HAMLIB Clients
 
+	struct RIGINFO * RIG = (struct RIGINFO *)Param;
 	fd_set readfs;
 	fd_set errorfs;
 	struct timeval timeout;
@@ -8906,7 +8928,7 @@ VOID FLRIGSendCommand(struct RIGPORTINFO * PORT, char * Command, char * Value)
 
 
 
-VOID FLRIGThread(struct RIGPORTINFO * PORT);
+VOID FLRIGThread(VOID * Param);
 
 VOID ConnecttoFLRIG(struct RIGPORTINFO * PORT)
 {
@@ -8915,10 +8937,11 @@ VOID ConnecttoFLRIG(struct RIGPORTINFO * PORT)
 	return ;
 }
 
-VOID FLRIGThread(struct RIGPORTINFO * PORT)
+VOID FLRIGThread(VOID * Param)
 {
 	// Opens sockets and looks for data
 	
+	struct RIGPORTINFO * PORT = (struct RIGPORTINFO *)Param;
 	char Msg[255];
 	int err, i, ret;
 	u_long param=1;
@@ -10158,7 +10181,7 @@ void ProcessSDRANGELFrame(struct RIGPORTINFO * PORT)
 
 
 
-VOID SDRANGELThread(struct RIGPORTINFO * PORT);
+VOID SDRANGELThread(VOID * Param);
 
 VOID ConnecttoSDRANGEL(struct RIGPORTINFO * PORT)
 {
@@ -10167,9 +10190,11 @@ VOID ConnecttoSDRANGEL(struct RIGPORTINFO * PORT)
 	return ;
 }
 
-VOID SDRANGELThread(struct RIGPORTINFO * PORT)
+VOID SDRANGELThread(VOID * Param)
 {
 	// Opens sockets and looks for data
+
+	struct RIGPORTINFO * PORT = (struct RIGPORTINFO *)Param;
 	char Msg[512];
 	int err, i, ret;
 	u_long param=1;

ScanHID.c

@@ -0,0 +1,51 @@
+// ScanHID.cpp : Defines the entry point for the console application.
+//
+
+#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
+#define _CRT_SECURE_NO_DEPRECATE
+
+#include <stdio.h>
+#include <conio.h>
+#include <stdlib.h>
+
+#include "hidapi.h"
+
+int main(int argc, char* argv[])
+{
+	char product[256];
+	char sernum[256] = "NULL";
+
+	struct hid_device_info *devs, *cur_dev;
+	const char *path_to_open = NULL;
+	hid_device *handle = NULL;
+
+	// Look for Device
+
+	devs = hid_enumerate(0,0); // so we list devices(USHORT)VID, (USHORT)PID);
+	cur_dev = devs;
+	while (cur_dev)
+	{
+		wcstombs(product, cur_dev->product_string, 255);
+		if (cur_dev->serial_number)
+			wcstombs(sernum, cur_dev->serial_number, 255);
+
+		if (product)
+			printf("HID Device %s VID %X PID %X Ser %s\r\n Path %s\r\n\r\n", product, cur_dev->vendor_id, cur_dev->product_id, sernum, cur_dev->path);
+		else
+			printf("HID Device %s VID %X PID %X Ser %s\r\n Path %s\r\n\r\n", "Missing Product", cur_dev->vendor_id, cur_dev->product_id, sernum, cur_dev->path);
+
+
+		cur_dev = cur_dev->next;
+	}
+
+
+	hid_free_enumeration(devs);
+	printf("Press any key to Exit");
+	_getch();
+
+
+}
+
+
+
+

TNCEmulators.c

@@ -241,8 +241,14 @@ typedef struct _SERIAL_STATUS {
 
 #ifndef WIN32
 
-#ifdef MACBPQ
+#if defined(MACBPQ)
 #include <util.h>
+#elif defined(FREEBSD)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
+#include <libutil.h>
+#else
+#include <util.h>
+#endif
 #endif
 
 extern int posix_openpt (int __oflag);
@@ -262,7 +268,7 @@ HANDLE LinuxOpenPTY(char * Name)
 	u_long param=1;
 	struct termios term;
 
-#ifdef MACBPQ
+#if defined(MACBPQ) || defined(FREEBSD)
 
 	// Create a pty pair
 	

TelnetV6.c

@@ -90,7 +90,7 @@ void RHPThread(void * Params);
 void ProcessRHPWebSockClosed(SOCKET socket);
 int ProcessSNMPPayload(UCHAR * Msg, int Len, UCHAR * Reply, int * OffPtr);
 int RHPProcessHTTPMessage(struct ConnectionInfo * conn, char * response, char * Method, char * URL, char * request, BOOL LOCAL, BOOL COOKIE);
-
+void checkNRTCPSockets(int portNo);
 
 #ifndef LINBPQ
 extern HKEY REGTREE;
@@ -172,12 +172,14 @@ VOID Tel_Format_Addr(struct ConnectionInfo * sockptr, char * dst);
 VOID ProcessTrimodeCommand(struct TNCINFO * TNC, struct ConnectionInfo * sockptr, char * MsgPtr);
 VOID ProcessTrimodeResponse(struct TNCINFO * TNC, struct STREAMINFO * STREAM, unsigned char * MsgPtr, int Msglen);
 VOID ProcessTriModeDataMessage(struct TNCINFO * TNC, struct ConnectionInfo * sockptr, SOCKET sock, struct STREAMINFO * STREAM);
-
+void processNETROMFrame(unsigned char * Message, int Len, struct ConnectionInfo * sockptr);
+void NETROMConnectionLost(struct ConnectionInfo * sockptr);
+void NETROMConnectionAccepted(struct ConnectionInfo * sockptr);
+struct ConnectionInfo * AllocateNRTCPRec();
 
 static int LogAge = 13;
 
 
-
 #ifdef WIN32
 
 int DeleteLogFile(char * Log);
@@ -542,6 +544,9 @@ int ProcessLine(char * buf, int Port)
 	else if (_stricmp(param,"HTTPPORT") == 0)
 		HTTPPort = TCP->HTTPPort = atoi(value);
 
+	else if (_stricmp(param,"NETROMPORT") == 0)
+		TCP->NETROMPort = atoi(value);
+
 	else if (_stricmp(param,"APIPORT") == 0)
 		TCP->APIPort = atoi(value);
 
@@ -1139,7 +1144,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 			shutdown(TCP->FBBsock[n++], SD_BOTH);
 
 		shutdown(TCP->Relaysock, SD_BOTH);
-		shutdown(TCP->HTTPsock, SD_BOTH);
+		shutdown(TCP->HTTPSock, SD_BOTH);
 		shutdown(TCP->HTTPsock6, SD_BOTH);
 
 
@@ -1163,7 +1168,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 
 		closesocket(TCP->Relaysock);
 		closesocket(TCP->Relaysock6);
-		closesocket(TCP->HTTPsock);
+		closesocket(TCP->HTTPSock);
 		closesocket(TCP->HTTPsock6);
 
 		// Save info from old TNC record
@@ -1248,7 +1253,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 			shutdown(TCP->FBBsock[n++], SD_BOTH);
 
 		shutdown(TCP->Relaysock, SD_BOTH);
-		shutdown(TCP->HTTPsock, SD_BOTH);
+		shutdown(TCP->HTTPSock, SD_BOTH);
 		shutdown(TCP->HTTPsock6, SD_BOTH);
 
 		shutdown(TCP->sock6, SD_BOTH);
@@ -1275,7 +1280,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 			closesocket(TCP->FBBsock6[n++]);
 
 		closesocket(TCP->Relaysock6);
-		closesocket(TCP->HTTPsock);
+		closesocket(TCP->HTTPSock);
 		closesocket(TCP->HTTPsock6);
 
 		return (0);
@@ -1498,6 +1503,8 @@ void * TelnetExtInit(EXTPORTDATA * PortEntry)
 
 	PortEntry->PORTCONTROL.TNC = TNC;
 
+	PortEntry->PORTCONTROL.Hardware = TNC->Hardware;
+
 	TNC->WebWindowProc = WebProc;
 	TNC->WebWinX = 260;
 	TNC->WebWinY = 325;
@@ -1711,11 +1718,14 @@ BOOL OpenSockets(struct TNCINFO * TNC)
 	}
 
 	if (TCP->HTTPPort)
-		TCP->HTTPsock = OpenSocket4(TNC, TCP->HTTPPort);
+		TCP->HTTPSock = OpenSocket4(TNC, TCP->HTTPPort);
 
 	if (TCP->APIPort)
 		TCP->APIsock = OpenSocket4(TNC, TCP->APIPort);
 
+	if (TCP->NETROMPort)
+		TCP->NETROMSock = OpenSocket4(TNC, TCP->NETROMPort);
+
 	if (TCP->SyncPort)
 		TCP->Syncsock = OpenSocket4(TNC, TCP->SyncPort);
 
@@ -1834,6 +1844,9 @@ BOOL OpenSockets6(struct TNCINFO * TNC)
 	if (TCP->APIPort)
 		TCP->APIsock6 = OpenSocket6(TNC, TCP->APIPort);
 
+	if (TCP->NETROMPort)
+		TCP->NETROMSock6 = OpenSocket6(TNC, TCP->NETROMPort);
+
 	if (TCP->SyncPort)
 		TCP->Syncsock6 = OpenSocket6(TNC, TCP->SyncPort);
 
@@ -1886,7 +1899,7 @@ static VOID SetupListenSet(struct TNCINFO * TNC)
 			maxsock = sock;
 	}
 		
-	sock = TCP->HTTPsock;
+	sock = TCP->HTTPSock;
 	if (sock)
 	{
 		FD_SET(sock, readfd);
@@ -1902,6 +1915,14 @@ static VOID SetupListenSet(struct TNCINFO * TNC)
 			maxsock = sock;
 	}
 		
+	sock = TCP->NETROMSock;
+	if (sock)
+	{
+		FD_SET(sock, readfd);
+		if (sock > maxsock)
+			maxsock = sock;
+	}
+
 	sock = TCP->Syncsock;
 	if (sock)
 	{
@@ -1977,6 +1998,14 @@ static VOID SetupListenSet(struct TNCINFO * TNC)
 			maxsock = sock;
 	}
 
+	sock = TCP->NETROMSock6;
+	if (sock)
+	{
+		FD_SET(sock, readfd);
+		if (sock > maxsock)
+			maxsock = sock;
+	}
+
 	sock = TCP->DRATSsock6;
 
 	if (sock)
@@ -2064,13 +2093,20 @@ VOID TelnetPoll(int Port)
 				Socket_Accept(TNC, sock, TCP->RelayPort);
 		}
 
-		sock = TCP->HTTPsock;
+		sock = TCP->HTTPSock;
 		if (sock)
 		{
 			if (FD_ISSET(sock, &readfd))
 				Socket_Accept(TNC, sock, TCP->HTTPPort);
 		}
 
+		sock = TCP->NETROMSock;
+		if (sock)
+		{
+			if (FD_ISSET(sock, &readfd))
+				Socket_Accept(TNC, sock, TCP->NETROMPort);
+		}
+
 		sock = TCP->DRATSsock;
 		if (sock)
 		{
@@ -2118,6 +2154,14 @@ VOID TelnetPoll(int Port)
 				Socket_Accept(TNC, sock, TCP->HTTPPort);
 		}
 
+		sock = TCP->NETROMSock6;
+		if (sock)
+		{
+			if (FD_ISSET(sock, &readfd))
+				Socket_Accept(TNC, sock, TCP->NETROMPort);
+		}
+
+
 		sock = TCP->DRATSsock6;
 		if (sock)
 		{
@@ -2245,9 +2289,12 @@ VOID TelnetPoll(int Port)
 		}
 	}
 
-
 nosocks:
 
+	// Poll TCPNR
+
+	checkNRTCPSockets(Port);
+
 	// Try SNMP
 
 	if (TCP->SNMPsock)
@@ -3060,7 +3107,7 @@ LRESULT CALLBACK TelWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPara
 				shutdown(TCP->FBBsock[n++], SD_BOTH);
 
 			shutdown(TCP->Relaysock, SD_BOTH);
-			shutdown(TCP->HTTPsock, SD_BOTH);
+			shutdown(TCP->HTTPSock, SD_BOTH);
 			shutdown(TCP->HTTPsock6, SD_BOTH);
 
 
@@ -3085,7 +3132,7 @@ LRESULT CALLBACK TelWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lPara
 
 			closesocket(TCP->Relaysock);
 			closesocket(TCP->Relaysock6);
-			closesocket(TCP->HTTPsock);
+			closesocket(TCP->HTTPSock);
 			closesocket(TCP->HTTPsock6);
 
 			// Save info from old TNC record
@@ -3254,6 +3301,35 @@ int Socket_Accept(struct TNCINFO * TNC, SOCKET SocketId, int Port)
 		return 0;
 	}
 
+	// Netrom Over TCP uses its own Connection Entries
+
+	if (SocketId == TCP->NETROMSock || SocketId == TCP->NETROMSock6)
+	{
+		sockptr = AllocateNRTCPRec();
+
+		if (sockptr == 0)
+		{
+			// No entries - accept and close
+			
+			sock = accept(SocketId, (struct sockaddr *)&sin6, &addrlen);
+
+			send(sock,"No Free Sessions\r\n", 18,0);
+			Debugprintf("No Free Netrom Telnet Sessions");
+
+			Sleep (500);
+			closesocket(sock);
+			return 0;
+		}
+
+		sock = accept(SocketId, (struct sockaddr *)&sockptr->sin, &addrlen);
+		sockptr->socket = sock;
+		ioctl(sock, FIONBIO, &param);
+		
+		sockptr->NETROMMode = TRUE;
+		NETROMConnectionAccepted(sockptr);
+		return 0;
+	}
+
 //   Find a free Session
 
 	for (n = 1; n <= TCP->MaxSessions; n++)
@@ -3305,7 +3381,8 @@ int Socket_Accept(struct TNCINFO * TNC, SOCKET SocketId, int Port)
 			TNC->Streams[n].FramesQueued = 0;
 
 			sockptr->HTTPMode = FALSE;	
-			sockptr->APIMode = FALSE;	
+			sockptr->APIMode = FALSE;
+			sockptr->NETROMMode = FALSE;
 			sockptr->SyncMode = FALSE;	
 			sockptr->DRATSMode = FALSE;	
 			sockptr->FBBMode = FALSE;	
@@ -3320,9 +3397,12 @@ int Socket_Accept(struct TNCINFO * TNC, SOCKET SocketId, int Port)
 
 			memset(sockptr->ADIF, 0, sizeof(struct ADIF));
 
-			if (SocketId == TCP->HTTPsock || SocketId == TCP->HTTPsock6)
+			if (SocketId == TCP->HTTPSock || SocketId == TCP->HTTPsock6)
 				sockptr->HTTPMode = TRUE;
 
+			if (SocketId == TCP->NETROMSock || SocketId == TCP->NETROMSock6)
+				sockptr->NETROMMode = TRUE;
+
 			if (SocketId == TCP->APIsock || SocketId == TCP->APIsock6)
 			{
 				sockptr->HTTPMode = TRUE;		// API is a type of HTTP socket
@@ -3356,7 +3436,7 @@ int Socket_Accept(struct TNCINFO * TNC, SOCKET SocketId, int Port)
 
 			if (sockptr->HTTPMode)
 				return 0;
-
+	
 			if (sockptr->DRATSMode)
 			{
 				send(sock, "100 Authentication not required\n", 33, 0);
@@ -3794,12 +3874,14 @@ MsgLoop:
 	LFPtr=memchr(MsgPtr, 10, InputLen);
 
 	if (LFPtr == 0)
+	{
 		if (CRPtr)
 		{
 			LFPtr = ++CRPtr;
 			InputLen++;
 		}
-		if (LFPtr == 0)
+	}
+	if (LFPtr == 0)
 	{
 		// Check Paclen
 
@@ -3815,7 +3897,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
 
@@ -3827,16 +3909,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
@@ -3849,7 +3931,7 @@ MsgLoop:
 	case 2:
 
 		// Normal Data State
-			
+
 		STREAM->bytesRXed += MsgLen;
 		SendIndex = 0;
 
@@ -3864,7 +3946,7 @@ MsgLoop:
 		}
 
 		SendtoNode(TNC, sockptr->Number, MsgPtr + SendIndex, MsgLen);
-		
+
 		MsgLen += SendIndex;
 
 		// If anything left, copy down buffer, and go back
@@ -3883,20 +3965,20 @@ MsgLoop:
 		return 0;
 
 	case 0:
-		
-        //   Check Username
-        //
+
+		//   Check Username
+		//
 
 		*(LFPtr-1)=0;				 // remove cr
-        
-  //      send(sock, NLMsg, 2, 0);
 
-        if (LogEnabled)
+		//      send(sock, NLMsg, 2, 0);
+
+		if (LogEnabled)
 		{
 			char Addr[256];
-			
+
 			Tel_Format_Addr(sockptr, Addr);
-			
+
 			if (strlen(MsgPtr) > 64)
 			{
 				MsgPtr[64] = 0;
@@ -4491,7 +4573,8 @@ MsgLoop:
 
 				if (P8 == 1)
 					SendPortsForMonitor(sock, sockptr->UserPointer->Secure);
-					sockptr->InputLen = 0;
+				
+				sockptr->InputLen = 0;
 				return 0;
 			}
 		}
@@ -5016,23 +5099,20 @@ int DataSocket_ReadHTTP(struct TNCINFO * TNC, struct ConnectionInfo * sockptr, S
 	{
 		// Failed or closed - clear connection
 
-		// if Websock connection till app
+		// if Websock connection tell app
 
 		if (sockptr->WebSocks)
 		{
 			if (memcmp(sockptr->WebURL, "rhp", 3) == 0)
-			{
 				ProcessRHPWebSockClosed(sockptr->socket);	
-				DataSocket_Disconnect(TNC, sockptr);
-				return 0;
-			}
-		}
-		else
-		{
-			TNC->Streams[sockptr->Number].ReportDISC = TRUE;		//Tell Node
+
 			DataSocket_Disconnect(TNC, sockptr);
 			return 0;
 		}
+
+		TNC->Streams[sockptr->Number].ReportDISC = TRUE;		//Tell Node
+		DataSocket_Disconnect(TNC, sockptr);
+		return 0;
 	}
 
 	MsgPtr = &sockptr->InputBuffer[0];
@@ -5272,6 +5352,7 @@ int DataSocket_ReadDRATS(struct TNCINFO * TNC, struct ConnectionInfo * sockptr,
 }
 
 
+
 int DataSocket_Disconnect(struct TNCINFO * TNC,  struct ConnectionInfo * sockptr)
 {
 	int n;
@@ -5686,7 +5767,9 @@ int Telnet_Connected(struct TNCINFO * TNC, struct ConnectionInfo * sockptr, SOCK
 			}
 			else
 			{
-				if (TNC->PortRecord->ATTACHEDSESSIONS[Stream]->L4CROSSLINK->APPL[0])
+				struct _TRANSPORTENTRY * CROSSLINK = TNC->PortRecord->ATTACHEDSESSIONS[Stream]->L4CROSSLINK;
+
+				if (CROSSLINK && CROSSLINK->APPL[0])
 					buffptr->Len = sprintf(&buffptr->Data[0], "*** Connected to %s\r",
 						TNC->PortRecord->ATTACHEDSESSIONS[Stream]->L4CROSSLINK->APPL);
 				else
@@ -6306,10 +6389,10 @@ VOID SaveCMSHostInfo(int port, struct TCPINFO * TCP, int CMSNo)
 		char ip[256];
 		int n;
 
-	if (sizeof(time_t) == 4)
-		n = sscanf(buf,"%s %d %s", addr, (int *)&t, ip);
-	else
-		n = sscanf(buf, "%s %lld %s", addr, &t, ip);
+		if (sizeof(time_t) == 4)
+			n = sscanf(buf,"%s %d %s", addr, (int *)&t, ip);
+		else
+			n = sscanf(buf, "%s %lld %s", addr, &t, ip);
 
 		if (n == 3)
 		{
@@ -6342,26 +6425,80 @@ int TCPConnect(struct TNCINFO * TNC, struct TCPINFO * TCP, struct STREAMINFO * S
 	struct ConnectionInfo * sockptr;
 	SOCKET sock;
 	struct sockaddr_in sinx; 
-	struct sockaddr_in destaddr;
 	int addrlen=sizeof(sinx);
-	int i;
+	char PortString[20];
+	struct addrinfo hints, *res = 0, *saveres;
+
+
+	sprintf(PortString, "%d", Port);
+
+	// get host info, make socket, and connect it
+
+	memset(&hints, 0, sizeof hints);
+
+	if (TCP->IPV6 == 0 && TCP->IPV4)
+		hints.ai_family = AF_INET;
+	else if (TCP->IPV4 == 0 && TCP->IPV6)
+		hints.ai_family = AF_INET6;
+	else if (TCP->IPV4 && TCP->IPV6)
+		hints.ai_family = AF_UNSPEC;  // use IPv4 or IPv6, whichever
+
+	else
+	{
+		ReportError(STREAM, "Neither IPv4 nor IPv5 are enabled");
+		return FALSE;			// Resolve failed
+	}
+
+
+	hints.ai_socktype = SOCK_STREAM;
+	getaddrinfo(Host, PortString, &hints, &res);
+
+	if (!res)
+	{
+		char Msg[256];
+		err = WSAGetLastError();
+		sprintf(Msg, "Resolve HostName Failed - Error %d", err);
+		ReportError(STREAM, Msg);
+		return FALSE;			// Resolve failed
+	}
+
+	// Step thorough the list of hosts
+
+	saveres = res;				// Save for free
+
+/*	if (res->ai_next)			// More than one
+	{
+		int n = ISHostIndex;
+
+		while (n && res->ai_next)
+		{
+			res = res->ai_next;
+			n--;
+		}
+
+		if (n)
+		{
+			// We have run off the end of the list
+
+			ISHostIndex = 0;	// Back to start
+			res = saveres;
+		}
+		else
+			ISHostIndex++;
+
+	}
+*/
+//	getnameinfo(res->ai_addr, (int)res->ai_addrlen, RealISHost, 256, serv, 256, 0);
 
 	sockptr = STREAM->ConnectionInfo;
 		
-	sock = sockptr->socket = socket(AF_INET, SOCK_STREAM, 0);
+	sock = sockptr->socket = socket(res->ai_family, res->ai_socktype, res->ai_protocol);
 
-	if (sock == INVALID_SOCKET)
-	{
-		ReportError(STREAM, "Create Socket Failed");
-		return FALSE;
-	}
-	
 	sockptr->SocketActive = TRUE;
 	sockptr->InputLen = 0;
 	sockptr->LoginState = 2;
 	sockptr->UserPointer = 0;
 	sockptr->DoEcho = FALSE;
-
 	sockptr->FBBMode = FBB;		// Raw Data
 
 	if (sockptr->ADIF == NULL)
@@ -6370,49 +6507,19 @@ int TCPConnect(struct TNCINFO * TNC, struct TCPINFO * TCP, struct STREAMINFO * S
 	memset(sockptr->ADIF, 0, sizeof(struct ADIF));
 
 	
-	// Resolve Name if needed
-
-	sockptr->sin.sin_family = AF_INET; 
-	sockptr->sin.sin_port = htons(Port);
-
-	sockptr->sin.sin_addr.s_addr = inet_addr(Host);
-
-	if (sockptr->sin.sin_addr.s_addr == INADDR_NONE)
+	if (sock == INVALID_SOCKET)
 	{
-		struct hostent * HostEnt;
-
-		//	Resolve name to address
-
-		HostEnt = gethostbyname(Host);
-		 
-		if (!HostEnt)
-		{
-			ReportError(STREAM, "Resolve HostName Failed");
-			return FALSE;			// Resolve failed
-		}
-		i = 0;
-		while (HostEnt->h_addr_list[i] != 0)
-		{
-			    struct in_addr addr;
-				addr.s_addr = *(u_long *) HostEnt->h_addr_list[i++];
-		}
-		memcpy(&sockptr->sin.sin_addr.s_addr, HostEnt->h_addr, 4);
+		ReportError(STREAM, "Create Socket Failed");
+		return FALSE;
 	}
 
-	ioctl (sockptr->socket, FIONBIO, &param);
- 
-	setsockopt (sockptr->socket, SOL_SOCKET, SO_REUSEADDR, (const char FAR *)&bcopt,4);
+	ioctl (sock, FIONBIO, &param);
 
-	sinx.sin_family = AF_INET;
-	sinx.sin_addr.s_addr = INADDR_ANY;
-	sinx.sin_port = 0;
+	setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, (const char FAR *)&bcopt,4);
 
-	if (bind(sockptr->socket, (struct sockaddr *) &sinx, addrlen) != 0 )
-	{
-		ReportError(STREAM, "Bind Failed");	
-  	 	return FALSE; 
-	}
+//	memcpy(work, res->ai_addr->sa_data, 4);
 
+	
 	if (LogEnabled)
 	{
 		char logmsg[512];
@@ -6421,21 +6528,21 @@ int TCPConnect(struct TNCINFO * TNC, struct TCPINFO * TCP, struct STREAMINFO * S
 		WriteLog (logmsg);
 	}
 
-
-	if (connect(sockptr->socket,(struct sockaddr *) &sockptr->sin, sizeof(destaddr)) == 0)
+	if (connect(sock, res->ai_addr, (int)res->ai_addrlen) == 0)
 	{
 		//
 		//	Connected successful
 		//
 
 		ReportError(STREAM, "*** Connected");
-
-		// Get Send Buffer Size
+		freeaddrinfo(saveres);
 
 		return TRUE;
 	}
 	else
 	{
+		freeaddrinfo(saveres);
+	
 		err=WSAGetLastError();
 
 		if (err == 10035 || err == 115 || err == 36)		//EWOULDBLOCK
@@ -6461,7 +6568,6 @@ int TCPConnect(struct TNCINFO * TNC, struct TCPINFO * TCP, struct STREAMINFO * S
 	}
 
 	return FALSE;
-
 }
 
 

UIARQ.c

@@ -80,6 +80,11 @@ int DoScanLine(struct TNCINFO * TNC, char * Buff, int Len);
 VOID ProcessARQPacket(struct PORTCONTROL * PORT, MESSAGE * Buffer);
 char * strlop(char * buf, char delim);
 
+void hookL4SessionAttempt(struct STREAMINFO * , char * remotecall, char * ourcall);
+void hookL4SessionAccepted(struct STREAMINFO * , char * remotecall, char * ourcall);
+void hookL4SessionDeleted(struct TNCINFO * TNC, void * STREAM);
+
+
 extern UCHAR BPQDirectory[];
 extern char MYALIASLOPPED[10];
 

UZ7HODrv.c

@@ -78,6 +78,11 @@ VOID ReleaseOtherPorts(struct TNCINFO * ThisTNC);
 int DoScanLine(struct TNCINFO * TNC, char * Buff, int Len);
 int standardParams(struct TNCINFO * TNC, char * buf);
 
+void hookL4SessionAttempt(struct STREAMINFO * , char * remotecall, char * ourcall);
+void hookL4SessionAccepted(struct STREAMINFO * , char * remotecall, char * ourcall);
+void hookL4SessionDeleted(struct TNCINFO * TNC, void * STREAM);
+
+
 extern UCHAR BPQDirectory[];
 
 #define MAXUZ7HOPORTS 16
@@ -1581,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_port = htons(TNC->TCPPort);
-		TNC->HostName = malloc(strlen(p_ipad)+1);
+	TNC->destaddr.sin_family = AF_INET;
+	TNC->destaddr.sin_port = htons(TNC->TCPPort);
+	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)
 		{
-			if (_stricmp(ptr, "PTT") == 0)
-			{
-				ptr = strtok(NULL, " \t\n\r");
+			ptr = strtok(NULL, " \t\n\r");
 
-				if (ptr)
-				{
-					DecodePTTString(TNC, ptr);
-					ptr = strtok(NULL, " \t\n\r");
-				}
-			}
-		
-			if (ptr &&_memicmp(ptr, "PATH", 4) == 0)
+			if (ptr)
 			{
-				p_cmd = strtok(NULL, "\n\r");
-				if (p_cmd) TNC->ProgramPath = _strdup(p_cmd);
+				DecodePTTString(TNC, ptr);
+				ptr = strtok(NULL, " \t\n\r");
 			}
 		}
 
-		// Read Initialisation lines
-
-		while(TRUE)
+		if (ptr &&_memicmp(ptr, "PATH", 4) == 0)
 		{
-			if (GetLine(buf) == 0)
-				return TRUE;
+			p_cmd = strtok(NULL, "\n\r");
+			if (p_cmd) TNC->ProgramPath = _strdup(p_cmd);
+		}
+	}
 
-			strcpy(errbuf, buf);
+	// Read Initialisation lines
 
-			if (memcmp(buf, "****", 4) == 0)
-				return TRUE;
+	while(TRUE)
+	{
+		if (GetLine(buf) == 0)
+			return TRUE;
 
-			ptr = strchr(buf, ';');
-			if (ptr)
-			{
-				*ptr++ = 13;
-				*ptr = 0;
-			}
-			
-			if (_memicmp(buf, "MAXSESSIONS", 11) == 0)
-			{
-				AGW->MaxSessions = atoi(&buf[12]);
-				if (AGW->MaxSessions > 26 ) AGW->MaxSessions = 26;
-			}
-			if (_memicmp(buf, "CONTIMEOUT", 10) == 0)
-				AGW->ConnTimeOut = atoi(&buf[11]) * 10;
-			else
+		strcpy(errbuf, buf);
+
+		if (memcmp(buf, "****", 4) == 0)
+			return TRUE;
+
+		ptr = strchr(buf, ';');
+		if (ptr)
+		{
+			*ptr++ = 13;
+			*ptr = 0;
+		}
+
+		if (_memicmp(buf, "MAXSESSIONS", 11) == 0)
+		{
+			AGW->MaxSessions = atoi(&buf[12]);
+			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 
-				TNC->RPBEACON = TRUE;
-			else
-			if (_memicmp(buf, "WINDOW", 6) == 0)
-				TNC->Window = atoi(&buf[7]);
-			else
-			if (_memicmp(buf, "DEFAULTMODEM", 12) == 0) 
-				TNC->AGWInfo->Modem = atoi(&buf[13]);
-			else
-			if (_memicmp(buf, "MODEMCENTER", 11) == 0 || _memicmp(buf, "MODEMCENTRE", 11) == 0)
-				TNC->AGWInfo->CenterFreq = atoi(&buf[12]);
-			else
-			if (standardParams(TNC, buf) == FALSE)
-				strcat(TNC->InitScript, buf);
-		}
+				if (_memicmp(buf, "BEACONAFTERSESSION", 18) == 0) // Send Beacon after each session 
+					TNC->RPBEACON = TRUE;
+				else
+					if (_memicmp(buf, "WINDOW", 6) == 0)
+						TNC->Window = atoi(&buf[7]);
+					else
+						if (_memicmp(buf, "DEFAULTMODEM", 12) == 0) 
+							TNC->AGWInfo->Modem = atoi(&buf[13]);
+						else
+							if (_memicmp(buf, "MODEMCENTER", 11) == 0 || _memicmp(buf, "MODEMCENTRE", 11) == 0)
+								TNC->AGWInfo->CenterFreq = atoi(&buf[12]);
+							else
+								if (standardParams(TNC, buf) == FALSE)
+									strcat(TNC->InitScript, buf);
+	}
 
 
 	return (TRUE);	

VARA.c

@@ -73,6 +73,11 @@ int	KissEncode(UCHAR * inbuff, UCHAR * outbuff, int len);
 VOID PROCESSNODEMESSAGE(MESSAGE * Msg, struct PORTCONTROL * PORT);
 VOID NETROMMSG(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG);
 
+void hookL4SessionAttempt(struct STREAMINFO * , char * remotecall, char * ourcall);
+void hookL4SessionAccepted(struct STREAMINFO * , char * remotecall, char * ourcall);
+void hookL4SessionDeleted(struct TNCINFO * TNC, void * STREAM);
+
+
 #ifndef LINBPQ
 BOOL CALLBACK EnumVARAWindowsProc(HWND hwnd, LPARAM  lParam);
 #endif
@@ -418,8 +423,9 @@ 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,15 +10,15 @@
 
 #endif
 
-#define KVers 6,0,24,71
-#define KVerstring "6.0.24.71\0"
+#define KVers 6,0,25,12
+#define KVerstring "6.0.25.12\0"
 
 
 #ifdef CKernel
 
 #define Vers KVers
 #define Verstring KVerstring
-#define Datestring "April 2025"
+#define Datestring "October 2025"
 #define VerComments "G8BPQ Packet Switch (C Version)" KVerstring
 #define VerCopyright "Copyright © 2001-2025 John Wiseman G8BPQ\0"
 #define VerDesc "BPQ32 Switch\0"

WINMOR.c

@@ -105,6 +105,11 @@ int DoScanLine(struct TNCINFO * TNC, char * Buff, int Len);
 BOOL KillOldTNC(char * Path);
 int standardParams(struct TNCINFO * TNC, char * buf);
 
+void hookL4SessionAttempt(struct STREAMINFO * , char * remotecall, char * ourcall);
+void hookL4SessionAccepted(struct STREAMINFO * , char * remotecall, char * ourcall);
+void hookL4SessionDeleted(struct TNCINFO * TNC, void * STREAM);
+
+
 static char ClassName[]="WINMORSTATUS";
 static char WindowTitle[] = "WINMOR";
 static int RigControlRow = 165;
@@ -613,8 +618,10 @@ 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

@@ -2662,10 +2662,10 @@ VOID SaveNewMessage(struct HTTPConnectionInfo * Session, char * MsgPtr, char * R
 	if (strlen(WebMail->BID) > 12)
 		WebMail->BID[12] = 0;
 
-	UndoTransparency(WebMail->BID);
-	UndoTransparency(WebMail->To);
-	UndoTransparency(WebMail->Subject);
-	UndoTransparency(WebMail->Body);
+//	UndoTransparency(WebMail->BID);
+//	UndoTransparency(WebMail->To);
+//	UndoTransparency(WebMail->Subject);
+//	UndoTransparency(WebMail->Body);
 
 	MsgLen = strlen(WebMail->Body);
 
@@ -2822,6 +2822,18 @@ VOID SaveNewMessage(struct HTTPConnectionInfo * Session, char * MsgPtr, char * R
 					strcpy(Msg->via, ToUser->HomeBBS);
 					sprintf(Prompt, "%s added from HomeBBS. Message Saved", Msg->via);
 				}
+				else
+				{
+					// No HomeBBS - check WP
+
+					WPRecP WP = LookupWP(Msg->to);
+
+					if (WP)
+					{
+						strcpy(Msg->via, WP->first_homebbs);
+						sprintf(Prompt, "%s added from WP", Msg->via);
+					}
+				}
 			}
 			else
 			{
@@ -3299,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))
 		{
@@ -4239,6 +4251,18 @@ VOID SaveTemplateMessage(struct HTTPConnectionInfo * Session, char * MsgPtr, cha
 					strcpy(Msg->via, ToUser->HomeBBS);
 					sprintf(Prompt, "%s added from HomeBBS. Message Saved", Msg->via);
 				}
+				else
+				{
+					// No HomeBBS - Check WP
+
+					WPRecP WP = LookupWP(Msg->to);
+	
+					if (WP)
+					{
+						strcpy(Msg->via, WP->first_homebbs);
+						sprintf(Prompt, "%s added from WP", Msg->via);
+					}
+				}
 			}
 			else
 			{
@@ -4459,6 +4483,18 @@ VOID BuildMessageFromHTMLInput(struct HTTPConnectionInfo * Session, char * Reply
 				strcpy(Msg->via, ToUser->HomeBBS);
 				sprintf(Prompt, "%s added from HomeBBS", Msg->via);
 			}
+			else
+			{
+				// No HomeBBS - Check WP
+			
+				WPRecP WP = LookupWP(Msg->to);
+
+				if (WP)
+				{
+					strcpy(Msg->via, WP->first_homebbs);
+					sprintf(Prompt, "%s added from WP", Msg->via);
+				}
+			}
 		}
 		else
 		{
@@ -5573,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

@@ -42,7 +42,7 @@ typedef int (FAR *FARPROCY)();
 #define L4INFO	5		// INFORMATION
 #define L4IACK	6		// INFORMATION ACK
 #define L4RESET 7		// Paula's extension
-
+#define L4CREQX 8		// Paula's extension
 
 extern char MYCALL[];	// 7 chars, ax.25 format
 extern char MYALIASTEXT[];	// 6 chars, not null terminated
@@ -64,15 +64,6 @@ extern int ENDOFDATA;
 extern int L3LIVES;
 extern int NUMBEROFNODES;
 
-struct CMDX
-{
-	char String[12];			// COMMAND STRING
-	UCHAR CMDLEN;				// SIGNIFICANT LENGTH
-//	VOID (*CMDPROC)(struct _TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail,  struct CMDX * CMD);// COMMAND PROCESSOR
-	VOID (*CMDPROC)();// COMMAND PROCESSOR
-	size_t CMDFLAG;				// FLAG/VALUE Offset
-
-};
 
 struct APPLCONFIG
 {
@@ -186,6 +177,20 @@ typedef struct _TRANSPORTENTRY
 	int Received;
 	int ReceivedAfterExpansion;
 
+	int segsSent;
+	int segsRcvd;
+	int segsResent;
+
+	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;
 
@@ -229,13 +234,15 @@ typedef struct ROUTE
 	BOOL INP3Node;
 	BOOL NoKeepAlive;			// Suppress Keepalive Processing
 	int	LastConnectAttempt;		// To stop us trying too often
+	int ConnectionAttempts;
 
-	int Status;			// 
+	int Status;			//
+	int OldBPQ;				// Set if other end is BPQ sending RIF in mS
 	int LastRTT;			// Last Value Reported
 	int RTT;				// Current	
 	int SRTT;				// Smoothed RTT
 	int NeighbourSRTT;		// Other End SRTT
-//	int RTTIncrement;		// Average of Ours and Neighbours SRTT in 10 ms
+	int RTTIncrement;		// Average of Ours and Neighbours SRTT in 10 ms - smoothed neighbor transport time (SNTT) in spec
 	int BCTimer;			// Time to next L3RTT Broadcast
 	int Timeout;			// Lost Response Timer
 	int Retries;			// Lost Response Count
@@ -244,6 +251,13 @@ typedef struct ROUTE
 	int	OtherendsRouteQual;	//	Route quality used by other end.
 	int	OtherendLocked;		//	Route quality locked by ROUTES entry.
 	int	FirstTimeFlag;		//	Set once quality has been set by direct receive
+	int RemoteMAXRTT;		//	For INP3
+	int RemoteMAXHOPS;
+
+	char * TCPHost;			// For NETROM over TCP
+	int TCPPort;
+	struct NRTCPSTRUCT * TCPSession;	
+	struct addrinfo * TCPAddress;		// Resolved Address
 
 } *PROUTE;
 
@@ -701,7 +715,8 @@ typedef struct PORTCONTROL
 	BOOL NormalizeQuality;		// Normalise Node Qualities
 	BOOL IgnoreUnlocked;		// Ignore Unlocked routes
 	BOOL INP3ONLY;				// Default to INP3 and disallow NODES
-	BOOL ALLOWINP3;
+	BOOL ALLOWINP3;				// Accept INP3 if offered by other end
+	BOOL ENABLEINP3;			// Send INP3 RTT probes to discovered neighbours
 
 	void (* UIHook)(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, MESSAGE * Buffer, MESSAGE * ADJBUFFER, UCHAR CTL, UCHAR MSGFLAG);			// Used for KISSARQ
 	struct PORTCONTROL * HookPort;
@@ -727,6 +742,10 @@ typedef struct PORTCONTROL
 	UCHAR * TX;					// % Sending
 	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;
 
 typedef struct FULLPORTDATA
@@ -927,6 +946,9 @@ typedef struct _LINKTABLE
 	VOID *	FRAMES[8];		// FRAMES WAITING ACK
 	VOID *	RXFRAMES[8];	// Frames received out of sequence
 
+	time_t	LASTFRAMESENT;	// For detecting stuck links
+	int		LASTSENTQCOUNT;	//
+
 	UCHAR	L2STATE;		// PROCESSING STATE
 	UCHAR	Ver2point2;		// Set if running 2.2
 	USHORT	L2TIMER;		// FRAME RETRY TIMER
@@ -960,6 +982,18 @@ typedef struct _LINKTABLE
 	time_t ConnectTime;		// For session stats
 	int bytesRXed;			// Info bytes only
 	int bytesTXed;
+	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
@@ -975,6 +1009,9 @@ typedef struct _LINKTABLE
 	int Received;
 	int ReceivedAfterExpansion;
 
+	char ApplName[16];
+	time_t lastStatusSentTime;
+	int apiSeq;						// for OARC event reporting
 
 } LINKTABLE;
 
@@ -1084,7 +1121,11 @@ struct SEM
 	int	Gets;
 	int Rels;
 	DWORD SemProcessID;
+#ifdef WIN32
 	DWORD SemThreadID;
+#else
+	pthread_t SemThreadID;
+#endif
 	int Line;		// caller file and line
 	char File[MAX_PATH];
 };
@@ -1371,6 +1412,7 @@ struct arp_table_entry
 //	SOCKET SourceSocket;
 	struct AXIPPORTINFO * PORT;
 	BOOL noUpdate;				// Don't update dest address from incoming packet
+	BOOL replytoSourcePort;		// Update map entry dest port from source port of each packet.
 	time_t LastHeard;			// Last Packet received from this ststiom
 };
 
@@ -1461,6 +1503,25 @@ struct AXIPPORTINFO
 
 };
 
+struct CMDX
+{
+	char String[12];			// COMMAND STRING
+	UCHAR CMDLEN;				// SIGNIFICANT LENGTH
+	VOID (*CMDPROC)(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail,  struct CMDX * CMD);// COMMAND PROCESSOR
+//	VOID (*CMDPROC)();// COMMAND PROCESSOR
+	size_t CMDFLAG;				// FLAG/VALUE Offset
+
+};
+
+struct NETROMX
+{
+	 int ServiceNo;
+	 char ServiceName[10];
+};
+
+extern struct NETROMX SERVICES[];
+extern int NUMBEROFSSERVICES;
+
 
 #define Disconnect(stream) SessionControl(stream,2,0)
 #define Connect(stream) SessionControl(stream,1,0)

bpq32.h

@@ -22,6 +22,8 @@ count on BPQ32.dll gets messed up, and the code will not unload cleanly.
 struct PORTCONTROL * APIENTRY GetPortTableEntryFromPortNum(int portslot);
 struct PORTCONTROL * APIENTRY GetPortTableEntryFromSlot(int portslot);
 
+int APIENTRY GetPortHardwareType(struct PORTCONTROL *PORT);
+
 
 //	Returns number of free buffers
 //	(BPQHOST function 7 (part)).

bpqaxip.c

@@ -192,8 +192,8 @@ extern UCHAR BPQDirectory[];
 
 extern int OffsetH, OffsetW;
 
-static void ResolveNames(struct AXIPPORTINFO * PORT);
-void OpenSockets(struct AXIPPORTINFO * PORT);
+static void ResolveNames(VOID * Param);
+void OpenSockets(VOID * Param);
 void CloseSockets(struct AXIPPORTINFO * PORT);
 
 
@@ -204,7 +204,7 @@ int Update_MH_KeepAlive(struct AXIPPORTINFO * PORT, struct in_addr ipad, char pr
 unsigned short int compute_crc(unsigned char *buf,int l);
 unsigned int find_arp(unsigned char * call);
 BOOL add_arp_entry(struct AXIPPORTINFO * PORT, unsigned char * call, UCHAR * ip, int len, int port,unsigned char * name,
-int keepalive, BOOL BCFlag, BOOL AutoAdded, int TCPMode, int SourcePort, BOOL IPv6, int noUpdate);
+		int keepalive, BOOL BCFlag, BOOL AutoAdded, int TCPMode, int SourcePort, BOOL IPv6, int noUpdate, int useSourcePort);
 BOOL add_bc_entry(struct AXIPPORTINFO * PORT, unsigned char * call, int len);
 BOOL convtoax25(unsigned char * callsign, unsigned char * ax25call, int * calllen);
 static BOOL ReadConfigFile(int Port);
@@ -213,7 +213,7 @@ int CheckKeepalives(struct AXIPPORTINFO * PORT);
 BOOL CopyScreentoBuffer(char * buff, struct AXIPPORTINFO * PORT);
 int DumpFrameInHex(unsigned char * msg, int len);
 VOID SendFrame(struct AXIPPORTINFO * PORT, struct arp_table_entry * arp_table, UCHAR * buff, int txlen);
-BOOL CheckSourceisResolvable(struct AXIPPORTINFO * PORT, char * call, int Port, VOID * rxaddr);
+BOOL CheckSourceisResolvable(struct AXIPPORTINFO * PORT, char * call, int FromPort, VOID * rxaddr, int ToPort);
 int DataSocket_Read(struct arp_table_entry * sockptr, SOCKET sock);
 int GetMessageFromBuffer(struct AXIPPORTINFO * PORT, char * Buffer);
 int	KissEncode(UCHAR * inbuff, UCHAR * outbuff, int len);
@@ -221,7 +221,7 @@ int	KissDecode(UCHAR * inbuff, int len);
 int Socket_Accept(int SocketId);
 int Socket_Connect(int SocketId, int Error);
 int Socket_Data(int sock, int error, int eventcode);
-VOID TCPConnectThread(struct arp_table_entry * arp);
+VOID TCPConnectThread(VOID * Param);
 VOID __cdecl Debugprintf(const char * format, ...);
 VOID __cdecl Consoleprintf(const char * format, ...);
 BOOL OpenListeningSocket(struct AXIPPORTINFO * PORT, struct arp_table_entry * arp);
@@ -429,7 +429,7 @@ static size_t ExtProc(int fn, int port, PMESSAGE buff)
 
 						if (PORT->Checkifcanreply)
 						{
-							if (CheckSourceisResolvable(PORT, call, 0, &RXaddr))
+							if (CheckSourceisResolvable(PORT, call, 0, &RXaddr, 0))
 
 								return 1;
 
@@ -437,14 +437,14 @@ static size_t ExtProc(int fn, int port, PMESSAGE buff)
 								// Can't reply. If AutoConfig is set, add to table and accept, else reject
 
 								if (PORT->AutoAddARP)
-									return add_arp_entry(PORT, call, (UCHAR *)&RXaddr.rxaddr.sin_addr.s_addr, 7, 0, inet_ntoa(RXaddr.rxaddr.sin_addr), 0, PORT->AutoAddBC, TRUE, 0, 0, FALSE, 0);
+									return add_arp_entry(PORT, call, (UCHAR *)&RXaddr.rxaddr.sin_addr.s_addr, 7, 0, inet_ntoa(RXaddr.rxaddr.sin_addr), 0, PORT->AutoAddBC, TRUE, 0, 0, FALSE, 0, 0);
 								else
 								{
 									char From[11] = "|";
 									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]);
 									}
@@ -536,7 +536,7 @@ static size_t ExtProc(int fn, int port, PMESSAGE buff)
 
 					if (PORT->Checkifcanreply)
 					{
-						if (CheckSourceisResolvable(PORT, call, htons(RXaddr.rxaddr.sin_port), &RXaddr))
+						if (CheckSourceisResolvable(PORT, call, htons(RXaddr.rxaddr.sin_port), &RXaddr, PORT->udpport[i]))
 							return 1;
 						else
 						{
@@ -547,17 +547,17 @@ static size_t ExtProc(int fn, int port, PMESSAGE buff)
 								{
 									char Addr[80];
 									Format_Addr((UCHAR *)&RXaddr.rxaddr6.sin6_addr, Addr, TRUE);
-									return add_arp_entry(PORT, call, (UCHAR *)&RXaddr.rxaddr6.sin6_addr, 7, htons(RXaddr.rxaddr6.sin6_port), Addr, 0, PORT->AutoAddBC, TRUE, 0, PORT->udpport[i], TRUE, 0);		
+									return add_arp_entry(PORT, call, (UCHAR *)&RXaddr.rxaddr6.sin6_addr, 7, htons(RXaddr.rxaddr6.sin6_port), Addr, 0, PORT->AutoAddBC, TRUE, 0, PORT->udpport[i], TRUE, 0, 0);		
 								}
 								else
-									return add_arp_entry(PORT, call, (UCHAR *)&RXaddr.rxaddr.sin_addr.s_addr, 7, htons(RXaddr.rxaddr.sin_port), inet_ntoa(RXaddr.rxaddr.sin_addr), 0, PORT->AutoAddBC, TRUE, 0, PORT->udpport[i], FALSE, 0);		
+									return add_arp_entry(PORT, call, (UCHAR *)&RXaddr.rxaddr.sin_addr.s_addr, 7, htons(RXaddr.rxaddr.sin_port), inet_ntoa(RXaddr.rxaddr.sin_addr), 0, PORT->AutoAddBC, TRUE, 0, PORT->udpport[i], FALSE, 0, 0);		
 							else
 							{
 								char From[11] = "|";
 								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]);
 								}
@@ -692,7 +692,7 @@ static size_t ExtProc(int fn, int port, PMESSAGE buff)
 		else 
 			Consoleprintf("Failed to reread config file - leaving config unchanged");
 
-		_beginthread(OpenSockets, 0, PORT );
+		_beginthread(OpenSockets, 0, PORT);
 
 		GetAXIPCache(PORT);
 
@@ -844,8 +844,9 @@ int InitAXIP(int Port)
 	return (TRUE);	
 }
 
-void OpenSockets(struct AXIPPORTINFO * PORT)
+void OpenSockets(void * Param)
 {
+	struct AXIPPORTINFO * PORT = (struct AXIPPORTINFO *)Param;
 	char Msg[255];
 	int err;
 	u_long param=1;
@@ -1343,6 +1344,7 @@ LRESULT FAR PASCAL ConfigWndProc(HWND hWnd,UINT message,WPARAM wParam,LPARAM lPa
 	char axcall[7];
 	BOOL UDPFlag, BCFlag;
 	struct AXIPPORTINFO * PORT;
+	int useSourcePort = 0;
 
 	for (i=1; i <= MAXBPQPORTS; i++)
 	{
@@ -1391,7 +1393,7 @@ LRESULT FAR PASCAL ConfigWndProc(HWND hWnd,UINT message,WPARAM wParam,LPARAM lPa
 			{
 				if (convtoax25(call,axcall,&calllen))
 				{
-					add_arp_entry(PORT, axcall,0,calllen,port,host,Interval, BCFlag, FALSE, 0, port, FALSE, 0);
+					add_arp_entry(PORT, axcall,0,calllen,port,host,Interval, BCFlag, FALSE, 0, port, FALSE, 0, useSourcePort);
 					ResolveDelay = 2;
 					return(DestroyWindow(hWnd));
 				}
@@ -1527,8 +1529,9 @@ static void CreateResolverWindow(struct AXIPPORTINFO * PORT)
 extern HWND hWndPopup;
 
 
-static void ResolveNames(struct AXIPPORTINFO * PORT)
+static void ResolveNames(VOID * Param)
 {
+	struct AXIPPORTINFO * PORT = (struct AXIPPORTINFO *)Param;
 	int count = 0;
 
 	PORT->ResolveNamesThreadId = GetCurrentThreadId();		// Detect if another started
@@ -2147,6 +2150,7 @@ static int ProcessLine(char * buf, struct AXIPPORTINFO * PORT)
 	int Interval;
 	int noUpdate=FALSE;
 	int TCPMode;
+	int useSourcePort = 0;
 
 	ptr = strtok(buf, " \t\n\r");
 
@@ -2234,6 +2238,7 @@ static int ProcessLine(char * buf, struct AXIPPORTINFO * PORT)
 		bcflag=0;
 		TCPMode=0;
 		SourcePort = 0;
+		useSourcePort = 0;
 
 //
 //		Look for (optional) KEEPALIVE, DYNAMIC, UDP or BROADCAST params
@@ -2264,7 +2269,14 @@ static int ProcessLine(char * buf, struct AXIPPORTINFO * PORT)
 			
 				if (p_udpport == NULL) return (FALSE);
 
-				port = atoi(p_udpport);
+				if (_stricmp(p_udpport,"FROMPORT") == 0)
+				{
+					useSourcePort = TRUE;
+					port = 0;
+				}
+				else
+					port = atoi(p_udpport);
+
 				p_UDP = strtok(NULL, " \t\n\r");
 				continue;
 			}
@@ -2327,7 +2339,7 @@ static int ProcessLine(char * buf, struct AXIPPORTINFO * PORT)
 			if (SourcePort == 0)
 				SourcePort = port;
 
-			add_arp_entry(PORT, axcall, 0, calllen, port, p_ipad, Interval, bcflag, FALSE, TCPMode, SourcePort, FALSE, noUpdate);
+			add_arp_entry(PORT, axcall, 0, calllen, port, p_ipad, Interval, bcflag, FALSE, TCPMode, SourcePort, FALSE, noUpdate, useSourcePort);
 			return (TRUE);
 		}
 	}		// End of Process MAP
@@ -2438,7 +2450,7 @@ BOOL convtoax25(unsigned char * callsign, unsigned char * ax25call,int * calllen
 }
 
 BOOL add_arp_entry(struct AXIPPORTINFO * PORT, UCHAR * call, UCHAR * ip, int len, int port,
-				   UCHAR * name, int keepalive, BOOL BCFlag, BOOL AutoAdded, int TCPFlag, int SourcePort, BOOL IPv6, int noUpdate)
+				   UCHAR * name, int keepalive, BOOL BCFlag, BOOL AutoAdded, int TCPFlag, int SourcePort, BOOL IPv6, int noUpdate, int useSourcePort)
 {
 	struct arp_table_entry * arp;
 
@@ -2457,7 +2469,8 @@ BOOL add_arp_entry(struct AXIPPORTINFO * PORT, UCHAR * call, UCHAR * ip, int len
 
 	arp->PORT = PORT;
 
-	if (port == 0) PORT->needip = 1;			// Enable Raw IP Mode
+	if (port == 0 && arp->replytoSourcePort == 0)
+		PORT->needip = 1;			// Enable Raw IP Mode
 
 	arp->ResolveFlag=TRUE;
 	PORT->NeedResolver=TRUE;
@@ -2476,6 +2489,7 @@ BOOL add_arp_entry(struct AXIPPORTINFO * PORT, UCHAR * call, UCHAR * ip, int len
 	arp->TCPMode = TCPFlag;
 	arp->noUpdate = noUpdate;
 	PORT->arp_table_len++;
+	arp->replytoSourcePort = useSourcePort;
 
 	if (PORT->MaxResWindowlength < (PORT->arp_table_len * 14) + 70)
 		PORT->MaxResWindowlength = (PORT->arp_table_len * 14) + 70;
@@ -2576,7 +2590,7 @@ int CheckKeepalives(struct AXIPPORTINFO * PORT)
 	return (0);
 }
 
-BOOL CheckSourceisResolvable(struct AXIPPORTINFO * PORT, char * call, int Port, VOID * rxaddr)
+BOOL CheckSourceisResolvable(struct AXIPPORTINFO * PORT, char * call, int FromPort, VOID * rxaddr, int ToPort)
 {
 	// Makes sure we can reply to call before accepting message
 
@@ -2606,9 +2620,15 @@ BOOL CheckSourceisResolvable(struct AXIPPORTINFO * PORT, char * call, int Port,
 					struct sockaddr_in * SA = rxaddr;
 					memcpy(&arp->destaddr.sin_addr.s_addr, &SA->sin_addr, 4);
 				}
-				//	Dont think I should update port
+				//	Dont think I should update port unless using source port for dest
 
-				//arp->port = Port;
+				if (arp->replytoSourcePort)
+				{
+					arp->port = FromPort;
+					arp->destaddr.sin_port = htons(arp->port);
+					if (arp->SourcePort == 0)
+						arp->SourcePort = ToPort;
+				}
 			}
 			arp->LastHeard = time(NULL);
 			return 1;		// Ok to process
@@ -2978,8 +2998,9 @@ int	KissDecode(UCHAR * inbuff, int len)
 	return txptr;
 }
 
-VOID TCPConnectThread(struct arp_table_entry * arp)
+VOID TCPConnectThread(void * Param)
 {
+	struct arp_table_entry * arp = (struct arp_table_entry *)Param;
 	char Msg[255];
 	int err, i;
 	u_long param=1;

bpqchat.c

@@ -73,6 +73,9 @@
 //.25
 
 //  Increase size of status display buffers (7)
+//	Allow sending BEL (CTRL/G) (79)
+//	Fix sending BEL (CTRL/G) (81)
+
 
 #include "BPQChat.h"
 #include "Dbghelp.h"

cMain.c

@@ -38,6 +38,7 @@ 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);
@@ -52,16 +53,33 @@ int CanPortDigi(int Port);
 int	KissEncode(UCHAR * inbuff, UCHAR * outbuff, int len);
 void MQTTTimer();
 void SaveMH();
+VOID InformPartner(struct _LINKTABLE * LINK, int Reason);
+VOID L2SENDCOMMAND(struct _LINKTABLE * LINK, int CMD);
+void WritePacketLogThread(void * param);
+void hookNodeStarted();
+void hookNodeRunning();
+void APIL2Trace(struct _MESSAGE * Message, char * Dirn);
 
 #include "configstructs.h"
 
 extern struct CONFIGTABLE xxcfg;
 extern BOOL needAIS;
 extern int needADSB;
+extern int EnableOARCAPI;
+extern SOCKET NodeAPISocket;
+extern int nodeStartedSent;
+extern SOCKADDR_IN UDPreportdest;
+extern char NodeAPIServer[80];
+extern int NodeAPIPort;
+
+time_t LastNodeStatus = 0;
+
+int nodeStatusTimer = 20 * 60;		// 20 mins
 
 struct PORTCONFIG * PortRec;
 
 #define RNRSET 0x2				// RNR RECEIVED FROM OTHER END
+#define	PFBIT 0x10		// POLL/FINAL BIT IN CONTROL BYTE
 
 //	STATION INFORMATION
 
@@ -177,6 +195,7 @@ extern VOID * ENDPOOL;
 extern void * APPL_Q;				// Queue of frames for APRS Appl
 
 extern BOOL APRSActive;
+extern int DEBUGINP3;
 
 #define BPQHOSTSTREAMS	64
 
@@ -190,9 +209,12 @@ BPQVECSTRUC * TELNETMONVECPTR = &BPQHOSTVECTOR[BPQHOSTSTREAMS];
 BPQVECSTRUC * AGWMONVECPTR = &BPQHOSTVECTOR[BPQHOSTSTREAMS + 1];
 BPQVECSTRUC * APRSMONVECPTR = &BPQHOSTVECTOR[BPQHOSTSTREAMS + 2];
 BPQVECSTRUC * IPHOSTVECTORPTR = &BPQHOSTVECTOR[BPQHOSTSTREAMS + 3];
+BPQVECSTRUC * FILEMONVECTOR = &BPQHOSTVECTOR[BPQHOSTSTREAMS + 4];
 
 int BPQVECLENGTH = sizeof(BPQVECSTRUC);
 
+int MONTOFILEFLAG = 0;
+
 int NODEORDER = 0;
 UCHAR LINKEDFLAG = 0;
 
@@ -246,6 +268,8 @@ int CFLAG = 0;						// C =HOST Command
 VOID * IDMSG_Q = NULL;				// ID/BEACONS WAITING TO BE SENT
 
 int	NODESINPROGRESS = 0;
+int NODESToOnePort = 0;				// Set to port num to send NODES to only one port.
+
 VOID * CURRENTNODE = NULL;			// NEXT _NODE TO SEND
 VOID * DESTHEADER = NULL;			// HEAD OF SORTED NODES CHAIN
 
@@ -301,8 +325,8 @@ VOID LINKINIT(PEXTPORTDATA PORTVEC)
 VOID LINKTX(PEXTPORTDATA PORTVEC, PMESSAGE Buffer)
 {
 	//	LOOP BACK TO SWITCH
+
 	struct _LINKTABLE * LINK;
-	
 	LINK = Buffer->Linkptr;
 
 	if (LINK)
@@ -858,6 +882,14 @@ BOOL Start()
 
 	PREFERINP3ROUTES = cfg->C_PREFERINP3ROUTES;
 
+	if (cfg->C_DEBUGINP3)
+		DEBUGINP3 = 0;
+
+	EnableOARCAPI = cfg->C_OARCAPI;
+
+	if (cfg->C_OnlyVer2point0)
+		SUPPORT2point2 = 0;
+
  
 	// Get pointers to PASSWORD and APPL1 commands
 
@@ -985,6 +1017,8 @@ BOOL Start()
 		PORT->IgnoreUnlocked = PortRec->IGNOREUNLOCKED;
 		PORT->INP3ONLY = PortRec->INP3ONLY;
 		PORT->ALLOWINP3 = PortRec->AllowINP3;
+		PORT->ENABLEINP3 = PortRec->EnableINP3;
+		PORT->isRF = PortRec->isRF;
 
 		PORT->PORTWINDOW = (UCHAR)PortRec->MAXFRAME;
 
@@ -1359,13 +1393,13 @@ BOOL Start()
 		
 		PORT = GetPortTableEntryFromPortNum(ROUTE->NEIGHBOUR_PORT);
 
-		if (Rcfg->pwind & 0x40)
+		if (Rcfg->nokeepalives)
 			ROUTE->NoKeepAlive = 1;
 		else
 			if (PORT != NULL)
 				ROUTE->NoKeepAlive = PORT->PortNoKeepAlive;
 
-		if (Rcfg->pwind & 0x80 || (PORT && PORT->INP3ONLY))
+		if (Rcfg->inp3 || (PORT && PORT->INP3ONLY))
 		{
 			ROUTE->INP3Node = 1;
 			ROUTE->NoKeepAlive = 0;			// Cant have INP3 and NOKEEPALIVES
@@ -1379,11 +1413,20 @@ BOOL Start()
 		ROUTE->OtherendsRouteQual = ROUTE->OtherendLocked = Rcfg->farQual;
 
 		ROUTE->NEIGHBOUR_FLAG = LOCKEDBYCONFIG;			// Locked
+
+		if (Rcfg->tcphost)
+		{
+			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];
@@ -1557,8 +1600,34 @@ BOOL Start()
 
 	upnpInit();
 
+	// Start Monitor to file thread
+	
+	_beginthread(WritePacketLogThread, 0, NULL);
+
 	lastSaveSecs = CurrentSecs = lastSlowSecs = time(NULL);
 
+	// if EnableOARCAPI set try to resolve host here so we can send Node up event before anything else
+
+	if (EnableOARCAPI)
+	{
+		struct hostent * HostEnt3;
+		HostEnt3 = gethostbyname(NodeAPIServer);
+
+		NodeAPISocket = socket(AF_INET, SOCK_DGRAM, 0);
+		UDPreportdest.sin_family = AF_INET;
+		UDPreportdest.sin_port = htons(NodeAPIPort);
+
+		if (HostEnt3)
+		{
+			memcpy(&UDPreportdest.sin_addr.s_addr,HostEnt3->h_addr,4);
+
+			hookNodeStarted();
+			nodeStartedSent = 1;
+			LastNodeStatus = time(NULL);
+		}
+	}
+
+
 	return 0;
 }
 
@@ -1964,7 +2033,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
@@ -2152,6 +2221,12 @@ VOID TIMERINTERRUPT()
 		if (MQTT)
 			MQTTTimer();
 
+		if (LastNodeStatus && (time(NULL) - LastNodeStatus) > nodeStatusTimer)
+		{
+			LastNodeStatus = time(NULL);
+			hookNodeRunning();
+		}
+
 /*
 		if (QCOUNT < 200)
 		{
@@ -2207,6 +2282,10 @@ VOID TIMERINTERRUPT()
 		}
 
 		Message = (struct _MESSAGE *)Buffer;
+
+		if(NodeAPISocket)
+			APIL2Trace(Message, "sent");
+
 		Message->PORT |= 0x80;			// Set TX Bit
 	
 		BPQTRACE(Message, FALSE);		// Dont send TX'ed frames to APRS
@@ -2318,6 +2397,9 @@ L2Packet:
 
 			if (MQTT && PORT->PROTOCOL == 0)
 				MQTTKISSRX(Buffer);
+
+			if(NodeAPISocket &&PORT->PROTOCOL == 0)
+				APIL2Trace(Message, "rcvd");
 			
 			// Bridge if requested
 
@@ -2503,6 +2585,47 @@ ENDOFLIST:
 
 				if ((LINK->L2FLAGS & RNRSET) == 0)
 					SDETX(LINK);
+				else
+				{
+					// Stuck link debug check
+
+					if (LINK->LINKWINDOW == 0 || LINK->LASTFRAMESENT == 0 || (time(NULL) - LINK->LASTFRAMESENT) > 60)			// No send for 60 secs
+					{
+						if (COUNT_AT_L2(LINK) > 16 || LINK->LINKWINDOW == 0)
+						{
+							// Dump Link State
+
+							char Normcall[11] = "";
+							char Normcall2[11] = "";
+
+							int Count = COUNT_AT_L2(LINK);
+							int secs = time(NULL) - LINK->LASTFRAMESENT;
+
+
+							ConvFromAX25(LINK->LINKCALL, Normcall);
+							ConvFromAX25(LINK->OURCALL, Normcall2);
+
+							Debugprintf("*** Stuck L2 Session for %d Secs RNR Set %s %s %d", secs, Normcall, Normcall2, Count);
+							Debugprintf("LINK->LINKNS %d LINK->LINKOWS %d SDTSLOT %d LINKWINDOW %d L2FLAGS %d", LINK->LINKNS, LINK->LINKOWS, LINK->SDTSLOT, LINK->LINKWINDOW, LINK->L2FLAGS);
+							Debugprintf("Slots %x %x %x %x %x %x %x %x", LINK->FRAMES[0], LINK->FRAMES[1], LINK->FRAMES[2], LINK->FRAMES[3],
+								LINK->FRAMES[4], LINK->FRAMES[5], LINK->FRAMES[6], LINK->FRAMES[7]);
+
+							// Reset Link
+
+
+							InformPartner(LINK, NORMALCLOSE);	// TELL OTHER END ITS GONE
+
+							LINK->L2RETRIES -= 1;		// Just send one DISC
+							LINK->L2STATE = 4;			// CLOSING
+
+							L2SENDCOMMAND(LINK, DISC | PFBIT);
+
+							return;
+						}
+					}
+
+				}
+
 			}
 		}
 		LINK++;
@@ -2627,6 +2750,18 @@ int BPQTRACE(MESSAGE * Msg, BOOL TOAPRS)
 		L4++;
 	}
 
+	// And to the Monitor to File system.
+
+	if (MONTOFILEFLAG)		// Trace Enabled?
+	{
+		Buffer = GetBuff();
+		if (Buffer)
+		{
+			memcpy(&Buffer->PORT, &Msg->PORT, BUFFLEN - sizeof(void *));	// Dont copy chain word
+			C_Q_ADD(&FILEMONVECTOR->HOSTTRACEQ, Buffer);
+		}
+	}
+
 	return TRUE;
 }
 ;
@@ -2635,6 +2770,7 @@ VOID INITIALISEPORTS()
 {
 	char INITMSG[80];
 	struct PORTCONTROL * PORT = PORTTABLE;
+	struct PORTCONTROL * SAVEPORT;
 	
 	while (PORT)
 	{
@@ -2642,7 +2778,68 @@ VOID INITIALISEPORTS()
 		WritetoConsoleLocal(INITMSG);
 
 		PORT->PORTINITCODE(PORT);
-		PORT = PORT->PORTPOINTER;
+		SAVEPORT=PORT;
+
+		// 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;
 	}
 }
 

chatconfig.cfg

@@ -18,5 +18,5 @@ Chat :
   MonitorSize = "828,1644,148,770";
   DebugSize = "0,0,0,0";
   WindowSize = "231,835,254,602";
-  Version = "6,0,24,32";
+  Version = "6,0,24,81";
 };

cheaders.h

@@ -105,10 +105,10 @@ VOID CLOSECURRENTSESSION(TRANSPORTENTRY * Session);
 
 VOID SendCommandReply(TRANSPORTENTRY * Session, struct DATAMESSAGE * Buffer, int Len);
 
-struct PORTCONTROL * APIENTRY GetPortTableEntryFromPortNum(int portnum);
+DllExport struct PORTCONTROL * APIENTRY GetPortTableEntryFromPortNum(int portnum);
 
 int cCOUNT_AT_L2(struct _LINKTABLE * LINK);
-VOID SENDL4CONNECT(TRANSPORTENTRY * Session);
+VOID SENDL4CONNECT(TRANSPORTENTRY * Session, int Service);
 
 VOID CloseSessionPartner(TRANSPORTENTRY * Session);
 int COUNTNODES(struct ROUTE * ROUTE);
@@ -202,8 +202,6 @@ int TrytoGuessCode(unsigned char * Char, int Len);
 #define XID 0xAF
 #define TEST 0xE3
 
-#define SUPPORT2point2 1
-
 // XID Optional Functions
 
 #define OPMustHave 0x02A080		// Sync TEST 16 bit FCS Extended Address
@@ -438,13 +436,12 @@ extern int MQTT_PORT;
 extern char MQTT_USER[80];
 extern char MQTT_PASS[80];
 
+extern int SUPPORT2point2;
+
+
 DllExport uint64_t APIENTRY GetPortFrequency(int PortNo, char * FreqStringMhz);
 
 
 void hookL2SessionAccepted(int Port, char * remotecall, char * ourcall, struct _LINKTABLE * LINK);
 void hookL2SessionDeleted(struct _LINKTABLE * LINK);
 void hookL2SessionAttempt(int Port, char * ourcall, char * remotecall, struct _LINKTABLE * LINK);
-
-void hookL4SessionAttempt(void * STREAM, char * remotecall, char * ourcall);
-void hookL4SessionAccepted(void * STREAM, char * remotecall, char * ourcall);
-void hookL4SessionDeleted(struct TNCINFO * TNC, void * STREAM);

compatbits.c

@@ -25,6 +25,8 @@ Stuff to make compiling on WINDOWS and LINUX easier
 
 #ifdef WIN32
 
+#include <windows.h>
+
 typedef unsigned int       uint32_t;
 
 #define pthread_t uint32_t
@@ -41,6 +43,7 @@ int pthread_equal(pthread_t T1, pthread_t T2)
 #include <syslog.h>
 #include <stdarg.h>
 #include <unistd.h>
+#include <stdint.h>
 
 #define BOOL int
 
@@ -188,3 +191,27 @@ 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,6 +24,7 @@ Stuff to make compiling on WINDOWS and LINUX easier
 
 #define strtoll _strtoi64
 
+
 #ifdef _WIN64
 #include "stdint.h"
 #else
@@ -49,7 +50,39 @@ Stuff to make compiling on WINDOWS and LINUX easier
 
 int pthread_equal(pthread_t T1, pthread_t T2);
 
-uintptr_t _beginthread(void(__cdecl *start_address)(void *), unsigned stack_size, void *arglist);
+uintptr_t _beginthread(void(__cdecl start_address)(void *), unsigned stack_size, void *arglist);
+
+#if defined(_MSC_VER) && _MSC_VER < 1900
+
+#define snprintf c99_snprintf
+#define vsnprintf c99_vsnprintf
+
+__inline int c99_vsnprintf(char *outBuf, size_t size, const char *format, va_list ap)
+{
+    int count = -1;
+
+    if (size != 0)
+        count = _vsnprintf_s(outBuf, size, _TRUNCATE, format, ap);
+    if (count == -1)
+        count = _vscprintf(format, ap);
+
+    return count;
+}
+
+__inline int c99_snprintf(char *outBuf, size_t size, const char *format, ...)
+{
+    int count;
+    va_list ap;
+
+    va_start(ap, format);
+    count = c99_vsnprintf(outBuf, size, format, ap);
+    va_end(ap);
+
+    return count;
+}
+#endif
+
+
 
 #else
 
@@ -152,9 +185,7 @@ int stricmp(const unsigned char * pStr1, const unsigned char *pStr2);
 char * strupr(char* s);
 char * strlwr(char* s);
 
-pthread_t _beginthread(void(*start_address)(), unsigned stack_size, VOID * arglist);
-
-
+pthread_t _beginthread(void(start_address)(void *), unsigned stack_size, VOID * arglist);
 
 #define WSAGetLastError() errno
 #define GetLastError() errno 
@@ -189,7 +220,7 @@ typedef struct tagRECT
 
 #endif
 
-
+uint32_t GetTickCountINP3();		
 
 #ifdef LINBPQ
 

config.c

@@ -305,10 +305,12 @@ static char *keywords[] =
 "APPL5ALIAS", "APPL6ALIAS", "APPL7ALIAS", "APPL8ALIAS",
 "APPL1QUAL", "APPL2QUAL", "APPL3QUAL", "APPL4QUAL",
 "APPL5QUAL", "APPL6QUAL", "APPL7QUAL", "APPL8QUAL",
-"BTEXT:", "NETROMCALL", "C_IS_CHAT", "MAXRTT", "MAXHOPS",		// IPGATEWAY= no longer allowed
+
+"BTEXT:", "NETROMCALL", "C_IS_CHAT", "MAXRTT", "MAXTT", "MAXHOPS",		// IPGATEWAY= no longer allowed
 "LogL4Connects", "LogAllConnects", "SAVEMH", "ENABLEADIFLOG", "ENABLEEVENTS", "SAVEAPRSMSGS", 
 "EnableM0LTEMap", "MQTT", "MQTT_HOST", "MQTT_PORT", "MQTT_USER", "MQTT_PASS",
-"L4Compress", "L4CompMaxframe", "L4CompPaclen", "L2Compress", "L2CompMaxframe", "L2CompPaclen", "PREFERINP3ROUTES"
+"L4Compress", "L4CompMaxframe", "L4CompPaclen", "L2Compress", "L2CompMaxframe",
+"L2CompPaclen", "PREFERINP3ROUTES", "OnlyVer2point0", "DEBUGINP3", "ENABLEOARCAPI"
 };           /* parameter keywords */
 
 static void * offset[] =
@@ -327,11 +329,12 @@ static void * offset[] =
 &xxcfg.C_APPL[4].ApplAlias, &xxcfg.C_APPL[5].ApplAlias, &xxcfg.C_APPL[6].ApplAlias, &xxcfg.C_APPL[7].ApplAlias,
 &xxcfg.C_APPL[0].ApplQual, &xxcfg.C_APPL[1].ApplQual, &xxcfg.C_APPL[2].ApplQual, &xxcfg.C_APPL[3].ApplQual,
 &xxcfg.C_APPL[4].ApplQual, &xxcfg.C_APPL[5].ApplQual, &xxcfg.C_APPL[6].ApplQual, &xxcfg.C_APPL[7].ApplQual,
-&xxcfg.C_BTEXT, &xxcfg.C_NETROMCALL, &xxcfg.C_C, &xxcfg.C_MAXRTT, &xxcfg.C_MAXHOPS,		// IPGATEWAY= no longer allowed
+
+&xxcfg.C_BTEXT, &xxcfg.C_NETROMCALL, &xxcfg.C_C, &xxcfg.C_MAXRTT, &xxcfg.C_MAXRTT, &xxcfg.C_MAXHOPS,		// IPGATEWAY= no longer allowed
 &xxcfg.C_LogL4Connects, &xxcfg.C_LogAllConnects, &xxcfg.C_SaveMH, &xxcfg.C_ADIF, &xxcfg.C_EVENTS, &xxcfg.C_SaveAPRSMsgs,
 &xxcfg.C_M0LTEMap, &xxcfg.C_MQTT, &xxcfg.C_MQTT_HOST, &xxcfg.C_MQTT_PORT, &xxcfg.C_MQTT_USER, &xxcfg.C_MQTT_PASS,
 &xxcfg.C_L4Compress, &xxcfg.C_L4CompMaxframe, &xxcfg.C_L4CompPaclen, &xxcfg.C_L2Compress, &xxcfg.C_L2CompMaxframe, 
-&xxcfg.C_L2CompPaclen, &xxcfg.C_PREFERINP3ROUTES};		/* offset for corresponding data in config file */
+&xxcfg.C_L2CompPaclen, &xxcfg.C_PREFERINP3ROUTES, &xxcfg.C_OnlyVer2point0,  &xxcfg.C_DEBUGINP3, &xxcfg.C_OARCAPI};		/* offset for corresponding data in config file */
 
 static int routine[] = 
 {
@@ -349,11 +352,12 @@ static int routine[] =
 13, 13 ,13, 13,
 14, 14, 14, 14,
 14, 14 ,14, 14,
-15, 0, 2, 9, 9,
+
+15, 0, 2, 9, 9, 9,
 2, 2, 1, 2, 2, 2,
 2, 2, 0, 1, 20, 20,
 1, 1, 1, 1, 1, 
-1, 1} ;			// Routine to process param
+1, 1, 1, 1, 1};			// Routine to process param
 
 int PARAMLIM = sizeof(routine)/sizeof(int);
 //int NUMBEROFKEYWORDS = sizeof(routine)/sizeof(int);
@@ -375,7 +379,8 @@ static char *pkeywords[] =
 "BCALL", "DIGIMASK", "NOKEEPALIVES", "COMPORT", "DRIVER", "WL2KREPORT", "UIONLY",
 "UDPPORT", "IPADDR", "I2CBUS", "I2CDEVICE", "UDPTXPORT", "UDPRXPORT", "NONORMALIZE",
 "IGNOREUNLOCKEDROUTES", "INP3ONLY", "TCPPORT", "RIGPORT", "PERMITTEDAPPLS", "HIDE",
-"SMARTID", "KISSCOMMAND", "SendtoM0LTEMap", "PortFreq", "M0LTEMapInfo", "QTSMPort", "ALLOWINP3"};         /* parameter keywords */
+"SMARTID", "KISSCOMMAND", "SendtoM0LTEMap", "PortFreq", "M0LTEMapInfo", "QTSMPort", 
+"ALLOWINP3", "ENABLEINP3", "isRF"};         /* parameter keywords */
 
 static void * poffset[] =
 {
@@ -389,7 +394,8 @@ 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.AllowINP3};	/* offset for corresponding data in config file */
+&xxp.SmartID, &xxp.KissParams, &xxp.SendtoM0LTEMap, &xxp.PortFreq, &xxp.M0LTEMapInfo, &xxp.QtSMPort, 
+&xxp.AllowINP3, &xxp.EnableINP3, &xxp.isRF};	/* offset for corresponding data in config file */
 
 static int proutine[] = 
 {
@@ -403,7 +409,8 @@ 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};							/* routine to process parameter */
+1, 20, 1, 21, 22, 1, 
+1, 1, 1};							/* routine to process parameter */
 
 int PPARAMLIM = sizeof(proutine)/sizeof(int);
 
@@ -600,7 +607,6 @@ BOOL ProcessConfig()
 			
 	
 	for (i=0;i<24;i++)
-		
 		paramok[45+i]=1;	/* or APPLCALLS, APPLALIASS APPLQUAL */
 
 	paramok[69]=1;			// BText optional
@@ -629,6 +635,10 @@ BOOL ProcessConfig()
 	paramok[90]=1;			// L2Compress Maxframe
 	paramok[91]=1;			// L2Compress Paclen
 	paramok[92]=1;			// PREFERINP3ROUTES
+	paramok[93]=1;			// ONLYVer2point0
+	paramok[94]=1;			// DEBUGINP3
+	paramok[95]=1;			// EnableOARCAPI
+	paramok[96]=1;			// OARCAPI
 
 
 	for (i=0; i < PARAMLIM; i++)
@@ -1582,32 +1592,160 @@ int routes(int i)
 
 		// strtok and sscanf can't handle successive commas, so split up usig strchr
 
-		memset(Param, 0, 2048);
-		strlop(rec, 13);
-		strlop(rec, ';');
+		// Now support keyword=value format
 
-		ptr1 = rec;
-
-		while (ptr1 && *ptr1 && n < 8)
+		if (strchr(rec, '='))
 		{
-			ptr2 = strchr(ptr1, ',');
-			if (ptr2) *ptr2++ = 0;
+			// New format
+			// 		call quality port window frack paclen farquality inp3 nokeepalives tcp
 
-			strcpy(&Param[n++][0], ptr1);
-			ptr1 = ptr2;
-			while(ptr1 && *ptr1 && *ptr1 == ' ')
-				ptr1++;
+			char * ptr, *context;
+			char copy[512] = "";
+
+			if (strlen(rec) < 512)
+				strcpy(copy, rec);
+
+			_strupr(rec);
+
+			ptr = strtok_s(rec, " ,=", &context);
+
+			while (ptr)
+			{
+				if (strcmp(ptr, "CALL") == 0)
+				{
+					char * Call = strtok_s(NULL, ",=", &context);
+
+					if (strlen(Call) < 80)
+						strcpy(Route->call, Call);
+
+				}
+				else if (strcmp(ptr, "PORT") == 0)
+				{
+					char * val = strtok_s(NULL, " ,=", &context);
+
+					if (val)
+						Route->port = atoi(val);
+				}
+
+				else if (strcmp(ptr, "QUALITY") == 0)
+				{
+					char * val = strtok_s(NULL, " ,=", &context);
+
+					if (val)
+						Route->quality = atoi(val);
+				}
+
+				else if (strcmp(ptr, "FRACK") == 0)
+				{
+					char * val = strtok_s(NULL, " ,=", &context);
+
+					if (val)
+						Route->pfrack = atoi(val);
+				}
+
+				else if (strcmp(ptr, "PACLEN") == 0)
+				{
+					char * val = strtok_s(NULL, " ,=", &context);
+
+					if (val)
+						Route->pwind = atoi(val);
+				}
+
+				else if (strcmp(ptr, "WINDOW") == 0)
+				{
+					char * val = strtok_s(NULL, " ,=", &context);
+
+					if (val)
+						Route->pwind = atoi(val);
+				}
+
+				else if (strcmp(ptr, "FARQUALITY") == 0)
+				{
+					char * val = strtok_s(NULL, " ,=", &context);
+
+					if (val)
+						Route->farQual = atoi(val);
+				}
+
+				else if (strcmp(ptr, "INP3") == 0)
+				{
+					char * val = strtok_s(NULL, " ,=", &context);
+
+					if (val)
+						Route->inp3 = atoi(val);
+				}
+
+				else if (strcmp(ptr, "NOKEEPALIVES") == 0)
+				{
+					char * val = strtok_s(NULL, " ,=", &context);
+
+					if (val)
+						Route->farQual = atoi(val);
+				}
+
+
+				else if (strcmp(ptr, "TCP") == 0)
+				{
+					char * val = strtok_s(NULL, " ,=", &context);
+
+					if (val)
+					{
+						char * port = strlop(val, ':');
+
+						Route->tcphost = _strdup(val);
+						if (port)
+							Route->tcpport = atoi(port);
+						else
+							Route->tcpport = 53119;  
+					}
+				}
+				else
+				{
+					Consoleprintf("Bad Route %s\r\n",rec);
+					err_flag = 1;
+					break;
+				}
+
+				ptr = strtok_s(NULL, " ,=", &context);
+			}
 		}
 
-		strcpy(Route->call, &Param[0][0]);
+		else
+		{
 
-		Route->quality = atoi(Param[1]);
-		Route->port = atoi(Param[2]);
-		Route->pwind = atoi(Param[3]);
-		Route->pfrack = atoi(Param[4]);
-		Route->ppacl = atoi(Param[5]);
-		inp3 = atoi(Param[6]);
-		Route->farQual = atoi(Param[7]);
+			memset(Param, 0, 2048);
+			strlop(rec, 13);
+			strlop(rec, ';');
+
+			ptr1 = rec;
+
+			while (ptr1 && *ptr1 && n < 8)
+			{
+				ptr2 = strchr(ptr1, ',');
+				if (ptr2) *ptr2++ = 0;
+
+				strcpy(&Param[n++][0], ptr1);
+				ptr1 = ptr2;
+				while(ptr1 && *ptr1 && *ptr1 == ' ')
+					ptr1++;
+			}
+
+			strcpy(Route->call, &Param[0][0]);
+
+			Route->quality = atoi(Param[1]);
+			Route->port = atoi(Param[2]);
+			Route->pwind = atoi(Param[3]);
+			Route->pfrack = atoi(Param[4]);
+			Route->ppacl = atoi(Param[5]);
+			inp3 = atoi(Param[6]);
+			Route->farQual = atoi(Param[7]);
+
+			if (inp3 & 1)
+				Route->inp3 = 1;
+
+			if (inp3 & 2)
+				Route->nokeepalives = 1;
+		}
 
 	   if (Route->farQual < 0 || Route->farQual > 255)
 	   {
@@ -1632,14 +1770,6 @@ int routes(int i)
 			err_flag = 1;
 	   }
 
-	   // Use top bit of window as INP3 Flag, next as NoKeepAlive
-
-	   if (inp3 & 1)
-		   Route->pwind |= 0x80;
-
-	   if (inp3 & 2)
-		   Route->pwind |= 0x40;
-
 	   if (err_flag == 1)
 	   {
 	      Consoleprintf("%s\r\n",rec);
@@ -1693,6 +1823,7 @@ int ports(int i)
 	}
 
 	xxp.SendtoM0LTEMap = 1;			// Default to enabled
+	xxp.isRF = -1;					// Default to undefined
 
 	while (endport == 0 && !feof(fp1))
 	{

configstructs.h

@@ -82,6 +82,8 @@ struct PORTCONFIG
 	char * M0LTEMapInfo;
 	int QtSMPort;
 	int AllowINP3;
+	int EnableINP3;
+	short isRF;
 };
 
 struct ROUTECONFIG
@@ -93,6 +95,10 @@ struct ROUTECONFIG
 	int pfrack;
 	int ppacl;
 	int farQual;
+	int inp3;
+	int nokeepalives;
+	char * tcphost;
+	int tcpport;
 };
 
 struct CONFIGTABLE
@@ -178,6 +184,9 @@ struct CONFIGTABLE
 	int C_L2CompMaxframe;
 	int C_L2CompPaclen;
 	int C_PREFERINP3ROUTES;
+	int C_OnlyVer2point0;
+	int C_DEBUGINP3;
+	int C_OARCAPI;
 
 
 //#define ApplOffset 80000			// Applications offset in config buffer

datadefs.c

@@ -35,6 +35,9 @@ int RFOnly = 0;
 
 int MAXRTT = 9000;			// 90 secs
 int MaxHops = 4;
+int DEBUGINP3 = 0;
+
+int EnableOARCAPI = 0;
 
 int RTTInterval = 24;		// 4 Minutes
 

debian/NEWS

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,23 @@
+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

@@ -0,0 +1,50 @@
+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

@@ -0,0 +1,342 @@
+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

@@ -0,0 +1,20 @@
+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

@@ -0,0 +1,37 @@
+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

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

debian/gbp.conf

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

debian/gitlab-ci.yml

@@ -0,0 +1,6 @@
+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

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

debian/linbpq.examples

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

debian/linbpq.service

@@ -0,0 +1,14 @@
+[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

@@ -0,0 +1,11 @@
+# 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

@@ -0,0 +1,57 @@
+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

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

debian/patches/spelling-fixes.patch

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,47 @@
+#!/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

@@ -0,0 +1,14 @@
+#!/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

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

debian/source/format

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

debian/watch

@@ -0,0 +1,3 @@
+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)))

ipcode.h

@@ -78,6 +78,8 @@ typedef struct _ETHARP
 	UCHAR	TARGETHWADDR[6];
 	uint32_t	TARGETIPADDR;
 
+	char	Padding[18];		// For  min ether send of 60
+
 } ETHARP, *PETHARP;
 
 typedef struct _RIP2HDDR

kiss.c

@@ -1905,7 +1905,7 @@ int i2cPoll(struct PORTCONTROL * PORT, NPASYINFO npKISSINFO)
 
 // KISS Over TCP Routines
 
-VOID ConnecttoTCPThread(NPASYINFO ASY);
+VOID ConnecttoTCPThread(void * Param);
 
 int ConnecttoTCP(NPASYINFO ASY)
 {
@@ -1914,8 +1914,9 @@ int ConnecttoTCP(NPASYINFO ASY)
 	return 0;
 }
 
-VOID ConnecttoTCPThread(NPASYINFO ASY)
+VOID ConnecttoTCPThread(void * Param)
 {
+	NPASYINFO ASY = (NPASYINFO)Param;
 	char Msg[255];
 	int err,i;
 	u_long param=1;
@@ -2131,7 +2132,7 @@ int KISSGetTCPMessage(NPASYINFO ASY)
 // Interface to QtSM Managmemt Interface
 
 
-VOID QtSMThread(struct PORTCONTROL * PORT);
+VOID QtSMThread(void * Param);
 
 VOID ConnecttoQtSM(struct PORTCONTROL * PORT)
 {
@@ -2141,11 +2142,12 @@ VOID ConnecttoQtSM(struct PORTCONTROL * PORT)
 	return ;
 }
 
-VOID QtSMThread(struct PORTCONTROL * PORT)
+VOID QtSMThread(void * Param)
 {
 	// This is the Managemt Interface in QtSM. It receives PTT ON/OFF msgs from QtSM and allows changing modem mode and freq.
 	//	Also will collect link usage stats
 	
+	struct PORTCONTROL * PORT = (struct PORTCONTROL *)Param;
 	char Msg[255];
 	int err, i, ret;
 	u_long param = 1;

linether.c

@@ -22,17 +22,29 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 
 // Normally uses a Raw socket, but that can't send to other apps on same machine.
 // so can use a TAP device instead (or maybe as well??)
+
+// Not suported on BSD based systems
+
+#ifndef FREEBSD
 #ifndef MACBPQ
 
+
+#if !(defined(MACBPQ) || defined(FREEBSD))
+
 #include <stdio.h>
-
 #include "cheaders.h"
-
 #include <sys/socket.h>
+
+#if !(defined(FREEBSD))
+
 #include <linux/if_packet.h>
 #include <linux/if_ether.h>
 #include <linux/if_arp.h>
 
+#endif
+#endif
+
+
 extern int tap_fd;
 
 typedef struct PCAPStruct
@@ -489,5 +501,11 @@ static int ProcessLine(char * buf, int Port, BOOL CheckPort)
 	return (FALSE);
 	
 }
+
+
+// 
+
+#endif // MACBPQ
+#endif // FREEBSD
 	
-#endif
+

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) {
-                reconst();
-        }
-        c = prnt[c + T];
-        do {
-                k = ++freq[c];
+	if (freq[R] == MAX_FREQ) {
+		reconst();
+	}
+	c = prnt[c + T];
+	do {
+		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]);
-                        l--;
-                        freq[c] = freq[l];
-                        freq[l] = k;
+			while ((unsigned)k > freq[++l]);
+			l--;
+			freq[c] = freq[l];
+			freq[l] = k;
 
-                        i = son[c];
-                        prnt[i] = l;
-                        if (i < T) prnt[i + 1] = l;
+			i = son[c];
+			prnt[i] = l;
+			if (i < T) prnt[i + 1] = l;
 
-                        j = son[l];
-                        son[l] = i;
+			j = son[l];
+			son[l] = i;
 
-                        prnt[j] = c;
-                        if (j < T) prnt[j + 1] = c;
-                        son[c] = j;
+			prnt[j] = c;
+			if (j < T) prnt[j + 1] = c;
+			son[c] = j;
 
-                        c = l;
-                }
-        } while ((c = prnt[c]) != 0);   /* repeat up to root */
+			c = l;
+		}
+	} while ((c = prnt[c]) != 0);   /* repeat up to root */
 }
 
 unsigned code, len;
 
 static void EncodeChar(unsigned int c)
 {
-    unsigned int i;
-    int j, k;
+	unsigned int i;
+	int j, k;
 
-        i = 0;
-        j = 0;
-        k = prnt[c + T];
+	i = 0;
+	j = 0;
+	k = prnt[c + T];
 
-        /* travel from leaf to root */
-        do {
-                i >>= 1;
+	/* travel from leaf to root */
+	do {
+		i >>= 1;
 
-                /* if node's address is odd-numbered, choose bigger brother node */
-                if (k & 1) i += 0x8000;
+		/* if node's address is odd-numbered, choose bigger brother node */
+		if (k & 1) i += 0x8000;
 
-                j++;
-        } while ((k = prnt[k]) != R);
-        Putcode(j, i);
-        code = i;
-        len = j;
-        update(c);
+		j++;
+	} while ((k = prnt[k]) != R);
+	Putcode(j, i);
+	code = i;
+	len = j;
+	update(c);
 }
 
 static void EncodePosition(unsigned int c)
 {
-    unsigned int i;
+	unsigned int i;
 
-        /* output upper 6 bits by table lookup */
-        i = c >> 6;
-        Putcode(p_len[i], (unsigned)p_code[i] << 8);
+	/* output upper 6 bits by table lookup */
+	i = c >> 6;
+	Putcode(p_len[i], (unsigned)p_code[i] << 8);
 
-        /* output lower 6 bits verbatim */
-        Putcode(6, (c & 0x3f) << 10);
+	/* output lower 6 bits verbatim */
+	Putcode(6, (c & 0x3f) << 10);
 }
 
 static void EncodeEnd(void)
 {
-        if (putlen) {
-				if (crc_fputc(putbuf >> 8) == EOF) {
-                        Error(wterr);
-                }
-                codesize++;
-        }
+	if (putlen) {
+		if (crc_fputc(putbuf >> 8) == EOF) {
+			Error(wterr);
+		}
+		codesize++;
+	}
 }
 
 int DecodeChar(void)
 {
-    unsigned int c;
+	unsigned int c;
 
-        c = son[R];
+	c = son[R];
 
-        /* travel from root to leaf, */
-        /* choosing the smaller child node (son[]) if the read bit is 0, */
-        /* the bigger (son[]+1} if 1 */
-        while (c < T) {
-                c += GetBit();
-                c = son[c];
-        }
-        c -= T;
-        update(c);
-    return (int)c;
+	/* travel from root to leaf, */
+	/* choosing the smaller child node (son[]) if the read bit is 0, */
+	/* the bigger (son[]+1} if 1 */
+	while (c < T) {
+		c += GetBit();
+		c = son[c];
+	}
+	c -= T;
+	update(c);
+	return (int)c;
 }
 
 int DecodePosition(void)
 {
-    unsigned int i, j, c;
+	unsigned int i, j, c;
 
-		/* recover upper 6 bits from table */
-		i = GetByte();
-		c = (unsigned)d_code[i] << 6;
-		j = d_len[i];
+	/* recover upper 6 bits from table */
+	i = GetByte();
+	c = (unsigned)d_code[i] << 6;
+	j = d_len[i];
 
-		/* read lower 6 bits verbatim */
-		j -= 2;
-		while (j--) {
-				i = (i << 1) + GetBit();
-		}
-    return (int)(c | (i & 0x3f));
+	/* read lower 6 bits verbatim */
+	j -= 2;
+	while (j--) {
+		i = (i << 1) + GetBit();
+	}
+	return (int)(c | (i & 0x3f));
 }
 
 /* compression */
@@ -1406,7 +1406,7 @@ File: 5566 NEWBOAT.HOMEPORT.JPG
 
 			if (SendBBStoSYSOPCall)
 				if (_stricmp(FullTo, BBSName) == 0)
-					strcpy(Msg->to, SYSOPCall);
+					strcpy(FullTo, SYSOPCall);
 
 			if ((Msg->via[0] == 0 || strcmp(Msg->via, "BPQ") == 0 || strcmp(Msg->via, "BBS") == 0)
 				&& (conn->Paclink || conn->RMSExpress))

mailapi.c

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

makefile

@@ -13,26 +13,68 @@ OBJS = pngwtran.o pngrtran.o pngset.o pngrio.o pngwio.o pngtrans.o pngrutil.o pn
  MailCommands.o MailDataDefs.o LinBPQ.o MailRouting.o MailTCP.o MBLRoutines.o md5.o Moncode.o \
  NNTPRoutines.o RigControl.o TelnetV6.o WINMOR.o TNCCode.o UZ7HODrv.o WPRoutines.o \
  SCSTrackeMulti.o SCSPactor.o SCSTracker.o HanksRT.o  UIRoutines.o AGWAPI.o AGWMoncode.o \
- DRATS.o FreeDATA.o base64.o Events.o nodeapi.o mailapi.o mqtt.o RHP.o
+ DRATS.o FreeDATA.o base64.o Events.o nodeapi.o mailapi.o mqtt.o RHP.o NETROMTCP.o
 
 # Configuration:
 
-CC = gcc
-		                       
-all: CFLAGS = -DLINBPQ -MMD -g -rdynamic -fcommon -fasynchronous-unwind-tables
-all: LDFLAGS = -l:libpaho-mqtt3a.a -l:libjansson.a
+#Default to Linux
+	CC = gcc    
+	LDFLAGS = -Xlinker -Map=output.map -lrt 
+
+all: CFLAGS = -DLINBPQ  -MMD -g -fcommon -fasynchronous-unwind-tables $(EXTRA_CFLAGS)	
+all: LIBS = -lpaho-mqtt3a -ljansson -lminiupnpc -lm -lz -lpthread -lconfig -lpcap                       
+all: linbpq
+
+#other OS
+
+OS_NAME = $(shell uname -s)
+ifeq ($(OS_NAME),NetBSD)
+	CC = cc
+    EXTRA_CFLAGS = -DFREEBSD -DNOMQTT -I/usr/pkg/include 
+    LDFLAGS =  -Xlinker -Map=output.map -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lrt -lutil -lexecinfo
+
+all: CFLAGS = -DLINBPQ  -MMD -g -fcommon -fasynchronous-unwind-tables $(EXTRA_CFLAGS)	
+all: LIBS = -lminiupnpc -lm -lz -lpthread -lconfig -lpcap                    
 all: linbpq
 
 
+endif
+ifeq ($(OS_NAME),FreeBSD)
+    CC = cc
+    EXTRA_CFLAGS = -DFREEBSD -DNOMQTT -I/usr/local/include
+    LDFLAGS = -Xlinker -Map=output.map -L/usr/local/lib -lrt -liconv -lutil -lexecinfo
+
+all: CFLAGS = -DLINBPQ  -MMD -g -fcommon -fasynchronous-unwind-tables $(EXTRA_CFLAGS)	
+all: LIBS =  -lminiupnpc -lm -lz -lpthread -lconfig -lpcap	                       
+all: linbpq
+
+endif
+
+ifeq ($(OS_NAME),Darwin)
+	CC = gcc	                       
+	EXTRA_CFLAGS = -DMACBPQ -DNOMQTT 
+	LDFLAGS = -liconv
+
+all: CFLAGS = -DLINBPQ  -MMD -g -fcommon -fasynchronous-unwind-tables $(EXTRA_CFLAGS)	
+all: LIBS = -lminiupnpc -lm -lz -lpthread -lconfig -lpcap                     
+all: linbpq
+endif
+
+$(info OS_NAME is $(OS_NAME))
+
+
+
 nomqtt: CFLAGS = -DLINBPQ -MMD -fcommon -g  -rdynamic -DNOMQTT -fasynchronous-unwind-tables
+nomqtt: LIBS = -lminiupnpc -lm -lz -lpthread -lconfig -lpcap   
 nomqtt: linbpq
 
 noi2c: CFLAGS = -DLINBPQ -MMD -DNOI2C -g  -rdynamic -fcommon -fasynchronous-unwind-tables
+noi2c: LIBS = -lpaho-mqtt3a -ljansson -lminiupnpc -lm -lz -lpthread -lconfig -lpcap                        
 noi2c: linbpq
 
 
 linbpq: $(OBJS)
-	gcc $(OBJS) -Xlinker -Map=output.map -l:libminiupnpc.a -lrt -lm -lz $(LDFLAGS) -lpthread -lconfig -lpcap -o linbpq
+	cc $(OBJS) $(CFLAGS) $(LDFLAGS) $(LIBS) -o linbpq
 	sudo setcap "CAP_NET_ADMIN=ep CAP_NET_RAW=ep CAP_NET_BIND_SERVICE=ep" linbpq		
 
 -include *.d

nodeapi.c

@@ -9,6 +9,7 @@
 #include <stdlib.h>
 #include "tncinfo.h"
 #include "asmstrucs.h"
+#include "telnetserver.h"
 #include "kiss.h"
 
 // Constants
@@ -56,6 +57,7 @@ int sendUserList(char * response, char * token, char * Rest, int Local);
 int sendInfo(char * response, char * token, char * Rest, int Local);
 int sendLinks(char * response, char * token, char * Rest, int Local);
 int sendPortMHList(char * response, char * token, char * Rest, int Local);
+int sendPortQState(char * response, char * token, char * Rest, int Local);
 int sendWhatsPacState(char * response, char * token, char * param, int Local);
 int sendWhatsPacConfig(char * response, char * token, char * param, int Local);
 
@@ -74,6 +76,7 @@ struct API APIList[] =
 	"/api/links", 10, sendLinks, 0,
 	"/api/users", 10, sendUserList, 0,
 	"/api/mheard", 11, sendPortMHList, 0,
+	"/api/tcpqueues", 14, sendPortQState, 0,
 	"/api/v1/config", 14, sendWhatsPacConfig, AuthSysop,
 	"/api/v1/state", 13, sendWhatsPacState, AuthSysop
 };
@@ -799,37 +802,192 @@ int sendLinks(char * response, char * token, char * param, int Local)
 
 int sendPortMHList(char * response, char * token, char * param, int Local)
 {
-        struct PORTCONTROL * PORTVEC ;
-		int n;
-		int port = 0;
+	struct PORTCONTROL * PORTVEC ;
+	int n;
+	int port = 0;
 
-		if (param[0] = '?' || param[0] == '/')
-			port = atoi(&param[1]);
+	if (param[0] = '?' || param[0] == '/')
+		port = atoi(&param[1]);
 
-		PORTVEC = GetPortTableEntryFromPortNum(port);
-		response[0] = 0;
+	PORTVEC = GetPortTableEntryFromPortNum(port);
+	response[0] = 0;
 
-		if (PORTVEC == 0)
-			return send_http_response(response, "401 Invalid API Call");
+	if (PORTVEC == 0)
+		return send_http_response(response, "401 Invalid API Call");
 
-		n = sprintf(response,"{\"mheard\":[\r\n");
+	n = sprintf(response,"{\"mheard\":[\r\n");
 
-        BuildPortMH(&response[n], PORTVEC );
+	BuildPortMH(&response[n], PORTVEC );
 
-		if (response[n] == 0)		// No entries
-		{
-			response[strlen(response) - 2] = '\0';          // remove \r\n
-			strcat(response, "]}\r\n");
-		}
-		else
-		{
-			response[strlen(response)-3 ] = '\0';          // remove ,\r\n
-			strcat(response, "\r\n]}\r\n");
-//      printf("MH for port %d:\r\n%s\r\n", PORTVEC->PORTNUMBER, response);
-		}
-		return strlen(response);
+	if (response[n] == 0)		// No entries
+	{
+		response[strlen(response) - 2] = '\0';          // remove \r\n
+		strcat(response, "]}\r\n");
+	}
+	else
+	{
+		response[strlen(response)-3 ] = '\0';          // remove ,\r\n
+		strcat(response, "\r\n]}\r\n");
+		//      printf("MH for port %d:\r\n%s\r\n", PORTVEC->PORTNUMBER, response);
+	}
+
+	return strlen(response);
 }
 
+int sendPortQState(char * response, char * token, char * param, int Local)
+{
+	struct TNCINFO * TNC;
+	struct TCPINFO * TCP;
+	struct ConnectionInfo * Conn;
+	struct STREAMINFO * STREAM;
+	int Stream;
+	int tcpqueue;
+	int Queued;
+	int n;
+	int port = 0;
+	char Type[10];
+	char Appl[20];
+	int radioport = 0;
+
+
+	if (param[0] = '?' || param[0] == '/')
+		port = atoi(&param[1]);
+
+	TNC = TNCInfo[port];
+
+	// At the moment only supports Telnet Ports
+
+	if (TNC == 0 || TNC->Hardware != H_TELNET)
+		return send_http_response(response, "401 Invalid API Call");
+
+	response[0] = 0;
+
+
+	TCP = TNC->TCPInfo;
+
+	if (TCP == 0)
+		return send_http_response(response, "401 Invalid API Call");
+
+	n = sprintf(response,"{\"QState\":[\r\n");
+
+	for (Stream = 0; Stream <= TCP->MaxSessions; Stream++)
+	{
+		char Call[10];	
+		STREAM = &TNC->Streams[Stream];
+
+		Conn = TNC->Streams[Stream].ConnectionInfo;
+
+
+		// if connected to the node
+
+		if (Conn->SocketActive)
+		{
+			TRANSPORTENTRY * Sess1 = TNC->PortRecord->ATTACHEDSESSIONS[Stream];
+			TRANSPORTENTRY * Sess2 = NULL;
+
+			if (Sess1)
+				Sess2 = Sess1->L4CROSSLINK;
+			else
+				continue;
+
+			radioport = 0;
+			
+			// Can't use TXCount - it is Semaphored=
+
+			Queued = C_Q_COUNT(&TNC->Streams[Stream].PACTORtoBPQ_Q);
+			Queued += C_Q_COUNT((UINT *)&TNC->PortRecord->PORTCONTROL.PORTRX_Q);
+
+			if (Sess2)
+				Queued += CountFramesQueuedOnSession(Sess2);
+
+			if (Sess1)
+				Queued += CountFramesQueuedOnSession(Sess1);
+
+
+	//		CountFramesQueuedOnSession(TRANSPORTENTRY * Session)
+
+			tcpqueue = Conn->FromHostBuffPutptr - Conn->FromHostBuffGetptr;
+
+			if (Sess2)
+				Sess1 = Sess2;
+	
+			Call[ConvFromAX25(Sess1->L4USER, Call)] = 0;
+			
+
+			if (Sess1->L4CIRCUITTYPE & BPQHOST)
+				strcpy(Type, "Host");
+	
+			else if (Sess1->L4CIRCUITTYPE & SESSION)
+			{
+				struct DEST_LIST * DEST = Sess1->L4TARGET.DEST;
+
+				strcpy(Type, "NETROM");
+
+				if (DEST)
+				{
+					int ActiveRoute = DEST->DEST_ROUTE;
+
+					if (ActiveRoute)
+					{
+						struct ROUTE * ROUTE = DEST->NRROUTE[ActiveRoute - 1].ROUT_NEIGHBOUR;
+
+						if (ROUTE)
+						{
+							struct _LINKTABLE * LINK = ROUTE->NEIGHBOUR_LINK;
+				
+							if (LINK && LINK->LINKPORT)
+								radioport = LINK->LINKPORT->PORTNUMBER;
+						}
+					}
+				}
+			}
+			else if (Sess1->L4CIRCUITTYPE & PACTOR)
+			{
+				//	PACTOR Type - Frames are queued on the Port Entry
+
+				struct PORTCONTROL * PORT = Sess1->L4TARGET.PORT;
+				strcpy(Type, "HFLINK");
+
+				if (PORT)
+					radioport = PORT->PORTNUMBER;
+
+			}
+			else
+			{
+				struct _LINKTABLE * LINK = Sess1->L4TARGET.LINK;
+			
+				strcpy(Type, "L2 Link");
+
+				if (LINK && LINK->LINKPORT)
+					radioport = LINK->LINKPORT->PORTNUMBER;
+			}
+
+
+			memcpy(Appl, Sess1->APPL, 16);
+			strlop(Appl, ' ');
+	
+			n += sprintf(&response[n], "{\"APPL\": \"%s\", \"callSign\": \"%s\", \"type\": \"%s\", \"tcpqueue\": %d, \"packets\": %d, \"port\": %d},\r\n" , Appl, Call, Type, tcpqueue, Queued, radioport);
+		
+		}
+	}
+
+	if (n < 20)		// No entries
+	{
+		response[strlen(response) - 2] = '\0';          // remove \r\n
+		strcat(response, "]}\r\n");
+	}
+	else
+	{
+		response[strlen(response)-3 ] = '\0';          // remove ,\r\n
+		strcat(response, "\r\n]}\r\n");
+		//      printf("MH for port %d:\r\n%s\r\n", PORTVEC->PORTNUMBER, response);
+	}
+	return strlen(response);
+}
+
+
+
+
 // WhatsPac configuration interface
 // WhatsPac also uses Paula's Remote Host Protocol (RHP). This is in a separate module
 

pngwutil.c

@@ -350,10 +350,11 @@ 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);
-      comp->output_ptr=NULL;
+	   png_free(png_ptr, comp->output_ptr);
+   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);
 

telnetserver.h

@@ -38,6 +38,7 @@ struct ConnectionInfo
 	BOOL SyncMode;				// RMS Relay Sync
 	BOOL HTTPMode;				// HTTP Server
 	BOOL APIMode;				// REST API Server
+	BOOL NETROMMode;
 	BOOL TriMode;				// Trimode emulation
 	BOOL TriModeConnected;		// Set when remote session is connected - now send data to DataSock
 	SOCKET TriModeDataSock;		// Data Socket
@@ -73,6 +74,9 @@ struct ConnectionInfo
 	int WebSocks;
 	char WebURL[32];			// URL for WebSocket Connection
 	int WebSecure;				// Set if secure session
+
+	int Connecting;				// For outward connect
+	int Connected;
 };
 
 

tncinfo.h

@@ -116,6 +116,7 @@ struct TCPINFO
 	int SNMPPort;
 	int DRATSPort;
 	int CMDPort[33];
+	int NETROMPort;
 	char RELAYHOST[64];
 	char CMSServer[64];
 	BOOL FallbacktoRelay;		// Use Relsy if can't connect to CMS
@@ -160,13 +161,14 @@ struct TCPINFO
 	SOCKET TCPSock;
 	SOCKET FBBsock[100];
 	SOCKET Relaysock;
-	SOCKET HTTPsock;
+	SOCKET HTTPSock;
 	SOCKET APIsock;
 	SOCKET TriModeSock;
 	SOCKET TriModeDataSock;
 	SOCKET Syncsock;
 	SOCKET DRATSsock;
 	SOCKET SNMPsock;
+	SOCKET NETROMSock;
 
 	struct ConnectionInfo * TriModeControlSession;
 	SOCKET sock6;
@@ -176,6 +178,7 @@ struct TCPINFO
 	SOCKET APIsock6;
 	SOCKET Syncsock6;
 	SOCKET DRATSsock6;
+	SOCKET NETROMSock6;
 
 	fd_set ListenSet;
 	SOCKET maxsock;

upnp.c

@@ -41,7 +41,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <winsock2.h>
 #endif
 #ifdef LINBPQ
-#ifndef MACBPQ
 #ifndef WIN32
 #include <miniupnpc/upnpcommands.h>
 #include <miniupnpc/miniupnpc.h>
@@ -49,13 +48,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <stdio.h>
 #endif
 #endif
-#endif
-#ifdef MACBPQ
-#include </usr/local/Cellar/miniupnpc/2.2.5/include/miniupnpc/upnpcommands.h>
-#include </usr/local/Cellar/miniupnpc/2.2.5/include/miniupnpc/miniupnpc.h>
-#include </usr/local/Cellar/miniupnpc/2.2.5/include/miniupnpc/upnperrors.h>
-#include <stdio.h>
-#endif
+
+
 int AddMap(char * controlURL, char * eport, char * iport, char * proto);
 int DeleteMap(char * controlURL, char * eport, char * iport, char * proto);
 
@@ -134,7 +128,7 @@ int upnpInit()
 				return 0;
 			}
 
-#if MINIUPNPC_API_VERSION == 18
+#if MINIUPNPC_API_VERSION >= 18
 			i = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr), wanaddr, sizeof(wanaddr));
 #else
 			i = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr));
@@ -168,7 +162,7 @@ int upnpClose()
 				return 0;
 			}
 
-#if MINIUPNPC_API_VERSION == 18
+#if MINIUPNPC_API_VERSION >= 18
 			i = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr), wanaddr, sizeof(wanaddr));
 #else
 			i = UPNP_GetValidIGD(devlist, &urls, &data, lanaddr, sizeof(lanaddr));