From: Automerge script <automerge@asterisk.org>
Date: Fri, 22 Jun 2012 21:22:26 +0000 (+0000)
Subject: Merged revisions 369236,369239 via svnmerge from
X-Git-Tag: 10.7.0-digiumphones-rc1~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c288ea612d2c786bc3c3561a5d9f274b570bbd9;p=thirdparty%2Fasterisk.git

Merged revisions 369236,369239 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r369236 | rmudgett | 2012-06-22 15:49:33 -0500 (Fri, 22 Jun 2012) | 5 lines

  Change incorrect chan_sip zombie hangup debug message.  They are all zombies now.
  ........

  Merged revisions 369235 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................
  r369239 | rmudgett | 2012-06-22 16:04:25 -0500 (Fri, 22 Jun 2012) | 5 lines

  Check if PBX was started for generic CCSS recall.
  ........

  Merged revisions 369238 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/10-digiumphones@369257 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index bce2ad5bdd..54528d80cd 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -6336,13 +6336,7 @@ static int sip_hangup(struct ast_channel *ast)
 		return 0;
 	}
 
-	if (ast_test_flag(ast, AST_FLAG_ZOMBIE)) {
-		if (p->refer)
-			ast_debug(1, "SIP Transfer: Hanging up Zombie channel %s after transfer ... Call-ID: %s\n", ast->name, p->callid);
-		else
-			ast_debug(1, "Hanging up zombie call. Be scared.\n");
-	} else
-		ast_debug(1, "Hangup call %s, SIP callid %s\n", ast->name, p->callid);
+	ast_debug(1, "Hangup call %s, SIP callid %s\n", ast->name, p->callid);
 
 	sip_pvt_lock(p);
 	if (ast_test_flag(&p->flags[0], SIP_INC_COUNT) || ast_test_flag(&p->flags[1], SIP_PAGE2_CALL_ONHOLD)) {
diff --git a/main/ccss.c b/main/ccss.c
index 6544ba394b..d012550f91 100644
--- a/main/ccss.c
+++ b/main/ccss.c
@@ -2710,8 +2710,13 @@ static void *generic_recall(void *data)
 			return NULL;
 		}
 	}
-	ast_cc_agent_recalling(agent->core_id, "Generic agent %s is recalling", agent->device_name);
-	ast_pbx_start(chan);
+	if (ast_pbx_start(chan)) {
+		ast_cc_failed(agent->core_id, "PBX failed to start for %s.", agent->device_name);
+		ast_hangup(chan);
+		return NULL;
+	}
+	ast_cc_agent_recalling(agent->core_id, "Generic agent %s is recalling",
+		agent->device_name);
 	return NULL;
 }