[svn-commits] file: branch file/bridging r79080 - in /team/file/bridging: ./ main/

[SVN commits to the Digium repositories]

Author: file
Date: Fri Aug 10 13:40:34 2007
New Revision: 79080

URL: http://svn.digium.com/view/asterisk?view=rev&rev=79080
Log:
Merged revisions 79063,79068,79074 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r79063 | murf | 2007-08-10 15:33:03 -0300 (Fri, 10 Aug 2007) | 1 line

oops. forgot to commit the prop change on .
................
r79068 | murf | 2007-08-10 15:35:15 -0300 (Fri, 10 Aug 2007) | 9 lines

Merged revisions 79049 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r79049 | murf | 2007-08-10 12:25:51 -0600 (Fri, 10 Aug 2007) | 1 line

Re bug behavior mentioned in #asterisk, made this tweak to code, to prevent hundreds of log messages from being generated
........

................
r79074 | file | 2007-08-10 15:37:32 -0300 (Fri, 10 Aug 2007) | 2 lines

Bring up to date with poll changes.

................

Modified:
    team/file/bridging/   (props changed)
    team/file/bridging/main/cdr.c
    team/file/bridging/main/dial.c

Propchange: team/file/bridging/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/file/bridging/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Aug 10 13:40:34 2007
@@ -1,1 +1,1 @@
-/trunk:1-79051
+/trunk:1-79078

Modified: team/file/bridging/main/cdr.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/main/cdr.c?view=diff&rev=79080&r1=79079&r2=79080
==============================================================================
--- team/file/bridging/main/cdr.c (original)
+++ team/file/bridging/main/cdr.c Fri Aug 10 13:40:34 2007
@@ -748,6 +748,7 @@
 			ast_cdr_busy(cdr);
 			break;
 		case AST_CAUSE_FAILURE:
+		case AST_CAUSE_NORMAL_CIRCUIT_CONGESTION:
 			ast_cdr_failed(cdr);
 			break;
 		case AST_CAUSE_NORMAL:

Modified: team/file/bridging/main/dial.c
URL: http://svn.digium.com/view/asterisk/team/file/bridging/main/dial.c?view=diff&rev=79080&r1=79079&r2=79080
==============================================================================
--- team/file/bridging/main/dial.c (original)
+++ team/file/bridging/main/dial.c Fri Aug 10 13:40:34 2007
@@ -289,6 +289,8 @@
 		ast_hangup(channel->owner);
 		channel->owner = NULL;
 	} else {
+		if (chan)
+			ast_poll_channel_add(chan, channel->owner);
 		res = 1;
 		ast_verb(3, "Called %s\n", numsubst);
 	}
@@ -595,6 +597,8 @@
 				set_state(dial, AST_DIAL_RESULT_HANGUP);
 				break;
 			}
+			if (chan)
+				ast_poll_channel_del(chan, channel->owner);
 			ast_hangup(who);
 			channel->owner = NULL;
 			continue;
@@ -616,6 +620,8 @@
 		AST_LIST_TRAVERSE(&dial->channels, channel, list) {
 			if (!channel->owner || channel->owner == who)
 				continue;
+			if (chan)
+				ast_poll_channel_del(chan, channel->owner);
 			ast_hangup(channel->owner);
 			channel->owner = NULL;
 		}
@@ -632,6 +638,8 @@
 		AST_LIST_TRAVERSE(&dial->channels, channel, list) {
 			if (!channel->owner)
 				continue;
+			if (chan)
+				ast_poll_channel_del(chan, channel->owner);
 			ast_hangup(channel->owner);
 			channel->owner = NULL;
 		}