rpms/wvdial/devel wvdial-1.60-dialtimeout.patch, NONE, 1.1 wvdial.spec, 1.26, 1.27

[Ondrej Vasik (ovasik)]

Author: ovasik

Update of /cvs/extras/rpms/wvdial/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29779

Modified Files:
	wvdial.spec 
Added Files:
	wvdial-1.60-dialtimeout.patch 
Log Message:
added dial timeout option(#200375)

wvdial-1.60-dialtimeout.patch:

--- NEW FILE wvdial-1.60-dialtimeout.patch ---
Written-by: Steve Marple <S.Marple lancaster ac uk>
Modified-by: Ondrej Vasik <ovasik redhat com>

--- wvdial-1.60.dialtimeout/wvdial.conf.5	2007-07-19 23:22:26.000000000 +0200
+++ wvdial-1.60/wvdial.conf.5	2007-10-10 14:02:37.000000000 +0200
@@ -231,6 +231,11 @@
 will quit after that many tries .If set to 0,
 .B wvdial
 will happily keep dialling forever.
+.TP
+.I Dial Timeout
+The maximum time in seconds that
+.B wvdial
+will wait for a connection to be made. Default value is 60 seconds.
 .PP
 The
 .BR wvdialconf (1)
--- wvdial-1.60.dialtimeout/wvdialer.cc	2007-07-19 23:22:26.000000000 +0200
+++ wvdial-1.60/wvdialer.cc	2007-10-10 14:01:21.000000000 +0200
@@ -641,6 +641,7 @@
         { "Idle Seconds",    NULL, &options.idle_seconds,  "", 0            },
         { "ISDN",            NULL, &options.isdn,          "", false        },
         { "Ask Password",    NULL, &options.ask_password,  "", false        },
+        { "Dial Timeout",    NULL, &options.dial_timeout,  "", 60           },
 
     	{ NULL,		     NULL, NULL,                   "", 0            }
     };
@@ -908,7 +909,7 @@
     switch( received ) 
     {
     case -1:	// nothing -- return control.
-	if( time( NULL ) - last_rx  >= 60 ) 
+	if( time( NULL ) - last_rx  >= options.dial_timeout ) 
 	{
 	    log( WvLog::Warning, "Timed out while dialing.  Trying again.\n" );
 	    stat = PreDial1;
--- wvdial-1.60.dialtimeout/wvdialer.h	2007-07-19 23:22:26.000000000 +0200
+++ wvdial-1.60/wvdialer.h	2007-10-10 14:01:52.000000000 +0200
@@ -141,6 +141,7 @@
 	int              idle_seconds;
 	int              isdn;
 	int              ask_password;
+	int              dial_timeout;
        
     } options;
    


Index: wvdial.spec
===================================================================
RCS file: /cvs/extras/rpms/wvdial/devel/wvdial.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- wvdial.spec	17 Aug 2007 13:44:33 -0000	1.26
+++ wvdial.spec	22 Oct 2007 08:41:32 -0000	1.27
@@ -1,12 +1,13 @@
 Summary: A heuristic autodialer for PPP connections
 Name: wvdial
 Version: 1.60
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPLv2
 URL: http://alumnit.ca/wiki/?WvDial
 Group: System Environment/Daemons
 Source0: http://alumnit.ca/download/wvdial-%{version}.tar.gz
 Patch1: wvdial-1.56-remotename.patch
+Patch2: wvdial-1.60-dialtimeout.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: libwvstreams-devel >= 0:4.4 lockdev-devel openssl-devel 
 BuildRequires: pkgconfig
@@ -21,6 +22,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .remotename
+%patch2 -p1 -b .dialtimeout
 
 %build
 make \
@@ -55,6 +57,9 @@
 %verify(not md5 size mtime) %config(noreplace) %{_sysconfdir}/wvdial.conf
 
 %changelog
+* Wed Oct 10 2007 Ondrej Vasik <ovasik at redhat.com> - 1.60-2
+- added option for dial timeout(#200375)
+
 * Fri Aug 17 2007 Harald Hoyer <harald at rawhide.home> - 1.60-1
 - version 1.60
 - changed license tag to LGPLv2