From 8c8ef4efb0e6545f33c860f0fcb53cf308d34068 Mon Sep 17 00:00:00 2001
From: Richard Mudgett <rmudgett@digium.com>
Date: Fri, 26 Feb 2016 18:54:53 -0600
Subject: [PATCH] res_pjsip_send_to_voicemail.c: Allow either quoted or not
send_to_vm reason.
Change-Id: Id6350b3c7d4ec8df7ec89863566645e2b0f441fd
---
res/res_pjsip_send_to_voicemail.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/res/res_pjsip_send_to_voicemail.c b/res/res_pjsip_send_to_voicemail.c
index 9d2b5b14b5..c7e62a2f72 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)
--
GitLab