vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Sun Nov 18 15:02:19 2018 +0200| [c87f660856174abd4664d8f182c6821ef533fe8d] | committer: Rémi Denis-Courmont
tls: remove unused server.open argument > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c87f660856174abd4664d8f182c6821ef533fe8d --- include/vlc_tls.h | 2 +- modules/misc/gnutls.c | 4 +--- modules/misc/securetransport.c | 3 +-- src/network/tls.c | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/vlc_tls.h b/include/vlc_tls.h index 258bc5674f..f6af4c4f55 100644 --- a/include/vlc_tls.h +++ b/include/vlc_tls.h @@ -218,7 +218,7 @@ typedef struct vlc_tls_server void *sys; vlc_tls_t *(*open)(struct vlc_tls_server *, vlc_tls_t *sock, - const char *host, const char *const *alpn); + const char *const *alpn); int (*handshake)(vlc_tls_t *session, const char *hostname, const char *service, char ** /*restrict*/ alp); diff --git a/modules/misc/gnutls.c b/modules/misc/gnutls.c index 4d47951337..98aaad5349 100644 --- a/modules/misc/gnutls.c +++ b/modules/misc/gnutls.c @@ -614,12 +614,10 @@ typedef struct vlc_tls_creds_sys * Initializes a server-side TLS session. */ static vlc_tls_t *gnutls_ServerSessionOpen(vlc_tls_server_t *crd, - vlc_tls_t *sk, const char *hostname, + vlc_tls_t *sk, const char *const *alpn) { vlc_tls_creds_sys_t *sys = crd->sys; - - assert (hostname == NULL); vlc_tls_gnutls_t *priv = gnutls_SessionOpen(VLC_OBJECT(crd), GNUTLS_SERVER, sys->x509_cred, sk, alpn); return (priv != NULL) ? &priv->tls : NULL; diff --git a/modules/misc/securetransport.c b/modules/misc/securetransport.c index acc2b44e98..ea6ef4e8e2 100644 --- a/modules/misc/securetransport.c +++ b/modules/misc/securetransport.c @@ -847,9 +847,8 @@ static int OpenClient (vlc_tls_client_t *crd) { * Initializes a server-side TLS session. */ static vlc_tls_t *st_ServerSessionOpen (vlc_tls_server_t *crd, vlc_tls_t *sock, - const char *hostname, const char *const *alpn) { + const char *const *alpn) { - VLC_UNUSED(hostname); VLC_UNUSED(alpn); msg_Dbg(crd, "open TLS server session"); diff --git a/src/network/tls.c b/src/network/tls.c index 1fabdd3b42..fb7bb6e0c7 100644 --- a/src/network/tls.c +++ b/src/network/tls.c @@ -204,7 +204,7 @@ vlc_tls_t *vlc_tls_ServerSessionCreate(vlc_tls_server_t *crd, const char *const *alpn) { int canc = vlc_savecancel(); - vlc_tls_t *session = crd->open(crd, sock, NULL, alpn); + vlc_tls_t *session = crd->open(crd, sock, alpn); vlc_restorecancel(canc); if (session != NULL) session->p = sock; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
