Changelog!

Update to upstream version '6.0.25.8+repack'
with Debian dir 34f11488df

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);
@@ -735,11 +736,15 @@ int AGWDoMonitorData()
 
 		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
 		{
@@ -812,7 +823,11 @@ 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;
-
 }
 
 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;
@@ -1142,6 +1156,7 @@ int ProcessAGWCommand(struct AGWSocketConnectionInfo * sockptr)
 	int con,conport;
 	int AGWYReply = 0;
 	int state, change;
+	int n;
 
 	// if we have hidden some ports then the port in the AGW packet will be an index into the visible ports,
 	// not the real port number
@@ -1194,9 +1209,9 @@ 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);
 
-			sprintf(ConnectMsg,"C %d %s",conport,ToCall);
+			n = sprintf(ConnectMsg,"C %d %s",conport,ToCall);
 
 			// if 'v' command add digis
 
@@ -1211,7 +1226,7 @@ int ProcessAGWCommand(struct AGWSocketConnectionInfo * sockptr)
 
 				while(nDigis--)
 				{
-					sprintf(ConnectMsg, "%s, %s", ConnectMsg, Digis);
+					n += sprintf(&ConnectMsg[n], " %s", Digis);
 					Digis += 10;
 				}
 			}
@@ -1292,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]);
@@ -1308,9 +1321,7 @@ int ProcessAGWCommand(struct AGWSocketConnectionInfo * sockptr)
         
         
         memset(&AGWTXHeader,0,36);
-
         AGWTXHeader.DataKind = 'G';
-
         AGWTXHeader.DataLength =(int)strlen(AGWPorts)+1;     // Length
     
         SendtoSocket(sockptr->socket, AGWPorts);
@@ -1318,6 +1329,20 @@ int ProcessAGWCommand(struct AGWSocketConnectionInfo * sockptr)
 		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':
 
        //   Toggle Raw receive
@@ -1415,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  ");

AISCommon.c

@@ -760,7 +760,7 @@ void SaveVesselDataBase()
 
 void LoadNavAidDataBase()
 {
-	int i;
+	int i, n, count;
 
 	FILE *file;
 	char buf[256];
@@ -793,10 +793,12 @@ void LoadNavAidDataBase()
 
 	NavRecords = (struct NAVAIDRECORD **)malloc(NavAidCount * sizeof(void *));
 
+	count = 0;
+
 	for (i = 0; i < NavAidCount; i++)
 	{
 		navptr = (struct NAVAIDRECORD *)malloc(sizeof(struct NAVAIDRECORD));
-		NavRecords[i] = navptr;
+		NavRecords[count] = navptr;
 		memset(navptr, 0, sizeof(struct NAVAIDRECORD));
 
 		fgets(buf, 255, file);
@@ -807,6 +809,19 @@ void LoadNavAidDataBase()
 		token = strtok(NULL,  "|\n" );
 		strcpy(&navptr->name[0],token);
 
+		for (n = 0; n < 20; n++)
+		{
+			char c = navptr->name[n];
+
+			if (!isalpha(c) && !isdigit(c) && c != ' ' && c != '_')
+			{
+				count--;
+				break;
+			}
+		}
+
+		count++;
+
 		token = strtok(NULL, "|\n" );
 		navptr->lat = atof(token);
 
@@ -820,6 +835,7 @@ void LoadNavAidDataBase()
 		navptr->TimeLastUpdated = atoi(token);
 	}
 
+	NavAidCount = count;
 	fclose(file);
 }
 

APRSCode.c

@@ -553,6 +553,8 @@ int APRSWriteLog(char * msg)
 	UCHAR Value[MAX_PATH];
 	time_t T;
 	struct tm * tm;
+	int n;
+
 
 	if (LogAPRSIS == 0)
 		return 0;
@@ -574,8 +576,9 @@ int APRSWriteLog(char * msg)
 		strcat(Value, "logs/APRS_");
 	}
 
-	sprintf(Value, "%s%02d%02d%02d.log", Value,
+	n = strlen(Value);
-				tm->tm_year - 100, tm->tm_mon+1, tm->tm_mday);
+
+	sprintf(&Value[n], "%02d%02d%02d.log", tm->tm_year - 100, tm->tm_mon+1, tm->tm_mday);
 
 	if ((file = fopen(Value, "ab")) == NULL)
 		return FALSE;

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
@@ -567,7 +573,7 @@ static int ProcessLine(char * buf, int Port)
 }
 
 
-void ARDOPThread(struct TNCINFO * TNC);
+void ARDOPThread(VOID * Param);
 VOID ARDOPProcessDataSocketData(int port);
 int ConnecttoARDOP(struct TNCINFO * TNC);
 static VOID ARDOPProcessReceivedData(struct TNCINFO * TNC);
@@ -888,6 +894,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 		{
 			if (TNC->SessionTimeLimit && STREAM->ConnectTime && time(NULL) > (TNC->SessionTimeLimit + STREAM->ConnectTime))
 			{
+				Debugprintf("ARDOP closing session on SessionTimelimit");
 				ARDOPSendCommand(TNC, "DISCONNECT", TRUE);
 				STREAM->ReportDISC = 1;
 				STREAM->AttachTime = 0;
@@ -900,6 +907,7 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 		{
 			if (STREAM->AttachTime && TNC->AttachTimeLimit && time(NULL) > (TNC->AttachTimeLimit + STREAM->AttachTime))
 			{
+				Debugprintf("ARDOP closing session on AttachTimelimit");
 				STREAM->ReportDISC = 1;
 				STREAM->AttachTime = 0;
 			}
@@ -1494,7 +1502,10 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 
 			if (_memicmp(&buff->L2DATA[0], "RADIO ", 6) == 0)
 			{
-				sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &buff->L2DATA[6]);
+				char cmd[56];
+
+				strcpy(cmd, &buff->L2DATA[6]);
+				sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, cmd);
 
 				if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, &buff->L2DATA[0]))
 				{
@@ -2056,21 +2067,12 @@ VOID * ARDOPExtInit(EXTPORTDATA * PortEntry)
 	strcat(TempScript, "ARQTIMEOUT 90\r");
 //	strcat(TempScript, "ROBUST False\r");
 
-	strcat(TempScript, TNC->InitScript);
+	// Make MYAUX and MYCALL overridable
 
-	free(TNC->InitScript);
-	TNC->InitScript = TempScript;
-
-	// Set MYCALL
-
-//	strcat(TNC->InitScript,"FECRCV True\r");
-//	strcat(TNC->InitScript,"AUTOBREAK True\r");
 	
 	sprintf(Msg, "MYCALL %s\r", TNC->NodeCall);
-	strcat(TNC->InitScript, Msg);
+	strcat(TempScript, Msg);
-//	strcat(TNC->InitScript,"PROCESSID\r");
+
-//	strcat(TNC->InitScript,"CODEC TRUE\r");
-//	strcat(TNC->InitScript,"LISTEN TRUE\r");
 
 	for (i = 0; i < 32; i++)
 	{
@@ -2094,9 +2096,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)
@@ -2300,12 +2318,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;
@@ -3138,6 +3157,7 @@ VOID ARDOPProcessResponse(struct TNCINFO * TNC, UCHAR * Buffer, int MsgLen)
 			// Incoming Connect
 
 			TNC->SessionTimeLimit = TNC->DefaultSessionTimeLimit;		// Reset Limit
+			STREAM->AttachTime = time(NULL);
 
 			// Stop other ports in same group
 
@@ -5745,8 +5765,7 @@ VOID ARDOPSCSPoll(struct TNCINFO * TNC)
 
 // Probably only for Teensy with ESP01. Runs SCS Emulator over a TCP Link
 
-
+VOID SerialConnecttoTCPThread(VOID *  Param);
-VOID SerialConnecttoTCPThread(struct TNCINFO * TNC);
 
 int SerialConnecttoTCP(struct TNCINFO * TNC)
 {
@@ -5754,9 +5773,9 @@ int SerialConnecttoTCP(struct TNCINFO * TNC)
 
 	return 0;
 }
-
+VOID SerialConnecttoTCPThread(VOID *  Param)
-VOID SerialConnecttoTCPThread(struct TNCINFO * TNC)
 {
+	struct TNCINFO * TNC = (struct TNCINFO *) Param;
 	char Msg[255];
 	int i;
 	u_long param = 1;
@@ -5955,7 +5974,7 @@ VOID ARAXINIT(struct PORTCONTROL * PORT)
 	char Msg[80] = "";
 	
 	memcpy(Msg, PORT->PORTDESCRIPTION, 30);
-	sprintf(Msg, "%s\n", Msg);
+	strcat(Msg, "\n);
 	
 	WritetoConsoleLocal(Msg);
 }

BBSHTMLConfig.c

@@ -117,6 +117,8 @@ struct UserInfo * FindBBS(char * Name);
 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 ";
@@ -186,7 +188,7 @@ char RefreshMainPage[] = "<html><head>"
 char StatusPage [] = 
 
 "<form style=\"font-family: monospace; text-align: center\"  method=post action=/Mail/DisSession?%s>"
-"<br>User&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Callsign&nbsp;&nbsp; Stream Queue<br>"
+"<br>User&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Callsign&nbsp;&nbsp; Stream &nbsp;Queue &nbsp;Sent &nbsp;Rxed<br>"
 "<select style=\"font-family: monospace;\" tabindex=1 size=10 name=call>";
 
 char StreamEnd[] = 
@@ -1701,6 +1703,8 @@ VOID ProcessConfUpdate(struct HTTPConnectionInfo * Session, char * MsgPtr, char
 		free(Filters);
 		Filters = NULL;
 
+		UndoTransparency(input);
+
 		while (input)
 		{
 			// extract and validate before saving
@@ -1714,7 +1718,7 @@ VOID ProcessConfUpdate(struct HTTPConnectionInfo * Session, char * MsgPtr, char
 
 			input = strstr(input, "&Type=");
 			
-			if (Filter.Action == 'H' || Filter.Action == 'R')
+			if (Filter.Action == 'H' || Filter.Action == 'R' || Filter.Action == 'A')
 			{
 				Filter.Type = toupper(input[6]);
 				input = strstr(input, "&From=");
@@ -2439,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)
+			if (FirstMessageIndextoForward > GetMessageSlotFromMessageNumber(Msg->number))
-				FirstMessageIndextoForward = Msg->number;
+				FirstMessageIndextoForward = GetMessageSlotFromMessageNumber(Msg->number);
 
 		}
 		*RLen = SendMessageDetails(Msg, Reply, Session->Key);
@@ -2755,6 +2759,19 @@ VOID SendUIPage(char * Reply, int * ReplyLen, char * Key)
 	*ReplyLen = Len;
 }
 
+void ConvertSpaceTonbsp(char * msg)
+{
+	// Replace any space with &nbsp;
+		
+	char * ptr;
+
+	while (ptr = strchr(msg, ' '))
+	{
+		memmove(ptr + 5, ptr, strlen(ptr) + 1);
+		memcpy(ptr, "&nbsp;", 6);
+	}
+}
+
 VOID SendStatusPage(char * Reply, int * ReplyLen, char * Key)
 {
 	int Len;
@@ -2776,6 +2793,8 @@ VOID SendStatusPage(char * Reply, int * ReplyLen, char * Key)
 		if (!conn->Active)
 		{
 			strcpy(msg,"Idle&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"
+								 "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"
+								 "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"
 								 "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;"
 								 "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;\r\n");
 		}
@@ -2789,16 +2808,16 @@ VOID SendStatusPage(char * Reply, int * ReplyLen, char * Key)
 					strcpy(Name, conn->UserPointer->Name);
 					Name[9] = 0;
 
-					i=sprintf_s(msg, sizeof(msg), "%s%s%s%s%2d&nbsp;%5d\r\n",
+					i=sprintf_s(msg, sizeof(msg), "%-12s  %-9s  %3d  %6d%6d%6d\r\n",
 						Name,
-						&TenSpaces[strlen(Name) * 6],
 						conn->UserPointer->Call,
-						&TenSpaces[strlen(conn->UserPointer->Call) * 6],
 						conn->BPQStream,
-						conn->OutputQueueLength - conn->OutputGetPointer);
+						conn->OutputQueueLength - conn->OutputGetPointer, conn->bytesSent, conn->bytesRxed);
 				}
 			}
 		}
+
+		ConvertSpaceTonbsp(msg);
 		Len += sprintf(&Reply[Len], StatusLine, conn->BPQStream, msg);
 	}
 

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)();
@@ -528,6 +532,19 @@ 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));
@@ -2085,6 +2102,7 @@ hold certain types or sizes of messages.
 
 The first letter of each valid line specifies the action :
 
+A = Accept	   : Message is accepted without checking other filters
 R = Reject     : The message will not be received.
 H = Hold       : The message will be received but held until the sysop reviews.
 L = Local Hold : Only messages created on this BBS will be held.
@@ -2179,21 +2197,38 @@ BOOL CheckRejFilters(char * From, char * To, char * ATBBS, char * BID, char Type
 
 	while (p)
 	{
-		if (p->Action != 'R')
+		if (p->Action != 'R' && p->Action != 'A')
 			goto Continue;
 
 		if (p->Type != Type && p->Type != '*')
 			goto Continue;
 
+		// wildcardcompare returns true on a match
+
 		if (wildcardcompare(From, p->From) == 0)
 			goto Continue;
 
+		if (p->TO[0] == '!')
+		{
+			if (wildcardcompare(ToCopy, &p->TO[1]) == 1)
+				goto Continue;
+		}
+		else
+		{
 			if (wildcardcompare(ToCopy, p->TO) == 0)
 				goto Continue;
+		}
 
 		if (ATBBS)
-			if (wildcardcompare(ATBBS, p->AT) == 0)
+		{
+			char AtCopy[256];
+			
+			strcpy(AtCopy, ATBBS);
+			_strupr(AtCopy);
+
+			if (wildcardcompare(AtCopy, p->AT) == 0)
 				goto Continue;
+		}
 
 		if (BID)
 			if (wildcardcompare(BID, p->BID) == 0)
@@ -2202,6 +2237,11 @@ BOOL CheckRejFilters(char * From, char * To, char * ATBBS, char * BID, char Type
 		if (p->MaxLen && Len < p->MaxLen)
 			goto Continue;
 
+		// if type 'A' matches all rules then accept without checking rest
+
+		if (p->Action == 'A')
+			return FALSE;
+
 		return TRUE;			// Hold
 
 Continue:
@@ -2244,6 +2284,7 @@ BOOL CheckHoldFilters(struct MsgInfo * Msg, char * From, char * To, char * ATBBS
 {
 	char ** Calls;
 	FBBFilter * p = Filters;
+	char ToCopy[256];
 
 	if (HoldFrom && From)
 	{
@@ -2307,6 +2348,9 @@ BOOL CheckHoldFilters(struct MsgInfo * Msg, char * From, char * To, char * ATBBS
 
 	// check fbb reject.sys type filters
 
+	strcpy(ToCopy, To);
+	_strupr(ToCopy);
+
 	while (p)
 	{
 		if (p->Action != 'H')
@@ -2318,9 +2362,16 @@ BOOL CheckHoldFilters(struct MsgInfo * Msg, char * From, char * To, char * ATBBS
 		if (wildcardcompare(Msg->from, p->From) == 0)
 			goto Continue;
 
-		if (wildcardcompare(Msg->to, p->TO) == 0)
+		if (p->TO[0] == '!')
+		{
+			if (wildcardcompare(ToCopy, &p->TO[1]) == 1)
 				goto Continue;
-
+		}
+		else
+		{
+			if (wildcardcompare(ToCopy, p->TO) == 0)
+				goto Continue;
+		}
 		if (wildcardcompare(Msg->via, p->AT) == 0)
 			goto Continue;
 
@@ -3388,6 +3439,7 @@ void Flush(CIRCUIT * conn)
 					
 					SendUnbuffered(conn->BPQStream, &conn->OutputQueue[conn->OutputGetPointer], len);
 					conn->OutputGetPointer+=len;
+					conn->bytesSent += len;
 					tosend-=len;
 					SendUnbuffered(conn->BPQStream, "<A>bort, <CR> Continue..>", 25);
 					FreeSemaphore(&OutputSEM);
@@ -3399,6 +3451,7 @@ void Flush(CIRCUIT * conn)
 		}
 
 		SendUnbuffered(conn->BPQStream, &conn->OutputQueue[conn->OutputGetPointer], len);
+		conn->bytesSent += len;
 
 		conn->OutputGetPointer+=len;
 
@@ -5216,7 +5269,6 @@ char * CheckToAddress(CIRCUIT * conn, char * Addr)
 					return NewAddr;
 				}
 			}
-			else
 			{
 				WPRecP WP = LookupWP(Addr);
 
@@ -5437,6 +5489,17 @@ BOOL DecodeSendParams(CIRCUIT * conn, char * Context, char ** From, char *To, ch
 				}
 				else
 				{
+					// 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;
 				}
 			}
@@ -5810,12 +5873,12 @@ VOID ProcessMsgLine(CIRCUIT * conn, struct UserInfo * user, char* Buffer, int ms
 						}
 						else
 						{
-							ToLen = sprintf(ToString, "%sTo: %s\r\n", ToString, Addr);
+							ToLen = sprintf(&ToString[strlen(ToString)], "To: %s\r\n", Addr);
 							continue;
 						}
 					}
 
-					ToLen = sprintf(ToString, "%sTo: %s@%s\r\n", ToString, Addr, Via);
+					ToLen = sprintf(&ToString[strlen(ToString)], "To: %s@%s\r\n", Addr, Via);
 					continue;
 				}
 
@@ -5833,7 +5896,7 @@ VOID ProcessMsgLine(CIRCUIT * conn, struct UserInfo * user, char* Buffer, int ms
 					}
 					else
 					{
-						ToLen = sprintf(ToString, "%sTo: %s\r\n", ToString, Addr);
+						ToLen = sprintf(&ToString[strlen(ToString)], "To: %s\r\n", Addr);
 
 						// Add to B2 Message for RMS
 
@@ -9016,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
@@ -9072,9 +9139,43 @@ 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
+
+	}
+
 
 	if (_memicmp(SID, "PMS-3.2", 7) == 0)
 	{
@@ -10245,7 +10346,7 @@ BOOL GetConfig(char * ConfigName)
 	GetStringValue(group, "ISPAccountPass", EncryptedISPAccountPass, 100);
 
 	sprintf(SignoffMsg, "73 de %s\r", BBSName);					// Default
-	GetStringValue(group, "SignoffMsg", ISPAccountName, 50);
+	GetStringValue(group, "SignoffMsg", SignoffMsg, 50);
 
 	DecryptPass(EncryptedISPAccountPass, ISPAccountPass, (int)strlen(EncryptedISPAccountPass));
 
@@ -10550,7 +10651,7 @@ int Connected(int Stream)
 	char callsign[10];
 	int port, paclen, maxframe, l4window;
 	char ConnectedMsg[] = "*** CONNECTED    ";
-	char Msg[100];
+	char Msg[256];
 	char Title[100];
 	int64_t Freq = 0;
 	int Mode = 0;
@@ -10634,6 +10735,12 @@ int Connected(int Stream)
 				}
 			}
 
+			if (Mode < 0 || Mode > 54)
+				Mode = 0;
+
+			if (Freq < 0 || Freq > 11000000000)
+				Freq = 0;
+
 			memset(conn, 0, sizeof(ConnectionInfo));		// Clear everything
 			conn->Active = TRUE;
 			conn->BPQStream = Stream;
@@ -10698,7 +10805,7 @@ int Connected(int Stream)
 							LongFreq = GetPortFrequency(port, FreqString);
 #endif
 					}
-					Length += sprintf(MailBuffer, "New User %s Connected to Mailbox on Port %d Freq %d Mode %ld\r\n", callsign, port, LongFreq, Mode);
+					Length += sprintf(MailBuffer, "New User %s Connected to Mailbox on Port %d Freq %lld Mode %d\r\n", callsign, port, LongFreq, Mode);
 
 					sprintf(Title, "New User %s", callsign);
 
@@ -10758,7 +10865,7 @@ int Connected(int Stream)
 			}
 
 			if (port)
-				n=sprintf_s(Msg, sizeof(Msg), "Incoming Connect from %s on Port %d Freq %d Mode %s",
+				n = sprintf_s(Msg, sizeof(Msg), "Incoming Connect from %s on Port %d Freq %lld Mode %s",
 					user->Call,  port, Freq, WL2KModes[Mode]);
 			else
 				n = sprintf_s(Msg, sizeof(Msg), "Incoming Connect from %s", user->Call);
@@ -11051,7 +11158,6 @@ int DoReceivedData(int Stream)
 		if (Stream == conn->BPQStream)
 		{
 			conn->SIDResponseTimer = 0;		// Got a message, so cancel timeout.
-
 			do
 			{ 
 				// May have several messages per packet, or message split over packets
@@ -11068,6 +11174,7 @@ int DoReceivedData(int Stream)
 				if (InputLen == 0 && conn->InputMode != 'Y')
 					return 0;
 
+				conn->bytesRxed += InputLen;
 				conn->InputLen += InputLen;
 
 				if (conn->InputLen == 0) return 0;

BPQMail.c

@@ -1148,6 +1148,14 @@
 //	Fix bug in WP Message processing (56)
 //	Fix treating addresses ending in WW as Internet (57)
 //	Run sending to packetnodes.spots.radio in a separate thread (61)
+//	Fix loading ISP Account Name from config file (67)
+//	Fixes to using {FormFolder} in Webmail Templates (68)
+//	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"
@@ -1168,6 +1176,7 @@ FARPROCX pRunEventProgram;
 FARPROCX pGetPortFrequency;
 FARPROCX pSendWebRequest;
 FARPROCX pGetLatLon;
+FARPROCX pGetPortHardwareType;
 
 BOOL WINE = FALSE;
 
@@ -1724,6 +1733,7 @@ int APIENTRY WinMain(HINSTANCE hInstance,
 //	SaveUserDatabase();
 	SaveMessageDatabase();
 	SaveBIDDatabase();
+	SaveRestartData();
 
 	configSaved = 1;
 	SaveConfig(ConfigName);
@@ -1950,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)
@@ -3020,9 +3032,9 @@ int RefreshMainWindow()
 					strcpy(msg,"Logging in");
 				else
 				{
-					i=sprintf_s(msg, sizeof(msg), "%-10s %-10s %2d %-10s%5d",
+					i=sprintf_s(msg, sizeof(msg), "%-10s %-10s %2d %-10s%5d    %5d  %5d",
 						conn->UserPointer->Name, conn->UserPointer->Call, conn->BPQStream,
-						"BBS", conn->OutputQueueLength - conn->OutputGetPointer);
+						"BBS", conn->OutputQueueLength - conn->OutputGetPointer, conn->bytesSent, conn->bytesRxed);
 				}
 			}
 		}
@@ -3083,6 +3095,7 @@ static PSOCKADDR_IN psin;
 
 SOCKET sock;
 
+void GetRestartData();
 
 BOOL Initialise()
 {
@@ -3270,6 +3283,8 @@ BOOL Initialise()
 	GetBadWordFile();
 	GetHTMLForms();
 
+	GetRestartData();
+
 	UsingingRegConfig = FALSE;
 
 	// Make sure SYSOPCALL is set

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);
@@ -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);
 }

