RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tls_gnutls: Readd support for nonblocking operation 

The rtmp protocol uses nonblocking reads, to poll for incoming
messages from the server while publishing a stream.

Prior to 94599a6de3 and
d13b124eaf, the tls protocol
handled the nonblocking flag, mostly as a side effect from not
using custom IO callbacks for reading from the socket. When custom
IO callbacks were taken into use in
d15eec4d6b, the handling of a nonblocking
socket wasn't necessary for the default blocking mode any longer.

The code was simplified, since it was overlooked that other code
within libavformat actually used the tls protocol in nonblocking mode.

This fixes publishing over rtmps, with the gnutls backend.

Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2017-06-19 15:49:25 +03:00
parent 0671eb2346
commit eb061ad6fd
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavformat/tls_gnutls.c
View File

@ -61,6 +61,7 @@ static int print_tls_error(URLContext *h, int ret)
{ {
switch (ret) { switch (ret) {
case GNUTLS_E_AGAIN: case GNUTLS_E_AGAIN:
return AVERROR(EAGAIN);
case GNUTLS_E_INTERRUPTED: case GNUTLS_E_INTERRUPTED:
break; break;
case GNUTLS_E_WARNING_ALERT_RECEIVED: case GNUTLS_E_WARNING_ALERT_RECEIVED:
@ -97,6 +98,9 @@ static ssize_t gnutls_url_pull(gnutls_transport_ptr_t transport,
return ret; return ret;
if (ret == AVERROR_EXIT) if (ret == AVERROR_EXIT)
return 0; return 0;
if (ret == AVERROR(EAGAIN))
errno = EAGAIN;
else
errno = EIO; errno = EIO;
return -1; return -1;
} }
@ -110,6 +114,9 @@ static ssize_t gnutls_url_push(gnutls_transport_ptr_t transport,
return ret; return ret;
if (ret == AVERROR_EXIT) if (ret == AVERROR_EXIT)
return 0; return 0;
if (ret == AVERROR(EAGAIN))
errno = EAGAIN;
else
errno = EIO; errno = EIO;
return -1; return -1;
} }
@ -202,7 +209,11 @@ fail:
static int tls_read(URLContext *h, uint8_t *buf, int size) static int tls_read(URLContext *h, uint8_t *buf, int size)
{ {
TLSContext *c = h->priv_data; TLSContext *c = h->priv_data;
int ret = gnutls_record_recv(c->session, buf, size); int ret;
// Set or clear the AVIO_FLAG_NONBLOCK on c->tls_shared.tcp
c->tls_shared.tcp->flags &= ~AVIO_FLAG_NONBLOCK;
c->tls_shared.tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
ret = gnutls_record_recv(c->session, buf, size);
if (ret > 0) if (ret > 0)
return ret; return ret;
if (ret == 0) if (ret == 0)
@ -213,7 +224,11 @@ static int tls_read(URLContext *h, uint8_t *buf, int size)
static int tls_write(URLContext *h, const uint8_t *buf, int size) static int tls_write(URLContext *h, const uint8_t *buf, int size)
{ {
TLSContext *c = h->priv_data; TLSContext *c = h->priv_data;
int ret = gnutls_record_send(c->session, buf, size); int ret;
// Set or clear the AVIO_FLAG_NONBLOCK on c->tls_shared.tcp
c->tls_shared.tcp->flags &= ~AVIO_FLAG_NONBLOCK;
c->tls_shared.tcp->flags |= h->flags & AVIO_FLAG_NONBLOCK;
ret = gnutls_record_send(c->session, buf, size);
if (ret > 0) if (ret > 0)
return ret; return ret;
if (ret == 0) if (ret == 0)