History

avformat/tls_openssl: unset nonblock flag on correct URLContext during dtls handshake

The internal BIO functions do not in fact look at this flag, only the outer tls_read and tls_write functions do.

Timo Rothenpieler committed 1 year ago

Commit 95eae5d1 parent 7afe1161 file · +1 −4Browse files

Unified · Split

libavformat/tls_openssl.c+1−4
@@ -702,8 +702,7 @@ static int dtls_handshake(URLContext *h) · 701 unmodified lines
702702 int ret = 1, r0, r1;
703703 TLSContext *p = h->priv_data;
704704
705− int was_nonblock = h->flags & AVIO_FLAG_NONBLOCK;
706− h->flags &= ~AVIO_FLAG_NONBLOCK;
705+ p->tls_shared.udp->flags &= ~AVIO_FLAG_NONBLOCK;
707706
708707 r0 = SSL_do_handshake(p->ssl);
709708 if (r0 <= 0) {
@@ -724,8 +723,6 @@ static int dtls_handshake(URLContext *h) · 14 unmodified lines
724723 ret = 0;
725724 p->tls_shared.state = DTLS_STATE_FINISHED;
726725 end:
727− if (was_nonblock)
728− h->flags |= AVIO_FLAG_NONBLOCK;
729726 return ret;
730727 }
731728

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t