BPQRemotePTT.cfg

@@ -1,12 +0,0 @@
-main : 
-{
-  BPQHostIP = "192.168.1.64";
-  COM1 = "COM43";
-  COM2 = "";
-  COM3 = "";
-  COM4 = "";
-  HamLibPort1 = 4534;
-  HamLibPort2 = 0;
-  HamLibPort3 = 0;
-  HamLibPort4 = 0;
-};

BPQTermMDI.c

@@ -2974,6 +2974,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); 

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)
@@ -1253,6 +1253,51 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 //	Fix problem using SENDRAW from BPQMail (63)
 //	Fix compatibility with latest ardopcf (64)
 //	Fix bug in RHP socket timeout code (65)
+//	Fix L4 RTT (66)
+//	Fix RigConrol with Chanxx but no other settings (66)
+//	Add option to compress L2 frames (67)
+//	Sort Routes displays (67)
+//	Fix Ardop session premature close (70)
+//	Add timestamps to log entries in Web Driver windows (70)
+//	Generate stack backtrace if SIGSEGV or SIGABRT occur (Linux) (70)
+//	Remove some debug logging from L2 code (70)
+//	Fix compiling LinBPQ with nomqtt option (70)
+//	Improve handling of binary data in RHP interface (70)
+//	Fix sending KISS commands to multiport or multidropped TNCs (70)
+//	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)
 
 
 #define CKernel
@@ -1348,6 +1393,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);
@@ -1357,6 +1404,8 @@ VOID ADIFWriteFreqList();
 void SaveAIS();
 void initAIS();
 void initADSB();
+int CloseAllSessions();
+int CloseAllLinks();
 
 extern BOOL ADIFLogEnabled;
 
@@ -1416,6 +1465,7 @@ extern HWND hIPResWnd;
 extern BOOL IPMinimized;
 
 extern int NODESINPROGRESS;
+extern int NODESToOnePort;
 extern VOID * CURRENTNODE;
 
 
@@ -1485,7 +1535,7 @@ extern char ReportDest[7];
 
 extern UCHAR ConfigDirectory[260];
 
-extern uint64_t timeLoadedMS;
+extern uint64_t INP3timeLoadedMS;
 
 VOID __cdecl Debugprintf(const char * format, ...);
 VOID __cdecl Consoleprintf(const char * format, ...);
@@ -1603,6 +1653,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;
 
@@ -1658,6 +1710,8 @@ BOOL ReconfigFlag = FALSE;
 BOOL RigReconfigFlag = FALSE;
 BOOL APRSReconfigFlag = FALSE;
 BOOL CloseAllNeeded = FALSE;
+int CloseAllTimer = 0;
+
 BOOL NeedWebMailRefresh = FALSE;
 
 int AttachedPIDList[100] = {0};
@@ -2339,6 +2393,52 @@ VOID TimerProcX()
 
 	CheckGuardZone();
 
+	if (CloseAllTimer == 50)			// First entry
+	{
+		if (CloseAllSessions() == 0)
+		{
+			if (CloseAllLinks() == 0)			// No sessions closed so close links now
+				CloseAllTimer = 0;				// 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;
 }
 
@@ -2374,7 +2474,9 @@ FirstInit()
 		EnumProcessesPtr = (FARPROCX)GetProcAddress(ExtDriver,"EnumProcesses");
 	}
 
-	timeLoadedMS = GetTickCount();
+	INP3timeLoadedMS = GetTickCount();
+
+	srand(time(NULL));
 	
 	INITIALISEPORTS();
 
@@ -5863,13 +5965,24 @@ DllExport VOID APIENTRY CreateNewTrayIcon()
 	trayMenu = NULL;
 }
 
+void hookNodeClosing(char * Reason);
+
+
 DllExport VOID APIENTRY CloseAllPrograms()
 {
-//	HANDLE hProc;
+	CLOSING = TRUE;
 
-	// Close all attached BPQ32 programs
+	// Tell BG to shut when all links are gone or after 5 secs
 
-	Closing  = TRUE;
+	CloseAllTimer = 50;
+}
+
+VOID RealCloseAllPrograms()
+{
+	hookNodeClosing("Shutdown");
+	Sleep(500);
+
+	Closing = 1;
 
 	ShowWindow(FrameWnd, SW_RESTORE);
 
@@ -6117,13 +6230,14 @@ DllExport BOOL APIENTRY SaveReg(char * KeyIn, HANDLE hFile)
 						{
 							if (len > 76)
 							{
-								len = sprintf(RegLine, "%s\\\r\n", RegLine);
+								len += sprintf(&RegLine[len], "\\\r\n", RegLine);
+								strcat(RegLine, "\\\r\n");
 								WriteFile(hFile, RegLine, len, &written, NULL);
 								strcpy(RegLine, "  ");
 								len = 2;
 							}
 
-							len = sprintf(RegLine, "%s%02x,", RegLine, Value[k]);
+							len += sprintf(&RegLine[len], "%02x,", Value[k]);
 						}
 						RegLine[--len] = 0x0d;
 						RegLine[++len] = 0x0a;	
@@ -6149,19 +6263,20 @@ DllExport BOOL APIENTRY SaveReg(char * KeyIn, HANDLE hFile)
 						{
 							if (len > 76)
 							{
-								len = sprintf(RegLine, "%s\\\r\n", RegLine);
+								len += sprintf(&RegLine[len], "\\\r\n");
 								WriteFile(hFile, RegLine, len, &written, NULL);
 								strcpy(RegLine, "  ");
 								len = 2;
 							}
-							len = sprintf(RegLine, "%s%02x,", RegLine, Value[k]);
+
+							len += sprintf(&RegLine[len], "%02x,", Value[k]);
 							if (len > 76)
 							{
-								len = sprintf(RegLine, "%s\\\r\n", RegLine);
+								len += sprintf(&RegLine[len], "\\\r\n");
 								WriteFile(hFile, RegLine, len, &written, NULL);
 								strcpy(RegLine, "  ");
 							}
-							len = sprintf(RegLine, "%s00,", RegLine);
+							len += sprintf(&RegLine[len], "00,");
 						}
 
 						RegLine[--len] = 0x0d;

CMSAuth.c

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

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

@@ -984,6 +984,29 @@ 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 )
@@ -70,6 +66,11 @@ void GetPortCTEXT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, st
 VOID WriteMiniDump();
 int CheckKissInterlock(struct PORTCONTROL * PORT, int Exclusive);
 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);
 
@@ -82,6 +83,7 @@ UCHAR SAVEDAPPLFLAGS = 0;
 
 UCHAR ALIASINVOKED = 0;
 
+extern int MONTOFILEFLAG;
 
 VOID * CMDPTR = 0;
 
@@ -151,13 +153,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);
@@ -183,6 +187,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, ...)
 {
@@ -245,10 +297,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);
@@ -713,6 +836,104 @@ BOOL cATTACHTOBBS(TRANSPORTENTRY * Session, UINT Mask, int Paclen, int * AnySess
 	return FALSE;
 }
 
+void ConnecttoService(TRANSPORTENTRY * Session, char * Bufferptr, int ServiceIndex, char * Node, int Stay)
+{
+	struct DEST_LIST * Dest = DESTS;
+	int n = MAXDESTS;
+	int gotDest = 0;
+	unsigned char axcall[7];
+	int Service = -1;
+
+	// 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;
+
+	Service = SERVICES[ServiceIndex].ServiceNo;
+
+	Bufferptr = Cmdprintf(Session, Bufferptr, "Connecting to Service %s on Node %s \r", SERVICES[ServiceIndex].ServiceName, 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;
+
+	ptr = strtok_s(CmdTail, " ", &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, i, ptr, Stay);
+			return 1;
+		}
+	}
+
+	return 0;
+}
+
+
+
 VOID APPLCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {		
 	BOOL CONFAILED = 0;
@@ -721,6 +942,7 @@ VOID APPLCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct
 	char * ptr1, *ptr2;
 	int n = 12;
 	BOOL Stay = FALSE;
+	char * ptr, *Context;
 
 	//	Copy Appl and Null Terminate
 
@@ -739,12 +961,43 @@ VOID APPLCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct
 		return;
 	}
 
+	ptr = strtok_s(CmdTail, " ", &Context);
 
-	if (CmdTail[0] == 'S')
+	// ptr is first param. Context is rest of string;
-		Stay = TRUE;
 
+	if (ptr)
+	{
+		// could be Node for NETROMX connect or S flag
+		
+		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
@@ -826,6 +1079,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));
 }
@@ -1225,15 +1481,57 @@ VOID CMDSTATS(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 }
 
+#define	PFBIT 0x10		// POLL/FINAL BIT IN CONTROL BYTE
+
+VOID InformPartner(struct _LINKTABLE * LINK, int Reason);
+VOID L2SENDCOMMAND(struct _LINKTABLE * LINK, int CMD);
+BOOL FindLink(UCHAR * LinkCall, UCHAR * OurCall, int Port, struct _LINKTABLE ** REQLINK);
+
 VOID CMDL00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CMDX * CMD)
 {
 	//	PROCESS 'LINKS' MESSAGE
 
 	struct _LINKTABLE * LINK = LINKS;
 	int n = MAXLINKS;
-	int len;
+	int len, Count;
 	char Normcall[11] = "";
+	UCHAR DEST[7];
+	UCHAR ORIGIN[7];
+	int Port = 0;
+	char * ptr = 0, * Context;
 
+	ptr = strtok_s(CmdTail, " ", &Context);
+
+	if (ptr && _stricmp(ptr, "reset") == 0)
+	{
+		ptr = strtok_s(NULL, " ", &Context);
+		if (ptr)
+			ConvToAX25(ptr, DEST);
+
+		ptr = strtok_s(NULL, " ", &Context);
+		if (ptr)
+			ConvToAX25(ptr, ORIGIN);
+
+		ptr = strtok_s(NULL, " ", &Context);
+		if (ptr)
+			Port = atoi(ptr);
+
+		if (FindLink(DEST, ORIGIN, Port, &LINK))
+		{
+			InformPartner(LINK, NORMALCLOSE);	// TELL OTHER END ITS GONE
+
+			LINK->L2RETRIES -= 1;		// Just send one DISC
+			LINK->L2STATE = 4;			// CLOSING
+
+			L2SENDCOMMAND(LINK, DISC | PFBIT);
+			Bufferptr = Cmdprintf(Session, Bufferptr, "Link Reset\r");
+		}
+		else
+			Bufferptr = Cmdprintf(Session, Bufferptr, "Link Not Found\r");
+
+	}
+	else
+	{
 		Bufferptr = Cmdprintf(Session, Bufferptr, "Links\r");
 
 		while (n--)
@@ -1241,6 +1539,7 @@ VOID CMDL00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct C
 			if (LINK->LINKCALL[0])
 			{
 				len = ConvFromAX25(LINK->LINKCALL, Normcall);
+				Count = COUNT_AT_L2(LINK);
 
 				Bufferptr = Cmdprintf(Session, Bufferptr, "%s", Normcall);
 
@@ -1248,15 +1547,26 @@ VOID CMDL00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct C
 				Bufferptr = Cmdprintf(Session, Bufferptr, "%s", Normcall);
 
 				if (LINK->Ver2point2)
-				Bufferptr = Cmdprintf(Session, Bufferptr, " S=%d P=%d T=%d V=2.2\r",
+					Bufferptr = Cmdprintf(Session, Bufferptr, " S=%d P=%d T=%d V=2.2 Q=%d\r",
-					LINK->L2STATE, LINK->LINKPORT->PORTNUMBER, LINK->LINKTYPE);
+					LINK->L2STATE, LINK->LINKPORT->PORTNUMBER, LINK->LINKTYPE, Count);
 				else
-				Bufferptr = Cmdprintf(Session, Bufferptr, " S=%d P=%d T=%d V=%d\r",
+					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);
+					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++;
 		}
-
+	}
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 }
 
@@ -1575,8 +1885,8 @@ char *  DisplayRoute(TRANSPORTENTRY * Session, char * Bufferptr, struct ROUTE *
 
 		if (Routes->INP3Node)		// INP3 Enabled?
 		{
-			double srtt = Routes->SRTT/1000.0;
+			double srtt = Routes->SRTT/100.0;
-			double nsrtt = Routes->NeighbourSRTT/1000.0;
+			double nsrtt = Routes->NeighbourSRTT/100.0;
 
 			Bufferptr = Cmdprintf(Session, Bufferptr, " %4.2fs %4.2fs", srtt, nsrtt);
 		}
@@ -1604,6 +1914,8 @@ VOID CMDR00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct C
 	int Port = 0;
 	char AXCALL[7];
 	BOOL Found;
+	int count, i, n = 0;
+	struct ROUTE * List[1000];
 
 	ptr = strtok_s(CmdTail, " ", &Context);
 
@@ -1624,14 +1936,31 @@ VOID CMDR00(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct C
 
 	Bufferptr = Cmdprintf(Session, Bufferptr, "Routes\r");
 
-	while (MaxRoutes--)
+	// Build and sort list of routes
+				
+	for (count = 0; count < MaxRoutes; count++)
 	{
 		if (Routes->NEIGHBOUR_CALL[0] != 0)
-			if (Port == 0 || Port == Routes->NEIGHBOUR_PORT)
+		{
-				Bufferptr = DisplayRoute(Session, Bufferptr, Routes, Verbose);
+			List[n++] = Routes;
+
+			if (n > 999)
+				break;
+		}
 
 		Routes++;
 	}
+
+	if (n > 1)
+		qsort(List, n, sizeof(void *), CompareRoutes);
+
+	for (i = 0; i < n; i++)
+	{
+		Routes = List[i];
+
+		if (Port == 0 || Port == Routes->NEIGHBOUR_PORT)
+			Bufferptr = DisplayRoute(Session, Bufferptr, Routes, Verbose);
+	}
 	goto SendReply;
 
 ROUTEUPDATE:
@@ -1733,6 +2062,7 @@ VOID LISTENCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struc
 	char * ptr, *Context;
 	struct PORTCONTROL * PORT = NULL;
 	char ListenPortList[128] = "";
+	int len = 0;
 
 	ptr = strtok_s(CmdTail, " ,", &Context);
 
@@ -1785,7 +2115,7 @@ VOID LISTENCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struc
 			}
 		}
 
-		sprintf(ListenPortList, "%s %d", ListenPortList, Port);
+		len += sprintf(&ListenPortList[len], " %d", Port);
 
 		ListenMask |= ((uint64_t)1 << (Port - 1));
 	}
@@ -2077,7 +2407,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;
 	
@@ -2086,6 +2416,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;
@@ -2093,15 +2425,41 @@ VOID DoNetromConnect(TRANSPORTENTRY * Session, char * Bufferptr, struct DEST_LIS
 
 	NewSess->SPYFLAG = Spy;
 
+	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;
@@ -2127,6 +2485,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;
@@ -2157,6 +2516,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
@@ -2303,7 +2665,7 @@ NoPort:
 
 	//	SEE IF CALL TO ANY OF OUR HOST SESSIONS - UNLESS DIGIS SPECIFIED
 
-	if (axcalls[7] == 0)
+	if (axcalls[7] == 0 && axcalls[9] )
 	{
 		//	If this connect is as a result of a command alias, don't check appls or we will loop
 
@@ -2321,6 +2683,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)
@@ -2351,7 +2716,28 @@ NoPort:
 		}
 	}
 
-	if (axcalls[7] == 0)
+	// if no digis see if connect to known node. But now could have a single numeric param as a service number (Paula's Netromx)
+	// cmdCopy is command tail (after call)
+
+	// Make sure field is numeric
+
+	i = 0;
+
+	while (cmdCopy[i] >= '0' && cmdCopy[i]<= '9')
+		i++;
+
+	if (cmdCopy[i] != ' ')
+		goto Downlink;
+	else
+	{
+		if (i > 0)			// Some digits
+		{
+			haveService = 1;
+			Service = atoi(cmdCopy);
+		}
+	}
+
+	if (axcalls[7] == 0 || haveService)
 	{
 		//	SEE IF CALL TO ANOTHER NODE 
 
@@ -2364,7 +2750,7 @@ NoPort:
 			{
 				if (memcmp(Dest->DEST_ALIAS, TextCall, 6) == 0)	
 				{
-					DoNetromConnect(Session, Bufferptr, Dest, Spy);
+					DoNetromConnect(Session, Bufferptr, Dest, Spy, Service);
 					return;
 				}
 				Dest++;
@@ -2378,7 +2764,7 @@ NoPort:
 		{
 			if (CompareCalls(Dest->DEST_CALL, axcalls))	
 			{
-				DoNetromConnect(Session, Bufferptr, Dest, Spy);
+				DoNetromConnect(Session, Bufferptr, Dest, Spy, Service);
 				return;
 			}
 			Dest++;
@@ -2816,15 +3202,12 @@ VOID LINKCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct
 	SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
 }
 
-int CompareNode(const void *a, const void *b);
-int CompareAlias(const void *a, const void *b);
-
 char * DoOneNode(TRANSPORTENTRY * Session, char * Bufferptr, struct DEST_LIST * Dest)
 {
 	char Normcall[10];
 	char Alias[10];
 	struct NR_DEST_ROUTE_ENTRY * NRRoute;
-	struct DEST_ROUTE_ENTRY * Route;
+	struct INP3_DEST_ROUTE_ENTRY * Route;
 	struct ROUTE * Neighbour;
 	int i, Active, len;
 
@@ -2865,7 +3248,7 @@ char * DoOneNode(TRANSPORTENTRY * Session, char * Bufferptr, struct DEST_LIST *
 
 	//	DISPLAY  INP3 ROUTES
 
-	Route = &Dest->ROUTE[0];
+	Route = &Dest->INP3ROUTE[0];
 
 	Active = Dest->DEST_ROUTE;
 
@@ -2875,7 +3258,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;
@@ -2922,17 +3305,17 @@ int DoINP3ViaEntry(struct DEST_LIST * Dest, int n, char * line, int cursor)
 	int len;
 	double srtt;
 
-	if (Dest->ROUTE[n].ROUT_NEIGHBOUR != 0)
+	if (Dest->INP3ROUTE[n].ROUT_NEIGHBOUR != 0)
 	{
-		srtt = Dest->ROUTE[n].SRTT/1000.0;
+		srtt = Dest->INP3ROUTE[n].SRTT/100.0;
 
-		len=ConvFromAX25(Dest->ROUTE[n].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, Portcall);
+		len=ConvFromAX25(Dest->INP3ROUTE[n].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, Portcall);
 		Portcall[len]=0;
 
 		len=sprintf(&line[cursor],"%s %d %d %4.2fs ",
 			Portcall,
-			Dest->ROUTE[n].ROUT_NEIGHBOUR->NEIGHBOUR_PORT,
+			Dest->INP3ROUTE[n].ROUT_NEIGHBOUR->NEIGHBOUR_PORT,
-			Dest->ROUTE[n].Hops, srtt);
+			Dest->INP3ROUTE[n].Hops, srtt);
 
 		cursor+=len;
 
@@ -3220,7 +3603,7 @@ NODE_VIA:
 	{
 		Dest+=1;
 
-		if (Dest->NRROUTE[0].ROUT_NEIGHBOUR == 0 && Dest->ROUTE[0].ROUT_NEIGHBOUR == 0)
+		if (Dest->NRROUTE[0].ROUT_NEIGHBOUR == 0 && Dest->INP3ROUTE[0].ROUT_NEIGHBOUR == 0)
 			continue;
 
 
@@ -3228,9 +3611,9 @@ NODE_VIA:
 			|| (Dest->NRROUTE[1].ROUT_NEIGHBOUR && CompareCalls(Dest->NRROUTE[1].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, AXCALL))
 			|| (Dest->NRROUTE[2].ROUT_NEIGHBOUR && CompareCalls(Dest->NRROUTE[2].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, AXCALL))
 
-			|| (Dest->ROUTE[0].ROUT_NEIGHBOUR && CompareCalls(Dest->ROUTE[0].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, AXCALL))
+			|| (Dest->INP3ROUTE[0].ROUT_NEIGHBOUR && CompareCalls(Dest->INP3ROUTE[0].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, AXCALL))
-			|| (Dest->ROUTE[1].ROUT_NEIGHBOUR && CompareCalls(Dest->ROUTE[1].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, AXCALL))
+			|| (Dest->INP3ROUTE[1].ROUT_NEIGHBOUR && CompareCalls(Dest->INP3ROUTE[1].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, AXCALL))
-			|| (Dest->ROUTE[2].ROUT_NEIGHBOUR && CompareCalls(Dest->ROUTE[2].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, AXCALL)))
+			|| (Dest->INP3ROUTE[2].ROUT_NEIGHBOUR && CompareCalls(Dest->INP3ROUTE[2].ROUT_NEIGHBOUR->NEIGHBOUR_CALL, AXCALL)))
 		{
 			len=ConvFromAX25(Dest->DEST_CALL,Normcall);
 
@@ -3544,6 +3927,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
@@ -3601,7 +3986,7 @@ VOID MHCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct CM
 	}
 	else
 	{
-		if (CMD->String[2] == 'V')		// MHV
+		if (CMD->String[2] == 'V' || CMD->String[3] == 'V')		// MHV
 		{
 			Bufferptr = Cmdprintf(Session, Bufferptr, "MHeard List %s for Port %d\r", MYNODECALL, Port);
 			Bufferptr = Cmdprintf(Session, Bufferptr, "Callsign   Last heard     Pkts RX    via Digi ;) \r");
@@ -4194,6 +4579,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),
@@ -4211,6 +4597,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,
@@ -4222,6 +4612,7 @@ struct CMDX COMMANDS[] =
 	"KISS        ",4,KISSCMD,0,
 	"GETPORTCTEXT",9,GetPortCTEXT, 0,
 
+
 #ifdef EXCLUDEBITS
 
 	"EXCLUDE     ",4,ListExcludedCalls,0,
@@ -4246,6 +4637,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,
@@ -4279,7 +4675,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,
@@ -4305,6 +4701,8 @@ struct CMDX COMMANDS[] =
 	"MHU         ",3,MHCMD,0,		// UTC Times
 	"MHL         ",3,MHCMD,0,		// Local Times
 	"MHV         ",3,MHCMD,0,
+	"MHUV        ",3,MHCMD,0,		// UTC Times
+	"MHLV        ",3,MHCMD,0,		// Local Times
 	"MHEARD      ",1,MHCMD,0,
 	"APRS        ",2,APRSCMD,0,
 	"ATTACH      ",1,ATTACHCMD,0,
@@ -4670,6 +5068,8 @@ VOID DoTheCommand(TRANSPORTENTRY * Session)
 	struct DATAMESSAGE * Buffer = REPLYBUFFER;
 	char * ptr1, * ptr2;
 	int n;
+	int i, Service = -1;
+	char * Cmd, *Node, *Context;
 
 	ptr1 = &COMMANDBUFFER[0];		//
 
@@ -4761,6 +5161,31 @@ VOID DoTheCommand(TRANSPORTENTRY * Session)
 		CMD++;
 	
 	}
+
+	// See if a NETROMX Service
+
+	Cmd = strtok_s(ptr1, " ", &Context);
+	Node = strtok_s(NULL, " ", &Context);
+		
+	for (i = 0; i < NUMBEROFSSERVICES; i++)
+	{
+		if (strcmp(Cmd, SERVICES[i].ServiceName) == 0)
+		{
+			int Stay = 0;
+			
+			if (Context && Context[0] == 'S')
+				Session->STAYFLAG = Stay;
+
+			if (Node)
+			{
+				ConnecttoService(Session, ReplyPointer, i, Node, Stay);
+				return;
+			}
+		
+			// Connecting to service on local node - msy be possible sometime
+		}
+	}
+
 	Session->BADCOMMANDS++;
 
 	if (Session->BADCOMMANDS > 6)			// TOO MANY ERRORS
@@ -5522,22 +5947,14 @@ VOID KISSCMD(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, struct
 
 			KISS = (struct KISSINFO *) PORT;
 
-			if (KISS->FIRSTPORT != KISS)
-			{
-				Bufferptr = Cmdprintf(Session, Bufferptr, "Not first port of a Multidrop Set\r");
-				SendCommandReply(Session, REPLYBUFFER, (int)(Bufferptr - (char *)REPLYBUFFER));
-				return;
-			}
-
 			// Send Command
 
 			KissLen = KissEncode(KissString, ENCBUFF, KissLen);
 
-			PORT = (struct PORTCONTROL *)KISS->FIRSTPORT;			// ALL FRAMES GO ON SAME Q
-
 			PORT->Session = Session;
 			PORT->LastKISSCmdTime = time(NULL);
 
+			PORT = (struct PORTCONTROL *)KISS->FIRSTPORT;			// ALL FRAMES GO ON SAME Q
 			ASYSEND(PORT, ENCBUFF, KissLen);
 
 			Bufferptr = Cmdprintf(Session, Bufferptr, "Command Sent\r");

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;
@@ -77,6 +83,9 @@ char * stristr (char *ch1, char *ch2);
 
 extern VOID * ENDBUFFERPOOL;
 
+extern int PoolBuilt;
+
+extern int EnableOARCAPI;
 
 //	Read/Write length field in a buffer header
 
@@ -363,7 +372,7 @@ BOK1:
 
 		if (n > 1000)
 		{
-			Debugprintf("Loop searching free chain - pointer = %p %p", debug, pointer);
+			Debugprintf("Releasebuffer Loop searching free chain - pointer = %p %p from %s Line %d", debug, pointer, File, Line);
 			return 0;
 		}
 	}
@@ -376,6 +385,11 @@ BOK1:
 
 	QCOUNT++;
 
+	if (PoolBuilt && QCOUNT > MAXBUFFS)
+	{
+		Debugprintf("Releasebuffer QCOUNT > MAXBUFFS - pointer = %p from %s Line %d", pointer, File, Line);
+		return 0;
+	}
 	return 0;
 }
 
@@ -1061,6 +1075,7 @@ BOOL ReadConfigFile(int Port, int ProcLine(char * buf, int Port))
 				WritetoConsoleLocal("\n");
 				WritetoConsoleLocal("Bad config record ");
 				WritetoConsoleLocal(errbuf);
+				WritetoConsoleLocal("\n");
 			}
 		}
 	}
