diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-08 20:31:43 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-08 20:31:43 +0000 |
commit | 5237cca0c04054b1be942dc80f46d335ebff23c5 (patch) | |
tree | 66d67880529ba0143af358f8b05ee381868d10b5 | |
parent | 8acee1992315d85bb741413ef84792010b0a25d0 (diff) |
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
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@129153 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | apps/app_dial.c | 1 | ||||
-rw-r--r-- | channels/chan_sip.c | 1 | ||||
-rw-r--r-- | include/asterisk/causes.h | 3 |
3 files changed, 4 insertions, 1 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index d7b21f6cb..cdb3f545d 100644 --- a/apps/app_dial.c +++ b/apps/app_dial.c @@ -381,6 +381,7 @@ static void handle_cause(int cause, struct cause_args *num) num->congestion++; break; + case AST_CAUSE_NO_ROUTE_DESTINATION: case AST_CAUSE_UNREGISTERED: if (cdr) ast_cdr_failed(cdr); diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 37769827c..adf52c0d1 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -4675,6 +4675,7 @@ static const char *hangup_cause2sip(int cause) 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"; diff --git a/include/asterisk/causes.h b/include/asterisk/causes.h index fb4f3c115..7e83ec530 100644 --- a/include/asterisk/causes.h +++ b/include/asterisk/causes.h @@ -99,6 +99,7 @@ For more information: #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 @@ For more information: #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 /*@{ */ |