kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-13 05:18:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "dialplan_functions: wrong srtp use status report of a dialplan function" into 13

Browse Source
This commit is contained in:
Joshua Colp
2018-08-06 08:34:12 -05:00
committed by Gerrit Code Review
parent 80567a67d9 4aa91c6f11
commit e3e45a86f6
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
channels/pjsip/dialplan_functions.c
View File

@@ -530,7 +530,13 @@ static int channel_read_rtp(struct ast_channel *chan, const char *type, const ch
} else if (!strcmp(type, "direct")) { } else if (!strcmp(type, "direct")) {
ast_copy_string(buf, ast_sockaddr_stringify(&media->direct_media_addr), buflen); ast_copy_string(buf, ast_sockaddr_stringify(&media->direct_media_addr), buflen);
} else if (!strcmp(type, "secure")) { } 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")) { } else if (!strcmp(type, "hold")) {
snprintf(buf, buflen, "%d", media->held ? 1 : 0); snprintf(buf, buflen, "%d", media->held ? 1 : 0);
} else { } else {

1
main/sdp_srtp.c
View File

@@ -350,7 +350,6 @@ int ast_sdp_crypto_process(struct ast_rtp_instance *rtp, struct ast_sdp_srtp *sr
if (!memcmp(crypto->remote_key, remote_key, sizeof(crypto->remote_key))) { if (!memcmp(crypto->remote_key, remote_key, sizeof(crypto->remote_key))) {
ast_debug(1, "SRTP remote key unchanged; maintaining current policy\n"); ast_debug(1, "SRTP remote key unchanged; maintaining current policy\n");
ast_set_flag(srtp, AST_SRTP_CRYPTO_OFFER_OK);
return 0; return 0;
} }
memcpy(crypto->remote_key, remote_key, sizeof(crypto->remote_key)); memcpy(crypto->remote_key, remote_key, sizeof(crypto->remote_key));