Release new version

Update to upstream version '6.0.24.82+repack'
with Debian dir a145ad04db

AGWMoncode.c

@@ -49,7 +49,7 @@ 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 XID     0xAF
 #define TEST    0xE3
 #define	RR	1
 #define	RNR	5
@@ -267,16 +267,16 @@ int InternalAGWDecodeFrame(MESSAGE * msg, char * buffer, time_t Stamp, int * Fra
 			FRMRFLAG = 1;
 			break;
 
-		case XID:
-
-			strcpy(SUP, "XID");
-			XIDFLAG = 1;
-			break;
-
-		case TEST:
-
-			strcpy(SUP, "TEST");
-			TESTFLAG = 1;
+		case XID:
+
+			strcpy(SUP, "XID");
+			XIDFLAG = 1;
+			break;
+
+		case TEST:
+
+			strcpy(SUP, "TEST");
+			TESTFLAG = 1;
 			break;
 		}
 

BPQMail.c

@@ -1154,6 +1154,7 @@
 //	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)
 
 #include "bpqmail.h"
 #include "winstdint.h"

BPQTermMDI.c

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

Bpq32.c

@@ -1279,6 +1279,9 @@ along with LinBPQ/BPQ32.  If not, see http://www.gnu.org/licenses
 //	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)
 
 #define CKernel
 

ChatMultiConsole.c

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

ChatUsers.txt

@@ -0,0 +1,2 @@
+GM8BPQ 0 John ?_qthｬ26ｬ0
+G8BPQ 0 John ?_qthｬ26ｬ0

HTTPcode.c

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

HanksRT.c

