[prev in list] [next in list] [prev in thread] [next in thread] 

List:       ipcop-svn
Subject:    [Ipcop-svn] SF.net SVN: ipcop: [421] ipcop/trunk
From:       dotzball () users ! sourceforge ! net
Date:       2007-06-25 15:48:30
Message-ID: E1I2qnm-0005DU-Lw () sc8-pr-svn4 ! sourceforge ! net
[Download RAW message or body]

Revision: 421
          http://ipcop.svn.sourceforge.net/ipcop/?rev=421&view=rev
Author:   dotzball
Date:     2007-06-25 08:48:30 -0700 (Mon, 25 Jun 2007)

Log Message:
-----------
Add 'Persistent' option for ISDN connections

Modified Paths:
--------------
    ipcop/trunk/config/ppp/ip-down
    ipcop/trunk/html/cgi-bin/pppsetup.cgi

Modified: ipcop/trunk/config/ppp/ip-down
===================================================================
--- ipcop/trunk/config/ppp/ip-down	2007-06-21 21:47:33 UTC (rev 420)
+++ ipcop/trunk/config/ppp/ip-down	2007-06-25 15:48:30 UTC (rev 421)
@@ -25,6 +25,18 @@
 }
 
 if ( -e "${General::swroot}/red/keepconnected") {
+
+	# We have to stop the ipppd (TYPE is ISDN) it stays even on disconnect (from ISP),
+	# and rc.connectioncheck will fail to reconnect as it waits for [p]ppd to go away.
+	my %pppsettings;
+	&General::readhash("${General::swroot}/ppp/settings", \%pppsettings);
+
+	if ($pppsettings{'TYPE'} eq 'isdn')
+	{
+		system ("/bin/touch ${General::swroot}/red/redial");
+		system ('/etc/rc.d/rc.red stop');
+	}
+
 	if ( system ('/bin/ps ax | /bin/grep -q "[r]c.connectioncheck reconnect"') ) {
 		system ('/etc/rc.d/rc.connectioncheck reconnect &');
 	} else {

Modified: ipcop/trunk/html/cgi-bin/pppsetup.cgi
===================================================================
--- ipcop/trunk/html/cgi-bin/pppsetup.cgi	2007-06-21 21:47:33 UTC (rev 420)
+++ ipcop/trunk/html/cgi-bin/pppsetup.cgi	2007-06-25 15:48:30 UTC (rev 421)
@@ -671,10 +671,6 @@
 	<td colspan='4'>
 		<input type='radio' name='RECONNECTION' value='manual' \
$checked{'RECONNECTION'}{'manual'} />$Lang::tr{'manual'}</td>  </tr>
-END
-;
-if ($pppsettings{'TYPE'} ne 'isdn') {
-print <<END
 <tr>
 	<td>
 		<input type='radio' name='RECONNECTION' value='persistent' \
$checked{'RECONNECTION'}{'persistent'} />$Lang::tr{'persistent'}</td> @@ -689,10 \
+685,6 @@  print <<END
 	</select></td>
 </tr>
-END
-;
-}
-print <<END
 <tr>
 	<td>
 		<input type='radio' name='RECONNECTION' value='dialondemand' \
$checked{'RECONNECTION'}{'dialondemand'} />$Lang::tr{'dod'}</td>


This was sent by the SourceForge.net collaborative development platform, the world's \
largest Open Source development site.

-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn


[prev in list] [next in list] [prev in thread] [next in thread]