[pptpclient-commits] CVS: pptp-extras/pptpconfig ChangeLog, 1.18, 1.19 NEWS, 1.13, 1.14 pptpconfig.php, 1.13, 1.14

[James C. <qu...@us...>]

Update of /cvsroot/pptpclient/pptp-extras/pptpconfig
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4958

Modified Files:
	ChangeLog NEWS pptpconfig.php 
Log Message:
#1758592 fix byte counter overflow

Index: ChangeLog
===================================================================
RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- ChangeLog	24 Mar 2007 07:32:14 -0000	1.18
+++ ChangeLog	24 Jul 2007 01:25:22 -0000	1.19
@@ -1,3 +1,20 @@
+Tue Jul 24 11:17:11 2007  Robert Jackson  <rj...@so...>
+
+	* pptpconfig.php: tracker item #1758592 counter overflow patch.
+
+	Once the number of bytes in reaches 10,000,000 both the counters
+	for bytes in and bytes out suddenly greatly reduce in value.  This
+	is because the regular expression parsing /proc/net/dev goes wrong
+	because the white space changes. This causes the incorrect column
+	to be read.
+
+	In particular, the space between the colon and the first number
+	disappears e.g. "ppp0: 5958751" to "ppp0:11100991" (see full
+	example).
+
+	My patch inserts an additional space after the colon so the
+	existing regular expression will work correctly.
+
 Sat Mar 24 18:29:21 2007  James Cameron  <qu...@us...>
 
 	* pptpconfig.desktop: use explicit path in case user has /usr/sbin
@@ -5,7 +22,7 @@
 
 Tue Mar  6 12:21:30 2007  mvsfnet  <mv...@us...>
 
-	* pptpconfig.php: tracker item 1662620 CLI patches.
+	* pptpconfig.php: tracker item #1662620 CLI patches.
 
 	pptpconfig.php fails from the command line because the pipe to
 	pppd is set to nonblocking, the reader function is reached much

Index: NEWS
===================================================================
RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/NEWS,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- NEWS	24 Mar 2007 07:32:14 -0000	1.13
+++ NEWS	24 Jul 2007 01:25:22 -0000	1.14
@@ -1,5 +1,6 @@
+	- fix byte counter overflow at 10,000,000 [#1758592 Jackson]
 	- use explicit path in desktop [Cameron]
-	- CLI patches [ 1662620 anonymous ]
+	- CLI patches [#1662620 anonymous]
 	- add command line start, stop and status options [DiVerdi]
 	- call setsid() to prevent process group kill hitting parent [Cameron]
 

Index: pptpconfig.php
===================================================================
RCS file: /cvsroot/pptpclient/pptp-extras/pptpconfig/pptpconfig.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- pptpconfig.php	6 Mar 2007 01:36:22 -0000	1.13
+++ pptpconfig.php	24 Jul 2007 01:25:22 -0000	1.14
@@ -1273,6 +1273,7 @@
     fclose($fp);
 
     # pull apart the line into fields, and display
+    $line = str_replace(':', ': ', $line);
     $regs = split(':|  *',$line);
 
     $tree = $context['tree'];