@@ -1124,6 +1139,11 @@ int CompareNode(struct DEST_LIST ** a, struct DEST_LIST ** b)
 	return memcmp(a[0]->DEST_CALL, b[0]->DEST_CALL, 7);
 }
 
+int CompareRoutes(struct ROUTE ** a, struct ROUTE ** b)
+{
+	return memcmp(a[0]->NEIGHBOUR_CALL, b[0]->NEIGHBOUR_CALL, 7);
+}
+
 DllExport int APIENTRY CountFramesQueuedOnStream(int Stream)
 {
 	BPQVECSTRUC * PORTVEC = &BPQHOSTVECTOR[Stream-1];		// API counts from 1
@@ -2129,7 +2149,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;
 
@@ -3291,8 +3320,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
@@ -3648,11 +3681,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();
 
@@ -3680,6 +3724,22 @@ VOID ResolveUpdateThread(void * Unused)
 		if (HostEnt2)
 			memcpy(&Chatreportdest.sin_addr.s_addr,HostEnt2->h_addr,4);
 
+		Debugprintf("Resolving %s", NodeAPIServer);
+		
+		HostEnt3 = gethostbyname(NodeAPIServer);
+	
+		if (HostEnt3)
+		{
+			memcpy(&UDPreportdest.sin_addr.s_addr,HostEnt3->h_addr,4);
+
+			if (nodeStartedSent == 0)
+			{
+				hookNodeStarted();
+				nodeStartedSent = 1;
+				LastNodeStatus = time(NULL);
+			}
+		}
+		
 		if (HostEnt1 && HostEnt2)
 		{		
 			Sleep(1000 * 60 * 30);	
@@ -4792,6 +4852,7 @@ void GetPortCTEXT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, st
 	struct stat STAT;
 	struct PORTCONTROL * PORT = PORTTABLE;
 	char PortList[256] = "";
+	int len = 0;
 
 	while (PORT)
 	{
@@ -4833,7 +4894,7 @@ void GetPortCTEXT(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, st
 				*ptr = '\r';
 
 
-			sprintf(PortList, "%s,%d", PortList, PORT->PORTNUMBER);
+			len += sprintf(&PortList[len], ",%d", PORT->PORTNUMBER);
 		}
 
 		PORT = PORT->PORTPOINTER;
@@ -5171,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];

FBBRoutines.c

@@ -27,6 +27,8 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 void _GetSemaphore(struct SEM * Semaphore, int ID, char * File, int Line);
 
 
+void DeleteRestartData(CIRCUIT * conn);
+
 int32_t Encode(char * in, char * out, int32_t inlen, BOOL B1Protocol, int Compress);
 void MQTTMessageEvent(void* message);
 
@@ -41,6 +43,130 @@ int B2RestartCount = 0;
 
 extern char ProperBaseDir[];
 
+char RestartDir[MAX_PATH] = "";
+
+void GetRestartData()
+{
+	int i;
+	struct FBBRestartData Restart;
+	struct FBBRestartData * RestartRec;
+	char MsgFile[MAX_PATH];
+	FILE * hFile;
+	int FileSize;
+	struct stat STAT;
+	size_t ReadLen = 0;
+	time_t Age;
+
+	strcpy(RestartDir, MailDir);
+	strcat(RestartDir, "/Restart");
+
+	// Make sure RestartDir exists
+
+#ifdef WIN32
+	CreateDirectory(RestartDir, NULL);		// Just in case
+#else
+	mkdir(RestartDir, S_IRWXU | S_IRWXG | S_IRWXO);
+	chmod(RestartDir, S_IRWXU | S_IRWXG | S_IRWXO);
+#endif
+
+	// look for restart files. These will be numbered from 1 up
+
+	for (i = 1; 1; i++)
+	{
+		sprintf_s(MsgFile, sizeof(MsgFile), "%s/%d", RestartDir, i);
+						
+		if (stat(MsgFile, &STAT) == -1)
+			break;
+	
+		FileSize = STAT.st_size;
+
+		Age = time(NULL) - STAT.st_ctime;
+
+		if (Age > 86400 * 2)		// Max 2 days
+			continue;
+
+		hFile = fopen(MsgFile, "rb");
+
+		if (hFile == NULL)
+			break;
+
+		// Read Restart Record
+
+		fread(&Restart, 1, sizeof(struct FBBRestartData), hFile); 
+
+		if ((Restart.MailBufferSize + sizeof(struct FBBRestartData)) != FileSize)			// Duff file
+		{
+			fclose(hFile);
+			break;
+		}
+
+		RestartRec = zalloc(sizeof (struct FBBRestartData));
+
+		GetSemaphore(&AllocSemaphore, 0);
+
+		RestartData = realloc(RestartData,(++RestartCount+1) * sizeof(void *));
+		RestartData[RestartCount] = RestartRec;
+
+		FreeSemaphore(&AllocSemaphore);
+
+		memcpy(RestartRec, &Restart, sizeof(struct FBBRestartData));
+		RestartRec->MailBuffer = malloc(RestartRec->MailBufferSize);
+		ReadLen = fread(RestartRec->MailBuffer, 1, RestartRec->MailBufferSize, hFile); 
+		
+		Logprintf(LOG_BBS, 0, '?', "Restart Data for %s %s Len %d Loaded", RestartRec->Call, RestartRec->bid, RestartRec->length);
+		fclose(hFile);
+	}
+}
+
+
+void SaveRestartData()
+{
+	// Save restart data to file so we can reload on restart
+	// Restart data has pointers to buffers so we must save copy of data and reconstitue on restart
+
+	// Delete and resave all restart data to keep restart directory clean
+
+	int i, n = 1;
+	char MsgFile[MAX_PATH];
+	FILE * hFile;
+	size_t WriteLen=0;
+	struct FBBRestartData * RestartRec = NULL;
+	struct stat STAT;
+	time_t NOW = time(NULL);
+
+
+	for (i = 1; 1; i++)
+	{
+		sprintf_s(MsgFile, sizeof(MsgFile), "%s/%d", RestartDir, i);
+						
+		if (stat(MsgFile, &STAT) == -1)
+			break;
+
+		DeleteFile(MsgFile);
+	}
+
+	for (i = 1; i <= RestartCount; i++)
+	{
+		RestartRec = RestartData[i];
+
+		if (RestartRec == 0)
+			return;				// Shouldn't happen!
+
+		if ((NOW - RestartRec->TimeCreated) > 86400 * 2)	// Max 2 days
+			continue;
+
+		sprintf_s(MsgFile, sizeof(MsgFile), "%s/%d", RestartDir, n++);
+
+		hFile = fopen(MsgFile, "wb");
+
+		if (hFile)
+		{
+			WriteLen = fwrite(RestartRec, 1, sizeof(struct FBBRestartData), hFile);		// Save Header	
+			WriteLen = fwrite(RestartRec->MailBuffer, 1, RestartRec->MailBufferSize, hFile); // Save Data
+			fclose(hFile);
+		}
+	}
+}
 VOID FBBputs(CIRCUIT * conn, char * buf)
 {
 	// Sends to user and logs
@@ -985,12 +1111,12 @@ loop:
 			{
 				RestartRec = RestartData[i];
 		
-				if ((RestartRec->UserPointer == conn->UserPointer)
+				if ((strcmp(RestartRec->Call, conn->UserPointer->Call) == 0)
-					&& (strcmp(RestartRec->TempMsg->bid, conn->TempMsg->bid) == 0))
+					&& (strcmp(RestartRec->bid, conn->TempMsg->bid) == 0))
 				{
-					if (RestartRec->TempMsg->length <= offset)
+					if (RestartRec->length <= offset)
 					{
-						conn->TempMsg->length = RestartRec->TempMsg->length;
+						conn->TempMsg->length = RestartRec->length;
 						conn->MailBuffer = RestartRec->MailBuffer;
 						conn->MailBufferSize = RestartRec->MailBufferSize;
 
@@ -1019,6 +1145,7 @@ loop:
 						RestartData[n] = RestartData[n+1];		// move down all following entries
 					}
 					RestartCount--;
+					SaveRestartData();
 				}
 			}
 
@@ -1146,6 +1273,7 @@ loop:
 			{
 #endif
 				conn->InputMode = 0;		//  So we won't save Restart data if decode fails
+				DeleteRestartData(conn);
 				Decode(conn, 0);			// Setup Next Message will reset InputMode if needed
 #ifndef LINBPQ
 			}
@@ -1845,14 +1973,14 @@ VOID SaveFBBBinary(CIRCUIT * conn)
 	{
 		RestartRec = RestartData[i];
 		
-		if ((RestartRec->UserPointer == conn->UserPointer)
+		if ((strcmp(RestartRec->Call, conn->UserPointer->Call) == 0)
-			&& (strcmp(RestartRec->TempMsg->bid, conn->TempMsg->bid) == 0))
+			&& (strcmp(RestartRec->bid, conn->TempMsg->bid) == 0))
 		{
-			// Fund it, so reuse
+			// Found it, so reuse
 
 			//	If we have more data, reset retry count
 
-			if (RestartRec->TempMsg->length < conn->TempMsg->length)
+			if (RestartRec->length < conn->TempMsg->length)
 				RestartRec->Count = 0;;
 
 			break;
@@ -1869,19 +1997,53 @@ VOID SaveFBBBinary(CIRCUIT * conn)
 		RestartData[RestartCount] = RestartRec;
 
 		FreeSemaphore(&AllocSemaphore);
+		RestartRec->TimeCreated = time(NULL);
 	}
 
-	RestartRec->UserPointer = conn->UserPointer;
+	strcpy(RestartRec->Call, conn->UserPointer->Call);
-	RestartRec->TempMsg = conn->TempMsg;
+	RestartRec->length = conn->TempMsg->length;
+	strcpy(RestartRec->bid, conn->TempMsg->bid);
 	RestartRec->MailBuffer = conn->MailBuffer;
 	RestartRec->MailBufferSize = conn->MailBufferSize;
 
 	len = sprintf_s(Msg, sizeof(Msg), "Disconnect received from %s during Binary Transfer - %d Bytes Saved for restart",
 		conn->Callsign, conn->TempMsg->length);
 
+	SaveRestartData();
+
 	WriteLogLine(conn, '|',Msg, len, LOG_BBS);
 }
 
+void DeleteRestartData(CIRCUIT * conn)
+{
+	struct FBBRestartData * RestartRec = NULL;
+	int i, n;
+
+	if (conn->TempMsg == NULL)
+		return;
+	
+	for (i = 1; i <= RestartCount; i++)
+	{
+		RestartRec = RestartData[i];
+		
+		if ((strcmp(RestartRec->Call, conn->UserPointer->Call) == 0)
+			&& (strcmp(RestartRec->bid, conn->TempMsg->bid) == 0))
+		{
+			// Remove restrt data
+
+			for (n = i; n < RestartCount; n++)
+			{
+				RestartData[n] = RestartData[n+1];		// move down all following entries
+			}
+				
+			RestartCount--;
+			SaveRestartData();
+			return;
+		}
+	}
+}
+
+
 BOOL LookupRestart(CIRCUIT * conn, struct FBBHeaderLine * FBBHeader)
 {
 	int i, n;
@@ -1895,15 +2057,15 @@ BOOL LookupRestart(CIRCUIT * conn, struct FBBHeaderLine * FBBHeader)
 	{
 		RestartRec = RestartData[i];
 		
-		if ((RestartRec->UserPointer == conn->UserPointer)
+		if ((strcmp(RestartRec->Call, conn->UserPointer->Call) == 0)
-			&& (strcmp(RestartRec->TempMsg->bid, FBBHeader->BID) == 0))
+			&& (strcmp(RestartRec->bid, FBBHeader->BID) == 0))
 		{
 			char Msg[120];
 			int len;
 
 			RestartRec->Count++;
 
-			if (RestartRec->Count > 3)
+			if (RestartRec->Count > 10)
 			{
 				len = sprintf_s(Msg, sizeof(Msg), "Too many restarts for %s - Requesting restart from beginning",
 					FBBHeader->BID);
@@ -1918,15 +2080,16 @@ BOOL LookupRestart(CIRCUIT * conn, struct FBBHeaderLine * FBBHeader)
 				}
 				
 				RestartCount--;
+				SaveRestartData();
 				return FALSE;
 			}
 
 			len = sprintf_s(Msg, sizeof(Msg), "Restart Data found for %s - Requesting restart from %d",
-				FBBHeader->BID, RestartRec->TempMsg->length);
+				FBBHeader->BID, RestartRec->length);
 
 			WriteLogLine(conn, '|',Msg, len, LOG_BBS);
 
-			return (RestartRec->TempMsg->length);
+			return (RestartRec->length);
 		}
 	}
 

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
 
@@ -538,7 +544,11 @@ pollloop:
 
 			if (_memicmp(&buff->L2DATA[0], "RADIO ", 6) == 0)
 			{
-				sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &buff->L2DATA[6]);
+				char cmd[56];
+
+				strcpy(cmd, &buff->L2DATA[6]);
+				sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, cmd);
+
 	
 				if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, &buff->L2DATA[0]))
 				{
@@ -815,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);
@@ -452,6 +457,11 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 				TNC->lasttime = ltime;
 				ConnecttoFreeData(port);
 			}
+			while (TNC->PortRecord->UI_Q)
+			{
+				buffptr = Q_REM(&TNC->PortRecord->UI_Q);
+				ReleaseBuffer(buffptr);	
+			}
 		}
 
 
@@ -740,7 +750,10 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 
 		if (_memicmp(&buff->L2DATA[0], "RADIO ", 6) == 0)
 		{
-			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &buff->L2DATA[6]);
+			char cmd[56];
+
+			strcpy(cmd, &buff->L2DATA[6]);
+			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, cmd);
 
 			if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, &buff->L2DATA[0]))
 			{
@@ -4139,7 +4152,7 @@ void buildParamString(struct TNCINFO * TNC, char * line)
 		FDI->TuningRange * -1.0, FDI->TuningRange * 1.0, FDI->TXLevel);
 
 	if (FDI->hamlibHost)
-		sprintf(line, "%s --rigctld_ip %s --rigctld_port %d", line, FDI->hamlibHost, FDI->hamlibPort);
+		sprintf(&line[strlen(line)], " --rigctld_ip %s --rigctld_port %d", FDI->hamlibHost, FDI->hamlibPort);
 
 	if (FDI->LimitBandWidth)
 		strcat(line, " --500hz");

HFCommon.c

@@ -1866,9 +1866,6 @@ static char ** SeparateMultiString(char * MultiString)
 	return Value;
 }
 
-
-
-
 extern int nextDummyInterlock;
 
 int standardParams(struct TNCINFO * TNC, char * buf)
@@ -1917,7 +1914,7 @@ int standardParams(struct TNCINFO * TNC, char * buf)
 		TNC->ActiveTXFreq = atof(&buf[13]);
 	else if (_memicmp(buf, "ActiveRXFreq", 12) == 0)	// Set at start of session
 		TNC->ActiveRXFreq = atof(&buf[13]);
