windows: Add a common Windows header for platform specific wrappers
Include some more basic system headers in utils.h, so we can use that common header on the different platforms.
This commit is contained in:
parent
b4c51061c3
commit
922ee2c529
|
@ -87,7 +87,7 @@ utils/utils.h utils/chunk.h utils/debug.h utils/enum.h utils/identification.h \
|
|||
utils/lexparser.h utils/optionsfrom.h utils/capabilities.h utils/backtrace.h \
|
||||
utils/leak_detective.h utils/printf_hook/printf_hook.h \
|
||||
utils/printf_hook/printf_hook_vstr.h utils/printf_hook/printf_hook_builtin.h \
|
||||
utils/parser_helper.h utils/test.h utils/integrity_checker.h \
|
||||
utils/parser_helper.h utils/test.h utils/integrity_checker.h utils/windows.h \
|
||||
utils/utils/strerror.h
|
||||
endif
|
||||
|
||||
|
|
|
@ -30,7 +30,7 @@ print OID_H "/* Object identifiers (OIDs) used by strongSwan\n",
|
|||
" * ", $automatic, "\n",
|
||||
" * ", $warning, "\n",
|
||||
" */\n\n",
|
||||
"#include <sys/types.h>\n\n",
|
||||
"#include <utils/utils.h>\n\n",
|
||||
"#ifndef OID_H_\n",
|
||||
"#define OID_H_\n\n",
|
||||
"typedef struct {\n",
|
||||
|
|
|
@ -14,8 +14,10 @@
|
|||
* for more details.
|
||||
*/
|
||||
|
||||
#define _GNU_SOURCE
|
||||
#include <dlfcn.h>
|
||||
#ifdef HAVE_DLADDR
|
||||
# define _GNU_SOURCE
|
||||
# include <dlfcn.h>
|
||||
#endif
|
||||
#include <time.h>
|
||||
|
||||
#include "crypto_tester.h"
|
||||
|
|
|
@ -30,10 +30,8 @@ typedef struct host_t host_t;
|
|||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
|
||||
#include <utils/utils.h>
|
||||
#include <utils/chunk.h>
|
||||
|
||||
/**
|
||||
|
|
|
@ -14,8 +14,6 @@
|
|||
*/
|
||||
|
||||
#include <sys/types.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netdb.h>
|
||||
|
||||
#include "host_resolver.h"
|
||||
|
||||
|
|
|
@ -15,16 +15,15 @@
|
|||
* for more details.
|
||||
*/
|
||||
|
||||
#include <arpa/inet.h>
|
||||
#include <string.h>
|
||||
#include <netdb.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "traffic_selector.h"
|
||||
|
||||
#include <collections/linked_list.h>
|
||||
#include <utils/identification.h>
|
||||
#include <utils/debug.h>
|
||||
#include <utils/utils.h>
|
||||
#include <utils/identification.h>
|
||||
#include <collections/linked_list.h>
|
||||
|
||||
#define NON_SUBNET_ADDRESS_RANGE 255
|
||||
|
||||
|
|
|
@ -30,6 +30,8 @@
|
|||
#include <alloca.h>
|
||||
#endif
|
||||
|
||||
#include <utils/utils.h>
|
||||
|
||||
typedef struct chunk_t chunk_t;
|
||||
|
||||
/**
|
||||
|
|
|
@ -15,15 +15,12 @@
|
|||
* for more details.
|
||||
*/
|
||||
|
||||
#define _GNU_SOURCE
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "identification.h"
|
||||
|
||||
#include <utils/utils.h>
|
||||
#include <asn1/oid.h>
|
||||
#include <asn1/asn1.h>
|
||||
#include <crypto/hashers/hasher.h>
|
||||
|
|
|
@ -19,14 +19,11 @@
|
|||
#include <string.h>
|
||||
#include <stdio.h>
|
||||
#include <signal.h>
|
||||
#include <sys/socket.h>
|
||||
#include <netinet/in.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <unistd.h>
|
||||
#include <syslog.h>
|
||||
#include <netdb.h>
|
||||
#include <locale.h>
|
||||
#ifdef HAVE_DLADDR
|
||||
#include <dlfcn.h>
|
||||
#endif
|
||||
#include <time.h>
|
||||
#include <errno.h>
|
||||
|
||||
|
@ -42,6 +39,7 @@
|
|||
#include "leak_detective.h"
|
||||
|
||||
#include <library.h>
|
||||
#include <utils/utils.h>
|
||||
#include <utils/debug.h>
|
||||
#include <utils/backtrace.h>
|
||||
#include <collections/hashtable.h>
|
||||
|
|
|
@ -26,9 +26,18 @@
|
|||
#include <stdlib.h>
|
||||
#include <stddef.h>
|
||||
#include <sys/time.h>
|
||||
#include <arpa/inet.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef WIN32
|
||||
# include "windows.h"
|
||||
#else
|
||||
# define _GNU_SOURCE
|
||||
# include <arpa/inet.h>
|
||||
# include <sys/socket.h>
|
||||
# include <netdb.h>
|
||||
# include <netinet/in.h>
|
||||
#endif
|
||||
|
||||
/**
|
||||
* strongSwan program return codes
|
||||
*/
|
||||
|
@ -273,7 +282,7 @@ static inline bool memeq(const void *x, const void *y, size_t len)
|
|||
* TODO: since the uintXX_t types are defined by the C99 standard we should
|
||||
* probably use those anyway
|
||||
*/
|
||||
#ifdef __sun
|
||||
#if defined __sun || defined WIN32
|
||||
#include <stdint.h>
|
||||
typedef uint8_t u_int8_t;
|
||||
typedef uint16_t u_int16_t;
|
||||
|
|
|
@ -0,0 +1,153 @@
|
|||
/*
|
||||
* Copyright (C) 2013 Martin Willi
|
||||
* Copyright (C) 2013 revosec AG
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version. See <http://www.fsf.org/copyleft/gpl.txt>.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful, but
|
||||
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
||||
* for more details.
|
||||
*/
|
||||
|
||||
/**
|
||||
* @defgroup windows windows
|
||||
* @{ @ingroup utils
|
||||
*/
|
||||
|
||||
#ifndef WINDOWS_H_
|
||||
#define WINDOWS_H_
|
||||
|
||||
#include <winsock2.h>
|
||||
#include <ws2tcpip.h>
|
||||
#include <direct.h>
|
||||
|
||||
/* undef Windows variants evaluating values more than once */
|
||||
#undef min
|
||||
#undef max
|
||||
|
||||
/* interface is defined as an alias to "struct" in basetypes.h, but
|
||||
* we use it here and there as ordinary identifier. */
|
||||
#undef interface
|
||||
|
||||
/* used by Windows API, but we have our own */
|
||||
#undef CALLBACK
|
||||
|
||||
/* UID/GID types for capabilities, even if not supported */
|
||||
typedef u_int uid_t;
|
||||
typedef u_int gid_t;
|
||||
|
||||
/**
|
||||
* Replacement for random(3)
|
||||
*/
|
||||
static inline long random(void)
|
||||
{
|
||||
return rand();
|
||||
}
|
||||
|
||||
/**
|
||||
* Replacement for srandom(3)
|
||||
*/
|
||||
static inline void srandom(unsigned int seed)
|
||||
{
|
||||
srand(seed);
|
||||
}
|
||||
|
||||
/**
|
||||
* Provided via ws2_32
|
||||
*/
|
||||
const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
|
||||
|
||||
/**
|
||||
* Provided via ws2_32
|
||||
*/
|
||||
int inet_pton(int af, const char *src, void *dst);
|
||||
|
||||
/**
|
||||
* Provided by printf hook backend
|
||||
*/
|
||||
int asprintf(char **strp, const char *fmt, ...);
|
||||
|
||||
/**
|
||||
* Provided by printf hook backend
|
||||
*/
|
||||
int vasprintf(char **strp, const char *fmt, va_list ap);
|
||||
|
||||
/**
|
||||
* timeradd(3) from <sys/time.h>
|
||||
*/
|
||||
static inline void timeradd(struct timeval *a, struct timeval *b,
|
||||
struct timeval *res)
|
||||
{
|
||||
res->tv_sec = a->tv_sec + b->tv_sec;
|
||||
res->tv_usec = a->tv_usec + b->tv_usec;
|
||||
if (res->tv_usec >= 1000000)
|
||||
{
|
||||
res->tv_usec -= 1000000;
|
||||
res->tv_sec++;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* timersub(3) from <sys/time.h>
|
||||
*/
|
||||
static inline void timersub(struct timeval *a, struct timeval *b,
|
||||
struct timeval *res)
|
||||
{
|
||||
res->tv_sec = a->tv_sec - b->tv_sec;
|
||||
res->tv_usec = a->tv_usec - b->tv_usec;
|
||||
if (res->tv_usec < 0)
|
||||
{
|
||||
res->tv_usec += 1000000;
|
||||
res->tv_sec--;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* gmtime_r(3) from <time.h>
|
||||
*/
|
||||
static inline struct tm *gmtime_r(const time_t *timep, struct tm *result)
|
||||
{
|
||||
if (sizeof(time_t) == 4)
|
||||
{
|
||||
if (_gmtime32_s(result, (__time32_t*)time) == 0)
|
||||
{
|
||||
return result;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (_gmtime64_s(result, (__time64_t*)time) == 0)
|
||||
{
|
||||
return result;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/**
|
||||
* localtime_r(3) from <time.h>
|
||||
*/
|
||||
static inline struct tm *localtime_r(const time_t *timep, struct tm *result)
|
||||
{
|
||||
if (sizeof(time_t) == 4)
|
||||
{
|
||||
if (_localtime32_s(result, (__time32_t*)time) == 0)
|
||||
{
|
||||
return result;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (_localtime64_s(result, (__time64_t*)time) == 0)
|
||||
{
|
||||
return result;
|
||||
}
|
||||
}
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#endif /** WINDOWS_H_ @}*/
|
Loading…
Reference in New Issue