kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-18 18:58:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_rtp_asterisk: Always return provided DTLS packet length."

Browse Source
This commit is contained in:
George Joseph
2019-11-18 13:04:05 -06:00
committed by Gerrit Code Review
parent b2086393b2 02129ad4d0
commit b3de3ce042
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/res_rtp_asterisk.c
View File

@@ -660,6 +660,10 @@ static int dtls_bio_write(BIO *bio, const char *buf, int len)
struct ast_sockaddr remote_address = { {0, } }; struct ast_sockaddr remote_address = { {0, } };
int ice; int ice;
/* OpenSSL can't tolerate a packet not being sent, so we always state that
* we sent the packet. If it isn't then retransmission will occur.
*/
if (rtp->rtcp && rtp->rtcp->dtls.write_bio == bio) { if (rtp->rtcp && rtp->rtcp->dtls.write_bio == bio) {
rtcp = 1; rtcp = 1;
ast_sockaddr_copy(&remote_address, &rtp->rtcp->them); ast_sockaddr_copy(&remote_address, &rtp->rtcp->them);
@@ -668,10 +672,12 @@ static int dtls_bio_write(BIO *bio, const char *buf, int len)
} }
if (ast_sockaddr_isnull(&remote_address)) { if (ast_sockaddr_isnull(&remote_address)) {
return 0; return len;
} }
return __rtp_sendto(instance, (char *)buf, len, 0, &remote_address, rtcp, &ice, 0); __rtp_sendto(instance, (char *)buf, len, 0, &remote_address, rtcp, &ice, 0);
return len;
} }
static long dtls_bio_ctrl(BIO *bio, int cmd, long arg1, void *arg2) static long dtls_bio_ctrl(BIO *bio, int cmd, long arg1, void *arg2)