Merge "dialplan_functions: wrong srtp use status report of a dialplan function" into 16
This commit is contained in:
commit
fcece326ed
|
@ -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 {
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue