Make roken build on windows
Signed-off-by: Love Hornquist Astrand <lha@h5l.org>
This commit is contained in:

committed by
Love Hornquist Astrand

parent
c4b95f7330
commit
d00f9984a5
@@ -41,61 +41,93 @@
|
||||
*/
|
||||
|
||||
static void
|
||||
accept_it (int s)
|
||||
accept_it (rk_socket_t s, rk_socket_t *ret_socket)
|
||||
{
|
||||
int s2;
|
||||
rk_socket_t as;
|
||||
|
||||
s2 = accept(s, NULL, NULL);
|
||||
if(s2 < 0)
|
||||
as = accept(s, NULL, NULL);
|
||||
if(rk_IS_BAD_SOCKET(as))
|
||||
err (1, "accept");
|
||||
close(s);
|
||||
dup2(s2, STDIN_FILENO);
|
||||
dup2(s2, STDOUT_FILENO);
|
||||
/* dup2(s2, STDERR_FILENO); */
|
||||
close(s2);
|
||||
|
||||
if (ret_socket) {
|
||||
|
||||
*ret_socket = as;
|
||||
|
||||
} else {
|
||||
int fd = socket_to_fd(as, 0);
|
||||
|
||||
/* We would use _O_RDONLY for the socket_to_fd() call for
|
||||
STDIN, but there are instances where we assume that STDIN
|
||||
is a r/w socket. */
|
||||
|
||||
dup2(fd, STDIN_FILENO);
|
||||
dup2(fd, STDOUT_FILENO);
|
||||
|
||||
rk_closesocket(as);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* Listen on a specified port, emulating inetd.
|
||||
/**
|
||||
* Listen on a specified addresses
|
||||
*
|
||||
* Listens on the specified addresses for incoming connections. If
|
||||
* the \a ret_socket parameter is \a NULL, on return STDIN and STDOUT
|
||||
* will be connected to an accepted socket. If the \a ret_socket
|
||||
* parameter is non-NULL, the accepted socket will be returned in
|
||||
* *ret_socket. In the latter case, STDIN and STDOUT will be left
|
||||
* unmodified.
|
||||
*
|
||||
* This function does not return if there is an error or if no
|
||||
* connection is established.
|
||||
*
|
||||
* @param[in] ai Addresses to listen on
|
||||
* @param[out] ret_socket If non-NULL receives the accepted socket.
|
||||
*
|
||||
* @see mini_inetd()
|
||||
*/
|
||||
|
||||
void ROKEN_LIB_FUNCTION
|
||||
mini_inetd_addrinfo (struct addrinfo *ai)
|
||||
ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
|
||||
mini_inetd_addrinfo (struct addrinfo *ai, rk_socket_t *ret_socket)
|
||||
{
|
||||
int ret;
|
||||
struct addrinfo *a;
|
||||
int n, nalloc, i;
|
||||
int *fds;
|
||||
rk_socket_t *fds;
|
||||
fd_set orig_read_set, read_set;
|
||||
int max_fd = -1;
|
||||
rk_socket_t max_fd = (rk_socket_t)-1;
|
||||
|
||||
for (nalloc = 0, a = ai; a != NULL; a = a->ai_next)
|
||||
++nalloc;
|
||||
|
||||
fds = malloc (nalloc * sizeof(*fds));
|
||||
if (fds == NULL)
|
||||
if (fds == NULL) {
|
||||
errx (1, "mini_inetd: out of memory");
|
||||
UNREACHABLE(return);
|
||||
}
|
||||
|
||||
FD_ZERO(&orig_read_set);
|
||||
|
||||
for (i = 0, a = ai; a != NULL; a = a->ai_next) {
|
||||
fds[i] = socket (a->ai_family, a->ai_socktype, a->ai_protocol);
|
||||
if (fds[i] < 0)
|
||||
if (rk_IS_BAD_SOCKET(fds[i]))
|
||||
continue;
|
||||
socket_set_reuseaddr (fds[i], 1);
|
||||
socket_set_ipv6only(fds[i], 1);
|
||||
if (bind (fds[i], a->ai_addr, a->ai_addrlen) < 0) {
|
||||
if (rk_IS_SOCKET_ERROR(bind (fds[i], a->ai_addr, a->ai_addrlen))) {
|
||||
warn ("bind af = %d", a->ai_family);
|
||||
close(fds[i]);
|
||||
rk_closesocket(fds[i]);
|
||||
fds[i] = rk_INVALID_SOCKET;
|
||||
continue;
|
||||
}
|
||||
if (listen (fds[i], SOMAXCONN) < 0) {
|
||||
if (rk_IS_SOCKET_ERROR(listen (fds[i], SOMAXCONN))) {
|
||||
warn ("listen af = %d", a->ai_family);
|
||||
close(fds[i]);
|
||||
rk_closesocket(fds[i]);
|
||||
fds[i] = rk_INVALID_SOCKET;
|
||||
continue;
|
||||
}
|
||||
#ifndef NO_LIMIT_FD_SETSIZE
|
||||
if (fds[i] >= FD_SETSIZE)
|
||||
errx (1, "fd too large");
|
||||
#endif
|
||||
FD_SET(fds[i], &orig_read_set);
|
||||
max_fd = max(max_fd, fds[i]);
|
||||
++i;
|
||||
@@ -108,23 +140,40 @@ mini_inetd_addrinfo (struct addrinfo *ai)
|
||||
read_set = orig_read_set;
|
||||
|
||||
ret = select (max_fd + 1, &read_set, NULL, NULL, NULL);
|
||||
if (ret < 0 && errno != EINTR)
|
||||
if (rk_IS_SOCKET_ERROR(ret) && rk_SOCK_ERRNO != EINTR)
|
||||
err (1, "select");
|
||||
} while (ret <= 0);
|
||||
|
||||
for (i = 0; i < n; ++i)
|
||||
if (FD_ISSET (fds[i], &read_set)) {
|
||||
accept_it (fds[i]);
|
||||
accept_it (fds[i], ret_socket);
|
||||
for (i = 0; i < n; ++i)
|
||||
close(fds[i]);
|
||||
rk_closesocket(fds[i]);
|
||||
free(fds);
|
||||
return;
|
||||
}
|
||||
abort ();
|
||||
}
|
||||
|
||||
void ROKEN_LIB_FUNCTION
|
||||
mini_inetd (int port)
|
||||
/**
|
||||
* Listen on a specified port
|
||||
*
|
||||
* Listens on the specified port for incoming connections. If the \a
|
||||
* ret_socket parameter is \a NULL, on return STDIN and STDOUT will be
|
||||
* connected to an accepted socket. If the \a ret_socket parameter is
|
||||
* non-NULL, the accepted socket will be returned in *ret_socket. In
|
||||
* the latter case, STDIN and STDOUT will be left unmodified.
|
||||
*
|
||||
* This function does not return if there is an error or if no
|
||||
* connection is established.
|
||||
*
|
||||
* @param[in] port Port to listen on
|
||||
* @param[out] ret_socket If non-NULL receives the accepted socket.
|
||||
*
|
||||
* @see mini_inetd_addrinfo()
|
||||
*/
|
||||
ROKEN_LIB_FUNCTION void ROKEN_LIB_CALL
|
||||
mini_inetd(int port, rk_socket_t * ret_socket)
|
||||
{
|
||||
int error;
|
||||
struct addrinfo *ai, hints;
|
||||
@@ -141,7 +190,8 @@ mini_inetd (int port)
|
||||
if (error)
|
||||
errx (1, "getaddrinfo: %s", gai_strerror (error));
|
||||
|
||||
mini_inetd_addrinfo(ai);
|
||||
mini_inetd_addrinfo(ai, ret_socket);
|
||||
|
||||
freeaddrinfo(ai);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user