Update upstream source from tag 'upstream/6.0.24.78+repack'

Update to upstream version '6.0.24.78+repack'
with Debian dir 819c1fdecb

Bpq32.c

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

L2Code.c

@@ -3281,7 +3281,7 @@ VOID L2TimerProc()
 
 				LINK->L2ACKREQ = 0;					// CLEAR ANY DELAYED ACK TIMER
 	
-				if (LINK->L2RETRIES == 0)			// IF RR(P) OUTSTANDING WILl REPORT ANYWAY
+				if (LINK->L2RETRIES == 0)			// IF RR(P) OUTSTANDING WILL REPORT ANYWAY
 				{
 					SendSupervisCmd(LINK);
 					LINK++;
@@ -3904,6 +3904,7 @@ UINT RR_OR_RNR(struct _LINKTABLE * LINK)
 {
 	UCHAR Temp;
 	TRANSPORTENTRY * Session;
+	int SaveRNRSent = LINK->L2FLAGS & RNRSENT;
 	
 	LINK->L2FLAGS &= ~RNRSENT;
 
@@ -3979,6 +3980,11 @@ stayinREJ2:
 
 		// if we support SREJ send that instesd or REJ
 
+		// Dont send SREJ if clearing RNR - causes FRMR
+
+		if (SaveRNRSent)
+			return REJ;
+
 		if (LINK->Ver2point2)		// We only allow 2.2 with SREJ Multi
 			return SREJ;
 		else

L4Code.c

@@ -824,9 +824,8 @@ VOID L4BG()
 							int Len = bytesleft;
 							if (Len > ChunkSize)
 								Len = ChunkSize;
-
+			
-							complen = L2Compressit(Compressed, 8192, toCompress, Len);
+							complen = L2Compressit(Compressed, 8192, CompressPtr, Len);
-
 							Debugprintf("Chunked %d %d %d%%", Len, complen, ((Len - complen) * 100) / Len);
 
 							sendChunk(L4, Compressed, complen, savePort);

Versions.h

@@ -10,8 +10,8 @@
 
 #endif
 
-#define KVers 6,0,24,77
+#define KVers 6,0,24,78
-#define KVerstring "6.0.24.77\0"
+#define KVerstring "6.0.24.78\0"
 
 
 #ifdef CKernel

makefile

@@ -19,7 +19,11 @@ OBJS = pngwtran.o pngrtran.o pngset.o pngrio.o pngwio.o pngtrans.o pngrutil.o pn
 
 #Default to Linux
 	CC = gcc    
-	EXTRA_LDFLAGS = -Xlinker -Map=output.map -lrt -l:libpaho-mqtt3a.a -l:libjansson.a
+	LDFLAGS = -Xlinker -Map=output.map -lrt 
+
+all: CFLAGS = -DLINBPQ  -MMD -g -fcommon -fasynchronous-unwind-tables $(EXTRA_CFLAGS)	
+all: LIBS = -lpaho-mqtt3a -ljansson -lminiupnpc -lm -lz -lpthread -lconfig -lpcap                       
+all: linbpq
 
 #other OS
 
@@ -27,34 +31,50 @@ OS_NAME = $(shell uname -s)
 ifeq ($(OS_NAME),NetBSD)
 	CC = cc
     EXTRA_CFLAGS = -DFREEBSD -DNOMQTT -I/usr/pkg/include 
-    EXTRA_LDFLAGS =  -Xlinker -Map=output.map -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lrt -lutil -lexecinfo
+    LDFLAGS =  -Xlinker -Map=output.map -Wl,-R/usr/pkg/lib -L/usr/pkg/lib -lrt -lutil -lexecinfo
+
+all: CFLAGS = -DLINBPQ  -MMD -g -fcommon -fasynchronous-unwind-tables $(EXTRA_CFLAGS)	
+all: LIBS = -lminiupnpc -lm -lz -lpthread -lconfig -lpcap                    
+all: linbpq
+
+
 endif
 ifeq ($(OS_NAME),FreeBSD)
     CC = cc
     EXTRA_CFLAGS = -DFREEBSD -DNOMQTT -I/usr/local/include
-    EXTRA_LDFLAGS = -Xlinker -Map=output.map -L/usr/local/lib -lrt -liconv -lutil -lexecinfo
+    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 
-	EXTRA_LDFLAGS = -liconv
+	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))
 
-all: CFLAGS = -DLINBPQ  -MMD -g -fcommon -fasynchronous-unwind-tables $(EXTRA_CFLAGS)		                       
-all: linbpq
 
 
 nomqtt: CFLAGS = -DLINBPQ -MMD -fcommon -g  -rdynamic -DNOMQTT -fasynchronous-unwind-tables
+nomqtt: LIBS = -lminiupnpc -lm -lz -lpthread -lconfig -lpcap   
 nomqtt: linbpq
 
 noi2c: CFLAGS = -DLINBPQ -MMD -DNOI2C -g  -rdynamic -fcommon -fasynchronous-unwind-tables
+noi2c: LIBS = -lpaho-mqtt3a -ljansson -lminiupnpc -lm -lz -lpthread -lconfig -lpcap                        
 noi2c: linbpq
 
 
 linbpq: $(OBJS)
-	cc $(OBJS) $(EXTRA_LDFLAGS) -lminiupnpc -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

upnp.c

@@ -41,7 +41,6 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <winsock2.h>
 #endif
 #ifdef LINBPQ
-#ifndef MACBPQ
 #ifndef WIN32
 #include <miniupnpc/upnpcommands.h>
 #include <miniupnpc/miniupnpc.h>
@@ -49,13 +48,8 @@ POSSIBILITY OF SUCH DAMAGE.
 #include <stdio.h>
 #endif
 #endif
-#endif
+
-#ifdef MACBPQ
+
-#include </usr/local/Cellar/miniupnpc/2.2.5/include/miniupnpc/upnpcommands.h>
-#include </usr/local/Cellar/miniupnpc/2.2.5/include/miniupnpc/miniupnpc.h>
-#include </usr/local/Cellar/miniupnpc/2.2.5/include/miniupnpc/upnperrors.h>
-#include <stdio.h>
-#endif
 int AddMap(char * controlURL, char * eport, char * iport, char * proto);
 int DeleteMap(char * controlURL, char * eport, char * iport, char * proto);