[svn-commits] rmudgett: branch rmudgett/bridge_phase r381512 - /team/rmudgett/bridge_phase/...

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Thu Feb 14 16:28:57 2013
New Revision: 381512

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=381512
Log:
Make compile again.

Modified:
    team/rmudgett/bridge_phase/main/features.c

Modified: team/rmudgett/bridge_phase/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/main/features.c?view=diff&rev=381512&r1=381511&r2=381512
==============================================================================
--- team/rmudgett/bridge_phase/main/features.c (original)
+++ team/rmudgett/bridge_phase/main/features.c Thu Feb 14 16:28:57 2013
@@ -4472,16 +4472,14 @@
 	if (config->timelimit) {
 		struct ast_bridge_features_limits call_duration_limits_chan;
 		struct ast_bridge_features_limits call_duration_limits_peer;
-		int abandon_call = 0; /* Flag raised if set limits fails so we can abandon the call. */
+		int abandon_call = 0; /* TRUE if set limits fails so we can abandon the call. */
 
 		if (ast_bridge_features_limits_construct(&call_duration_limits_chan)) {
 			ast_log(LOG_ERROR, "Could not construct caller duration limits. Bridge canceled.\n");
 
 			ast_bridge_features_destroy(peer_features);
 			ast_bridge_features_cleanup(&chan_features);
-			if (bridge_cdr) {
-				ast_cdr_discard(bridge_cdr);
-			}
+			ast_autoservice_chan_hangup_peer(chan, peer);
 			return -1;
 		}
 
@@ -4491,9 +4489,7 @@
 
 			ast_bridge_features_destroy(peer_features);
 			ast_bridge_features_cleanup(&chan_features);
-			if (bridge_cdr) {
-				ast_cdr_discard(bridge_cdr);
-			}
+			ast_autoservice_chan_hangup_peer(chan, peer);
 			return -1;
 		}
 
@@ -4514,9 +4510,7 @@
 			ast_log(LOG_ERROR, "Could not set duration limits on one or more sides of the call. Bridge canceled.\n");
 			ast_bridge_features_destroy(peer_features);
 			ast_bridge_features_cleanup(&chan_features);
-			if (bridge_cdr) {
-				ast_cdr_discard(bridge_cdr);
-			}
+			ast_autoservice_chan_hangup_peer(chan, peer);
 			return -1;
 		}
 	}