@@ -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)
 			{

L2Code.c

@@ -2176,7 +2176,9 @@ VOID SFRAME(struct _LINKTABLE * LINK, struct PORTCONTROL * PORT, UCHAR CTL, UCHA
 				int count;
 				MESSAGE * Msg;
 				MESSAGE * Buffer;
-						
+
+				LINK->L2FLAGS &= ~POLLSENT;			// CLEAR I(P) or RR(P) SET
+				
 				Msg = LINK->FRAMES[NS];	// is frame available?
 
 				if (Msg == NULL)
@@ -2977,6 +2979,43 @@ VOID SDETX(struct _LINKTABLE * LINK)
 //	if (LINK->L2RESEQ_Q)
 //		return;
 	
+	// **** Debug code **** look for stuck links
+
+	if (LINK->LASTFRAMESENT && (time(NULL) - LINK->LASTFRAMESENT) > 60)			// No send for 60 secs
+	{
+		if (COUNT_AT_L2(LINK) > 16)
+		{
+			// Dump Link State
+
+			char Normcall[11] = "";
+			char Normcall2[11] = "";
+
+			int Count = COUNT_AT_L2(LINK);
+			int secs = time(NULL) - LINK->LASTFRAMESENT;
+				
+			ConvFromAX25(LINK->LINKCALL, Normcall);
+			ConvFromAX25(LINK->OURCALL, Normcall2);
+
+			Debugprintf("*** Stuck L2 Session for %d Secs %s %s %d", secs, Normcall, Normcall2, Count);
+			Debugprintf("LINK->LINKNS %d LINK->LINKOWS %d SDTSLOT %d LINKWINDOW %d L2FLAGS %d", LINK->LINKNS, LINK->LINKOWS, LINK->SDTSLOT, LINK->LINKWINDOW, LINK->L2FLAGS);
+			Debugprintf("Slots %x %x %x %x %x %x %x %x", LINK->FRAMES[0], LINK->FRAMES[1], LINK->FRAMES[2], LINK->FRAMES[3],
+				LINK->FRAMES[4], LINK->FRAMES[5], LINK->FRAMES[6], LINK->FRAMES[7]);
+
+			// Reset Link
+
+
+			InformPartner(LINK, NORMALCLOSE);	// TELL OTHER END ITS GONE
+
+			LINK->L2RETRIES -= 1;		// Just send one DISC
+			LINK->L2STATE = 4;			// CLOSING
+
+			L2SENDCOMMAND(LINK, DISC | PFBIT);
+
+			return;
+		}
+	}
+
+
 	Outstanding = LINK->LINKNS - LINK->LINKOWS;			// Was WS not NS
 
 	if (Outstanding < 0)
@@ -2994,6 +3033,10 @@ VOID SDETX(struct _LINKTABLE * LINK)
 		Msg = Q_REM(&LINK->TX_Q);
 		Msg->CHAIN = NULL;
 
+		LINK->LASTFRAMESENT = time(NULL);
+		LINK->LASTSENTQCOUNT = COUNT_AT_L2(LINK);
+
+
 		if (LINK->AllowCompress && Msg->LENGTH > 20  && LINK->TX_Q && Msg->PID == 240)			// if short and no more not worth trying compression
 		{
 			int complen = 0;
@@ -3018,6 +3061,7 @@ VOID SDETX(struct _LINKTABLE * LINK)
 			// I think I need to know how many slots are available, so I don't compress too much
 			// Then collect data, compressing after each frame to make sure will fit in available space
 
+
 			while (LINK->FRAMES[n] == NULL && slots < 8)
 			{
 				slots++;

MultiConsole.c

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

RTKnown.txt

@@ -0,0 +1 @@
+G8BPQ-1 1754642136

TelnetV6.c

@@ -5018,23 +5018,20 @@ int DataSocket_ReadHTTP(struct TNCINFO * TNC, struct ConnectionInfo * sockptr, S
 	{
 		// Failed or closed - clear connection
 
-		// if Websock connection till app
+		// if Websock connection tell app
 
 		if (sockptr->WebSocks)
 		{
 			if (memcmp(sockptr->WebURL, "rhp", 3) == 0)
-			{
 				ProcessRHPWebSockClosed(sockptr->socket);	
-				DataSocket_Disconnect(TNC, sockptr);
-				return 0;
-			}
-		}
-		else
-		{
-			TNC->Streams[sockptr->Number].ReportDISC = TRUE;		//Tell Node
+
 			DataSocket_Disconnect(TNC, sockptr);
 			return 0;
 		}
+
+		TNC->Streams[sockptr->Number].ReportDISC = TRUE;		//Tell Node
+		DataSocket_Disconnect(TNC, sockptr);
+		return 0;
 	}
 
 	MsgPtr = &sockptr->InputBuffer[0];

Versions.h

@@ -10,15 +10,15 @@
 
 #endif
 
-#define KVers 6,0,24,78
-#define KVerstring "6.0.24.78\0"
+#define KVers 6,0,24,82
+#define KVerstring "6.0.24.82\0"
 
 
 #ifdef CKernel
 
 #define Vers KVers
 #define Verstring KVerstring
-#define Datestring "July 2025"
+#define Datestring "August 2025"
 #define VerComments "G8BPQ Packet Switch (C Version)" KVerstring
 #define VerCopyright "Copyright © 2001-2025 John Wiseman G8BPQ\0"
 #define VerDesc "BPQ32 Switch\0"

WebMail.c

@@ -2662,10 +2662,10 @@ VOID SaveNewMessage(struct HTTPConnectionInfo * Session, char * MsgPtr, char * R
 	if (strlen(WebMail->BID) > 12)
 		WebMail->BID[12] = 0;
 
-	UndoTransparency(WebMail->BID);
-	UndoTransparency(WebMail->To);
-	UndoTransparency(WebMail->Subject);
-	UndoTransparency(WebMail->Body);
+//	UndoTransparency(WebMail->BID);
+//	UndoTransparency(WebMail->To);
+//	UndoTransparency(WebMail->Subject);
+//	UndoTransparency(WebMail->Body);
 
 	MsgLen = strlen(WebMail->Body);
 

asmstrucs.h

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

bpqchat.c

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

cMain.c

@@ -52,6 +52,9 @@ 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);
+
 
 #include "configstructs.h"
 
@@ -62,6 +65,7 @@ extern int needADSB;
 struct PORTCONFIG * PortRec;
 
 #define RNRSET 0x2				// RNR RECEIVED FROM OTHER END
+#define	PFBIT 0x10		// POLL/FINAL BIT IN CONTROL BYTE
 
 //	STATION INFORMATION
 
@@ -2506,6 +2510,47 @@ ENDOFLIST:
 
 				if ((LINK->L2FLAGS & RNRSET) == 0)
 					SDETX(LINK);
+				else
+				{
+					// Stuck link debug check
+
+					if (LINK->LASTFRAMESENT && (time(NULL) - LINK->LASTFRAMESENT) > 60)			// No send for 60 secs
+					{
+						if (COUNT_AT_L2(LINK) > 16)
+						{
+							// 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++;

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";
 };

debian/changelog

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