diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-09 23:08:50 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-10-09 23:08:50 +0000 |
| commit | 9293bab55141cb9ab9d53caeea054f66952ed987 (patch) | |
| tree | 2e024f9b8a3d01a4f7e4830e7259eec60af6a131 | |
| parent | a259178a75114a920ee32ec24f8216f21f81f7d0 (diff) | |
Fix interpretation of PRIREDIRECTIONREASON set by chan_sip.
This commit is the simplest way to solve a problem that has already been solved
in trunk with the "COLP/CONP and Redirecting party information into Asterisk"
commit. In trunk the redirection reason is translated into a generic redirect
reason. I would have had to do the same fix except chan_sip never reads
PRIREDIRECTREASON. So both chan_dahdi and chan_h323 have been modified to
interpret the one different redirect reason of "no-answer" properly and set the
ISDN reason code 2 of "no reply".
(closes issue #15033)
Reported by: steinwej
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@223404 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/chan_dahdi.c | 3 | ||||
| -rw-r--r-- | channels/chan_h323.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index 9db9b57d0..89deea0f5 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -3090,7 +3090,8 @@ static int dahdi_call(struct ast_channel *ast, char *rdest, int timeout) redirect_reason = 0; else if (!strcasecmp(rr_str, "BUSY")) redirect_reason = 1; - else if (!strcasecmp(rr_str, "NO_REPLY")) + else if (!strcasecmp(rr_str, "NO_REPLY") || !strcasecmp(rr_str, "NOANSWER")) + /* the NOANSWER is to match diversion-reason from chan_sip, (which never reads PRIREDIRECTREASON) */ redirect_reason = 2; else if (!strcasecmp(rr_str, "UNCONDITIONAL")) redirect_reason = 15; diff --git a/channels/chan_h323.c b/channels/chan_h323.c index f5fa3e6d6..c44e0597f 100644 --- a/channels/chan_h323.c +++ b/channels/chan_h323.c @@ -631,7 +631,8 @@ static int oh323_call(struct ast_channel *c, char *dest, int timeout) pvt->options.redirect_reason = 0; else if (!strcasecmp(addr, "BUSY")) pvt->options.redirect_reason = 1; - else if (!strcasecmp(addr, "NO_REPLY")) + else if (!strcasecmp(addr, "NO_REPLY") || !strcasecmp(addr, "NOANSWER")) + /* the NOANSWER is to match diversion-reason from chan_sip, (which never reads PRIREDIRECTREASON) */ pvt->options.redirect_reason = 2; else if (!strcasecmp(addr, "UNCONDITIONAL")) pvt->options.redirect_reason = 15; |