sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

res_rtp_asterisk: Always return provided DTLS packet length. 

OpenSSL can not tolerate if the packet sent out does not
match the length that it provided to the sender. This change
lies and says that each time the full packet was sent. If
a problem does occur then a retransmission will occur as
appropriate.

ASTERISK-28576

Change-Id: Id42455b15c9dc4eb987c8c023ece6fbf3c22a449
This commit is contained in:
Joshua Colp 2019-11-14 06:19:04 -04:00 committed by George Joseph
parent e7320bbbf0
commit eb54e381fd
1 changed files with 8 additions and 2 deletions
Show Stats 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, } };
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) {
rtcp = 1;
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)) {
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)