-	else if (_memicmp(buf, "DisconnectScript", 16) == 0)	// Set at start of session
+	else if (_memicmp(buf, "DisconnectScript", 16) == 0)	// Set at end of session
 		TNC->DisconnectScript = SeparateMultiString(&buf[17]);
 	else if (_memicmp(buf, "PTTONHEX", 8) == 0)
 	{

HSMODEM.c

@@ -648,7 +648,11 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 
 		if (_memicmp(&buff->L2DATA[0], "RADIO ", 6) == 0)
 		{
-			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &buff->L2DATA[6]);
+			char cmd[56];
+
+			strcpy(cmd, &buff->L2DATA[6]);
+			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, cmd);
+
 	
 			if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, &buff->L2DATA[0]))
 			{

HTTPcode.c

@@ -17,6 +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
 */	
 
+
 //#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
 
 #define _CRT_SECURE_NO_DEPRECATE
@@ -104,9 +105,13 @@ extern int NumberofPorts;
 
 extern UCHAR ConfigDirectory[260];
 
+extern struct AXIPPORTINFO * Portlist[];
+
 VOID sendandcheck(SOCKET sock, const char * Buffer, int Len);
 int CompareNode(const void *a, const void *b);
 int CompareAlias(const void *a, const void *b);
+int CompareRoutes(const void * a, const void * b);
+
 void ProcessMailHTTPMessage(struct HTTPConnectionInfo * Session, char * Method, char * URL, char * input, char * Reply, int * RLen, int InputLen, char * Token);
 void ProcessChatHTTPMessage(struct HTTPConnectionInfo * Session, char * Method, char * URL, char * input, char * Reply, int * RLen);
 struct PORTCONTROL * APIENTRY GetPortTableEntryFromSlot(int portslot);
@@ -3793,12 +3798,82 @@ doHeader:
 
 			*/
 
+			// AXIP Partners
+
+			if (_stricmp(NodeURL, "/Node/AXIP.html") == 0)
+			{
+				int i;
+				char Normcall[10];
+				int Width = 5;
+				int x = 0, n = 0, nd = 0;
+				struct arp_table_entry * List[1000];
+				struct arp_table_entry * ListD[1000];
+				char AXIPList[10000] = "";
+				int ListLen = 0;
+
+				struct AXIPPORTINFO * AXPORT = Portlist[0];
+				struct PORTCONTROL * PORT = PORTTABLE;
+				struct arp_table_entry * arp;
+				time_t NOW = time(NULL);
+				
+				char AXIPHeader[] =
+					"<table align='center' bgcolor='ffffff' border=2 cellpadding=10 cellspacing=2 style=font-family:monospace>"
+					"<tr><td align='center'>AXIP Up</td><td align='center'>AXIP Down</td></tr><tr><td valign='top'>%s";
+				
+
+				while (PORT)
+				{
+					AXPORT = Portlist[PORT->PORTNUMBER];
+
+					if (AXPORT)
+					{
+						// Get ARP entries
+
+						for (i = 0; i < AXPORT->arp_table_len; i++)
+						{
+							arp = &AXPORT->arp_table[i];
+
+							if (arp->LastHeard == 0 || (NOW - arp->LastHeard) > 3600)			// Considered down
+								ListD[nd++] = arp;
+							else
+								List[n++] = arp;
+						}
+					}
+					PORT = PORT->PORTPOINTER;
+				}
+
+				if (n > 1)
+					qsort(List, n, sizeof(void *), CompareNode);
+				if (nd > 1)
+					qsort(ListD, nd, sizeof(void *), CompareNode);
+
+				for (i = 0; i < n; i++)
+				{
+					int len = ConvFromAX25(List[i]->callsign, Normcall);
+					Normcall[len]=0;
+
+					ListLen += sprintf(&AXIPList[ListLen], "%02d - %s %d<br>", i + 1, Normcall, (List[i]->LastHeard)?(NOW - List[i]->LastHeard):0);
+				}
+
+				ReplyLen += sprintf(&_REPLYBUFFER[ReplyLen], AXIPHeader, AXIPList);
+
+				ListLen = 0;
+	
+				for (i = 0; i < nd; i++)
+				{
+					int len = ConvFromAX25(ListD[i]->callsign, Normcall);
+					Normcall[len]=0;
+					ListLen += sprintf(&AXIPList[ListLen], "%02d - %s %d<br>", i + 1, Normcall, (ListD[i]->LastHeard)?(NOW - ListD[i]->LastHeard):0);
+				}
+				ReplyLen += sprintf(&_REPLYBUFFER[ReplyLen], "</td><td valign='top'>%s", AXIPList);
+				ReplyLen += sprintf(&_REPLYBUFFER[ReplyLen], "</td></tr></table></body></html>");
+			}
 
 			if (_stricmp(NodeURL, "/Node/Routes.html") == 0)
 			{
 				struct ROUTE * Routes = NEIGHBOURS;
 				int MaxRoutes = MAXNEIGHBOURS;
-				int count;
+				int count, i;
 				char Normcall[10];
 				char locked[4] = " ";
 				int NodeCount;
@@ -3807,11 +3882,33 @@ doHeader:
 				char Active[10];
 				int Queued;
 				
+				int x = 0, n = 0;
+				struct ROUTE * List[1000];
+
+			
 				ReplyLen += sprintf(&_REPLYBUFFER[ReplyLen], "%s", RouteHddr);
 
+				// Build and sort list of routes
+				
 				for (count = 0; count < MaxRoutes; count++)
 				{
 					if (Routes->NEIGHBOUR_CALL[0] != 0)
+					{
+						List[n++] = Routes;
+
+						if (n > 999)
+							break;
+					}
+
+					Routes++;
+				}
+
+				if (n > 1)
+					qsort(List, n, sizeof(void *), CompareRoutes);
+
+				for (i = 0; i < n; i++)
+				{
+					Routes = List[i];
 					{
 						int len = ConvFromAX25(Routes->NEIGHBOUR_CALL, Normcall);
 						Normcall[len]=0;
@@ -4379,7 +4476,7 @@ int ProcessMailAPISignon(struct TCPINFO * TCP, char * MsgPtr, char * Appl, char
 
 		if (user && user[0] && password && password[0])
 		{
-			sprintf(MsgPtr, "%s?%s&%s", MsgPtr, user, password); 
+			sprintf(&MsgPtr[strlen(MsgPtr)], "?%s&%s", user, password); 
 		}
 	}
 
@@ -4742,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
 		{
@@ -4788,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)
 			{
@@ -1860,7 +1860,7 @@ static void cn_dec(ChatCIRCUIT *circuit, CHATNODE *node)
 					__try
 					{
 #endif
-						len = sprintf(line, "%s %p %s", line, cn->node, cn->node->alias);
+						len += sprintf(&line[len], " %p %s", cn->node, cn->node->alias);
 						if (len > 80)
 						{
 							Debugprintf("%s", line);
@@ -2821,7 +2821,7 @@ static void show_circuits(ChatCIRCUIT *conn, char Flag)
 	CHATNODE    *node;
 	LINK *link;
 	char line[1000];
-	int     len;
+	int len = 0;
 	CN	*cn;
 
 	int i = 0;
@@ -2836,16 +2836,16 @@ static void show_circuits(ChatCIRCUIT *conn, char Flag)
 	nprintf(conn, "%d Node(s)\r", i);
 
 	if (Flag == 'c')
-		sprintf(line, "Here %-6.6s <-", OurNode);
+		len = sprintf(line, "Here %-6.6s <-", OurNode);
 	else
-		sprintf(line, "Here %-6.6s <-", OurAlias);
+		len = sprintf(line, "Here %-6.6s <-", OurAlias);
 
 	for (node = node_hd; node; node = node->next) if (node->refcnt)
 	{
 		if (Flag == 'c')
-			len = sprintf(line, "%s %s", line, node->call);
+			len += sprintf(&line[len], " %s", node->call);
 		else
-			len = sprintf(line, "%s %s", line, node->alias);
+			len += sprintf(&line[len], " %s", node->alias);
 		if (len > 80)
 		{
 			nprintf(conn, "%s\r", line);
@@ -2873,9 +2873,9 @@ static void show_circuits(ChatCIRCUIT *conn, char Flag)
 						__try
 						{
 							if (Flag == 'c')
-								len = sprintf(line, "%s %s", line, cn->node->call);
+								len += sprintf(&line[len], " %s", cn->node->call);
 							else
-								len = sprintf(line, "%s %s", line, cn->node->alias);
+								len += sprintf(&line[len], " %s", cn->node->alias);
 							if (len > 80)
 							{
 								nprintf(conn, "%s\r", line);
@@ -2883,23 +2883,23 @@ static void show_circuits(ChatCIRCUIT *conn, char Flag)
 							}
 						}
 						__except(EXCEPTION_EXECUTE_HANDLER)
-							{len = sprintf(line, "%s *PE* Corrupt Rec %x %x", line, cn, cn->node);}
+							{len += sprintf(&line[len], " *PE* Corrupt Rec %x %x", cn, cn->node);}
 					}
 					else
-						len = sprintf(line, "%s Corrupt Rec %x %x ", line, cn, cn->node);
+						len = sprintf(&line[len], " Corrupt Rec %x %x ", cn, cn->node);
 				}
 			}
 			__except(EXCEPTION_EXECUTE_HANDLER)
-			{len = sprintf(line, "%s *PE* Corrupt Rec %x %x ", line, cn, cn->node);}
+			{len += sprintf(&line[len], " *PE* Corrupt Rec %x %x ", cn, cn->node);}
 #else
 			for (cn = circuit->hnode; cn; cn = cn->next)
 			{
 				if (cn->node && cn->node->alias)
 				{
 					if (Flag == 'c')
-						len = sprintf(line, "%s %s", line, cn->node->call);
+						len += sprintf(&line[len], " %s", cn->node->call);
 					else
-						len = sprintf(line, "%s %s", line, cn->node->alias);
+						len += sprintf(&line[len], " %s", cn->node->alias);
 					if (len > 80)
 					{
 						nprintf(conn, "%s\r", line);
@@ -2907,7 +2907,7 @@ static void show_circuits(ChatCIRCUIT *conn, char Flag)
 					}
 				}
 				else
-					len = sprintf(line, "%s Corrupt Rec %p %p ", line, cn, cn->node);
+					len += sprintf(&line[len], " Corrupt Rec %p %p ", cn, cn->node);
 			}
 #endif
 			nprintf(conn, "%s\r", line);
@@ -3682,7 +3682,7 @@ VOID SendChatLinkStatus()
 			}
 		}
 
-		len = sprintf(Msg, "%s%s %c ", Msg, link->call, '0' + link->flags);
+		len += sprintf(&Msg[len], "%s %c ", link->call, '0' + link->flags);
 
 		if (len > 240)
 			break;

IPCode.c

@@ -100,6 +100,9 @@ TODo	?Multiple Adapters
 #ifdef WIN32
 int pcap_sendpacket(pcap_t *p, u_char *buf, int size);
 #else
+#ifndef PCAP_API
+#define PCAP_API extern
+#endif
 PCAP_API int pcap_sendpacket(pcap_t *, const u_char *, int);
 #endif
 
@@ -387,7 +390,7 @@ char * FormatIP(uint32_t Addr)
 	return FormatIPWork;
 }
 
-int CompareRoutes (const VOID * a, const VOID * b)
+int CompareIPRoutes (const VOID * a, const VOID * b)
 {
 	PROUTEENTRY x;
 	PROUTEENTRY y;
@@ -4972,7 +4975,7 @@ VOID SHOWIPROUTE(TRANSPORTENTRY * Session, char * Bufferptr, char * CmdTail, str
 	Bufferptr = Cmdprintf(Session, Bufferptr, "%d Entries\r", NumberofRoutes);
 
 	if (NumberofRoutes)
-		qsort(RouteRecords, NumberofRoutes, sizeof(void *), CompareRoutes);
+		qsort(RouteRecords, NumberofRoutes, sizeof(void *), CompareIPRoutes);
 
 	for (i=0; i < NumberofRoutes; i++)
 	{

KAMPactor.c

@@ -70,6 +70,8 @@ static RECT Rect;
 
 int DoScanLine(struct TNCINFO * TNC, char * Buff, int Len);
 VOID WritetoTrace(struct TNCINFO * TNC, char * Msg, int Len);
+VOID SuspendOtherPorts(struct TNCINFO * ThisTNC);
+VOID ReleaseOtherPorts(struct TNCINFO * ThisTNC);
 
 static FILE * LogHandle[32] = {0};
 
@@ -517,6 +519,28 @@ ok:
 	return 0;
 }
 
+VOID KAMSuspendPort(struct TNCINFO * TNC, struct TNCINFO * ThisTNC)
+{
+	struct STREAMINFO * STREAM = &TNC->Streams[0];
+
+	strcpy(TNC->WEB_TNCSTATE, "Interlocked");
+	MySetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
+
+//	STREAM->CmdSet = STREAM->CmdSave = zalloc(100);
+//	sprintf(STREAM->CmdSet, "I%s\r", "SCSPTC");		// Should prevent connects
+
+}
+
+VOID KAMReleasePort(struct TNCINFO * TNC)
+{
+	struct STREAMINFO * STREAM = &TNC->Streams[0];
+
+	strcpy(TNC->WEB_TNCSTATE, "Free");
+	MySetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
+
+}
+
+
 static int WebProc(struct TNCINFO * TNC, char * Buff, BOOL LOCAL)
 {
 	int Len = sprintf(Buff, "<html><meta http-equiv=expires content=0><meta http-equiv=refresh content=15>"
@@ -595,6 +619,11 @@ void * KAMExtInit(EXTPORTDATA * PortEntry)
 	PortEntry->PORTCONTROL.PORTSTARTCODE = KAMStartPort;
 	PortEntry->PORTCONTROL.PORTSTOPCODE = KAMStopPort;
 
+//	TNC->SuspendPortProc = KAMSuspendPort;
+//	TNC->ReleasePortProc = KAMReleasePort;
+
+
+
 	ptr=strchr(TNC->NodeCall, ' ');
 	if (ptr) *(ptr) = 0;					// Null Terminate
 
@@ -887,15 +916,30 @@ VOID KAMPoll(int Port)
 				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);	
+					EncodeAndSend(TNC, TXMsg, datalen);
+				}
 				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
 
+				SuspendOtherPorts(TNC);
+
 				sprintf(TNC->WEB_TNCSTATE, "In Use by %s", TNC->Streams[0].MyCall);
 				SetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
 
@@ -1036,16 +1080,30 @@ 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)
 				EncodeAndSend(TNC, "C20PACTOR", 9);			// Back to Listen
 			else
 				EncodeAndSend(TNC, "C20TOR", 6);			// Back to Listen
 
+
 			TNC->InternalCmd = 'T';
 			TNC->Timeout = 50;
 			TNC->IntCmdDelay--;
@@ -1266,6 +1324,51 @@ VOID KAMPoll(int Port)
 					return;
 				}
 
+				if (memcmp(MsgPtr, "GTOR ", 5) == 0)	// GTOR Connect
+				{
+					memcpy(STREAM->RemoteCall, &MsgPtr[5], 9);
+					STREAM->Connecting = TRUE;
+
+					// If Stream 0, Convert C CALL to PACTOR CALL
+
+					if (Stream == 0)
+					{
+						datalen = sprintf(TXMsg, "C20GTOR %s", TNC->Streams[0].RemoteCall);
+						
+						// If Pactor, check busy detecters on any interlocked ports
+
+						if (TNC->HFPacket == 0 && InterlockedCheckBusy(TNC) && TNC->OverrideBusy == 0)
+						{
+							// Channel Busy. Wait
+
+							TNC->ConnectCmd = _strdup(TXMsg);
+
+							sprintf(TNC->WEB_TNCSTATE, "Waiting for clear channel");
+							SetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
+
+							TNC->BusyDelay = TNC->BusyWait * 10;
+
+							return;
+						}
+
+						TNC->OverrideBusy = FALSE;
+
+						sprintf(TNC->WEB_TNCSTATE, "%s Connecting to %s",
+							TNC->Streams[0].MyCall, TNC->Streams[0].RemoteCall);
+						SetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
+					}
+					else
+						datalen = sprintf(TXMsg, "C1%cC %s", Stream + '@', STREAM->RemoteCall);
+
+					EncodeAndSend(TNC, TXMsg, datalen);
+					TNC->Timeout = 50;
+					TNC->InternalCmd = 'C';			// So we dont send the reply to the user.
+					ReleaseBuffer(buffptr);
+					STREAM->Connecting = TRUE;
+
+					return;
+				}
+
 				if (memcmp(MsgPtr, "DISCONNECT", datalen) == 0)	// Disconnect
 				{
 					if (Stream == 0)
@@ -1644,6 +1747,10 @@ VOID ProcessKHOSTPacket(struct TNCINFO * TNC, UCHAR * Msg, int Len)
 			return;
 		}
 
+
+		WritetoTrace(TNC, Buffer, Len);
+
+
 		// Pass to Appl
 
 		Stream = TNC->CmdStream;
@@ -1680,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;
 	}
 
@@ -1790,6 +1967,10 @@ VOID ProcessKHOSTPacket(struct TNCINFO * TNC, UCHAR * Msg, int Len)
 				if (Msg[1] == '2' && Msg[2] == 'A')
 					TNC->HFPacket = TRUE;
 
+				// Stop other ports in same group
+
+				SuspendOtherPorts(TNC);
+
 				ProcessIncommingConnect(TNC, Call, Stream, TRUE);
 
 				SESS = TNC->PortRecord->ATTACHEDSESSIONS[Stream];
@@ -2047,6 +2228,10 @@ VOID ForcedClose(struct TNCINFO * TNC, int Stream)
 
 VOID CloseComplete(struct TNCINFO * TNC, int Stream)
 {
+	sprintf(TNC->WEB_TNCSTATE, "Free");
+	SetWindowText(TNC->xIDC_TNCSTATE, TNC->WEB_TNCSTATE);
+
+	ReleaseOtherPorts(TNC);
 	TNC->NeedPACTOR = 50;	
 }
 

KISSHF.c

@@ -458,7 +458,11 @@ ok:
 	
 		if (_memicmp(txbuff, "RADIO ", 6) == 0)
 		{
-			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &txbuff[6]);
+			char cmd[56];
+
+			strcpy(cmd, &buff->L2DATA[6]);
+			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, cmd);
+
 	
 			if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, &buff->L2DATA[0]))
 			{

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;
@@ -67,6 +73,8 @@ extern dest_list * CURRENTNODE;
 
 int L3_10SECS = 10;
 
+extern int PREFERINP3ROUTES;
+
 
 VOID L3BG()
 {
@@ -92,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)
 					{
@@ -135,12 +151,14 @@ VOID L3BG()
 					// Drop through to Activate
 				}
 				
+				// No Active Route
+
 				if (ACTIVATE_DEST(DEST) == FALSE)
 				{
 					// Node has no routes - get rid of it
 
 					REMOVENODE(DEST);
-					return;					// Avoid riskof looking at lod entries
+					return;					// Avoid risk of looking at old entries
 				}
 			}
 		}
@@ -154,14 +172,24 @@ BOOL ACTIVATE_DEST(struct DEST_LIST * DEST)
 {
 	int n = MAXDESTS;
 	struct PORTCONTROL * PORT = PORTTABLE;
-	struct ROUTE * ROUTE;
+	struct ROUTE * ROUTE = NULL;
 	struct _LINKTABLE * LINK;
 	struct TNCINFO * TNC;
 
 	int ActiveRoute;
 
-	if (DEST->DEST_ROUTE == 0)		// ALREADY HAVE A SELECTED ROUTE?
+	if (DEST->DEST_ROUTE == 0)		// Don't ALREADY HAVE A SELECTED ROUTE?
-		DEST->DEST_ROUTE = 1;		// TRY TO ACTIVATE FIRST
+	{
+		DEST->DEST_ROUTE = 1;
+
+		if (PREFERINP3ROUTES)
+		{
+			// if we have any INP3 routes use the first. It will always be the fastest. The others are there for fallback if the first fails.
+
+			if (ROUTE = DEST->INP3ROUTE[0].ROUT_NEIGHBOUR)
+				DEST->DEST_ROUTE = 4;		// TRY TO ACTIVATE FIRST
+		}
+	}
 		
 	ActiveRoute = DEST->DEST_ROUTE - 1;
 
@@ -169,7 +197,7 @@ BOOL ACTIVATE_DEST(struct DEST_LIST * DEST)
 
 	if (ROUTE == 0)
 	{
-		//	Currnet Route not present
+		//	Current Route not present
 		//	If  current route is 1, then we must have INP3 routes (or entry is corrupt)
 
 		if (DEST->DEST_ROUTE != 1)
@@ -177,13 +205,17 @@ BOOL ACTIVATE_DEST(struct DEST_LIST * DEST)
 
 		// Current Route is 1
 
-		if (DEST->ROUTE[0].ROUT_NEIGHBOUR == 0)
+		if (DEST->INP3ROUTE[0].ROUT_NEIGHBOUR == 0)
 			return FALSE;					// No INP3 so No Routes
 
 		DEST->DEST_ROUTE = 4;			// First INP3
-		ROUTE = DEST->ROUTE[0].ROUT_NEIGHBOUR;
+		ROUTE = DEST->INP3ROUTE[0].ROUT_NEIGHBOUR;
 	}
 
+	if (ROUTE == 0)			// Shouldn't happen
+		return FALSE;
+
+
 	// if NetROM over VARA conection is made by the driver
 
 	TNC = TNCInfo[ROUTE->NEIGHBOUR_PORT];
@@ -204,7 +236,7 @@ BOOL ACTIVATE_DEST(struct DEST_LIST * DEST)
 		return L2SETUPCROSSLINK(ROUTE);
 	}
 	
-	// We mst be waiting for link to come up
+	// We umst be waiting for link to come up
 	
 	return TRUE;
 
@@ -223,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
@@ -259,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;
 	}
 
@@ -436,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
@@ -548,7 +587,7 @@ VOID PROCESSNODEMESSAGE(MESSAGE * Msg, struct PORTCONTROL * PORT)
 
 		ptr1 += 7;
 	
-		//	UPDATE ALIAS
+		//	UPDATE ALIAS#
 
 		memcpy(DEST->DEST_ALIAS, ptr1, 6);
 
@@ -707,11 +746,11 @@ int COUNTNODES(struct ROUTE * ROUTE)
 			count++;
 		else if (DEST->NRROUTE[2].ROUT_NEIGHBOUR == ROUTE)
 			count++;
-		else if (DEST->ROUTE[0].ROUT_NEIGHBOUR == ROUTE)
+		else if (DEST->INP3ROUTE[0].ROUT_NEIGHBOUR == ROUTE)
 			count++;
-		else if (DEST->ROUTE[1].ROUT_NEIGHBOUR == ROUTE)
+		else if (DEST->INP3ROUTE[1].ROUT_NEIGHBOUR == ROUTE)
 			count++;
-		else if (DEST->ROUTE[2].ROUT_NEIGHBOUR == ROUTE)
+		else if (DEST->INP3ROUTE[2].ROUT_NEIGHBOUR == ROUTE)
 			count++;
 
 		DEST++;
@@ -726,12 +765,26 @@ VOID L3BG();
 
 VOID SENDNEXTNODESFRAGMENT();
 
-VOID SENDNODESMSG()
+VOID SENDNODESMSG(int Portnum)
 {
 	if (NODESINPROGRESS)
 		return;
 
+	NODESToOnePort = Portnum;
+
+	if (Portnum)			// Nodes to one port only
+	{
+		L3CURRENTPORT = GetPortTableEntryFromPortNum(Portnum);
+
+		if (L3CURRENTPORT == 0)
+		{
+			NODESToOnePort = 0;
+			return;
+		}
+	}
+	else
 		L3CURRENTPORT = PORTTABLE;
+	
 	SENDNEXTNODESFRAGMENT();
 }
 
@@ -767,15 +820,18 @@ 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;
 			}
 		}
 
+		if (NODESToOnePort == 0)			// CurrentPort already set if NODESToOnePort
 			L3CURRENTPORT = PORT;
 
 		DEST = CURRENTNODE = DESTS;			// START OF LIST
@@ -833,6 +889,16 @@ VOID SENDNEXTNODESFRAGMENT()
 		if (DEST >= ENDDESTLIST)
 		{
 			CURRENTNODE = 0;			// Finished on this port
+
+			// if sending to only one port then stop
+
+			if (NODESToOnePort)
+			{
+				NODESToOnePort = 0;
+				NODESINPROGRESS = 0;
+			}
+			else
+			{
 				L3CURRENTPORT = PORT->PORTPOINTER;
 				if (L3CURRENTPORT == NULL)
 				{
@@ -840,12 +906,13 @@ VOID SENDNEXTNODESFRAGMENT()
 
 					NODESINPROGRESS = 0;
 				}
+			}
 			goto Sendit;
 		}
 
 		if (DEST->DEST_CALL[0] != 0x40 && DEST->NRROUTE[0].ROUT_QUALITY >= TXMINQUAL &&
 			DEST->NRROUTE[0].ROUT_OBSCOUNT >= OBSMIN &&
-			(NODE == 1 || DEST->DEST_STATE & 0x80))			// Only send appl nodes if DEST = 0;
+			(NODE == 1 || DEST->DEST_STATE & 0x80))			// Only send appl nodes if NODE = 0;
 		{		
 			// Send it
 			
@@ -878,6 +945,9 @@ VOID SENDNEXTNODESFRAGMENT()
 
 			*(ptr1++) = (UCHAR)Qual;
 
+			if (Qual == 0)
+				continue;
+
 			Count--;
 		}
 		DEST++;
