mirror/openvpn
0
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2024-09-20 12:02:28 +02:00
Code

work around inet_ntop/inet_pton problems for MSVC builds on WinXP

Browse Source 
always use our built-in replacement functions now, even if building
on Win7 (which has inet_ntop/inet_pton in the system libraries) because
the resulting binary will then fail on WinXP.

Signed-off-by: Gert Doering <gert@greenie.muc.de>
Acked-by: David Sommerseth <davids@redhat.com>
Signed-off-by: David Sommerseth <davids@redhat.com>
This commit is contained in:
Gert Doering 2011-11-24 21:09:36 +01:00 committed by David Sommerseth
parent 0f2bc0dd92
commit 53fb2c5c46
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
socket.c
View File

@ -3083,11 +3083,12 @@ link_socket_write_udp_posix_sendmsg (struct link_socket *sock,
/*
* inet_ntop() and inet_pton() wrap-implementations using
* WSAAddressToString() and WSAStringToAddress() functions
*
* this is needed as long as we support running OpenVPN on WinXP
*/
#ifndef _MSC_VER
const char *
inet_ntop(int af, const void *src, char *dst, socklen_t size)
openvpn_inet_ntop(int af, const void *src, char *dst, socklen_t size)
{
struct sockaddr_storage ss;
unsigned long s = size;
@ -3111,7 +3112,7 @@ inet_ntop(int af, const void *src, char *dst, socklen_t size)
}
int
inet_pton(int af, const char *src, void *dst)
openvpn_inet_pton(int af, const char *src, void *dst)
{
struct sockaddr_storage ss;
int size = sizeof(ss);
@ -3134,8 +3135,6 @@ inet_pton(int af, const char *src, void *dst)
return 0;
}
#endif
int
socket_recv_queue (struct link_socket *sock, int maxsize)
{

10
win32.h
View File

@ -276,10 +276,12 @@ char *get_win_sys_path (void);
/* call self in a subprocess */
void fork_to_self (const char *cmdline);
#ifndef _MSC_VER
const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
int inet_pton(int af, const char *src, void *st);
#endif
const char *openvpn_inet_ntop(int af, const void *src,
char *dst, socklen_t size);
int openvpn_inet_pton(int af, const char *src, void *dst);
#define inet_ntop(af,src,dst,size) openvpn_inet_ntop(af,src,dst,size)
#define inet_pton(af,src,dst) openvpn_inet_pton(af,src,dst)
/* Find temporary directory */
const char *win_get_tempdir();