6.0.24.1

BBSUtilities.c

@@ -8061,6 +8061,14 @@ BOOL ProcessBBSConnectScript(CIRCUIT * conn, char * Buffer, int len)
 		now %= 86400;
 		Line = Scripts[n];
 
+		// Skip comments
+
+		while (Line && ((strcmp(Line, " ") == 0 || Line[0] == ';' || Line[0] == '#')))
+		{
+			n++;
+			Line = Scripts[n];
+		}
+
 		if (_memicmp(Line, "TIMES", 5) == 0)
 		{
 		NextBand:
@@ -11871,7 +11879,7 @@ void run_pg( CIRCUIT * conn, struct UserInfo * user )
 	PROCESS_INFORMATION piProcInfo; 
 	STARTUPINFO siStartInfo;
 	BOOL bSuccess = FALSE; 
-	DWORD dwRead, dwWritten; 
+	DWORD dwRead; 
 	CHAR chBuf[BUFSIZE]; 
 	int index = 0;
 	int ret = 0;
@@ -14527,7 +14535,7 @@ void ProcessSyncModeMessage(CIRCUIT * conn, struct UserInfo * user, char* Buffer
 		char * BIDptr;
 
 		BIDRec * BID;
-		char *ptr1, *ptr2, *context;
+		char *ptr2, *context;
 
 		//		TR AddMessage_1145_G8BPQ 727 1202 440 True
 
@@ -14763,8 +14771,6 @@ void SendRequestSync(CIRCUIT * conn)
 	char MsgTime[32];
 	time_t Time = time(NULL);
 
-	char * Encoded;
-
 	tm = gmtime(&Time);
 
 	sprintf_s(Date, sizeof(Date), "%04d%02d%02d%02d%02d%02d",

BPQMail.c

@@ -1097,7 +1097,7 @@
 //	Disconnect immediately if "Invalid Command" "*** Protocol Error" or "Already Connected" received (.70)
 //	Check Badword and Reject filters before processing WP Messages
 
-//  6.0.24.1  ?? 2022
+//  6.0.24.1  August 2023
 
 //	Fix ' in Webmail subject (8)
 //	Change web buttons to white on black when pressed (10)
@@ -1116,6 +1116,7 @@
 //	QtTerm Monitoring fixed for 63 port version of BPQ (69)
 //	Fix to UI system to support up to 63 ports (79)
 //	Fix recently introduced crash when "Don't allow new users" is set (81)
+//	Skip comments before TIMES at start of Connect Script (83)
 
 
 #include "bpqmail.h"

Bpq32.c

@@ -1086,7 +1086,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 //	Add ? and * wildcards to NODES command (74)
 //  Add Port RADIO config parameter (74)
 
-//  Version 6.0.24.1 ??
+//  Version 6.0.24.1 August 2023
 
 //	Apply NODES command wildcard to alias as well a call (2)
 //	Add STOPPORT/STARTPORT to VARA Driver (2)
@@ -1178,6 +1178,7 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 //	Fix Web Terminal (80)
 //	Trap ENCRYPTION message from VARA (81)
 //	Fix processing of the Winlink API /account/exists response (82)
+//	Fix sending CTEXT to L4 connects to Node when FULL_CTEXT is not set
 
 #define CKernel
 

HALDriver.c

@@ -310,7 +310,7 @@ ConfigLine:
 	return (TRUE);	
 }
 
-static size_t ExtProc(int fn, int port,unsigned char * buff)
+static size_t ExtProc(int fn, int port , PDATAMESSAGE buff)
 {
 	int txlen = 0;
 	PMSGWITHLEN buffptr;
@@ -342,7 +342,7 @@ static size_t ExtProc(int fn, int port,unsigned char * buff)
 			if (STREAM->ReportDISC)
 			{
 				STREAM->ReportDISC = FALSE;
-				buff[4] = 0;
+				buff->PORT = 0;
 
 				return -1;
 			}
@@ -359,17 +359,15 @@ static size_t ExtProc(int fn, int port,unsigned char * buff)
 			
 				buffptr=Q_REM(&STREAM->PACTORtoBPQ_Q);
 
-				datalen=buffptr->Len;
+				datalen = (int)buffptr->Len;
 
-				buff[4] = 0;
+				buff->PORT = 0;						// Compatibility with Kam Driver
-				buff[7] = 0xf0;
+				buff->PID = 0xf0;
-				memcpy(&buff[8],buffptr->Data,datalen);		// Data goes to +7, but we have an extra byte
+				memcpy(&buff->L2DATA, &buffptr->Data[0], datalen);		// Data goes to + 7, but we have an extra byte
-				datalen+=8;
+				datalen += sizeof(void *) + 4;
 
-				PutLengthinBuffer((PDATAMESSAGE)buff, datalen);
+				PutLengthinBuffer(buff, datalen);
 
-	//			buff[5]=(datalen & 0xff);
-	//			buff[6]=(datalen >> 8);
 		
 				ReleaseBuffer(buffptr);
 	
@@ -387,24 +385,27 @@ static size_t ExtProc(int fn, int port,unsigned char * buff)
 
 		// Find TNC Record
 
-		Stream = buff[4];
+		Stream = buff->PORT;
 
 		if (!TNC->TNCOK)
 		{
 			// Send Error Response
 			
-			buffptr->Len = 36;
+			PMSGWITHLEN buffptr = (PMSGWITHLEN)GetBuff();
-			memcpy(buffptr->Data, "No Connection to PACTOR TNC\r", 36);
 
-			C_Q_ADD(&STREAM->PACTORtoBPQ_Q, buffptr);
+			if (buffptr == 0) return (0);			// No buffers, so ignore
 
+			buffptr->Len = 27;
+			memcpy(&buffptr->Data[0], "No Connection to PACTOR TNC\r", 27);
+
+			C_Q_ADD(&TNC->Streams[Stream].PACTORtoBPQ_Q, buffptr);
 			return 0;
 		}
 
-		txlen = GetLengthfromBuffer((PDATAMESSAGE)buff) - 8;
+		txlen = GetLengthfromBuffer(buff) - (sizeof(void *) + 4);
 
 		buffptr->Len = txlen;
-		memcpy(buffptr->Data, &buff[8], txlen);
+		memcpy(&buffptr->Data[0], &buff->L2DATA[0], txlen);
 		
 		C_Q_ADD(&STREAM->BPQtoPACTOR_Q, buffptr);
 
@@ -415,7 +416,7 @@ static size_t ExtProc(int fn, int port,unsigned char * buff)
 
 	case 3:				// CHECK IF OK TO SEND. Also used to check if TNC is responding
 		
-		Stream = (int)buff;
+		Stream = (int)(size_t)buff;
 			
 		if (STREAM->FramesQueued  > 4)
 			return (1 | TNC->HostMode << 8);
@@ -463,7 +464,7 @@ static int WebProc(struct TNCINFO * TNC, char * Buff, BOOL LOCAL)
 }
 
 
-UINT HALExtInit(EXTPORTDATA *  PortEntry)
+VOID * HALExtInit(EXTPORTDATA *  PortEntry)
 {
 	char msg[500];
 	struct TNCINFO * TNC;
@@ -471,8 +472,9 @@ UINT HALExtInit(EXTPORTDATA *  PortEntry)
 	char * ptr;
 	int len;
 	char Msg[80];
+#ifndef LINBPQ
 	HWND x;
-
+#endif
 	//
 	//	Will be called once for each Pactor Port
 	//	The COM port number is in IOBASE
@@ -493,7 +495,7 @@ UINT HALExtInit(EXTPORTDATA *  PortEntry)
 		sprintf(msg," ** Error - no info in BPQ32.cfg for this port");
 		WritetoConsole(msg);
 
-		return (int)ExtProc;
+		return ExtProc;
 	}
 	
 	TNC->Port = port;
@@ -598,7 +600,7 @@ UINT HALExtInit(EXTPORTDATA *  PortEntry)
 
 	WritetoConsole("\n");
 
-	return ((int)ExtProc);
+	return ExtProc;
 }
 
 
@@ -1401,7 +1403,7 @@ CmdLoop:
 			return;					// Wait for more
 
 		Call = &TNC->CmdBuffer[1];
-		Used = strlen(Call) + 2;	// Opcode and Null
+		Used = (int)strlen(Call) + 2;	// Opcode and Null
 
 		UpdateMH(TNC, Call, '!', 0);
 
@@ -1458,7 +1460,7 @@ CmdLoop:
 			return;					// Wait for more
 
 		Call = &TNC->CmdBuffer[1];
-		Used = strlen(Call) + 2;	// Opcode and Null
+		Used = (int)strlen(Call) + 2;	// Opcode and Null
 
 		HALConnected(TNC, Call);
 

HALDriver64.c

@@ -1444,7 +1444,7 @@ CmdLoop:
 			return;					// Wait for more
 
 		Call = &TNC->CmdBuffer[1];
-		Used = (int)strlen(Call) + 2;	// Opcode and Null
+		Used = strlen(Call) + 2;	// Opcode and Null
 
 		// Could possibly be used for APPLCALLS by changing MYCALL when we see a call to one of our calls
 

HFCommon.c

@@ -752,7 +752,7 @@ IdTag (random alphanumeric, 12 chars)
 			SendHTTPRequest(sock, "/account/exists", Message, Len, Response);
 			closesocket(sock);
 
-			if (strstr(Response, "false"))
+			if (strstr(Response, "\"CallsignExists\":false"))
 			{
 				WritetoConsole("WL2K Traffic Reporting disabled - Gateway ");
 				WritetoConsole(ADIF->CMSCall);

L4Code.c

@@ -1417,7 +1417,7 @@ VOID SendConACK(struct _LINKTABLE * LINK, TRANSPORTENTRY * L4, L3MESSAGEBUFFER *
 	}
 
 
-	if (CTEXTLEN && (Applmask == 0) && FULL_CTEXT)	// Any connect, or call to alias
+	if (CTEXTLEN && Applmask == 0)	// Connects to Node (not application)
 	{
 		struct DATAMESSAGE * Msg;
 		int Totallen = CTEXTLEN;

Versions.h

@@ -10,8 +10,8 @@
 
 #endif
 
-#define KVers 6,0,23,82
+#define KVers 6,0,24,1
-#define KVerstring "6.0.23.82\0"
+#define KVerstring "6.0.24.1\0"
 
 #ifdef CKernel
 
@@ -27,8 +27,8 @@
 
 #ifdef TermTCP
 
-#define Vers 1,0,16,1
+#define Vers 1,0,16,2
-#define Verstring "1.0.16.1\0"
+#define Verstring "1.0.16.2\0"
 #define VerComments "Internet Terminal for G8BPQ Packet Switch\0"
 #define VerCopyright "Copyright © 2011-2023 John Wiseman G8BPQ\0"
 #define VerDesc "Simple TCP Terminal Program for G8BPQ Switch\0"

bpqchat.c

@@ -58,7 +58,7 @@
 //  Add Connect Scripts
 //	Improve connect timeouts and add link validation polls
 
-//  Version 6.0.24.1 ??
+//  Version 6.0.24.1 August 23
 
 //	Restore CMD_TO_APPL flag to Applflags (13)
 //	Check for and remove names set to *RTL