[svn-commits] tilghman: branch 1.4 r129149 - in /branches/1.4: apps/ channels/ include/aste...

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Jul  8 15:27:47 2008
New Revision: 129149

URL: http://svn.digium.com/view/asterisk?view=rev&rev=129149
Log:
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.4/apps/app_dial.c
    branches/1.4/channels/chan_sip.c
    branches/1.4/include/asterisk/causes.h

Modified: branches/1.4/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/apps/app_dial.c?view=diff&rev=129149&r1=129148&r2=129149
==============================================================================
--- branches/1.4/apps/app_dial.c (original)
+++ branches/1.4/apps/app_dial.c Tue Jul  8 15:27:47 2008
@@ -341,6 +341,7 @@
 			ast_cdr_failed(chan->cdr); \
 		numcongestion++; \
 		break; \
+	case AST_CAUSE_NO_ROUTE_DESTINATION: \
 	case AST_CAUSE_UNREGISTERED: \
 		if (chan->cdr) \
 			ast_cdr_failed(chan->cdr); \

Modified: branches/1.4/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_sip.c?view=diff&rev=129149&r1=129148&r2=129149
==============================================================================
--- branches/1.4/channels/chan_sip.c (original)
+++ branches/1.4/channels/chan_sip.c Tue Jul  8 15:27:47 2008
@@ -3457,6 +3457,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.4/include/asterisk/causes.h
URL: http://svn.digium.com/view/asterisk/branches/1.4/include/asterisk/causes.h?view=diff&rev=129149&r1=129148&r2=129149
==============================================================================
--- branches/1.4/include/asterisk/causes.h (original)
+++ branches/1.4/include/asterisk/causes.h Tue Jul  8 15:27:47 2008
@@ -33,6 +33,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
@@ -75,7 +76,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