generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

b_sock.c: correct indirect calls on WinSock platforms [from HEAD].

Browse Source 
PR: 2130
Submitted by: Eugeny Gostyukhin
This commit is contained in:
Andy Polyakov 2009-12-30 12:56:16 +00:00
parent f0389d8d37
commit 5448e6739c
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
crypto/bio/b_sock.c
View File

@ -88,6 +88,17 @@ NETDB_DEFINE_CONTEXT
static int wsa_init_done=0; static int wsa_init_done=0;
#endif #endif
/*
* WSAAPI specifier is required to make indirect calls to run-time
* linked WinSock 2 functions used in this module, to be specific
* [get|free]addrinfo and getnameinfo. This is because WinSock uses
* uses non-C calling convention, __stdcall vs. __cdecl, on x86
* Windows. On non-WinSock platforms WSAAPI needs to be void.
*/
#ifndef WSAAPI
#define WSAAPI
#endif
#if 0 #if 0
static unsigned long BIO_ghbn_hits=0L; static unsigned long BIO_ghbn_hits=0L;
static unsigned long BIO_ghbn_miss=0L; static unsigned long BIO_ghbn_miss=0L;
@ -627,12 +638,12 @@ int BIO_get_accept_socket(char *host, int bind_mode)
#ifdef EAI_FAMILY #ifdef EAI_FAMILY
do { do {
static union { void *p; static union { void *p;
int (*f)(const char *,const char *, int (WSAAPI *f)(const char *,const char *,
const struct addrinfo *, const struct addrinfo *,
struct addrinfo **); struct addrinfo **);
} p_getaddrinfo = {NULL}; } p_getaddrinfo = {NULL};
static union { void *p; static union { void *p;
void (*f)(struct addrinfo *); void (WSAAPI *f)(struct addrinfo *);
} p_freeaddrinfo = {NULL}; } p_freeaddrinfo = {NULL};
struct addrinfo *res,hint; struct addrinfo *res,hint;
@ -840,7 +851,7 @@ int BIO_accept(int sock, char **addr)
char h[NI_MAXHOST],s[NI_MAXSERV]; char h[NI_MAXHOST],s[NI_MAXSERV];
size_t nl; size_t nl;
static union { void *p; static union { void *p;
int (*f)(const struct sockaddr *,size_t/*socklen_t*/, int (WSAAPI *f)(const struct sockaddr *,size_t/*socklen_t*/,
char *,size_t,char *,size_t,int); char *,size_t,char *,size_t,int);
} p_getnameinfo = {NULL}; } p_getnameinfo = {NULL};
/* 2nd argument to getnameinfo is specified to /* 2nd argument to getnameinfo is specified to