[svn-commits] tilghman: branch 1.6.0 r129153 - in /branches/1.6.0: ./ apps/ channels/ inclu...

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Jul  8 15:31:43 2008
New Revision: 129153

URL: http://svn.digium.com/view/asterisk?view=rev&rev=129153
Log:
Merged revisions 129152 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r129152 | tilghman | 2008-07-08 15:30:29 -0500 (Tue, 08 Jul 2008) | 16 lines

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

........
r129149 | tilghman | 2008-07-08 15:27:47 -0500 (Tue, 08 Jul 2008) | 8 lines

Cause SIP to return a 480 instead of a 404 when a sip peer exists, but is not
registered.
(closes issue #12885)
 Reported by: ibc
 Patches: 
       20080701__bug12885__2.diff.txt uploaded by Corydon76 (license 14)
 Tested by: ibc

........

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

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/apps/app_dial.c
    branches/1.6.0/channels/chan_sip.c
    branches/1.6.0/include/asterisk/causes.h

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/apps/app_dial.c?view=diff&rev=129153&r1=129152&r2=129153
==============================================================================
--- branches/1.6.0/apps/app_dial.c (original)
+++ branches/1.6.0/apps/app_dial.c Tue Jul  8 15:31:43 2008
@@ -381,6 +381,7 @@
 		num->congestion++;
 		break;
 
+	case AST_CAUSE_NO_ROUTE_DESTINATION:
 	case AST_CAUSE_UNREGISTERED:
 		if (cdr)
 			ast_cdr_failed(cdr);

Modified: branches/1.6.0/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_sip.c?view=diff&rev=129153&r1=129152&r2=129153
==============================================================================
--- branches/1.6.0/channels/chan_sip.c (original)
+++ branches/1.6.0/channels/chan_sip.c Tue Jul  8 15:31:43 2008
@@ -4675,6 +4675,7 @@
 		case AST_CAUSE_NO_USER_RESPONSE:	/* 18 */
 			return "408 Request Timeout";
 		case AST_CAUSE_NO_ANSWER:		/* 19 */
+		case AST_CAUSE_UNREGISTERED:        /* 20 */
 			return "480 Temporarily unavailable";
 		case AST_CAUSE_CALL_REJECTED:		/* 21 */
 			return "403 Forbidden";

Modified: branches/1.6.0/include/asterisk/causes.h
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/include/asterisk/causes.h?view=diff&rev=129153&r1=129152&r2=129153
==============================================================================
--- branches/1.6.0/include/asterisk/causes.h (original)
+++ branches/1.6.0/include/asterisk/causes.h Tue Jul  8 15:31:43 2008
@@ -99,6 +99,7 @@
 #define AST_CAUSE_USER_BUSY				17
 #define AST_CAUSE_NO_USER_RESPONSE			18
 #define AST_CAUSE_NO_ANSWER				19
+#define AST_CAUSE_SUBSCRIBER_ABSENT			20
 #define AST_CAUSE_CALL_REJECTED				21
 #define AST_CAUSE_NUMBER_CHANGED			22
 #define AST_CAUSE_DESTINATION_OUT_OF_ORDER		27
@@ -141,7 +142,7 @@
 #define AST_CAUSE_NORMAL 				AST_CAUSE_NORMAL_CLEARING
 #define AST_CAUSE_NOANSWER	 			AST_CAUSE_NO_ANSWER
 #define AST_CAUSE_CONGESTION	 			AST_CAUSE_NORMAL_CIRCUIT_CONGESTION
-#define AST_CAUSE_UNREGISTERED				AST_CAUSE_NO_ROUTE_DESTINATION
+#define AST_CAUSE_UNREGISTERED				AST_CAUSE_SUBSCRIBER_ABSENT
 #define AST_CAUSE_NOTDEFINED 				0
 #define AST_CAUSE_NOSUCHDRIVER				AST_CAUSE_CHAN_NOT_IMPLEMENTED
 /*@{ */