diff options
| author | Joshua Colp <jcolp@digium.com> | 2016-03-03 05:32:59 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-03-03 05:32:59 -0600 |
| commit | 8140d7a8ef7077eca2f5be548750b3da68430f86 (patch) | |
| tree | cfbe3199f2170cf264e03cad9099ab40e7f78625 /res/res_pjsip_send_to_voicemail.c | |
| parent | 71427f1454c3c444f0f38aab440489a611131b81 (diff) | |
| parent | 8c8ef4efb0e6545f33c860f0fcb53cf308d34068 (diff) | |
Merge "res_pjsip_send_to_voicemail.c: Allow either quoted or not send_to_vm reason."
Diffstat (limited to 'res/res_pjsip_send_to_voicemail.c')
| -rw-r--r-- | res/res_pjsip_send_to_voicemail.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/res/res_pjsip_send_to_voicemail.c b/res/res_pjsip_send_to_voicemail.c index cd0f05f27..bd70bcfd7 100644 --- a/res/res_pjsip_send_to_voicemail.c +++ b/res/res_pjsip_send_to_voicemail.c @@ -47,7 +47,8 @@ #define SEND_TO_VM_HEADER_VALUE "feature_send_to_vm" #define SEND_TO_VM_REDIRECT "REDIRECTING(reason)" -#define SEND_TO_VM_REDIRECT_VALUE "\"send_to_vm\"" +#define SEND_TO_VM_REDIRECT_VALUE "send_to_vm" +#define SEND_TO_VM_REDIRECT_QUOTED_VALUE "\"" SEND_TO_VM_REDIRECT_VALUE "\"" static void send_response(struct ast_sip_session *session, int code, struct pjsip_rx_data *rdata) { @@ -102,9 +103,13 @@ static int has_diversion_reason(pjsip_rx_data *rdata) pjsip_param *reason; pjsip_fromto_hdr *hdr = get_diversion_header(rdata); - return hdr && - (reason = get_diversion_reason(hdr)) && - !pj_stricmp2(&reason->value, SEND_TO_VM_REDIRECT_VALUE); + if (!hdr) { + return 0; + } + reason = get_diversion_reason(hdr); + return reason + && (!pj_stricmp2(&reason->value, SEND_TO_VM_REDIRECT_QUOTED_VALUE) + || !pj_stricmp2(&reason->value, SEND_TO_VM_REDIRECT_VALUE)); } static int has_call_feature(pjsip_rx_data *rdata) |