Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
371d15ec
Commit
371d15ec
authored
Nov 10, 2011
by
Martin Storsjö
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
tls: Use the URLContext as logging context
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
c9e5ac33
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
5 deletions
+5
-5
tls.c
libavformat/tls.c
+5
-5
No files found.
libavformat/tls.c
View file @
371d15ec
...
@@ -73,7 +73,7 @@ static int do_tls_poll(URLContext *h, int ret)
...
@@ -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)
...
@@ -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)
...
@@ -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)
...
@@ -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
;
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment