generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tls: Use the URLContext as logging context

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö 2011-11-10 17:52:38 +02:00
parent c9e5ac3380
commit 371d15ec36
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/tls.c
View File

@ -73,7 +73,7 @@ static int do_tls_poll(URLContext *h, int ret)
struct pollfd p = { c->fd, 0, 0 }; struct pollfd p = { c->fd, 0, 0 };
#if CONFIG_GNUTLS #if CONFIG_GNUTLS
if (ret != GNUTLS_E_AGAIN && ret != GNUTLS_E_INTERRUPTED) { if (ret != GNUTLS_E_AGAIN && ret != GNUTLS_E_INTERRUPTED) {
av_log(NULL, AV_LOG_ERROR, "%s\n", gnutls_strerror(ret)); av_log(h, AV_LOG_ERROR, "%s\n", gnutls_strerror(ret));
return AVERROR(EIO); return AVERROR(EIO);
} }
if (gnutls_record_get_direction(c->session)) if (gnutls_record_get_direction(c->session))
@ -87,7 +87,7 @@ static int do_tls_poll(URLContext *h, int ret)
} else if (ret == SSL_ERROR_WANT_WRITE) { } else if (ret == SSL_ERROR_WANT_WRITE) {
p.events = POLLOUT; p.events = POLLOUT;
} else { } else {
av_log(NULL, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL)); av_log(h, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL));
return AVERROR(EIO); return AVERROR(EIO);
} }
#endif #endif
@ -148,13 +148,13 @@ static int tls_open(URLContext *h, const char *uri, int flags)
#elif CONFIG_OPENSSL #elif CONFIG_OPENSSL
c->ctx = SSL_CTX_new(SSLv3_client_method()); c->ctx = SSL_CTX_new(SSLv3_client_method());
if (!c->ctx) { if (!c->ctx) {
av_log(NULL, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL)); av_log(h, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL));
ret = AVERROR(EIO); ret = AVERROR(EIO);
goto fail; goto fail;
} }
c->ssl = SSL_new(c->ctx); c->ssl = SSL_new(c->ctx);
if (!c->ssl) { if (!c->ssl) {
av_log(NULL, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL)); av_log(h, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL));
ret = AVERROR(EIO); ret = AVERROR(EIO);
goto fail; goto fail;
} }
@ -166,7 +166,7 @@ static int tls_open(URLContext *h, const char *uri, int flags)
if (ret > 0) if (ret > 0)
break; break;
if (ret == 0) { if (ret == 0) {
av_log(NULL, AV_LOG_ERROR, "Unable to negotiate TLS/SSL session\n"); av_log(h, AV_LOG_ERROR, "Unable to negotiate TLS/SSL session\n");
ret = AVERROR(EIO); ret = AVERROR(EIO);
goto fail; goto fail;
} }