@@ -924,13 +994,15 @@ VOID L3LINKCLOSED(struct _LINKTABLE * LINK, int Reason)
 
 VOID CLEARACTIVEROUTE(struct ROUTE * ROUTE, int Reason)
 {
-	//	FIND ANY DESINATIONS WITH [ESI] AS ACTIVE NEIGHBOUR, AND
+	//	FIND ANY DESINATIONS WITH ROUTE AS ACTIVE NEIGHBOUR, AND
 	//	SET INACTIVE
 
 	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;
@@ -945,7 +1017,7 @@ VOID CLEARACTIVEROUTE(struct ROUTE * ROUTE, int Reason)
 		if (DEST->DEST_ROUTE == 0)
 			continue;
 
-		if (DEST->ROUTE[DEST->DEST_ROUTE].ROUT_NEIGHBOUR == ROUTE)   // Is this the active route
+		if (DEST->INP3ROUTE[DEST->DEST_ROUTE].ROUT_NEIGHBOUR == ROUTE)   // Is this the active route
 		{
 			// Yes, so clear
 
@@ -1023,7 +1095,7 @@ VOID L3TimerProc()
 			
 			L3TIMER = L3INTERVAL;
 			UPDATEDESTLIST();
-			SENDNODESMSG();
+			SENDNODESMSG(0);
 		}
 	}
 
@@ -1061,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
@@ -1120,7 +1197,7 @@ UPDEST000:
 		{
 			//	 Any INP3 Routes?
 
-			if (DEST->ROUTE[0].ROUT_NEIGHBOUR == 0)
+			if (DEST->INP3ROUTE[0].ROUT_NEIGHBOUR == 0)
 			{
 				//	NO ROUTES LEFT TO DEST - REMOVE IT
 
@@ -1292,19 +1369,25 @@ VOID REMOVENODE(dest_list * DEST)
 	NUMBEROFNODES--;
 }
 
-VOID L3CONNECTFAILED(struct _LINKTABLE * LINK)
+VOID L3LINKSETUPFAILED(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", Normcall);
+	}
+
 	TellINP3LinkSetupFailed(ROUTE);
 
 	ROUTE->NEIGHBOUR_LINK = 0;		// CLEAR IT
@@ -1313,9 +1396,10 @@ VOID L3CONNECTFAILED(struct _LINKTABLE * LINK)
 }
 
 
+
 VOID L3TRYNEXTDEST(struct ROUTE * ROUTE)
 {
-	//	FIND ANY DESINATIONS WITH [ESI] AS ACTIVE NEIGHBOUR, AND
+	//	FIND ANY DESINATIONS WITH ROUTE AS ACTIVE NEIGHBOUR, AND
 	//	SET NEXT BEST NEIGHBOUR (IF ANY) ACTIVE
 
 	int n = MAXDESTS;
@@ -1328,7 +1412,7 @@ VOID L3TRYNEXTDEST(struct ROUTE * ROUTE)
 		
 		if (ActiveRoute)
 		{
-			ActiveRoute --;			// Routes numbered 1 - 6, idex from 0
+			ActiveRoute --;			// Routes numbered 1 - 6, index from 0
 			
 			if (DEST->NRROUTE[ActiveRoute].ROUT_NEIGHBOUR == ROUTE)
 			{

L4Code.c

@@ -38,22 +38,22 @@ extern BPQVECSTRUC BPQHOSTVECTOR[];
 #define BPQHOSTSTREAMS 64
 #define IPHOSTVECTOR BPQHOSTVECTOR[BPQHOSTSTREAMS + 3]
 
-VOID CLOSECURRENTSESSION(TRANSPORTENTRY * Session);
+void CLOSECURRENTSESSION(TRANSPORTENTRY * Session);
-VOID SENDL4DISC(TRANSPORTENTRY * Session);
+void SENDL4DISC(TRANSPORTENTRY * Session);
-int C_Q_COUNT(VOID * Q);
+int C_Q_COUNT(void * Q);
 TRANSPORTENTRY * SetupSessionForL2(struct _LINKTABLE * LINK);
-VOID InformPartner(struct _LINKTABLE * LINK, int Reason);
+void InformPartner(struct _LINKTABLE * LINK, int Reason);
-VOID IFRM150(TRANSPORTENTRY * Session, PDATAMESSAGE Buffer);
+void IFRM150(TRANSPORTENTRY * Session, PDATAMESSAGE Buffer);
-VOID SendConNAK(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG);
+void SendConNAK(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG);
 BOOL FINDCIRCUIT(L3MESSAGEBUFFER * L3MSG, TRANSPORTENTRY ** REQL4, int * NewIndex);
 int GETBUSYBIT(TRANSPORTENTRY * L4);
 BOOL cATTACHTOBBS(TRANSPORTENTRY * Session, UINT Mask, int Paclen, int * AnySessions);
 VOID SETUPNEWCIRCUIT(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, 
-		 TRANSPORTENTRY * L4, char * BPQPARAMS, int ApplMask, int * BPQNODE);
+		 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 SendConACK(struct _LINKTABLE * LINK, TRANSPORTENTRY * L4, L3MESSAGEBUFFER * L3MSG, BOOL BPQNODE, UINT Applmask, UCHAR * ApplCall);
-VOID L3SWAPADDRESSES(L3MESSAGEBUFFER * L3MSG);
+void L3SWAPADDRESSES(L3MESSAGEBUFFER * L3MSG);
-VOID L4TIMEOUT(TRANSPORTENTRY * L4);
+void L4TIMEOUT(TRANSPORTENTRY * L4);
 struct DEST_LIST * CHECKL3TABLES(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * Msg);
 int CHECKIFBUSYL4(TRANSPORTENTRY * L4);
 VOID AUTOTIMER(TRANSPORTENTRY * L4);
@@ -67,18 +67,28 @@ VOID ProcessRTTMsg(struct ROUTE * Route, struct _L3MESSAGEBUFFER * Buff, int Len
 VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask, UCHAR * ApplCall);
 void WriteConnectLog(char * fromCall, char * toCall, UCHAR * Mode);
 void SendVARANetromMsg(struct TNCINFO * TNC, PL3MESSAGEBUFFER MSG);
-unsigned char * Compressit(unsigned char * In, int Len, int * OutLen);
 int doinflate(unsigned char * source, unsigned char * dest, int Len, int destlen, int * outLen);
+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);
 
 static UINT APPLMASK;
 
 extern BOOL LogL4Connects;
 extern BOOL LogAllConnects;
 
+
 extern int L4Compress;
 extern int L4CompMaxframe;
 extern int L4CompPaclen;
 
+
+extern int L2Compress;
+extern int L2CompMaxframe;
+extern int L2CompPaclen;
+
 // L4 Flags Values
 
 #define DISCPENDING	8		// SEND DISC WHEN ALL DATA ACK'ED
@@ -126,6 +136,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?
@@ -162,14 +180,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)
@@ -299,6 +309,7 @@ VOID SENDL4MESSAGE(TRANSPORTENTRY * L4, struct DATAMESSAGE * Msg)
 		return;
 	}
 
+	
 	L3MSG = GetBuff();
 
 	if (L3MSG == 0)
@@ -449,7 +460,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;
@@ -473,9 +484,18 @@ VOID SENDL4CONNECT(TRANSPORTENTRY * Session)
 
 	MSG->L4INDEX = Session->CIRCUITINDEX;
 	MSG->L4ID = Session->CIRCUITID;
-	MSG->L4TXNO = 0;
+
+	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
 	
@@ -567,6 +587,55 @@ void sendChunk(TRANSPORTENTRY * L4, unsigned char * Compressed, int complen, int
 	}
 }
 
+void sendL2Chunk(struct _LINKTABLE * LINK, unsigned char * Compressed, int complen, int sendPacLen)
+{
+	unsigned char * compdata;
+	struct DATAMESSAGE * Msg;
+	int sendLen = complen;
+	int fragments;
+
+	LINK->SentAfterCompression += complen;
+	
+	if (complen > L2CompPaclen)
+	{
+		fragments = (complen / sendPacLen);			// Split to roughly equal sized fraagments
+
+		if (fragments * sendPacLen != complen)
+			fragments++;
+
+		sendLen = (complen / fragments) + 1;
+	}
+
+	Debugprintf("L2 Chunk %d Bytes %d PACLEN %d Fragments %d FragSize", complen, sendPacLen, fragments, sendLen);
+
+	compdata = Compressed;
+
+	while (complen > 0)
+	{
+		int PID = 0xF1;
+
+		if (complen > sendLen)
+			PID = 0xF2;				// More to come
+
+		Msg = GetBuff();
+
+		if (!Msg)
+			return;
+
+		Msg->PORT = LINK->LINKPORT->PORTNUMBER;
+
+		memcpy(Msg->L2DATA, compdata, sendLen);
+		Msg->LENGTH = sendLen + MSGHDDRLEN + 1;			// 1 for pid field
+		Msg->PID = PID;	// Not sent so use as a flag for compressed msg
+
+		compdata += sendLen;
+		complen -= sendLen;
+
+		C_Q_ADD(&LINK->TX_Q, Msg);
+	}
+}
+
+
 VOID L4BG()
 {
 	// PROCESS DATA QUEUED ON SESSIONS
@@ -628,7 +697,7 @@ VOID L4BG()
 
 				LINK = L4->L4TARGET.LINK;
 
-				if (COUNT_AT_L2(LINK) > 8)
+				if (COUNT_AT_L2(LINK) > 64)
 					break;
 			}
 
@@ -666,36 +735,32 @@ VOID L4BG()
 				if (L4->AllowCompress)
 				{
 					int complen = 0;
-					unsigned char * Compressed;
+					unsigned char Compressed[8192];
+					unsigned char toCompress[8192];
+					int toCompressLen = 0;
 					int dataLen;
 					int savePort = Msg->PORT;
 					int maxCompSendLen;
 
 					// Save first packet, then see if more on TX_Q
 
-					L4->toCompress = malloc(8192);
-					L4->toCompressLen = 0;
-
 					dataLen = Msg->LENGTH - MSGHDDRLEN - 1;		// No header or pid
 
 					L4->Sent += dataLen;
 
-					memcpy(&L4->toCompress[L4->toCompressLen], Msg->L2DATA, dataLen);
+					memcpy(&toCompress[toCompressLen], Msg->L2DATA, dataLen);
-					L4->toCompressLen += dataLen;
+					toCompressLen += dataLen;
 
 					// See if first will compress. If not assume too short or already compressed data and just send
 
-					Compressed = Compressit(L4->toCompress, L4->toCompressLen, &complen);
+					complen = L2Compressit(Compressed, 8192, toCompress, toCompressLen);
 				
 					if (complen >= dataLen)
 					{
-						free(Compressed);
 						L4->SentAfterCompression += dataLen;
 						SENDL4MESSAGE(L4, Msg);
 						ReleaseBuffer(Msg);
-						free(L4->toCompress);
+						toCompressLen = 0;
-						L4->toCompress = 0;
-						L4->toCompressLen = 0;
 						continue;
 					}
 
@@ -705,7 +770,7 @@ VOID L4BG()
 					{
 						// no more, so just send the stuff we've just compressed. Compressed data will fit in input packet
 
-//						Debugprintf("%d %d %d%%", L4->toCompressLen, complen, ((L4->toCompressLen - complen) * 100) / L4->toCompressLen);
+//						Debugprintf("%d %d %d%%", toCompressLen, complen, ((toCompressLen - complen) * 100) / toCompressLen);
 
 						memcpy(Msg->L2DATA, Compressed, complen);
 						
@@ -716,17 +781,13 @@ VOID L4BG()
 						SENDL4MESSAGE(L4, Msg);
 						ReleaseBuffer(Msg);
 		
-						free(L4->toCompress);
+						toCompressLen = 0;
-						L4->toCompressLen = 0;
-						L4->toCompress = 0;
-						free(Compressed);
 						continue;
 					}
 
-					free(Compressed);
 					ReleaseBuffer(Msg);					// Not going to use it
 
-					while (L4->L4TX_Q && L4->toCompressLen < (8192 - 256))		// Make sure can't overrin buffer
+					while (L4->L4TX_Q && toCompressLen < (8192 - 256))		// Make sure can't overrin buffer
 					{
 						// Collect the data from L4TX_Q
 					
@@ -734,23 +795,22 @@ VOID L4BG()
 						dataLen = Msg->LENGTH - MSGHDDRLEN - 1;		// No header or pid
 						L4->Sent += dataLen;
 
-						memcpy(&L4->toCompress[L4->toCompressLen], Msg->L2DATA, dataLen);
+						memcpy(&toCompress[toCompressLen], Msg->L2DATA, dataLen);
-						L4->toCompressLen += dataLen;
+						toCompressLen += dataLen;
 
 						ReleaseBuffer(Msg);
 					}
 
-					L4->toCompress[L4->toCompressLen] = 0;
+					toCompress[toCompressLen] = 0;
 	
-					Compressed = Compressit(L4->toCompress, L4->toCompressLen, &complen);
+					complen = L2Compressit(Compressed, 8192, toCompress, toCompressLen);
-//					Debugprintf("%d %d %d%%", L4->toCompressLen, complen, ((L4->toCompressLen - complen) * 100) / L4->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;
@@ -762,8 +822,8 @@ VOID L4BG()
 
 						int Fragments;
 						int ChunkSize;
-						unsigned char * CompressPtr = L4->toCompress;
+						unsigned char * CompressPtr = toCompress;
-						int bytesleft = L4->toCompressLen;
+						int bytesleft = toCompressLen;
 
 						// Assume 10% worse compression on smaller input
 
@@ -771,7 +831,7 @@ VOID L4BG()
 
 						Fragments = j / maxCompSendLen;
 						Fragments++;
-						ChunkSize = (L4->toCompressLen / Fragments) + 1;	// 1 for rounding
+						ChunkSize = (toCompressLen / Fragments) + 1;	// 1 for rounding
 
 						while (bytesleft > 0)
 						{
@@ -779,8 +839,7 @@ VOID L4BG()
 							if (Len > ChunkSize)
 								Len = ChunkSize;
 			
-							free (Compressed);
+							complen = L2Compressit(Compressed, 8192, CompressPtr, Len);
-							Compressed = Compressit(CompressPtr, Len, &complen);
 //							Debugprintf("Chunked %d %d %d%%", Len, complen, ((Len - complen) * 100) / Len);
 
 							sendChunk(L4, Compressed, complen, savePort);
@@ -793,10 +852,7 @@ VOID L4BG()
 					else
 						sendChunk(L4, Compressed, complen,savePort);
 
-					free(L4->toCompress);
+					toCompressLen = 0;
-					L4->toCompressLen = 0;
-					L4->toCompress = 0;
-					free(Compressed);
 				}
 				else
 				{
@@ -808,14 +864,14 @@ VOID L4BG()
 				continue;
 			}
 
+			// L2 Link
+
 			LINK = L4->L4TARGET.LINK;
 
 			// If we want to enforce PACLEN this may be a good place to do it
 
 			Msglen = Msg->LENGTH - (MSGHDDRLEN + 1); //Dont include PID
 
-			LINK->bytesTXed += Msglen;
-
 			Paclen = L4->SESSPACLEN;
 
 			if (Paclen == 0)
@@ -936,9 +992,6 @@ VOID CLEARSESSIONENTRY(TRANSPORTENTRY * Session)
 	if (Session->PARTCMDBUFFER)
 		ReleaseBuffer(Session->PARTCMDBUFFER);
 
-	if (Session->toCompress)
-		free(Session->toCompress);
-
 	if (Session->unCompress)
 		free(Session->unCompress);
 
@@ -1182,7 +1235,7 @@ VOID L4TIMEOUT(TRANSPORTENTRY * L4)
 
 		Debugprintf("Retrying L4 Connect Request");
 
-		SENDL4CONNECT(L4);				// Resend connect
+		SENDL4CONNECT(L4, L4->Service);				// Resend connect
 		return;
 	}
 
@@ -1217,10 +1270,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
@@ -1527,19 +1583,25 @@ 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] = "";
+
+	memcpy(APPLCMD, APPL->APPLCMD, 13);
 
 	memcpy(BPQPARAMS, &L4T1, 2);	// SET DEFAULT T1 IN CASE NOT FROM ANOTHER BPQ NODE
 
@@ -1567,8 +1629,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)
 	{
@@ -1578,6 +1641,58 @@ 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.
+
+						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
@@ -1589,6 +1704,7 @@ VOID CONNECTREQUEST(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, UINT Appl
 
 	//	IF APPL CONNECT, SEE IF APPL HAS AN ALIAS
 
+doAPPLConnect:
 
 	if (ALIASPTR[0] > ' ')
 	{
@@ -1603,7 +1719,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
 
@@ -1706,10 +1822,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)
@@ -1776,7 +1899,7 @@ int FINDCIRCUIT(L3MESSAGEBUFFER * L3MSG, TRANSPORTENTRY ** REQL4, int * NewIndex
 	return FALSE;
 }
 
-VOID L3SWAPADDRESSES(L3MESSAGEBUFFER * L3MSG)
+void L3SWAPADDRESSES(L3MESSAGEBUFFER * L3MSG)
 {
 	//	EXCHANGE ORIGIN AND DEST
 
@@ -1786,12 +1909,12 @@ 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)
+void SendConNAK(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG)
 {
 	L3MSG->L4FLAGS = L4CACK | L4BUSY;			// REJECT
 	L3MSG->L4DATA[0] = 0;						// WINDOW
@@ -1806,6 +1929,9 @@ VOID SendL4RESET(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG)
 {
 	// Paula's extension
 
+	L3MSG->L4RXNO = L3MSG->L4ID;
+	L3MSG->L4TXNO = L3MSG->L4INDEX;
+
 	L3MSG->L4FLAGS = L4RESET;
 
 	L3SWAPADDRESSES(L3MSG);	
@@ -1822,7 +1948,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
@@ -1841,10 +1967,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
 	
@@ -1965,7 +2091,7 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 {
 	//	INTERNODE LINK
 
-	TRANSPORTENTRY * L4 = 0;
+	TRANSPORTENTRY * L4;
 	struct DEST_LIST * DEST;
 	int Opcode;
 	char Nodename[20];
@@ -1979,6 +2105,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;
@@ -2007,9 +2135,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;
 	}
 
@@ -2026,7 +2158,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??
 
@@ -2034,10 +2167,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++;
 		}
@@ -2115,6 +2247,9 @@ VOID FRAMEFORUS(struct _LINKTABLE * LINK, L3MESSAGEBUFFER * L3MSG, int ApplMask,
 			L4->L4WINDOW = L3MSG->L4DATA[0];
 
 			strcpy(ReplyText, "Connected to");
+
+			OutgoingL4ConnectionEvent(L4);
+
 		}
 
 		if (Partner == 0)
@@ -2153,16 +2288,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;
@@ -2489,13 +2633,14 @@ VOID ACKFRAMES(L3MESSAGEBUFFER * L3MSG, TRANSPORTENTRY * L4, int NR)
 
 				RTT = GetTickCount() - L4->RTT_TIMER;
 
-				if (RTT < 180)				// Sanity Check
+				if (RTT < 180000)				// Sanity Check
 				{
 					if (DEST->DEST_RTT == 0)
 						DEST->DEST_RTT = RTT;
 					else
 						DEST->DEST_RTT = ((DEST->DEST_RTT * 9) + RTT) /10;	// 90% Old + New
 				}
+				L4->RTT_TIMER = 0;
 			}
 		}
 
@@ -2598,241 +2743,32 @@ VOID SENDL4IACK(TRANSPORTENTRY * Session)
 }
 
 
-
+int CloseAllSessions()
-
+{
-/*
+	int n = MAXCIRCUITS;
-	PUBLIC	KILLSESSION
+	TRANSPORTENTRY * L4 = L4TABLE;
-KILLSESSION:
+	TRANSPORTENTRY * Partner;
-
+	int MaxLinks = MAXLINKS;
-	pushad
+	int Closed = 0;
-	push	ebx
+
-	CALL	_CLEARSESSIONENTRY
+	while (n--)
-	pop	ebx
+	{
-	popad
+		if (L4->L4USER[0] == 0)
-
+		{
-	JMP	L4CONN90		; REJECT
+			L4++;
-
+			continue;
-	PUBLIC	CONNECTACK
+		}
-CONNECTACK:
+
-;
+		Closed++;
-;	EXTRACT EXTENDED PARAMS IF PRESENT
+		
-;
+		Partner = L4->L4CROSSLINK;
-
+
-	CMP	BYTE PTR MSGLENGTH[EDI],L4DATA+1
+		CLOSECURRENTSESSION(L4);
-	JE SHORT NOTBPQ
+				
-
+		if (Partner)
-	MOV	AL,L4DATA+1[EDI]
+			CLOSECURRENTSESSION(Partner);	// CLOSE THIS ONE
-	SUB	AL,L3MONR[EDI]
+
-	ADD	AL,41H			; HOPS TO DEST + 40H
+		L4++;
-
+	}
-	MOV	ESI,L4TARGET[EBX]
+	return Closed;
-	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	
-		
-	POP	ECX
-	POP	ESI
-	POP	EBX
-	
-	RET
-
-	PUBLIC	xxx
-xxx:
-			
-	POP	ECX
-	POP	ESI
-	REP MOVSB
-
-	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
-*/

LinBPQ.c

@@ -83,8 +83,10 @@ void RHPPoll();
 
 VOID GetPGConfig();
 void SendBBSDataToPktMap();
+void CloseAllLinks();
+void hookNodeClosing(char * Reason);
 
-extern uint64_t timeLoadedMS;
+extern uint64_t INP3timeLoadedMS;
 
 BOOL IncludesMail = FALSE;
 BOOL IncludesChat = FALSE;
@@ -262,9 +264,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 +339,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,6 +347,7 @@ BOOL CtrlHandler(DWORD fdwCtrlType)
     // CTRL-CLOSE: confirm that the user wants to exit.
     case CTRL_CLOSE_EVENT:
 
+	CloseAllLinks();
 	CLOSING = TRUE;
      printf( "Ctrl-Close event\n\n" );
 	 Sleep(20000);
@@ -354,6 +358,7 @@ BOOL CtrlHandler(DWORD fdwCtrlType)
     case CTRL_BREAK_EVENT:
       Beep( 900, 200 );
       printf( "Ctrl-Break event\n\n" );
+	CloseAllLinks();
 	CLOSING = TRUE;
       Beep( 750, 300 );
      return FALSE;
@@ -366,6 +371,7 @@ BOOL CtrlHandler(DWORD fdwCtrlType)
     case CTRL_SHUTDOWN_EVENT:
       Beep( 750, 500 );
       printf( "Ctrl-Shutdown event\n\n" );
+	CloseAllLinks();
 	CLOSING = TRUE;
       Beep( 750, 300 );
     return FALSE;
@@ -381,12 +387,11 @@ BOOL CtrlHandler(DWORD fdwCtrlType)
 #include <signal.h>
 
 // Linux Signal Handlers
-
 static void segvhandler(int sig)
 {
     void *array[10];
     size_t size;
-	char msg[] = "SIGSEGV Received\n";
+    char msg[] = "\nSIGSEGV Received\n";
 
     write(STDERR_FILENO, msg, strlen(msg));
 
@@ -397,6 +402,12 @@ static void segvhandler(int sig)
 
     backtrace_symbols_fd(array, size, STDERR_FILENO);
 
+    write(STDOUT_FILENO, msg, strlen(msg));
+    backtrace_symbols_fd(array, size, STDOUT_FILENO);
+
+	hookNodeClosing("sigsegv");
+	Sleep(500);
+
     exit(1);
 }
 
@@ -404,28 +415,38 @@ static void abrthandler(int sig)
 {
     void *array[10];
     size_t size;
-	char msg[] = "SIGABRT Received\n";
+    char msg[] = "\nSIGABRT Received\n";
 
     write(STDERR_FILENO, msg, strlen(msg));
+    write(STDOUT_FILENO, msg, strlen(msg));
 
     // get void*'s for all entries on the stack
 
     size = backtrace(array, 10);
     backtrace_symbols_fd(array, size, STDERR_FILENO);
 
+    write(STDOUT_FILENO, msg, strlen(msg));
+    backtrace_symbols_fd(array, size, STDOUT_FILENO);
+
+	hookNodeClosing("sigabrt");
+	Sleep(500);
+
     exit(1);
 }
 
+
 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();
 }
 
 
