[patch] reduce flood patch

pptpd-1.3.1-reduce-debug-flood.patch (text/plain), 3.22 KB, created by Thomas Stein on 2006-03-26 23:20:45 UTC

Index: ChangeLog
===================================================================
RCS file: /cvsroot/poptop/poptop/ChangeLog,v
retrieving revision 1.54
diff -u -r1.54 ChangeLog
--- ChangeLog	13 Feb 2006 23:57:06 -0000	1.54
+++ ChangeLog	27 Mar 2006 00:45:37 -0000
@@ -1,3 +1,9 @@
+Mon Mar 27 11:42:36 2006  James Cameron  <[e-mail]>
+
+	* pptpgre.c (decaps_gre, dequeue_gre): only report to LOG_DEBUG if
+	the debug option is set.  Reported by: Thomas Stein
+	<[e-mail]>
+
 Tue Feb 14 10:52:13 2006  James Cameron  <[e-mail]>
 
 	* pptpd-1.3.1.tar.gz: released.
Index: NEWS
===================================================================
RCS file: /cvsroot/poptop/poptop/NEWS,v
retrieving revision 1.36
diff -u -r1.36 NEWS
--- NEWS	13 Feb 2006 23:57:06 -0000	1.36
+++ NEWS	27 Mar 2006 00:45:37 -0000
@@ -1,3 +1,5 @@
+- avoid reporting packet loss if debug option not set [Cameron]
+
 1.3.1: released 2005-02-14
 
 - make connections limit configurable at run-time [Cameron]
Index: pptpgre.c
===================================================================
RCS file: /cvsroot/poptop/poptop/pptpgre.c,v
retrieving revision 1.7
diff -u -r1.7 pptpgre.c
--- pptpgre.c	29 Dec 2005 00:10:32 -0000	1.7
+++ pptpgre.c	27 Mar 2006 00:45:38 -0000
@@ -37,6 +37,7 @@
 #include "ppphdlc.h"
 #include "pptpgre.h"
 #include "pptpdefs.h"
+#include "pptpctrl.h"
 #include "defaults.h"
 #include "pqueue.h"
 
@@ -317,9 +318,14 @@
 		/* if it is timed out... */
 		if (head->seq != gre.seq_recv + 1 ) {  /* wrap-around safe */
 			stats.rx_lost += head->seq - gre.seq_recv - 1;
-			syslog(LOG_DEBUG, "GRE: timeout waiting for %d packets", head->seq - gre.seq_recv - 1);        
-		}
-		syslog(LOG_DEBUG, "GRE: accepting #%d from queue", head->seq);
+			if (pptpctrl_debug)
+				syslog(LOG_DEBUG, 
+				       "GRE: timeout waiting for %d packets", 
+				       head->seq - gre.seq_recv - 1);        
+		}
+		if (pptpctrl_debug)
+			syslog(LOG_DEBUG, "GRE: accepting #%d from queue", 
+			       head->seq);
 		gre.seq_recv = head->seq;
 		status = callback(cl, head->packet, head->packlen);
 		pqueue_del(head);
@@ -399,16 +405,24 @@
 		}
 		/* check for out-of-order sequence number */
 		if (seq_greater(seq, gre.seq_recv)) {
-			syslog(LOG_DEBUG, "GRE: accepting packet #%d", seq);
+			if (pptpctrl_debug)
+				syslog(LOG_DEBUG, "GRE: accepting packet #%d", 
+				       seq);
 			stats.rx_accepted++;
 			gre.seq_recv = seq;
 			return cb(cl, buffer + ip_len + headersize, payload_len);
 		} else if (seq == gre.seq_recv) {
-			syslog(LOG_DEBUG, "GRE: discarding duplicate or old packet #%d (expecting #%d)", seq, gre.seq_recv + 1);
+			if (pptpctrl_debug)
+				syslog(LOG_DEBUG,
+				       "GRE: discarding duplicate or old packet #%d (expecting #%d)", 
+				       seq, gre.seq_recv + 1);
 			return 0;	/* discard duplicate packets */
 		} else {
 			stats.rx_buffered++;
-			syslog(LOG_DEBUG, "GRE: buffering packet #%d (expecting #%d, lost or reordered)", seq, gre.seq_recv + 1);
+			if (pptpctrl_debug)
+				syslog(LOG_DEBUG,
+				       "GRE: buffering packet #%d (expecting #%d, lost or reordered)",
+				       seq, gre.seq_recv + 1);
 			pqueue_add(seq, buffer + ip_len + headersize, payload_len);
 			return 0;	/* discard out-of-order packets */
 		}