Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Add openconnect__win32_sock_init() function to initialise sockets
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
David Woodhouse authored and David Woodhouse committed Feb 6, 2014
1 parent 0b416d8 commit 4251eb1
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 0 deletions.
8 changes: 8 additions & 0 deletions compat.c
Expand Up @@ -239,6 +239,14 @@ int openconnect__win32_neterrno()
}
}

void openconnect__win32_sock_init()
{
WSADATA data;
if (WSAStartup (MAKEWORD(1, 1), &data) != 0) {
fprintf(stderr, _("ERROR: Cannot initialize sockets\n"));
exit(1);
}
}
#ifdef OPENCONNECT_GNUTLS
ssize_t openconnect__win32_sock_read(gnutls_transport_ptr_t ptr, void *data, size_t size)
{
Expand Down
3 changes: 3 additions & 0 deletions gnutls.c
Expand Up @@ -2081,6 +2081,9 @@ void openconnect_close_https(struct openconnect_info *vpninfo, int final)

void openconnect_init_ssl(void)
{
#ifdef _WIN32
openconnect__win32_sock_init();
#endif
gnutls_global_init();
}

Expand Down
1 change: 1 addition & 0 deletions openconnect-internal.h
Expand Up @@ -392,6 +392,7 @@ static inline int set_fd_cloexec(int fd)
#define pipe(fds) _pipe(fds, 4096, O_BINARY)
#define neterrno openconnect__win32_neterrno
int openconnect__win32_neterrno();
void openconnect__win32_sock_init();
#ifdef OPENCONNECT_GNUTLS
ssize_t openconnect__win32_sock_read(gnutls_transport_ptr_t ptr, void *data, size_t size);
ssize_t openconnect__win32_sock_write(gnutls_transport_ptr_t ptr, const void *data, size_t size);
Expand Down
3 changes: 3 additions & 0 deletions openssl.c
Expand Up @@ -1450,6 +1450,9 @@ void openconnect_close_https(struct openconnect_info *vpninfo, int final)

void openconnect_init_ssl(void)
{
#ifdef _WIN32
openconnect__win32_sock_init();
#endif
SSL_library_init();
ERR_clear_error();
SSL_load_error_strings();
Expand Down

0 comments on commit 4251eb1

Please sign in to comment.