@@ -787,6 +808,8 @@ int Redirected = 0;
 static void segvhandler(int sig);
 static void abrthandler(int sig);
 
+void GetRestartData();
+
 
 int main(int argc, char * argv[])
 {
@@ -831,20 +854,21 @@ int main(int argc, char * argv[])
 #endif
 
 // 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();
+	 INP3timeLoadedMS = GetTickCount();
 
 #endif
 
 	 printf("G8BPQ AX25 Packet Switch System Version %s %s\n", TextVerstring, Datestring);
 	 printf("%s\n", VerCopyright);
 
+	 srand(time(NULL));
+
 
 	 // look for optarg format parameters
 
@@ -902,7 +926,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
 
@@ -1174,6 +1201,8 @@ int main(int argc, char * argv[])
 		chmod(MailDir, S_IRWXU | S_IRWXG | S_IRWXO);
 #endif
 
+
+
 		// Make backup copies of Databases
 
 		//	CopyConfigFile(ConfigName);
@@ -1195,6 +1224,7 @@ int main(int argc, char * argv[])
 		GetBadWordFile();
 		GetHTMLForms();
 		GetPGConfig();
+		GetRestartData();
 
 		// Make sure there is a user record for the BBS, with BBS bit set.
 
@@ -1442,6 +1472,7 @@ int main(int argc, char * argv[])
 				SaveMessageDatabase();
 				SaveBIDDatabase();
 				SaveConfig(ConfigName);
+				SaveRestartData();
 			}
 
 			KEEPGOING--;					// Give time for links to close
@@ -1665,6 +1696,9 @@ int main(int argc, char * argv[])
 			Slowtimer = 0;
 	}
 
+	hookNodeClosing("Shutdown");
+	Sleep(500);
+
 	printf("Closing Ports\n");
 
 	CloseTNCEmulator();

MULTIPSK.c

@@ -407,7 +407,10 @@ static size_t ExtProc(int fn, int port,  PDATAMESSAGE buff)
 
 			if (_memicmp(buff->L2DATA, "RADIO ", 6) == 0)
 			{
-				sprintf(buff->L2DATA, "%d %s", TNC->Port, &buff->L2DATA[6]);
+				char cmd[56];
+
+				strcpy(cmd, &buff->L2DATA[6]);
+				sprintf(buff->L2DATA, "%d %s", TNC->Port, cmd);
 
 				if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, buff->L2DATA))
 				{
@@ -1539,7 +1542,7 @@ VOID CloseComplete(struct TNCINFO * TNC, int Stream)
 		sprintf(Cmd, "%cDIGITAL MODE %s\x1b", '\x1a', TNC->MPSKInfo->DefaultMode);
 
 	if (TNC->MPSKInfo->Beacon)
-		sprintf(Cmd, "%s%cBEACON_ARQ_FAE\x1b", Cmd, '\x1a');
+		sprintf(&Cmd[strlen(Cmd)], "%cBEACON_ARQ_FAE\x1b", '\x1a');
 	
 	Len = strlen(Cmd);
 

MailTCP.c

@@ -1570,12 +1570,12 @@ VOID ProcessSMTPServerMessage(SocketConn * sockptr, char * Buffer, int Len)
 						if (CheckifLocalRMSUser(Addr)) // if local RMS - Leave Here
 							continue;
 						
-						ToLen = sprintf(ToString, "%sTo: %s\r\n", ToString, &Addr[4]);
+						ToLen = sprintf(&ToString[strlen(ToString)], "To: %s\r\n", &Addr[4]);
 						*sockptr->RecpTo[i] = 0;		// So we dont create individual one later
 						continue;
 					}
 
-					ToLen = sprintf(ToString, "%sTo: %s@%s\r\n", ToString, &Addr[4], Via);
+					ToLen = sprintf(&ToString[strlen(ToString)], "To: %s@%s\r\n", &Addr[4], Via);
 					*sockptr->RecpTo[i] = 0;			// So we dont create individual one later
 					continue;
 				}
@@ -1591,7 +1591,7 @@ VOID ProcessSMTPServerMessage(SocketConn * sockptr, char * Buffer, int Len)
 					if (CheckifLocalRMSUser(Addr)) // if local RMS - Leave Here
 						continue;
 					
-					ToLen = sprintf(ToString, "%sTo: %s\r\n", ToString, Addr);
+					ToLen = sprintf(&ToString[strlen(ToString)], "To: %s\r\n", Addr);
 					*sockptr->RecpTo[i] = 0;		// So we dont create individual one later
 
 					continue;

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);
@@ -535,6 +535,16 @@ KC6OAR*>ID:
 
 					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;
 				}
 			}	
 		}
@@ -551,6 +561,15 @@ KC6OAR*>ID:
 
 		switch (ADJBUFFER->PID)
 		{
+		case 0xF1:
+		case 0xF2:
+
+			//	Compressed L2 Data
+
+		Output += sprintf((char *)Output, " <%d Bytes of Compressed L2 Data>", MsgLen - (19 + sizeof(void *)));
+
+		break;
+
 		case 0xF0:		// Normal Data
 		{
 			char Infofield[257];
@@ -636,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
@@ -672,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  ");
@@ -695,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++);
@@ -703,6 +737,9 @@ char * DISPLAY_NETROM(MESSAGE * ADJBUFFER, UCHAR * Output, int MsgLen)
 		Node[ConvFromAX25(ptr, Node)] = 0;
 		ptr +=7;
 
+		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
@@ -718,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:
 
@@ -966,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

@@ -919,6 +919,9 @@ LRESULT APIENTRY InputProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 
 			DoRefresh(Cinfo);
 
+			Cinfo->Console->bytesRxed += Cinfo->kbptr+1;
+
+
 			if (Cinfo->Console->SysopChatStream)
 				SendUnbuffered(Cinfo->Console->SysopChatStream->BPQStream, &Cinfo->kbbuf[0], Cinfo->kbptr+1);
 			else
@@ -942,6 +945,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); 

NETROMTCP.c

