oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Merge branch 'master' into wip/win32-port2

Browse Source
This commit is contained in:
Love Hornquist Astrand
2009-11-25 05:41:14 -08:00
parent 2204b852a7 b6fe5a95d3
commit 86f4c66efd
23 changed files with 108 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/roken/fnmatch.hin
View File

@@ -36,7 +36,7 @@
#ifndef ROKEN_LIB_FUNCTION
#ifdef _WIN32
#define ROKEN_LIB_FUNCTION __declspec(dllimport)
#define ROKEN_LIB_FUNCTION
#define ROKEN_LIB_CALL __stdcall
#else
#define ROKEN_LIB_FUNCTION

12
lib/roken/getifaddrs-test.c
View File

@@ -40,11 +40,7 @@
#include <ifaddrs.h>
<<<<<<< HEAD
void
=======
static void
>>>>>>> master
print_addr(const char *s, struct sockaddr *sa)
{
int i;
@@ -59,11 +55,7 @@ print_addr(const char *s, struct sockaddr *sa)
printf("\n");
}
<<<<<<< HEAD
void
=======
static void
>>>>>>> master
print_ifaddrs(struct ifaddrs *x)
{
struct ifaddrs *p;
@@ -87,11 +79,7 @@ main(int argc, char **argv)
struct ifaddrs *addrs = NULL;
int ret;
<<<<<<< HEAD
if (SOCK_INIT)
=======
if (rk_SOCK_INIT())
>>>>>>> master
errx(1, "Couldn't initialize sockets. Err=%d\n", rk_SOCK_ERRNO);
ret = getifaddrs(&addrs);

4
lib/roken/glob.hin
View File

@@ -37,9 +37,11 @@
#ifndef ROKEN_LIB_FUNCTION
#ifdef _WIN32
#define ROKEN_LIB_FUNCTION _stdcall
#define ROKEN_LIB_FUNCTION
#define ROKEN_LIB_CALL _stdcall
#else
#define ROKEN_LIB_FUNCTION
#define ROKEN_LIB_CALL
#endif
#endif

4
lib/roken/ifaddrs.hin
View File

@@ -38,9 +38,11 @@
#ifndef ROKEN_LIB_FUNCTION
#ifdef _WIN32
#define ROKEN_LIB_FUNCTION _stdcall
#define ROKEN_LIB_FUNCTION
#define ROKEN_LIB_CALL _stdcall
#else
#define ROKEN_LIB_FUNCTION
#define ROKEN_LIB_CALL
#endif
#endif

18
lib/roken/mini_inetd.c
View File

@@ -114,25 +114,17 @@ mini_inetd_addrinfo (struct addrinfo *ai, rk_socket_t *ret_socket)
socket_set_ipv6only(fds[i], 1);
if (rk_IS_SOCKET_ERROR(bind (fds[i], a->ai_addr, a->ai_addrlen))) {
warn ("bind af = %d", a->ai_family);
<<<<<<< HEAD
closesocket(fds[i]);
=======
rk_closesocket(fds[i]);
>>>>>>> master
fds[i] = rk_INVALID_SOCKET;
continue;
}
if (rk_IS_SOCKET_ERROR(listen (fds[i], SOMAXCONN))) {
warn ("listen af = %d", a->ai_family);
<<<<<<< HEAD
closesocket(fds[i]);
=======
rk_closesocket(fds[i]);
>>>>>>> master
fds[i] = rk_INVALID_SOCKET;
continue;
}
#ifndef NO_LIMIT_FD_SETSIZE
#ifdef FD_SETSIZE
if (fds[i] >= FD_SETSIZE)
errx (1, "fd too large");
#endif
@@ -156,11 +148,7 @@ mini_inetd_addrinfo (struct addrinfo *ai, rk_socket_t *ret_socket)
if (FD_ISSET (fds[i], &read_set)) {
accept_it (fds[i], ret_socket);
for (i = 0; i < n; ++i)
<<<<<<< HEAD
closesocket(fds[i]);
=======
rk_closesocket(fds[i]);
>>>>>>> master
free(fds);
return;
}
@@ -185,11 +173,7 @@ mini_inetd_addrinfo (struct addrinfo *ai, rk_socket_t *ret_socket)
* @see mini_inetd_addrinfo()
*/
ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
<<<<<<< HEAD
mini_inetd (int port, rk_socket_t * ret_socket)
=======
mini_inetd(int port, rk_socket_t * ret_socket)
>>>>>>> master
{
int error;
struct addrinfo *ai, hints;

13
lib/roken/roken.h.in
View File

@@ -72,8 +72,8 @@ typedef SOCKET rk_socket_t;
#define EWOULDBLOCK WSAEWOULDBLOCK
#define ENOTSOCK WSAENOTSOCK
#define rk_SOCK_INIT rk_WSAStartup()
#define rk_SOCK_EXIT rk_WSACleanup()
#define rk_SOCK_INIT() rk_WSAStartup()
#define rk_SOCK_EXIT() rk_WSACleanup()
ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL rk_WSAStartup(void);
ROKEN_LIB_FUNCTION int ROKEN_LIB_CALL rk_WSACleanup(void);
@@ -89,13 +89,8 @@ typedef int rk_socket_t;
#define rk_SOCK_ERRNO errno
#define rk_INVALID_SOCKET (-1)
<<<<<<< HEAD
#define rk_SOCK_INIT 0
#define rk_SOCK_EXIT 0
=======
#define rk_SOCK_INIT() 0
#define rk_SOCK_EXIT() 0
>>>>>>> master
#endif
@@ -933,11 +928,7 @@ extern const char *__progname;
#endif
ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
<<<<<<< HEAD
mini_inetd_addrinfo (struct addrinfo*, rk_socket *);
=======
mini_inetd_addrinfo (struct addrinfo*, rk_socket_t *);
>>>>>>> master
ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
mini_inetd (int, rk_socket_t *);

32
lib/roken/test-mini_inetd.c
View File

@@ -87,11 +87,7 @@ get_connected_socket(rk_socket_t * s_ret)
done:
if (!rk_IS_BAD_SOCKET(s))
<<<<<<< HEAD
closesocket(s);
=======
rk_closesocket(s);
>>>>>>> master
if (ai)
freeaddrinfo(ai);
@@ -129,11 +125,7 @@ test_simple_echo_client(void)
if (rk_IS_SOCKET_ERROR(rv)) {
fprintf(stderr, "[%s] send() failure (%s)\n",
getprogname(), strerror(rk_SOCK_ERRNO));
<<<<<<< HEAD
closesocket(s);
=======
rk_closesocket(s);
>>>>>>> master
return 1;
}
@@ -141,41 +133,25 @@ test_simple_echo_client(void)
if (rk_IS_SOCKET_ERROR(rv)) {
fprintf (stderr, "[%s] recv() failure (%s)\n",
getprogname(), strerror(rk_SOCK_ERRNO));
<<<<<<< HEAD
closesocket(s);
=======
rk_closesocket(s);
>>>>>>> master
return 1;
}
if (rv == 0) {
fprintf (stderr, "[%s] No data received\n", prog);
<<<<<<< HEAD
closesocket(s);
=======
rk_closesocket(s);
>>>>>>> master
return 1;
}
if (rv != strlen(test_strings[i])) {
fprintf (stderr, "[%s] Data length mismatch %d != %d\n", prog, rv, strlen(test_strings[i]));
<<<<<<< HEAD
closesocket(s);
=======
rk_closesocket(s);
>>>>>>> master
return 1;
}
}
fprintf (stderr, "[%s] Done\n", prog);
<<<<<<< HEAD
closesocket(s);
=======
rk_closesocket(s);
>>>>>>> master
return 0;
}
@@ -222,11 +198,7 @@ test_simple_echo_socket(void)
if (!strcmp(buf, "exit")) {
fprintf(stderr, "[%s] Exiting...\n", prog);
shutdown(s, SD_SEND);
<<<<<<< HEAD
closesocket(s);
=======
rk_closesocket(s);
>>>>>>> master
return 0;
}
}
@@ -236,11 +208,7 @@ test_simple_echo_socket(void)
strerror(rk_SOCK_ERRNO));
}
<<<<<<< HEAD
closesocket(s);
=======
rk_closesocket(s);
>>>>>>> master
}
return 1;