Revision: 5726
http://ipcop.svn.sourceforge.net/ipcop/?rev=5726&view=rev
Author: owes
Date: 2011-07-08 20:33:12 +0000 (Fri, 08 Jul 2011)
Log Message:
-----------
Fix pressing disconnect in GUI when pppoe reconnect is waiting for holdoff time.
Modified Paths:
--------------
ipcop/trunk/src/rc.d/rc.connectioncheck
ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20
Modified: ipcop/trunk/src/rc.d/rc.connectioncheck
===================================================================
--- ipcop/trunk/src/rc.d/rc.connectioncheck 2011-07-08 20:29:18 UTC (rev
5725)
+++ ipcop/trunk/src/rc.d/rc.connectioncheck 2011-07-08 20:33:12 UTC (rev
5726)
@@ -150,9 +150,19 @@
&msg("Restarting $attempts/$pppsettings{'MAXRETRIES'}");
}
- &msg("Holdoff $pppsettings{'HOLDOFF'} seconds");
- sleep $pppsettings{'HOLDOFF'};
+ my $holdoff = $pppsettings{'HOLDOFF'};
+ &msg("Holdoff $holdoff seconds");
+ while (($holdoff > 0) && (-e "/var/ipcop/red/keepconnected")) {
+ sleep 1;
+ $holdoff--;
+ }
+ if (! -e "/var/ipcop/red/keepconnected") {
+ # user pressed disconnect in gui
+ &msg('Disconnect via GUI');
+ exit 0;
+ }
+
system("/etc/rc.d/rc.red start");
}
elsif ($ARGV[0] eq 'reconnect') {
Modified: ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20
===================================================================
--- ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20 2011-07-08 20:29:18 UTC
(rev 5725)
+++ ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20 2011-07-08 20:33:12 UTC
(rev 5726)
@@ -1,5 +1,6 @@
## please place IPCop files first, then packages sorted by alphabetical order
/etc/logrotate.d/squid
+/etc/rc.d/rc.connectioncheck
/etc/rc.d/rc.firewall
/etc/rc.d/rc.red
/home/httpd/cgi-bin/aliases.cgi
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All of the data generated in your IT infrastructure is seriously valuable.
Why? It contains a definitive record of application performance, security
threats, fraudulent activity, and more. Splunk takes this data and makes
sense of it. IT sense. And common sense.
http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn
