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

List:       ipcop-cvs
Subject:    [IPCop-cvs] ipcop/src/ppp dialer,1.3,1.4 ip-down,1.5,1.6 ip-up,1.3,1.4
From:       Mark Wormgoor <riddles () users ! sourceforge ! net>
Date:       2005-03-29 18:45:37
Message-ID: E1DGLj5-0007OM-LC () sc8-pr-cvs1 ! sourceforge ! net
[Download RAW message or body]

Update of /cvsroot/ipcop/ipcop/src/ppp
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25484/src/ppp

Modified Files:
	dialer ip-down ip-up 
Log Message:
Merging all changes from 1.4 back into trunk


Index: dialer
===================================================================
RCS file: /cvsroot/ipcop/ipcop/src/ppp/dialer,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dialer	11 Dec 2003 10:57:34 -0000	1.3
--- dialer	29 Mar 2005 18:45:34 -0000	1.4
***************
*** 10,20 ****
  #
  
! require 'CONFIG_ROOT/header.pl';
  
  my %pppsettings;
  my %modemsettings;
  
! &readhash("${swroot}/ppp/settings", \%pppsettings);
! &readhash("${swroot}/modem/settings", \%modemsettings);
  
  if ($modemsettings{'INIT'} eq '') {
--- 10,21 ----
  #
  
! use strict;
! require 'CONFIG_ROOT/general-functions.pl';
  
  my %pppsettings;
  my %modemsettings;
  
! &General::readhash("${General::swroot}/ppp/settings", \%pppsettings);
! &General::readhash("${General::swroot}/modem/settings", \%modemsettings);
  
  if ($modemsettings{'INIT'} eq '') {

Index: ip-up
===================================================================
RCS file: /cvsroot/ipcop/ipcop/src/ppp/ip-up,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ip-up	11 Dec 2003 10:57:34 -0000	1.3
--- ip-up	29 Mar 2005 18:45:34 -0000	1.4
***************
*** 10,16 ****
  #
  
! require 'CONFIG_ROOT/header.pl';
  
! &log("PPP has gone up on $ARGV[0]");
  umask 022;
  
--- 10,17 ----
  #
  
! use strict;
! require 'CONFIG_ROOT/general-functions.pl';
  
! &General::log("PPP has gone up on $ARGV[0]");
  umask 022;
  
***************
*** 18,22 ****
  
  # read vars back from file.
! &readhash("${swroot}/ppp/settings", \%pppsettings);
  
  if ( ( $pppsettings{'TYPE'} eq 'isdn') &&
--- 19,23 ----
  
  # read vars back from file.
! &General::readhash("${General::swroot}/ppp/settings", \%pppsettings);
  
  if ( ( $pppsettings{'TYPE'} eq 'isdn') &&
***************
*** 32,54 ****
  	if (!($pppsettings{'TYPE'} =~ /^isdn/))
  	{
! 		if (open(FILE, ">${swroot}/red/dns1")) { print FILE $ENV{'DNS1'}; close FILE; }
! 		if (open(FILE, ">${swroot}/red/dns2")) { print FILE $ENV{'DNS2'}; close FILE; }
  	}
  	else
  	{
! 		if (open(FILE, ">${swroot}/red/dns1")) { print FILE $ENV{'MS_DNS1'}; close FILE; }
! 		if (open(FILE, ">${swroot}/red/dns2")) { print FILE $ENV{'MS_DNS2'}; close FILE; }
  	}
  } else {
! 	if (open(FILE, ">${swroot}/red/dns1")) { print FILE $pppsettings{'DNS1'}; close FILE; }
! 	if (open(FILE, ">${swroot}/red/dns2")) { print FILE $pppsettings{'DNS2'}; close FILE; }
  }
  
! if (open(FILE, ">${swroot}/red/iface")) { print FILE $ARGV[0]; close (FILE); }
! if (open(FILE, ">${swroot}/red/local-ipaddress"))  { print FILE $ARGV[3]; close (FILE); }
! if (open(FILE, ">${swroot}/red/remote-ipaddress")) { print FILE $ARGV[4]; close (FILE); }
  
! system('/bin/touch', "${swroot}/red/active");
  system('/etc/rc.d/rc.updatered');
  
! system "/bin/echo -en '\a' >/dev/console";
--- 33,58 ----
  	if (!($pppsettings{'TYPE'} =~ /^isdn/))
  	{
! 		if (open(FILE, ">${General::swroot}/red/dns1")) { print FILE $ENV{'DNS1'}; close FILE; }
! 		if (open(FILE, ">${General::swroot}/red/dns2")) { print FILE $ENV{'DNS2'}; close FILE; }
  	}
  	else
  	{
! 		if (open(FILE, ">${General::swroot}/red/dns1")) { print FILE $ENV{'MS_DNS1'}; close FILE; }
! 		if (open(FILE, ">${General::swroot}/red/dns2")) { print FILE $ENV{'MS_DNS2'}; close FILE; }
  	}
  } else {
! 	if (open(FILE, ">${General::swroot}/red/dns1")) { print FILE $pppsettings{'DNS1'}; close FILE; }
! 	if (open(FILE, ">${General::swroot}/red/dns2")) { print FILE $pppsettings{'DNS2'}; close FILE; }
  }
  
! if (open(FILE, ">${General::swroot}/red/iface")) { print FILE $ARGV[0]; close (FILE); }
! if (open(FILE, ">${General::swroot}/red/local-ipaddress"))  { print FILE $ARGV[3]; close (FILE); }
! if (open(FILE, ">${General::swroot}/red/remote-ipaddress")) { print FILE $ARGV[4]; close (FILE); }
  
! system('/bin/touch', "${General::swroot}/red/active");
  system('/etc/rc.d/rc.updatered');
  
! # Beep when ppp goes up or down. Silence if 'nobeeps' file exists.
! if ( ! -e "${General::swroot}/ppp/nobeeps") {
! 	system "/bin/echo -en '\a' >/dev/console";
! }

Index: ip-down
===================================================================
RCS file: /cvsroot/ipcop/ipcop/src/ppp/ip-down,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ip-down	30 Sep 2004 07:49:05 -0000	1.5
--- ip-down	29 Mar 2005 18:45:34 -0000	1.6
***************
*** 10,29 ****
  #
  
! require 'CONFIG_ROOT/header.pl';
  
! &log("PPP has gone down on $ARGV[0]");
  
  umask 022;
  
! unlink "${swroot}/red/active";
  system "/etc/rc.d/rc.updatered";
  
! system('/usr/bin/beep','-l 75', '-f 880', '-n', '-l 75', '-f 440');
  
! if ( -e "${swroot}/red/keepconnected") {
  	if ( system ('/bin/ps ax | /bin/grep -q "[r]c.connectioncheck reconnect"') ) {
  		system ('/etc/rc.d/rc.connectioncheck reconnect &');
  	} else {
! 		&log ('already rc.connectioncheck reconnect running');
  	}
  }
--- 10,33 ----
  #
  
! use strict;
! require 'CONFIG_ROOT/general-functions.pl';
  
! &General::log("PPP has gone down on $ARGV[0]");
  
  umask 022;
  
! unlink "${General::swroot}/red/active";
  system "/etc/rc.d/rc.updatered";
  
! # Beep when ppp goes up or down. Silence if 'nobeeps' file exists.
! if ( ! -e "${General::swroot}/ppp/nobeeps") {
! 	system('/usr/bin/beep','-l 75', '-f 880', '-n', '-l 75', '-f 440');
! }
  
! if ( -e "${General::swroot}/red/keepconnected") {
  	if ( system ('/bin/ps ax | /bin/grep -q "[r]c.connectioncheck reconnect"') ) {
  		system ('/etc/rc.d/rc.connectioncheck reconnect &');
  	} else {
! 		&General::log ('rc.connectioncheck reconnect already running');
  	}
  }



-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://ads.osdn.com/?ad_id=6595&alloc_id=14396&op=click
_______________________________________________
IPCop-cvs mailing list
IPCop-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-cvs
[prev in list] [next in list] [prev in thread] [next in thread]