@@ -0,0 +1,551 @@
+/*
+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);
+
+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;
+
+	Debugprintf("Opening NRTCP Connection");
+
+	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, MYNETROMCALL, 10);
+		Route->NEIGHBOUR_LINK = Info->LINK;
+
+		Info->Route = Route;
+		Info->LINK->NEIGHBOUR = Route;
+		Info->LINK->LINKPORT = GetPortTableEntryFromPortNum(Route->NEIGHBOUR_PORT);
+	}
+
+	return NETROMTCPConnect(Route, sockptr);
+
+}
+
+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 hints, *res = 0, *saveres;
+	int Port = Route->TCPPort;
+
+	sprintf(PortString, "%d", Port);
+
+	// get host info, make socket, and connect it
+
+	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);
+
+	if (!res)
+	{
+		err = WSAGetLastError();
+		Debugprintf("Resolve HostName %s Failed - Error %d", Route->TCPHost, err);
+		return FALSE;			// Resolve failed
+	}
+
+	// Step thorough the list of hosts
+
+	saveres = res;				// Save for free
+
+	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;
+		freeaddrinfo(saveres);
+
+		return TRUE;
+	}
+	else
+	{
+		freeaddrinfo(saveres);
+	
+		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.
+
+		memcpy(Info->Call, Msg->Call, 10);
+
+		ConvToAX25(Msg->Call, axCall);
+
+		if (FindNeighbour(axCall, portNo, &Route))
+		{
+			Info->Route = Route;
+			Route->NEIGHBOUR_LINK = Info->LINK;
+			Info->LINK->NEIGHBOUR = Route;
+			Info->LINK->LINKPORT = GetPortTableEntryFromPortNum(Route->NEIGHBOUR_PORT);
+			Route->TCPSession = Info;
+			Info->LINK->L2STATE = 5;
+
+			if (Info->Route->INP3Node)
+				SendRTTMsg(Info->Route);
+		}
+		else
+			goto seeifMore;			// Should we kill connection?
+	}
+
+
+	if (memcmp(Info->Call, Msg->Call, 10) != 0)
+	{
+		// something wrong - maybe connection reused
+	}
+
+	// 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 = 0;
+	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);
+		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 | 128;		// TX Flag
+
+		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);
+
+		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);
+
+		Route->TCPSession = 0;
+
+		Info->Call[0] = 0;
+	}
+
+	sockptr->SocketActive = FALSE;
+
+	memset(sockptr, 0, sizeof(struct ConnectionInfo)); 
+}
+

RHP.c

@@ -451,8 +451,13 @@ int processRHCPSend(SOCKET Socket, char * Msg, char * ReplyBuffer)
 	int ID;
 	char * Data;
 	char * ptr;
+	unsigned char * uptr;
 	int c;
 	int Len;
+	unsigned int HexCode1;
+	unsigned int HexCode2;
+
+	int n;
 
 	int Handle = 1;
 
@@ -470,9 +475,10 @@ int processRHCPSend(SOCKET Socket, char * Msg, char * ReplyBuffer)
 
 	RHPSession = RHPSessions[Handle - 1];
 
-	// Look for \ escapes
+	// Look for \ escapes, Can now also get \u00c3
 
 	ptr = Data;
+	Len = strlen(Data);				// in case no escapes
 
 	while (ptr = strchr(ptr, '\\'))
 	{
@@ -483,23 +489,60 @@ int processRHCPSend(SOCKET Socket, char * Msg, char * ReplyBuffer)
 		case 'r':
 
 			*ptr = 13;
+			memmove(ptr + 1, ptr + 2, strlen(ptr + 1));
 			break;	
 
+		case 'u':
+
+			HexCode1 = HexCode2 = 0;
+			
+			n = toupper(ptr[2]) - '0';
+			if (n > 9) n = n - 7;
+			HexCode1 |= n << 4;
+
+			n = toupper(ptr[3]) - '0';
+			if (n > 9) n = n - 7;
+			HexCode1 |= n;
+
+			n = toupper(ptr[4]) - '0';
+			if (n > 9) n = n - 7;
+			HexCode2 |= n << 4;
+
+			n = toupper(ptr[5]) - '0';
+			if (n > 9) n = n - 7;
+			HexCode2 |= n;
+
+			if (HexCode1 == 0 || HexCode1 == 0xC2)
+			{
+				uptr = ptr;
+				*uptr = HexCode2;
+			}
+			else if (HexCode1 == 0xc2)
+			{
+				uptr = ptr;
+				*uptr = HexCode2 + 0x40;
+			}
+
+			memmove(ptr + 1, ptr + 6, strlen(ptr + 5));		
+			break;
+
+			
 		case '\\':
 
 			*ptr = '\\';
+			memmove(ptr + 1, ptr + 2, strlen(ptr + 1));
 			break;	
 
 		case '"':
 
 			*ptr = '"';
+			memmove(ptr + 1, ptr + 2, strlen(ptr + 1));
 			break;	
 		}
-		memmove(ptr + 1, ptr + 2, strlen(ptr + 1));
 		ptr++;
+		Len = ptr - Data;
 	}
 
-	Len = strlen(Data);
 	ptr = Data;
 
 	while (Len > RHPPaclen)
@@ -640,7 +683,7 @@ void RHPPoll()
 
 				// Message is JSON so Convert CR to \r, \ to \\ " to \"
 
-				// Looks like I need to escape everything not between 0x20 and 0x7f eg \U00c3
+				// Looks like I need to escape everything not between 0x20 and 0x7f eg \u00c3
 
 
 				while (c = *(ptr))

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 PTTCATThread(void * Param);
-VOID ConnecttoHAMLIB(struct RIGPORTINFO * PORT);
+
 
 // ----- 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 
 
@@ -5286,8 +5286,12 @@ BOOL DecodeModePtr(char * Param, double * Dwell, double * Freq, char * Mode,
 
 	ptr = strtok_s(NULL, ",", &Context);
 
+	if (ptr == NULL)
+		if (*MemoryNumber)		// If channel, dont need mode
+			return TRUE;
+
 	if (ptr == NULL || strlen(ptr) >  8)
-		return FALSE;
+		return FALSE;		// Mode Missing
 
 	// If channel, dont need mode
 
@@ -5446,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);
@@ -7393,6 +7416,8 @@ VOID SetupScanInterLockGroups(struct RIGINFO *RIG)
 	int Interlock = RIG->Interlock;
 	char PortString[128] = "";
 	char TxPortString[128] = "";
+	int n = 0;
+	int nn = 0;
 
 	// Find TNC ports in this Rig's scan group
 
@@ -7409,7 +7434,7 @@ VOID SetupScanInterLockGroups(struct RIGINFO *RIG)
 		{
 			int p = PortRecord->PORTNUMBER;
 			RIG->BPQPort |= ((uint64_t)1 << p);
-			sprintf(PortString, "%s,%d", PortString, p);
+			n += sprintf(&PortString[n], ",%d", p);
 			TNC->RIG = RIG;
 
 			if (RIG->PTTMode == 0 && TNC->PTTMode)
@@ -7419,7 +7444,7 @@ VOID SetupScanInterLockGroups(struct RIGINFO *RIG)
 		{
 			int p = PortRecord->PORTNUMBER;
 			RIG->BPQPort |= ((uint64_t)1 << p);
-			sprintf(TxPortString, "%s,%d", TxPortString, p);
+			nn += sprintf(&TxPortString[nn], ",%d", p);
 			TNC->TXRIG = RIG;
 
 			if (RIG->PTTMode == 0 && TNC->PTTMode)
@@ -7459,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;
@@ -8446,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)
 {
@@ -8456,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;
@@ -8581,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;
@@ -8900,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)
 {
@@ -8909,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;
@@ -10152,7 +10181,7 @@ void ProcessSDRANGELFrame(struct RIGPORTINFO * PORT)
 
 
 
-VOID SDRANGELThread(struct RIGPORTINFO * PORT);
+VOID SDRANGELThread(VOID * Param);
 
 VOID ConnecttoSDRANGEL(struct RIGPORTINFO * PORT)
 {
@@ -10161,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();
+
+
+}
+
+
+
+

SerialPort.c

@@ -508,7 +508,10 @@ ok:
 
 		if (_memicmp(&buff->L2DATA[0], "RADIO ", 6) == 0)
 		{
-			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &buff->L2DATA[6]);
+			char cmd[56];
+
+			strcpy(cmd, &buff->L2DATA[6]);
+			sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, cnd);
 
 				if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, &buff->L2DATA[0]))
 			{

TNCCode.c

@@ -322,6 +322,9 @@ Dll VOID APIENTRY Send_AX(UCHAR * Block, DWORD Len, UCHAR Port)
 
 		EXTPORTDATA * EXTPORT = (EXTPORTDATA *) PORT;
 
+		if (EXTPORT->UI_Q)
+			C_Q_ADD(&EXTPORT->UI_Q, Copy);
+		else
 			C_Q_ADD(&EXTPORT->UI_Q, Copy);
 		return;
 	}

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++)
@@ -3306,6 +3382,7 @@ int Socket_Accept(struct TNCINFO * TNC, SOCKET SocketId, int Port)
 
 			sockptr->HTTPMode = 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
@@ -4501,7 +4581,7 @@ MsgLoop:
 			WritetoTrace(Stream, MsgPtr, InputLen, sockptr->ADIF, 'R');
 		}
 
-		if (InputLen == 8 && memcmp(MsgPtr, ";;;\r\n", 8) == 0)
+		if (InputLen == 8 && memcmp(MsgPtr, ";;;;;;\r\n", 8) == 0)
 		{
 			//	CMS Keepalive
 
@@ -5016,24 +5096,21 @@ 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;
 	}
-	}
 
 	MsgPtr = &sockptr->InputBuffer[0];
 	sockptr->InputLen += len;
@@ -5146,7 +5223,13 @@ int DataSocket_ReadHTTP(struct TNCINFO * TNC, struct ConnectionInfo * sockptr, S
 			}
 		}
 		else
+		{
 			Debugprintf("WebSock Opcode %d Msg %s", Opcode, &MsgPtr[6]);
+			closesocket(sockptr->socket);
+			sockptr->SocketActive = FALSE;
+			ShowConnections(TNC);
+		}
+
 
 		sockptr->InputLen = 0;
 		return 0;
@@ -5266,6 +5349,7 @@ int DataSocket_ReadDRATS(struct TNCINFO * TNC, struct ConnectionInfo * sockptr,
 }
 
 
+
 int DataSocket_Disconnect(struct TNCINFO * TNC,  struct ConnectionInfo * sockptr)
 {
 	int n;
@@ -5467,8 +5551,7 @@ int WriteLog(char * msg)
 		strcat(Value, "logs/Telnet_");
 	}
 
-	sprintf(Value, "%s%02d%02d%02d.log", Value,
+	sprintf(&Value[strlen(Value)], "%02d%02d%02d.log", tm->tm_year - 100, tm->tm_mon+1, tm->tm_mday);
-				tm->tm_year - 100, tm->tm_mon+1, tm->tm_mday);
 
 	if ((file = fopen(Value, "a")) == NULL)
 		return FALSE;
@@ -5523,8 +5606,7 @@ VOID WriteCMSLog(char * msg)
 		strcat(Value, "logs/CMSAccess");
 	}
 
-	sprintf(Value, "%s_%04d%02d%02d.log", Value,
+	sprintf(&Value[strlen(Value)], "_%04d%02d%02d.log", tm->tm_year +1900, tm->tm_mon+1, tm->tm_mday);
-				tm->tm_year +1900, tm->tm_mon+1, tm->tm_mday);
 
 	Handle = fopen(Value, "ab");
 
@@ -5682,7 +5764,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
@@ -6338,26 +6422,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)
@@ -6366,49 +6504,19 @@ int TCPConnect(struct TNCINFO * TNC, struct TCPINFO * TCP, struct STREAMINFO * S
 	memset(sockptr->ADIF, 0, sizeof(struct ADIF));
 
 	
-	// Resolve Name if needed
+	if (sock == INVALID_SOCKET)
-
-	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)
 	{
-		struct hostent * HostEnt;
+		ReportError(STREAM, "Create Socket Failed");
-
-		//	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);
-	}
-
-	ioctl (sockptr->socket, FIONBIO, &param);
- 
-	setsockopt (sockptr->socket, SOL_SOCKET, SO_REUSEADDR, (const char FAR *)&bcopt,4);
-
-	sinx.sin_family = AF_INET;
-	sinx.sin_addr.s_addr = INADDR_ANY;
-	sinx.sin_port = 0;
-
-	if (bind(sockptr->socket, (struct sockaddr *) &sinx, addrlen) != 0 )
-	{
-		ReportError(STREAM, "Bind Failed");	
 		return FALSE;
 	}
 
+	ioctl (sock, FIONBIO, &param);
+
+	setsockopt (sock, SOL_SOCKET, SO_REUSEADDR, (const char FAR *)&bcopt,4);
+
+//	memcpy(work, res->ai_addr->sa_data, 4);
+
+	
 	if (LogEnabled)
 	{
 		char logmsg[512];
@@ -6417,21 +6525,21 @@ int TCPConnect(struct TNCINFO * TNC, struct TCPINFO * TCP, struct STREAMINFO * S
 		WriteLog (logmsg);
 	}
 
-
+	if (connect(sock, res->ai_addr, (int)res->ai_addrlen) == 0)
-	if (connect(sockptr->socket,(struct sockaddr *) &sockptr->sin, sizeof(destaddr)) == 0)
 	{
 		//
 		//	Connected successful
 		//
 
 		ReportError(STREAM, "*** Connected");
-
+		freeaddrinfo(saveres);
-		// Get Send Buffer Size
 
 		return TRUE;
 	}
 	else
 	{
+		freeaddrinfo(saveres);
+	
 		err=WSAGetLastError();
 
 		if (err == 10035 || err == 115 || err == 36)		//EWOULDBLOCK
@@ -6457,7 +6565,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
@@ -685,6 +690,11 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 					ConnecttoUZ7HO(port);
 					lasttime[port] = ltime;
 				}
+				while (TNC->PortRecord->UI_Q)
+				{
+					buffptr = Q_REM(&TNC->PortRecord->UI_Q);
+					ReleaseBuffer(buffptr);	
+				}
 			}
 			else
 			{
@@ -1023,7 +1033,11 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 
 			if (_memicmp(&buff->L2DATA[0], "RADIO ", 6) == 0)
 			{
-				sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &buff->L2DATA[6]);
+				char cmd[56];
+
+				strcpy(cmd, &buff->L2DATA[6]);
+				sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, cmd);
+
 	
 				if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, &buff->L2DATA[0]))
 				{

V4.c

@@ -622,7 +622,10 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 
 			if (_memicmp(buff->L2DATA, "RADIO ", 6) == 0)
 			{
-				sprintf(buff->L2DATA, "%d %s", TNC->Port, &buff->L2DATA[6]);
+				char cmd[56];
+
+				strcpy(cmd, &buff->L2DATA[6]);
+				sprintf(buff->L2DATA, "%d %s", TNC->Port, cmd);
 
 				if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, buff->L2DATA))
 				{

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
@@ -1720,7 +1725,6 @@ VConnected:
 				GetSemaphore(&Semaphore, 52);
 				VARAProcessReceivedControl(TNC);
 				FreeSemaphore(&Semaphore);
-				Debugprintf("VARA Returned from processing control packet");
 			}
 								
 			if (FD_ISSET(TNC->TCPDataSock, &readfs))

Versions.h

@@ -10,14 +10,15 @@
 
 #endif
 
-#define KVers 6,0,24,65
+#define KVers 6,0,25,8
-#define KVerstring "6.0.24.65\0"
+#define KVerstring "6.0.25.8\0"
+
 
 #ifdef CKernel
 
 #define Vers KVers
 #define Verstring KVerstring
-#define Datestring "February 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;
@@ -139,6 +144,10 @@ VOID WritetoTraceSupport(struct TNCINFO * TNC, char * Msg, int Len)
 	int LineLen, i;
 	UCHAR Save;
 	int SaveLen = Len;
+	char Time[16];
+	time_t T;
+	struct tm * tm;
+
 	if (Len < 0)
 		return;
 
@@ -206,10 +215,16 @@ lineloop:
 #endif
 			// Write to Web Buffer
 
+			T = time(NULL);
+			tm = gmtime(&T);
+	
+			sprintf_s(Time, sizeof(Time),"%02d:%02d ", tm->tm_hour, tm->tm_min);
+
+			strcat(TNC->WebBuffer, Time);
 			strcat(TNC->WebBuffer, Line);
 			strcat(TNC->WebBuffer, "\r\n");
 			if (strlen(TNC->WebBuffer) > 4500)
-				memmove(TNC->WebBuffer, &TNC->WebBuffer[500], 4490);	// Make sure null is moved
+				memmove(TNC->WebBuffer, &TNC->WebBuffer[500], strlen(&TNC->WebBuffer[500]) + 1);	// Make sure null is moved
 		Skip:
 			ptr1 = ptr2;
 
@@ -248,10 +263,16 @@ lineloop:
 #else
 			index=SendMessage(TNC->hMonitor, LB_ADDSTRING, 0, (LPARAM)(LPCTSTR) ptr1 );
 #endif
+			T = time(NULL);
+			tm = gmtime(&T);
+	
+			sprintf_s(Time, sizeof(Time),"%02d:%02d ", tm->tm_hour, tm->tm_min);
+			strcat(TNC->WebBuffer, Time);
+
 			strcat(TNC->WebBuffer, ptr1);
 			strcat(TNC->WebBuffer, "\r\n");
 			if (strlen(TNC->WebBuffer) > 4500)
-				memmove(TNC->WebBuffer, &TNC->WebBuffer[500], 4490);	// Make sure null is moved
+				memmove(TNC->WebBuffer, &TNC->WebBuffer[500], strlen(&TNC->WebBuffer[500]) + 1);	// Make sure null is moved
 		}
 	}
 
@@ -984,7 +1005,11 @@ static size_t ExtProc(int fn, int port, PDATAMESSAGE buff)
 
 			if (_memicmp(&buff->L2DATA[0], "RADIO ", 6) == 0)
 			{
-				sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &buff->L2DATA[6]);
+				char cmd[56];
+
+				strcpy(cmd, &buff->L2DATA[6]);
+				sprintf(&buff->L2DATA[0], "%d %s", TNC->Port, &cmd);
+
 	
 				if (Rig_Command(TNC->PortRecord->ATTACHEDSESSIONS[0]->L4CROSSLINK, &buff->L2DATA[0]))
 				{

WPRoutines.c

@@ -37,6 +37,7 @@ VOID Do_Save_WPRec(HWND hDlg);
 VOID SaveInt64Value(config_setting_t * group, char * name, long long value);
 VOID SaveIntValue(config_setting_t * group, char * name, int value);
 VOID SaveStringValue(config_setting_t * group, char * name, char * value);
+BOOL GetStringValue(config_setting_t * group, char * name, char * value, int maxlen);
 void MQTTMessageEvent(void* message);
 
 WPRec * AllocateWPRecord()

WebMail.c

@@ -1446,7 +1446,12 @@ void ProcessWebMailMessage(struct HTTPConnectionInfo * Session, char * Key, BOOL
 
 	// Neither do js or file downloads
 
-	if (_memicmp(NodeURL, "/WebMail/WMFile/", 16) == 0)
+	// This could be a request for a Template file
+	// WebMail/Local_Templates/My Forms/inc/logo_ad63.png
+	// WebMail/Standard Templates/
+
+
+	if (_memicmp(NodeURL, "/WebMail/Local", 14) == 0 || (_memicmp(NodeURL, "/WebMail/Standard", 17) == 0))
 	{
 		int FileSize;
 		char * MsgBytes;
@@ -1456,9 +1461,10 @@ void ProcessWebMailMessage(struct HTTPConnectionInfo * Session, char * Key, BOOL
 		char TimeString[64];
 		char FileTimeString[64];
 		struct stat STAT;
-		char * FN = &NodeURL[16];
+ 		char * FN = &NodeURL[9];
 		char * fileBit = FN;
 		char * ext;
+		char Type[64] = "Content-Type: text/html\r\n";
 
 		UndoTransparency(FN);
 		ext = strchr(FN, '.');
@@ -1491,24 +1497,109 @@ void ProcessWebMailMessage(struct HTTPConnectionInfo * Session, char * Key, BOOL
 		FormatTime2(FileTimeString, STAT.st_ctime);
 		FormatTime2(TimeString, time(NULL));
 
-		if (_stricmp(ext, ".htm") == 0 || _stricmp(ext, ".html") == 0 || _stricmp(ext, ".css") == 0 ||  _stricmp(ext, ".js") == 0)
+		ext++;
-		{
-			*RLen = sprintf(Reply, "HTTP/1.1 200 OK\r\nContent-Length: %d\r\n"
-				"Content-Type: text/css\r\n"
-				"Date: %s\r\n"
-				"Last-Modified: %s\r\n" 
-				"\r\n%s", FileSize, TimeString, FileTimeString, MsgBytes);
-		}
-		else
-		{
-			*RLen = sprintf(Reply, "HTTP/1.1 200 OK\r\nContent-Length: %d\r\n"
-				"Content-Type: application/octet-stream\r\n"
-				"Content-Disposition: attachment; filename=\"%s\"\r\n"
-				"Date: %s\r\n"
-				"Last-Modified: %s\r\n" 
-				"\r\n%s", FileSize, fileBit, TimeString, FileTimeString, MsgBytes);
 		
+		if (_stricmp(ext, "js") == 0)
+			strcpy(Type, "Content-Type: text/javascript\r\n");
+	
+		if (_stricmp(ext, "css") == 0)
+			strcpy(Type, "Content-Type: text/css\r\n");
+
+		if (_stricmp(ext, "pdf") == 0)
+			strcpy(Type, "Content-Type: application/pdf\r\n");
+
+		if (_stricmp(ext, "jpg") == 0 || _stricmp(ext, "jpeg") == 0 || _stricmp(ext, "png") == 0 ||
+			_stricmp(ext, "gif") == 0 || _stricmp(ext, "bmp") == 0 || _stricmp(ext, "ico") == 0)
+			strcpy(Type, "Content-Type: image\r\n");
+
+		// File may be binary so output header then copy in message
+
+		*RLen = sprintf(Reply, "HTTP/1.1 200 OK\r\nContent-Length: %d\r\n"
+				"%s"
+				"Date: %s\r\n"
+				"Last-Modified: %s\r\n" 
+				"\r\n", FileSize, Type,TimeString, FileTimeString);
+
+		memcpy(&Reply[*RLen], MsgBytes, FileSize);
+		*RLen += FileSize;
+		free (MsgBytes);
+		return;
 	}	
+
+	// 
+
+	if (_memicmp(NodeURL, "/WebMail/WMFile/", 16) == 0)
+	{
+		int FileSize;
+		char * MsgBytes;
+		char MsgFile[512];
+		FILE * hFile;
+		size_t ReadLen;
+		char TimeString[64];
+		char FileTimeString[64];
+		struct stat STAT;
+		char * FN = &NodeURL[16];
+		char * fileBit = FN;
+		char * ext;
+		char Type[64] = "Content-Type: text/html\r\n";
+
+
+		UndoTransparency(FN);
+		ext = strchr(FN, '.');
+
+		sprintf(MsgFile, "%s/%s", BPQDirectory, FN);
+
+		while (strchr(fileBit, '/'))
+			fileBit = strlop(fileBit, '/');
+
+		if (stat(MsgFile, &STAT) == -1)
+		{
+			*RLen = sprintf(Reply, "HTTP/1.1 404 Not Found\r\nContent-Length: 16\r\n\r\nPage not found\r\n");
+			return;
+		}
+
+		hFile = fopen(MsgFile, "rb");
+	
+		if (hFile == 0)
+		{
+			*RLen = sprintf(Reply, "HTTP/1.1 404 Not Found\r\nContent-Length: 16\r\n\r\nPage not found\r\n");
+			return;
+		}
+
+		FileSize = STAT.st_size;
+		MsgBytes = malloc(FileSize + 1);
+		ReadLen = fread(MsgBytes, 1, FileSize, hFile); 
+
+		fclose(hFile);
+
+		FormatTime2(FileTimeString, STAT.st_ctime);
+		FormatTime2(TimeString, time(NULL));
+
+		ext++;
+		
+		if (_stricmp(ext, "js") == 0)
+			strcpy(Type, "Content-Type: text/javascript\r\n");
+	
+		if (_stricmp(ext, "css") == 0)
+			strcpy(Type, "Content-Type: text/css\r\n");
+
+		if (_stricmp(ext, "pdf") == 0)
+			strcpy(Type, "Content-Type: application/pdf\r\n");
+
+		if (_stricmp(ext, "jpg") == 0 || _stricmp(ext, "jpeg") == 0 || _stricmp(ext, "png") == 0 ||
+			_stricmp(ext, "gif") == 0 || _stricmp(ext, "bmp") == 0 || _stricmp(ext, "ico") == 0)
+			strcpy(Type, "Content-Type: image\r\n");
+
+		// File may be binary so output header then copy in message
+
+		*RLen = sprintf(Reply, "HTTP/1.1 200 OK\r\nContent-Length: %d\r\n"
+				"%s"
+				"Date: %s\r\n"
+				"Last-Modified: %s\r\n" 
+				"\r\n", FileSize, Type,TimeString, FileTimeString);
+
+		memcpy(&Reply[*RLen], MsgBytes, FileSize);
+		*RLen += FileSize;
 		free (MsgBytes);
 		return;
 	}	
@@ -2293,6 +2384,7 @@ void ProcessWebMailMessage(struct HTTPConnectionInfo * Session, char * Key, BOOL
 			
 		struct HtmlFormDir * Dir;
 		int i;
+		int len;
 
 		SubDir = strlop(&NodeURL[17], ':');
 		DirNo = atoi(&NodeURL[17]);
@@ -2313,9 +2405,9 @@ void ProcessWebMailMessage(struct HTTPConnectionInfo * Session, char * Key, BOOL
 		Dir = HtmlFormDirs[DirNo];
 
 		if (SubDir)
-			sprintf(popup, popuphddr, Key, Dir->Dirs[SubDirNo]->DirName);
+			len = sprintf(popup, popuphddr, Key, Dir->Dirs[SubDirNo]->DirName);
 		else
-			sprintf(popup, popuphddr, Key, Dir->DirName);
+			len = sprintf(popup, popuphddr, Key, Dir->DirName);
 
 		if (SubDir)
 		{
@@ -2326,7 +2418,7 @@ void ProcessWebMailMessage(struct HTTPConnectionInfo * Session, char * Key, BOOL
 				// We only send if there is a .txt file
 
 				if (_stricmp(&Name[strlen(Name) - 4], ".txt") == 0)
-					sprintf(popup, "%s <option value=%d:%d,%d>%s", popup, DirNo, SubDirNo, i, Name);
+					len += sprintf(&popup[len], " <option value=%d:%d,%d>%s", DirNo, SubDirNo, i, Name);
 			}
 		}
 		else
@@ -2338,10 +2430,10 @@ void ProcessWebMailMessage(struct HTTPConnectionInfo * Session, char * Key, BOOL
 				// We only send if there is a .txt file
 
 				if (_stricmp(&Name[strlen(Name) - 4], ".txt") == 0)
-					sprintf(popup, "%s <option value=%d,%d>%s", popup, DirNo, i, Name);
+					len += sprintf(&popup[len], " <option value=%d,%d>%s", DirNo, i, Name);
 			}
 		}
-		sprintf(popup, "%s</select></p>", popup);
+		len += sprintf(&popup[len], "</select></p>");
 
 		*RLen = sprintf(Reply, "%s", popup);
 		return;
@@ -2409,6 +2501,7 @@ VOID SendTemplateSelectScreen(struct HTTPConnectionInfo * Session, char *Params,
 	int i;
 	int MsgLen = 0;
 	char * Boundary;
+	int len;
 				
 	WebMailInfo * WebMail = Session->WebMail;
 
@@ -2455,7 +2548,7 @@ VOID SendTemplateSelectScreen(struct HTTPConnectionInfo * Session, char *Params,
 
 	// Also to active fields in case not changed by form
 
-	sprintf(popup, popuphddr, Session->Key);
+	len = sprintf(popup, popuphddr, Session->Key);
 
 	LastGroup = HtmlFormDirs[0]->FormSet;		// Save so we know when changes
 
@@ -2468,21 +2561,21 @@ VOID SendTemplateSelectScreen(struct HTTPConnectionInfo * Session, char *Params,
 		if (strcmp(LastGroup, Dir->FormSet) != 0)
 		{
 			LastGroup = Dir->FormSet;
-			sprintf(popup, "%s%s", popup, NewGroup);
+			len += sprintf(&popup[len], "%s", NewGroup);
 		}
 
-		sprintf(popup, "%s <option value=%d>%s", popup, i, Dir->DirName);
+		len += sprintf(&popup[len], " <option value=%d>%s", i, Dir->DirName);
 			
 		// Recurse any Subdirs
 			
 		n = 0;
 		while (n < Dir->DirCount)
 		{
-			sprintf(popup, "%s <option value=%d:%d>%s", popup, i, n, Dir->Dirs[n]->DirName);
+			len += sprintf(&popup[len], " <option value=%d:%d>%s", i, n, Dir->Dirs[n]->DirName);
 			n++;
 		}
 	}
-	sprintf(popup, "%s</select></td></tr></table></p>", popup);
+	len += sprintf(&popup[len], "%</select></td></tr></table></p>");
 
 	*WebMail->RLen = sprintf(WebMail->Reply, "%s", popup);
 
@@ -2569,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->BID);
-	UndoTransparency(WebMail->To);
+//	UndoTransparency(WebMail->To);
-	UndoTransparency(WebMail->Subject);
+//	UndoTransparency(WebMail->Subject);
-	UndoTransparency(WebMail->Body);
+//	UndoTransparency(WebMail->Body);
 
 	MsgLen = strlen(WebMail->Body);
 
@@ -2729,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
 			{
@@ -2881,7 +2986,7 @@ VOID SaveNewMessage(struct HTTPConnectionInfo * Session, char * MsgPtr, char * R
 
 // RMS Express Forms Support
 
-char * GetHTMLViewerTemplate(char * FN)
+char * GetHTMLViewerTemplate(char * FN, struct HtmlFormDir ** FormDir)
 {
 	int i, j, k, l;
 
@@ -2895,6 +3000,7 @@ char * GetHTMLViewerTemplate(char * FN)
 		{
 			if (strcmp(FN, Dir->Forms[j]->FileName) == 0)
 			{
+				*FormDir = Dir; 
 				return CheckFile(Dir, FN);
 			}
 		}
@@ -2915,6 +3021,7 @@ char * GetHTMLViewerTemplate(char * FN)
 				{
 					if (_stricmp(FN, SDir->Forms[k]->FileName) == 0)
 					{
+						*FormDir = SDir; 
 						return CheckFile(SDir, SDir->Forms[k]->FileName);
 					}
 				}
@@ -2978,6 +3085,13 @@ VOID GetPage(struct HTTPConnectionInfo * Session, char * NodeURL)
 	ptr = strchr(&NodeURL[17], ',');
 	Dir = HtmlFormDirs[DirNo];
 
+
+	if (DirNo == -1)
+	{
+		*WebMail->RLen = sprintf(WebMail->Reply, "<html><script>alert(\"No Page Selected. \");window.location.href = '/Webmail/NewMsg?%s';</script></html>", Session->Key);
+		return;
+	}
+
 	SubDir = strlop(&NodeURL[17], ':');
 	if (SubDir)
 	{
@@ -3291,6 +3405,13 @@ BOOL ParseXML(WebMailInfo * WebMail, char * XMLOrig)
 
 	// Extract Fields (stuff between < and >. Ignore Whitespace between fields
 
+	// Add FormFolder Key with our folder
+
+//	XMLKeys->Key = "FormFolder";
+//	XMLKeys->Value = _strdup(FormDir);
+
+//	XMLKeys++;
+
 	ptr1 = strstr(XML, "<xml_file_version>");
 
 	while (ptr1)
@@ -3394,6 +3515,8 @@ int DisplayWebForm(struct HTTPConnectionInfo * Session, struct MsgInfo * Msg, ch
 	size_t varlen, xmllen;
 	char var[100] = "<";
 	KeyValues * KeyValue; 
+	struct HtmlFormDir * Dir;
+	char FormDir[MAX_PATH];
 
 	if (ParseXML(WebMail, XML))
 		ptr = FindXMLVariable(WebMail, "display_form");
@@ -3407,7 +3530,11 @@ int DisplayWebForm(struct HTTPConnectionInfo * Session, struct MsgInfo * Msg, ch
 
 	strcpy(FN, ptr);
 
-	Form = GetHTMLViewerTemplate(FN);
+	Form = GetHTMLViewerTemplate(FN, &Dir);
+
+	sprintf(FormDir, "WMFile/%s/%s/", Dir->FormSet, Dir->DirName);
+
+
 
 	if (Form == NULL)
 	{
@@ -3423,6 +3550,15 @@ int DisplayWebForm(struct HTTPConnectionInfo * Session, struct MsgInfo * Msg, ch
 
 	// Don't know why, but {MsgOriginalBody} is sent instead of {var MsgOriginalBody}
 
+	// So is {FormFolder} instread of {var FormFolder}
+
+	// As a fiddle replace {FormFolder} with {var Folder} and look for that
+
+	while (varptr = stristr(Form, "{FormFolder}"))
+	{
+		memcpy(varptr, "{var ", 5);
+	}
+
 	varptr = stristr(Form, "{MsgOriginalBody}");
 	{
 		char * temp, * tempsave;
@@ -3562,6 +3698,23 @@ int DisplayWebForm(struct HTTPConnectionInfo * Session, struct MsgInfo * Msg, ch
 
 		while (KeyValue->Key)
 		{
+			if (_stricmp(var, "Folder") == 0)
+			{
+				// Local form folder, not senders
+
+				xmllen = strlen(FormDir);
+
+				// Ok, we have the position of the variable and the substitution text.
+				// Copy message up to variable to Result, then copy value
+
+				memcpy(Reply, formptr, varptr - formptr - 5);	// omit "{var "
+				Reply += (varptr - formptr - 5);
+
+				strcpy(Reply, FormDir);
+				Reply += xmllen;
+				break;
+			}
+
 			if (_stricmp(var, KeyValue->Key) == 0)
 			{
 				xmllen = strlen(KeyValue->Value);
@@ -3577,6 +3730,8 @@ int DisplayWebForm(struct HTTPConnectionInfo * Session, struct MsgInfo * Msg, ch
 				break;
 			}
 
+			KeyValue++;
+
 			if (KeyValue->Key == NULL)
 			{
 				// Not found in XML
@@ -3586,7 +3741,7 @@ int DisplayWebForm(struct HTTPConnectionInfo * Session, struct MsgInfo * Msg, ch
 				sprintf(Err, VarNotFoundMsg, var, "%s");
 				return ReturnRawMessage(User, Msg, Key, SaveReply, RawMessage, (int)(XML - RawMessage), Err);
 			}
-			KeyValue++;
+
 		}
 
 		formptr = endptr + 1;
@@ -4096,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
 			{
@@ -4316,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
 		{
@@ -5446,8 +5625,6 @@ char * CheckFile(struct HtmlFormDir * Dir, char * FN)
 
 #endif
 
-	printf("%s\n", MsgFile);
-
 	if (stat(MsgFile, &STAT) != -1)
 	{
 		hFile = fopen(MsgFile, "rb");
@@ -5464,8 +5641,6 @@ char * CheckFile(struct HtmlFormDir * Dir, char * FN)
 		MsgBytes[FileSize] = 0;
 		fclose(hFile);
 
-		printf("%d %s\n", strlen(MsgBytes), MsgBytes);
-
 		return MsgBytes;
 	}
 	return NULL;
@@ -5495,6 +5670,7 @@ BOOL DoSelectPrompt(struct HTTPConnectionInfo * Session, char * Select)
 	char * ptr, * ptr1;
 	char * prompt;
 	char * var[100];
+	int len;
 
 	WebMailInfo * WebMail = Session->WebMail;
 		
@@ -5564,7 +5740,7 @@ BOOL DoSelectPrompt(struct HTTPConnectionInfo * Session, char * Select)
 		ptr = ptr1;
 	}
 
-	sprintf(popup, popuphddr, Session->Key, prompt, vars + 1);
+	len = sprintf(popup, popuphddr, Session->Key, prompt, vars + 1);
 
 	for (i = 0; i < vars; i++)
 	{
@@ -5573,9 +5749,9 @@ BOOL DoSelectPrompt(struct HTTPConnectionInfo * Session, char * Select)
 		if (key == NULL)
 			key = var[i];
 
-		sprintf(popup, "%s <option value='%s'>%s", popup, key, var[i]);
+		len += sprintf(&popup[len], " <option value='%s'>%s", key, var[i]);
 	}
-	sprintf(popup, "%s</select></td></tr></table><br><input onclick=window.history.back() value=Back type=button class='btn'></div>", popup);
+	len += sprintf(&popup[len], "%s</select></td></tr></table><br><input onclick=window.history.back() value=Back type=button class='btn'></div>");
 
 	*WebMail->RLen = sprintf(WebMail->Reply, "%s", popup);
 	free(SelCopy);
@@ -6134,16 +6310,17 @@ VOID getAttachmentList(struct HTTPConnectionInfo * Session, char * Reply, int *
 	char popup[10000];
 	int i;
 	WebMailInfo * WebMail = Session->WebMail;
+	int len;
 
-	sprintf(popup, popuphddr, Session->Key, WebMail->Files);
+	len = sprintf(popup, popuphddr, Session->Key, WebMail->Files);
 
 	for (i = 0; i < WebMail->Files; i++)
 	{
 		if(WebMail->FileLen[i] < 100000)
-			sprintf(popup, "%s <option value=%d>%s (Len %d)", popup, i + 1, WebMail->FileName[i], WebMail->FileLen[i]);
+			len += sprintf(&popup[len], " <option value=%d>%s (Len %d)", i + 1, WebMail->FileName[i], WebMail->FileLen[i]);
 	}
 
-	sprintf(popup, "%s</select></td></tr></table><br><input onclick=window.history.back() value=Back type=button class='btn'></div>", popup);
+	len += sprintf(&popup[len], "%</select></td></tr></table><br><input onclick=window.history.back() value=Back type=button class='btn'></div>");
 
 	*RLen = sprintf(Reply, "%s", popup);
 	return;
@@ -6289,7 +6466,7 @@ int ProcessWebmailWebSock(char * MsgPtr, char * OutBuffer)
 		}
 	}
 
-	ptr += sprintf(ptr, "%s</pre> \r\n", ptr);
+	ptr += sprintf(&ptr[strlen(ptr)], "</pre> \r\n");
 
 	Len = ptr - &OutBuffer[10];
 

WinRPR.c

@@ -1580,8 +1580,6 @@ TNCRunning:
 
 	// Send INIT script
 
-	// VARA needs each command in a separate send
-
 	ptr1 = &TNC->InitScript[0];
 
 	GetSemaphore(&Semaphore, 52);
@@ -1606,7 +1604,6 @@ TNCRunning:
 			c = *(ptr2 + 1);		// Save next char
 			*(ptr2 + 1) = 0;		// Terminate string
 		}
-//		VARASendCommand(TNC, ptr1, TRUE);
 
 		if (ptr2)
 			*(1 + ptr2++) = c;		// Put char back 

adif.c

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

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
 {
@@ -176,8 +167,6 @@ typedef struct _TRANSPORTENTRY
 	//	We collect as much data as possible before compressing and re-packetizing
 
 	int AllowCompress;	
-	unsigned char * toCompress;	// Data being saved to compress
-	int toCompressLen;
 
 	unsigned char * unCompress;	// Data being saved to uncompress
 	int unCompressLen;
@@ -188,6 +177,14 @@ typedef struct _TRANSPORTENTRY
 	int Received;
 	int ReceivedAfterExpansion;
 
+	int segsSent;
+	int segsRcvd;
+	int segsResent;
+
+	int NRRID;
+	time_t NRRTime;
+
+	int Service;			// For Paula's Connnect to Service
 
 } TRANSPORTENTRY;
 
@@ -231,13 +228,15 @@ typedef struct ROUTE
 	BOOL INP3Node;
 	BOOL NoKeepAlive;			// Suppress Keepalive Processing
 	int	LastConnectAttempt;		// To stop us trying too often
+	int ConnectionAttempts;
 
 	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
@@ -246,6 +245,12 @@ 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;			
 
 } *PROUTE;
 
@@ -255,6 +260,7 @@ typedef struct ROUTE
 #define GotRTTResponse 2	// Other end has sent us a RTT Response
 #define GotRIF 4			// Other end has sent RIF, so is probably an INP3 Node
 							//	(could just be monitoring RTT for some reason
+#define SentRTTRequest 8
 #define SentOurRIF 16		// Set when we have sent a rif for our Call and any ApplCalls
 							//  (only sent when we have seen both a request and response)
 
@@ -462,16 +468,18 @@ typedef struct _APPLCALLS
 //  This way our times adjust to changes of neighbour SRTT. We can't cater for changes to other hop RTTs,
 //	But if these are significant (say 25% or 100 ms) they will be retransmitted
 
+// We treat the Routes as an array of 6. First 3 are NODES routes, next 3 are INP3 Routes. This works, but maybe is not ideal
+
 typedef struct NR_DEST_ROUTE_ENTRY
 {
 	struct ROUTE * ROUT_NEIGHBOUR;	// POINTER TO NEXT NODE IN PATH
 	UCHAR ROUT_QUALITY;		// QUALITY
 	UCHAR ROUT_OBSCOUNT;
 	UCHAR ROUT_LOCKED;
-	UCHAR Padding[4];		// SO Entries are the same length
+	UCHAR Padding[4];		// So Entries are the same length
 } *PNR_DEST_ROUTE_ENTRY;
 
-typedef struct DEST_ROUTE_ENTRY
+typedef struct INP3_DEST_ROUTE_ENTRY
 {
 	struct ROUTE * ROUT_NEIGHBOUR;	// POINTER TO NEXT NODE IN PATH
 	USHORT LastRTT;					// Last Value Reported
@@ -496,7 +504,7 @@ typedef struct DEST_LIST
 	UCHAR INP3FLAGS;
 
 	struct NR_DEST_ROUTE_ENTRY NRROUTE[3];	// Best 3 NR neighbours for this dest
-	struct DEST_ROUTE_ENTRY ROUTE[3];	// Best 3 INP neighbours for this dest
+	struct INP3_DEST_ROUTE_ENTRY INP3ROUTE[3];	// Best 3 INP neighbours for this dest
 
 	void * DEST_Q;				// QUEUE OF FRAMES FOR THIS DESTINATION
 
@@ -700,6 +708,8 @@ typedef struct PORTCONTROL
 	BOOL NormalizeQuality;		// Normalise Node Qualities
 	BOOL IgnoreUnlocked;		// Ignore Unlocked routes
 	BOOL INP3ONLY;				// Default to INP3 and disallow NODES
+	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;
@@ -725,6 +735,9 @@ 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
+
+
 }	PORTCONTROLX, *PPORTCONTROL;
 
 typedef struct FULLPORTDATA
@@ -925,6 +938,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
@@ -958,6 +974,26 @@ typedef struct _LINKTABLE
 	time_t ConnectTime;		// For session stats
 	int bytesRXed;			// Info bytes only
 	int bytesTXed;
+	int framesRXed;
+	int framesTXed;
+	int framesResent;
+
+	//	Now support compressing L2 Sessions.
+	//	We collect as much data as possible before compressing and re-packetizing
+
+	int AllowCompress;	
+
+	unsigned char * unCompress;	// Data being saved to uncompress
+	int unCompressLen;
+
+	int Sent;
+	int SentAfterCompression;
+
+	int Received;
+	int ReceivedAfterExpansion;
+
+	char ApplName[16];
+	time_t lastStatusSentTime;
 
 } LINKTABLE;
 
@@ -1067,7 +1103,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];
 };
@@ -1354,6 +1394,8 @@ 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
 };
 
 
@@ -1443,6 +1485,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);
+static void ResolveNames(VOID * Param);
-void OpenSockets(struct AXIPPORTINFO * PORT);
+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,7 +437,7 @@ 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] = "|";
@@ -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,10 +547,10 @@ 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] = "|";
@@ -733,7 +733,7 @@ VOID SendFrame(struct AXIPPORTINFO * PORT, struct arp_table_entry * arp_table, U
 		return;
 	}
 
-	// Seelcte source port by choosing right socket
+	// Select source port by choosing right socket
 
 	// First Set Default for Protocol
 
@@ -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);
 
+				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,10 +2620,17 @@ 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
 		}
 		index++;
@@ -2977,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"

bpqmail.h

@@ -290,6 +290,9 @@ typedef struct ConnectionInfo_S
 
 	struct ConnectionInfo_S * SysopChatStream;			// Stream sysop is chatting to
 
+	int bytesSent;
+	int bytesRxed;
+
 } ConnectionInfo, CIRCUIT;
 
 // Flags Equates
@@ -336,11 +339,13 @@ typedef struct ConnectionInfo_S
 
 struct FBBRestartData
 {
-	struct MsgInfo * TempMsg;		// Header while message is being received
+	char Call[10];
-	struct UserInfo * UserPointer;
+	char bid[13];
+	int length;
 	UCHAR * MailBuffer;				// Mail Message being received
 	int MailBufferSize;				// Total Malloc'ed size. Actual size in in Msg Struct
 	int Count;						// Give up if too many restarts
+	time_t TimeCreated;
 };
 
 //	We need to keep the B2Message file for B2 messages we are sending until the messages is acked, so
@@ -1387,6 +1392,7 @@ BOOL CheckBBSHElements(struct MsgInfo * Msg, struct UserInfo * bbs, struct	BBSFo
 BOOL CheckBBSHElementsFlood(struct MsgInfo * Msg, struct UserInfo * bbs, struct	BBSForwardingInfo * ForwardingInfo, char * ATBBS, char ** HElements);
 int CheckBBSToForNTS(struct MsgInfo * Msg, struct BBSForwardingInfo * ForwardingInfo);
 int CheckBBSATListWildCarded(struct MsgInfo * Msg, struct BBSForwardingInfo * ForwardingInfo, char * ATBBS);
+void SaveRestartData();
 
 VOID ReRouteMessages();
 

cMain.c

@@ -52,16 +52,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
 
@@ -144,6 +161,12 @@ int L4Compress = 0;
 int L4CompMaxframe = 3;
 int L4CompPaclen = 236;
 
+int L2Compress = 0;
+int L2CompMaxframe = 3;
+int L2CompPaclen = 236;
+
+int PREFERINP3ROUTES = 0;
+
 BOOL LogL4Connects = FALSE;
 BOOL LogAllConnects = FALSE;
 BOOL AUTOSAVEMH = TRUE;
@@ -161,6 +184,8 @@ char MQTT_PASS[80] = "";
 int MQTT_Connecting = 0;
 int MQTT_Connected = 0;
 
+int PoolBuilt = 0;
+
 
 //TNCTABLE	DD	0
 //NUMBEROFSTREAMS	DD	0
@@ -169,6 +194,7 @@ extern VOID * ENDPOOL;
 extern void * APPL_Q;				// Queue of frames for APRS Appl
 
 extern BOOL APRSActive;
+extern int DEBUGINP3;
 
 #define BPQHOSTSTREAMS	64
 
@@ -182,9 +208,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;
 
@@ -238,6 +267,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
 
@@ -293,8 +324,8 @@ VOID LINKINIT(PEXTPORTDATA PORTVEC)
 VOID LINKTX(PEXTPORTDATA PORTVEC, PMESSAGE Buffer)
 {
 	//	LOOP BACK TO SWITCH
-	struct _LINKTABLE * LINK;
 
+	struct _LINKTABLE * LINK;
 	LINK = Buffer->Linkptr;
 
 	if (LINK)
@@ -837,6 +868,28 @@ BOOL Start()
 	if (L4CompPaclen < 64 || L4CompPaclen > 236)
 		L4CompPaclen = 236;
 
+	L2Compress = cfg->C_L2Compress;
+	L2CompMaxframe = cfg->C_L2CompMaxframe;
+	L2CompPaclen = cfg->C_L2CompPaclen;
+
+	if (L2CompMaxframe < 1 || L2CompMaxframe > 16)
+		L2CompMaxframe = 3;
+
+	if (L2CompPaclen < 64 || L2CompPaclen > 236)
+		L2CompPaclen = 236;
+
+
+	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
 
 //	int APPL1 = 0;
@@ -962,6 +1015,8 @@ BOOL Start()
 		PORT->NormalizeQuality = !PortRec->NoNormalize;
 		PORT->IgnoreUnlocked = PortRec->IGNOREUNLOCKED;
 		PORT->INP3ONLY = PortRec->INP3ONLY;
+		PORT->ALLOWINP3 = PortRec->AllowINP3;
+		PORT->ENABLEINP3 = PortRec->EnableINP3;
 
 		PORT->PORTWINDOW = (UCHAR)PortRec->MAXFRAME;
 
@@ -986,6 +1041,9 @@ BOOL Start()
 		PORT->PORTPACLEN = (UCHAR)PortRec->PACLEN;
 		PORT->QUAL_ADJUST = (UCHAR)PortRec->QUALADJUST;
 	
+		if (PORT->QUAL_ADJUST < 0 || PORT->QUAL_ADJUST > 100)
+			PORT->QUAL_ADJUST = 100;
+
 		PORT->DIGIFLAG = PortRec->DIGIFLAG;
 		if (PortRec->DIGIPORT && CanPortDigi(PortRec->DIGIPORT))
 			PORT->DIGIPORT = PortRec->DIGIPORT;
@@ -1333,13 +1391,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
@@ -1354,6 +1412,12 @@ BOOL Start()
 
 		ROUTE->NEIGHBOUR_FLAG = LOCKEDBYCONFIG;			// Locked
 
+		if (Rcfg->tcphost)
+		{
+			ROUTE->TCPHost = Rcfg->tcphost;
+			ROUTE->TCPPort = Rcfg->tcpport;
+		}
+		
 		Rcfg++;
 		ROUTE++;
 	}
@@ -1443,6 +1507,8 @@ BOOL Start()
 
 	ENDBUFFERPOOL = NEXTFREEDATA;
 
+	PoolBuilt = 1;
+
 
 	//	Copy Bridge Map
 
@@ -1529,8 +1595,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;
 }
 
@@ -1560,6 +1652,7 @@ BOOL FindNeighbour(UCHAR * Call, int Port, struct ROUTE ** REQROUTE)
 	struct ROUTE * ROUTE = NEIGHBOURS;
 	struct ROUTE * FIRSTSPARE = NULL;
 	int n = MAXNEIGHBOURS;
+	char Normcall[10];
 
 	while (n--)
 	{
@@ -1572,6 +1665,10 @@ BOOL FindNeighbour(UCHAR * Call, int Port, struct ROUTE ** REQROUTE)
 			ROUTE++;
 			continue;
 		}
+
+			
+		Normcall[ConvFromAX25(ROUTE->NEIGHBOUR_CALL, Normcall)] = 0;
+
 		if (CompareCalls(ROUTE->NEIGHBOUR_CALL, Call))
 		{
 			*REQROUTE = ROUTE;
@@ -2119,6 +2216,12 @@ VOID TIMERINTERRUPT()
 		if (MQTT)
 			MQTTTimer();
 
+		if (LastNodeStatus && (time(NULL) - LastNodeStatus) > nodeStatusTimer)
+		{
+			LastNodeStatus = time(NULL);
+			hookNodeRunning();
+		}
+
 /*
 		if (QCOUNT < 200)
 		{
@@ -2174,6 +2277,10 @@ VOID TIMERINTERRUPT()
 		}
 
 		Message = (struct _MESSAGE *)Buffer;
+
+		if(NodeAPISocket)
+			APIL2Trace(Message, 'T');
+
 		Message->PORT |= 0x80;			// Set TX Bit
 	
 		BPQTRACE(Message, FALSE);		// Dont send TX'ed frames to APRS
@@ -2286,6 +2393,9 @@ L2Packet:
 			if (MQTT && PORT->PROTOCOL == 0)
 				MQTTKISSRX(Buffer);
 
+			if(NodeAPISocket &&PORT->PROTOCOL == 0)
+				APIL2Trace(Message, 'R');
+			
 			// Bridge if requested
 
 			for (toPort = 1; toPort <= MaxBPQPortNo; toPort++)
@@ -2470,6 +2580,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++;
@@ -2594,6 +2745,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;
 }
 ;

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.h

@@ -49,7 +49,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 +184,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 

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"
+"L4Compress", "L4CompMaxframe", "L4CompPaclen", "L2Compress", "L2CompMaxframe",
+"L2CompPaclen", "PREFERINP3ROUTES", "OnlyVer2point0", "DEBUGINP3", "ENABLEOARCAPI"
 };           /* parameter keywords */
 
 static void * offset[] =
