From a90177cd63c05c515adcca7543fe74569e083841 Mon Sep 17 00:00:00 2001
From: Salah Ahmed <txrubel@gmail.com>
Date: Thu, 2 Aug 2018 14:37:16 -0500
Subject: [PATCH] dialplan_functions: wrong srtp use status report of a
dialplan function
If asterisk offer an endpoint with SRTP and that endpoint respond
with non srtp, in that case channel(rtp,secure,audio) reply wrong
status.
Why delete flag AST_SRTP_CRYPTO_OFFER_OK while check identical remote_key:
Currently this flag has being set redundantly. In either case identical
or different remote_key this flag has being set. So if we
don't set it while we receive identical remote_key or non SRTP SDP
response then we can take decision of srtp use by using that flag.
ASTERISK-27999
Change-Id: I29dc2843cf4e5ae2604301cb4ff258f1822dc2d7
---
channels/pjsip/dialplan_functions.c | 8 +++++++-
res/res_srtp.c | 1 -
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/channels/pjsip/dialplan_functions.c b/channels/pjsip/dialplan_functions.c
index ce347dcd98..d21a80cd7c 100644
--- a/channels/pjsip/dialplan_functions.c
+++ b/channels/pjsip/dialplan_functions.c
@@ -529,7 +529,13 @@ static int channel_read_rtp(struct ast_channel *chan, const char *type, const ch
} else if (!strcmp(type, "direct")) {
ast_copy_string(buf, ast_sockaddr_stringify(&media->direct_media_addr), buflen);
} else if (!strcmp(type, "secure")) {
- snprintf(buf, buflen, "%d", media->srtp ? 1 : 0);
+ if (media->srtp) {
+ struct ast_sdp_srtp *srtp = media->srtp;
+ int flag = ast_test_flag(srtp, AST_SRTP_CRYPTO_OFFER_OK);
+ snprintf(buf, buflen, "%d", flag ? 1 : 0);
+ } else {
+ snprintf(buf, buflen, "%d", 0);
+ }
} else if (!strcmp(type, "hold")) {
snprintf(buf, buflen, "%d", media->remotely_held ? 1 : 0);
} else {
diff --git a/res/res_srtp.c b/res/res_srtp.c
index 7552a7a2ff..97856d08d3 100644
--- a/res/res_srtp.c
+++ b/res/res_srtp.c
@@ -1015,7 +1015,6 @@ static int res_sdp_crypto_parse_offer(struct ast_rtp_instance *rtp, struct ast_s
}
} else if (!memcmp(crypto->remote_key, remote_key, key_len_from_sdp)) {
ast_debug(1, "SRTP remote key unchanged; maintaining current policy\n");
- ast_set_flag(srtp, AST_SRTP_CRYPTO_OFFER_OK);
return 0;
}
--
GitLab