Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Kill DTLS_FREE macro
This can move to the library-specific *-dtls.c files too.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
David Woodhouse authored and David Woodhouse committed Sep 12, 2016
1 parent 455a999 commit f7a628d
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
4 changes: 1 addition & 3 deletions dtls.c
Expand Up @@ -61,11 +61,9 @@
#if defined(OPENCONNECT_OPENSSL)
#define DTLS_SEND SSL_write
#define DTLS_RECV SSL_read
#define DTLS_FREE SSL_free
#elif defined(OPENCONNECT_GNUTLS)
#define DTLS_SEND gnutls_record_send
#define DTLS_RECV gnutls_record_recv
#define DTLS_FREE gnutls_deinit
#endif

static int connect_dtls_socket(struct openconnect_info *vpninfo)
Expand Down Expand Up @@ -125,7 +123,7 @@ static int connect_dtls_socket(struct openconnect_info *vpninfo)
void dtls_close(struct openconnect_info *vpninfo)
{
if (vpninfo->dtls_ssl) {
DTLS_FREE(vpninfo->dtls_ssl);
dtls_ssl_free(vpninfo);
closesocket(vpninfo->dtls_fd);
unmonitor_read_fd(vpninfo, dtls);
unmonitor_write_fd(vpninfo, dtls);
Expand Down
4 changes: 4 additions & 0 deletions gnutls-dtls.c
Expand Up @@ -263,3 +263,7 @@ void dtls_shutdown(struct openconnect_info *vpninfo)
dtls_close(vpninfo);
}

void dtls_ssl_free(struct openconnect_info *vpninfo)
{
gnutls_deinit(vpninfo->dtls_ssl);
}
1 change: 1 addition & 0 deletions openconnect-internal.h
Expand Up @@ -800,6 +800,7 @@ intptr_t os_setup_tun(struct openconnect_info *vpninfo);
int start_dtls_handshake(struct openconnect_info *vpninfo, int dtls_fd);
int dtls_try_handshake(struct openconnect_info *vpninfo);
unsigned dtls_set_mtu(struct openconnect_info *vpninfo, unsigned mtu);
void dtls_ssl_free(struct openconnect_info *vpninfo);

/* dtls.c */
int dtls_setup(struct openconnect_info *vpninfo, int dtls_attempt_period);
Expand Down
5 changes: 5 additions & 0 deletions openssl-dtls.c
Expand Up @@ -416,6 +416,11 @@ void dtls_shutdown(struct openconnect_info *vpninfo)
SSL_CTX_free(vpninfo->dtls_ctx);
}

void dtls_ssl_free(struct openconnect_info *vpninfo)
{
SSL_free(vpninfo->dtls_ssl);
}

void append_dtls_ciphers(struct openconnect_info *vpninfo, struct oc_text_buf *buf)
{
#ifdef HAVE_DTLS12
Expand Down

0 comments on commit f7a628d

Please sign in to comment.