@@ -327,10 +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};		/* offset for corresponding data in config file */
+&xxcfg.C_L4Compress, &xxcfg.C_L4CompMaxframe, &xxcfg.C_L4CompPaclen, &xxcfg.C_L2Compress, &xxcfg.C_L2CompMaxframe, 
+&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[] = 
 {
@@ -348,10 +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} ;			// Routine to process param
+1, 1, 1, 1, 1, 
+1, 1, 1, 1, 1};			// Routine to process param
 
 int PARAMLIM = sizeof(routine)/sizeof(int);
 //int NUMBEROFKEYWORDS = sizeof(routine)/sizeof(int);
@@ -373,7 +379,7 @@ static char *pkeywords[] =
 "BCALL", "DIGIMASK", "NOKEEPALIVES", "COMPORT", "DRIVER", "WL2KREPORT", "UIONLY",
 "UDPPORT", "IPADDR", "I2CBUS", "I2CDEVICE", "UDPTXPORT", "UDPRXPORT", "NONORMALIZE",
 "IGNOREUNLOCKEDROUTES", "INP3ONLY", "TCPPORT", "RIGPORT", "PERMITTEDAPPLS", "HIDE",
-"SMARTID", "KISSCOMMAND", "SendtoM0LTEMap", "PortFreq", "M0LTEMapInfo", "QTSMPort"};         /* parameter keywords */
+"SMARTID", "KISSCOMMAND", "SendtoM0LTEMap", "PortFreq", "M0LTEMapInfo", "QTSMPort", "ALLOWINP3", "ENABLEINP3"};         /* parameter keywords */
 
 static void * poffset[] =
 {
@@ -387,7 +393,7 @@ static void * poffset[] =
 &xxp.BCALL, &xxp.DIGIMASK, &xxp.DefaultNoKeepAlives, &xxp.IOADDR, &xxp.DLLNAME, &xxp.WL2K, &xxp.UIONLY,
 &xxp.IOADDR, &xxp.IPADDR, &xxp.INTLEVEL, &xxp.IOADDR, &xxp.IOADDR, &xxp.ListenPort, &xxp.NoNormalize,
 &xxp.IGNOREUNLOCKED, &xxp.INP3ONLY, &xxp.TCPPORT, &xxp.RIGPORT, &xxp.PERMITTEDAPPLS, &xxp.Hide,
-&xxp.SmartID, &xxp.KissParams, &xxp.SendtoM0LTEMap, &xxp.PortFreq, &xxp.M0LTEMapInfo, &xxp.QtSMPort};	/* offset for corresponding data in config file */
+&xxp.SmartID, &xxp.KissParams, &xxp.SendtoM0LTEMap, &xxp.PortFreq, &xxp.M0LTEMapInfo, &xxp.QtSMPort, &xxp.AllowINP3, &xxp.EnableINP3};	/* offset for corresponding data in config file */
 
 static int proutine[] = 
 {
@@ -401,7 +407,7 @@ static int proutine[] =
 0, 1, 2, 18, 15, 16, 2,
 1, 17, 1, 1, 1, 1, 2,
 2, 2, 1, 1, 19, 2,
-1, 20, 1, 21, 22, 1};							/* routine to process parameter */
+1, 20, 1, 21, 22, 1, 1, 1};							/* routine to process parameter */
 
 int PPARAMLIM = sizeof(proutine)/sizeof(int);
 
@@ -535,6 +541,8 @@ BOOL ProcessConfig()
 
 //	xxcfg.SaveMH = TRUE;		// Default to save
 
+	xxcfg.C_PREFERINP3ROUTES = 0;	// Default to false
+
 	GetNextLine(rec);
 
 	while (rec[0])
@@ -596,7 +604,6 @@ BOOL ProcessConfig()
 			
 	
 	for (i=0;i<24;i++)
-		
 		paramok[45+i]=1;	/* or APPLCALLS, APPLALIASS APPLQUAL */
 
 	paramok[69]=1;			// BText optional
@@ -621,7 +628,13 @@ BOOL ProcessConfig()
 	paramok[86]=1;			// L4Compress
 	paramok[87]=1;			// L4Compress Maxframe
 	paramok[88]=1;			// L4Compress Paclen
-
+	paramok[89]=1;			// L2Compress
+	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
 
 	for (i=0; i < PARAMLIM; i++)
 	{
@@ -1574,6 +1587,127 @@ int routes(int i)
 
 		// strtok and sscanf can't handle successive commas, so split up usig strchr
 
+		// Now support keyword=value format
+
+		if (strchr(rec, '='))
+		{
+			// New format
+			// 		call quality port window frack paclen farquality inp3 nokeepalives tcp
+
+			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);
+			}
+		}
+
+		else
+		{
+
 			memset(Param, 0, 2048);
 			strlop(rec, 13);
 			strlop(rec, ';');
@@ -1601,6 +1735,13 @@ int routes(int i)
 			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)
 	   {
 	      Consoleprintf("Remote Quality must be between 0 and 255");
@@ -1624,14 +1765,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);

configstructs.h

@@ -81,6 +81,8 @@ struct PORTCONFIG
 	uint64_t PortFreq;
 	char * M0LTEMapInfo;
 	int QtSMPort;
+	int AllowINP3;
+	int EnableINP3;
 };
 
 struct ROUTECONFIG
@@ -92,6 +94,10 @@ struct ROUTECONFIG
 	int pfrack;
 	int ppacl;
 	int farQual;
+	int inp3;
+	int nokeepalives;
+	char * tcphost;
+	int tcpport;
 };
 
 struct CONFIGTABLE
@@ -173,6 +179,13 @@ struct CONFIGTABLE
 	int C_L4Compress;
 	int C_L4CompMaxframe;
 	int C_L4CompPaclen;
+	int C_L2Compress;
+	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,320 @@
+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 e166b36..23b3e27 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;
@@ -2294,7 +2296,7 @@ VOID QtSMThread(struct PORTCONTROL * PORT)
 						char Msg[64];
 						int Len;
 
-						// We need tp send a QtSMPort message for each Channel sharing thia connection
+						// We need to send a QtSMPort message for each Channel sharing this connection
 						// Note struct KISSINFO and struct PORTCONTROL are different mappings of the same data
 
 						struct KISSINFO * KISS = (struct KISSINFO *)PORT;

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
@@ -490,4 +502,10 @@ static int ProcessLine(char * buf, int Port, BOOL CheckPort)
 	
 }
 
-#endif
+
+// 
+
+#endif // MACBPQ
+#endif // FREEBSD
+	
+

lzhuf32.c

@@ -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:
 
+#Default to Linux
 	CC = gcc    
+	LDFLAGS = -Xlinker -Map=output.map -lrt 
 
-all: CFLAGS = -DLINBPQ -MMD -g -rdynamic -fcommon
+all: CFLAGS = -DLINBPQ  -MMD -g -fcommon -fasynchronous-unwind-tables $(EXTRA_CFLAGS)	
-all: LDFLAGS = -l:libpaho-mqtt3a.a -l:libjansson.a
+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
 
 
-nomqtt: CFLAGS = -DLINBPQ -MMD -fcommon -g  -rdynamic -DNOMQTT
+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
+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