Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
Icecast-Server
Commits
7bc74729
Commit
7bc74729
authored
Feb 06, 2015
by
Philipp Schafft
🦁
Browse files
Fix: do keep SSL state when reusing a TLS connection.
parent
a18e2540
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/client.c
View file @
7bc74729
...
...
@@ -103,6 +103,22 @@ static inline void client_reuseconnection(client_t *client) {
con
=
connection_create
(
con
->
sock
,
con
->
serversock
,
strdup
(
con
->
ip
));
reuse
=
client
->
reuse
;
client
->
con
->
sock
=
-
1
;
/* TODO: do not use magic */
/* handle to keep the TLS connection */
#ifdef HAVE_OPENSSL
if
(
client
->
con
->
ssl
)
{
/* AHhhggrr.. That pain....
* stealing SSL state...
*/
con
->
ssl
=
client
->
con
->
ssl
;
con
->
read
=
client
->
con
->
read
;
con
->
send
=
client
->
con
->
send
;
client
->
con
->
ssl
=
NULL
;
client
->
con
->
read
=
NULL
;
client
->
con
->
send
=
NULL
;
}
#endif
client
->
reuse
=
ICECAST_REUSE_CLOSE
;
client_destroy
(
client
);
...
...
src/connection.c
View file @
7bc74729
...
...
@@ -410,6 +410,9 @@ connection_t *connection_create (sock_t sock, sock_t serversock, char *ip)
void
connection_uses_ssl
(
connection_t
*
con
)
{
#ifdef HAVE_OPENSSL
if
(
con
->
ssl
)
return
;
con
->
read
=
connection_read_ssl
;
con
->
send
=
connection_send_ssl
;
con
->
ssl
=
SSL_new
(
ssl_ctx
);
...
...
Write
Preview
Supports
Markdown
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