Merged revisions 158053 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r158053 | mmichelson | 2008-11-20 11:33:06 -0600 (Thu, 20 Nov 2008) | 12 lines

Make sure to set the hangup cause on the calling channel in the case
that ast_call() fails. For incoming SIP channels, this was causing
us to send a 603 instead of a 486 when the call-limit was reached on
the destination channel.

(closes issue #13867)
Reported by: still_nsk
Patches:
      13867.diff uploaded by putnopvut (license 60)
Tested by: blitzrage

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158066 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 38d2bbd281bbd23212d3350f450c55da35280347..4f53eeba8bf5078b6cbfe8479c34fb6d16ca9cfa 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -1818,6 +1818,9 @@ static int dial_exec_full(struct ast_channel *chan, void *data, struct ast_flags
                        /* Again, keep going even if there's an error */
                        ast_debug(1, "ast call on peer returned %d\n", res);
                        ast_verb(3, "Couldn't call %s\n", numsubst);
+                       if (tc->hangupcause) {
+                               chan->hangupcause = tc->hangupcause;
+                       }
                        ast_hangup(tc);
                        tc = NULL;
                        ast_free(tmp);

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index e656fb795c0e183f7022264592f597e835f556c0..d59339b2ff41e6c443cbae705b73ccb0332b2f51 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -4870,8 +4870,11 @@ static int sip_call(struct ast_channel *ast, char *dest, int timeout)
 
        res = update_call_counter(p, INC_CALL_RINGING);
 
-       if (res == -1)
+       if (res == -1) {
                return res;
+       } else {
+               ast->hangupcause = AST_CAUSE_USER_BUSY;
+       }
 
        p->callingpres = ast->cid.cid_pres;
        p->jointcapability = ast_translate_available_formats(p->capability, p->prefcodec);