[svn-commits] murf: branch murf/bug8386-1.2 r48448 - /team/murf/bug8386-1.2/channel.c

[svn-commits at lists.digium.com]

Author: murf
Date: Wed Dec 13 03:25:21 2006
New Revision: 48448

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48448
Log:
Merged revisions 48315,48319-48322,48356,48361,48371,48374,48394,48398,48403 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r48315 | oej | 2006-12-06 05:14:40 -0700 (Wed, 06 Dec 2006) | 3 lines

Don't add Contact header on BYE, CANCEL, MESSAGE requests
(Bye, Cancel backported from 1.4, MESSAGE bug reported to me by Gunnar at Omnitor)

........
r48319 | crichter | 2006-12-06 07:35:25 -0700 (Wed, 06 Dec 2006) | 1 line

changed a few debugs to higher debug levels
........
r48320 | oej | 2006-12-06 08:42:41 -0700 (Wed, 06 Dec 2006) | 4 lines

Issue #8528 - make sure we don't delete the dialog too quickly after receiving
a 487. Move 487 handling into handle_response_invite where it really
belongs and don't add an ALREADYGONE flag to the dialog.

........
r48321 | crichter | 2006-12-06 08:48:45 -0700 (Wed, 06 Dec 2006) | 1 line

added the export and import of the MISDN_ADDRESS_COMPLETE Variable to inidcate wether the extension is already completely dialed or if there might come additional digits by information elements. also added some docs for that.
........
r48322 | russell | 2006-12-06 09:05:54 -0700 (Wed, 06 Dec 2006) | 3 lines

Fix the name of the rtignoreregexpire option in the sample configuration file.
(issue #8526, arkadia)

........
r48356 | russell | 2006-12-07 11:14:13 -0700 (Thu, 07 Dec 2006) | 3 lines

Ensure that the file position is not incremented beyond the total number of
files available for playback.  (issue #8539, ulogic)

........
r48361 | russell | 2006-12-09 08:45:37 -0700 (Sat, 09 Dec 2006) | 6 lines

Use locking when accessing the registrations list.  This list is not actually
used very often, so the likelihood of there being a problem is pretty small,
but still possible.  For example, if the CLI command to list the registrations
was called at the same time that a reload was occurring and the registrations
list was getting destroyed and rebuilt, a crash could occur.

........
r48371 | murf | 2006-12-09 19:14:13 -0700 (Sat, 09 Dec 2006) | 1 line

This version applies the patch suggested by stevens in bug 7836 (make inbound channel RINGING state consistent with other channels).
........
r48374 | tilghman | 2006-12-10 17:33:59 -0700 (Sun, 10 Dec 2006) | 5 lines

When doing a fork() and exec(), two problems existed (Issue 8086):
1) Ignored signals stayed ignored after the exec().
2) Signals could possibly fire between the fork() and exec(), causing Asterisk
signal handlers within the child to execute, which caused nasty race conditions.

........
r48394 | mogorman | 2006-12-11 14:55:43 -0700 (Mon, 11 Dec 2006) | 4 lines

app_externalivr needs a real silence file, and additional
changes to add silence files into core instead of extra
patch provided by bug 8177 with minor additions.

........
r48398 | mogorman | 2006-12-11 16:00:04 -0700 (Mon, 11 Dec 2006) | 2 lines

the english language can be a tricky beast

........
r48403 | kpfleming | 2006-12-11 22:11:13 -0700 (Mon, 11 Dec 2006) | 2 lines

add silence files

........

Modified:
    team/murf/bug8386-1.2/channel.c

Modified: team/murf/bug8386-1.2/channel.c
URL: http://svn.digium.com/view/asterisk/team/murf/bug8386-1.2/channel.c?view=diff&rev=48448&r1=48447&r2=48448
==============================================================================
--- team/murf/bug8386-1.2/channel.c (original)
+++ team/murf/bug8386-1.2/channel.c Wed Dec 13 03:25:21 2006
@@ -39,7 +39,7 @@
 #include <zaptel.h>
 #endif /* __linux__ */
 #ifndef ZT_TIMERPING
-#error "You need newer zaptel!  Please cvs update zaptel"
+#error "You need newer zaptel!  Please svn update zaptel"
 #endif
 #endif
 
@@ -3351,7 +3351,10 @@
 		if (bridge_end.tv_sec) {
 			to = ast_tvdiff_ms(bridge_end, ast_tvnow());
 			if (to <= 0) {
-				res = AST_BRIDGE_COMPLETE;
+				if (config->timelimit)
+					res = AST_BRIDGE_RETRY;
+				else
+ 					res = AST_BRIDGE_COMPLETE;
 				break;
 			}
 		} else