[asterisk-commits] murf: branch murf/masqpark r156446 - in /team/murf/masqpark: ./ apps/app_dial.c

[SVN commits to the Asterisk project]

Author: murf
Date: Wed Nov 12 17:25:39 2008
New Revision: 156446

URL: http://svn.digium.com/view/asterisk?view=rev&rev=156446
Log:
Merged revisions 156386 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r156386 | tilghman | 2008-11-12 14:18:57 -0700 (Wed, 12 Nov 2008) | 5 lines

When using call limits under 1 second, infinite call lengths are allowed,
instead.
(closes issue #13851)
 Reported by: ruddy

........

Modified:
    team/murf/masqpark/   (props changed)
    team/murf/masqpark/apps/app_dial.c

Propchange: team/murf/masqpark/
------------------------------------------------------------------------------
    automerge = yes

Propchange: team/murf/masqpark/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Nov 12 17:25:39 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-156324
+/branches/1.4:1-156445

Modified: team/murf/masqpark/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/murf/masqpark/apps/app_dial.c?view=diff&rev=156446&r1=156445&r2=156446
==============================================================================
--- team/murf/masqpark/apps/app_dial.c (original)
+++ team/murf/masqpark/apps/app_dial.c Wed Nov 12 17:25:39 2008
@@ -1744,6 +1744,9 @@
 		if (!res) {
 			if (calldurationlimit > 0) {
 				peer->whentohangup = time(NULL) + calldurationlimit;
+			} else if (timelimit > 0) {
+				/* Not enough granularity to make it less, but we can't use the special value 0 */
+				peer->whentohangup = time(NULL) + 1;
 			}
 			if (!ast_strlen_zero(dtmfcalled)) { 
 				if (option_verbose > 2)
@@ -1849,7 +1852,6 @@
 			chan->whentohangup = 0;
 		res = 0;
 	}
-
 done:
 	ast_module_user_remove(u);    
 	return res;