--- AUTHORS 2006-08-21 07:19:40.000000000 +0100 +++ AUTHORS 2008-03-30 23:23:49.000000000 +0100 @@ -17,3 +17,5 @@ John McNair John King Stephen DiVerdi + Henrique Martins + Alex Amiryan --- ChangeLog 2006-08-21 07:19:40.000000000 +0100 +++ ChangeLog 2009-09-13 06:59:49.000000000 +0100 @@ -1,3 +1,53 @@ +Mon Mar 31 11:08:46 2008 James Cameron + + * pptpconfig.php (tunnel_to_secret): quote password when placing + it in secrets file. This change was delayed reaching CVS by over + a year. Sorry. + +Mon Mar 31 09:18:46 2008 Alex Amiryan + + * pptpconfig.php: fix problem using CLI interface that caused + invalid route command to be attempted. + +Tue Jul 24 11:17:11 2007 Robert Jackson + + * 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 + + * pptpconfig.desktop: use explicit path in case user has /usr/sbin + in path before /usr/bin, from: Jonathan Kamens. + +Tue Mar 6 12:21:30 2007 Henrique Martins + + * 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 + faster than under the GUI, fgets returns an empty line as pppd + hasn't output anything yet, and the else GUI case loops on while + line is not blank, when it should be looping until feof. There's a + === typo in that while too. + + While at it added a couple of $use_gui checks, as gui + functions/settings are being called/done even when the code is + running from the gui, and attempted to include a patch similar to + one in the list to make pptpconfig.php runable from the command + line, i.e. no env DISPLAY variable. + Mon Aug 21 15:32:58 2006 James Cameron * pptpconfig-20060821: released. --- NEWS 2006-08-21 07:19:40.000000000 +0100 +++ NEWS 2008-03-30 23:23:49.000000000 +0100 @@ -1,6 +1,7 @@ -2006-08-21 add command line start - - - add version of pptp to debug log [Cameron] + - fix invalid route command on CLI interface [Amiryan] + - fix byte counter overflow at 10,000,000 [#1758592 Jackson] + - use explicit path in desktop [Cameron] + - CLI patches [#1662620 Martins] - add command line start, stop and status options [DiVerdi] - call setsid() to prevent process group kill hitting parent [Cameron] --- pptpconfig.desktop 2006-08-21 07:19:40.000000000 +0100 +++ pptpconfig.desktop 2007-03-24 07:32:14.000000000 +0000 @@ -4,7 +4,7 @@ Comment=Configure and start PPTP tunnels (VPN) Categories=Application;SystemSetup Encoding=UTF-8 -Exec=pptpconfig +Exec=/usr/bin/pptpconfig Icon= StartupNotify=true Terminal=false --- pptpconfig.php 2006-08-21 07:19:40.000000000 +0100 +++ pptpconfig.php 2009-09-13 06:59:49.000000000 +0100 @@ -1,7 +1,7 @@ #!/usr/lib/php-pcntl/bin/php -q &1', 'r'); stream_set_blocking($pipe, true); while (!feof($pipe)) { - while(Gtk::events_pending()) Gtk::main_iteration(); + if ($use_gui) { + while(Gtk::events_pending()) Gtk::main_iteration(); + } $text .= fgets($pipe, 2048); } $status = pclose($pipe); @@ -1272,6 +1273,7 @@ fclose($fp); # pull apart the line into fields, and display + $line = str_replace(':', ': ', $line); $regs = split(':| *',$line); $tree = $context['tree']; @@ -1368,10 +1370,10 @@ function reader($ignore, $ignore, $context) { global $me, $gtk_inputs, $use_gui, $quiet; - $line = fgets($context['pipe'], 1024); if ($use_gui) { # in the gui, the reader is a callback that processes on line at a time - if (!($line == false)) { + if (!feof($context['pipe'])) { + $line = fgets($context['pipe'], 1024); scribe($context, $line); if (ereg("Using interface (ppp[0-9]*)", $line, $regs)) { @@ -1394,7 +1396,8 @@ } } else { # in the CLI, reader should read all input right away - while (!($line === false)) { + while (!feof($context['pipe'])) { + $line = fgets($context['pipe'], 1024); scribe($context, $line); if (ereg("Using interface (ppp[0-9]*)", $line, $regs)) { @@ -1406,8 +1409,6 @@ if (ereg('^remote IP address ([0-9.]*)', $line, $regs)) { $context['remoteip'] = $regs[1]; } - - $line = fgets($context['pipe'], 1024); } } @@ -1454,13 +1455,15 @@ $state = 'initialising'; if ($state == 'stopping') { - $statusbar->push($window->get_data('id'), 'Stopped'); - $window->set_data('state', 'stopped'); - setup_list_set_state($context['name'], 'stopped'); + if ($use_gui) { + $statusbar->push($window->get_data('id'), 'Stopped'); + $window->set_data('state', 'stopped'); + setup_list_set_state($context['name'], 'stopped'); + $stop->set_sensitive(0); + $ping->set_sensitive(0); + $start->set_sensitive(1); + } scribe($context, "$me: stopped\n"); - $stop->set_sensitive(0); - $ping->set_sensitive(0); - $start->set_sensitive(1); } else { if ($use_gui ) $interface = $window->get_data('interface'); @@ -1746,8 +1749,10 @@ # if it was stopped, change to initialising, clear the old log if ($state == 'stopped') { $state = 'initialising'; - $text = $gx[$name]->get_widget('text'); - $text->delete_text(0, -1); + if ($use_gui) { + $text = $gx[$name]->get_widget('text'); + $text->delete_text(0, -1); + } } # if it is now initialising, start the pppd process --- TODO 2006-08-21 07:19:40.000000000 +0100 +++ TODO 2006-09-14 23:47:37.000000000 +0100 @@ -1,3 +1,6 @@ +origin: Sergio Lopez, 15th September 2006. +bug report: command line mode still requires DISPLAY +-- origin: Michael D. Adams, 20th March 2006, and Samuel Audet, 12th October 2005. bug report: if the server has multiple IP addresses, one IP may be used for the tunnel connection and another IP for the routing changes.