* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2014, Daniel Stenberg, <daniel@haxx.se>, et al.
*
* This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms
* This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
* KIND, either express or implied.
*
- * $Id$
***************************************************************************/
+#include "server_setup.h"
/* Purpose
*
* if no signal was being ignored or handled at all. Enjoy it!
*/
-#include "setup.h" /* portability help from the lib directory */
-
#ifdef HAVE_SIGNAL_H
#include <signal.h>
#endif
-#ifdef HAVE_UNISTD_H
-#include <unistd.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
-#ifdef _XOPEN_SOURCE_EXTENDED
-/* This define is "almost" required to build on HPUX 11 */
+#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
#ifdef HAVE_NETDB_H
#include "getpart.h"
#include "inet_pton.h"
#include "util.h"
+#include "server_sockaddr.h"
+#include "warnless.h"
/* include memdebug.h last */
#include "memdebug.h"
+#ifdef USE_WINSOCK
+#undef EINTR
+#define EINTR 4 /* errno.h value */
+#undef EAGAIN
+#define EAGAIN 11 /* errno.h value */
+#undef ENOMEM
+#define ENOMEM 12 /* errno.h value */
+#undef EINVAL
+#define EINVAL 22 /* errno.h value */
+#endif
+
#define DEFAULT_PORT 8999
#ifndef DEFAULT_LOGFILE
const char *serverlogfile = DEFAULT_LOGFILE;
static bool verbose = FALSE;
+static bool bind_only = FALSE;
+#ifdef ENABLE_IPV6
static bool use_ipv6 = FALSE;
+#endif
+static const char *ipv_inuse = "IPv4";
static unsigned short port = DEFAULT_PORT;
static unsigned short connectport = 0; /* if non-zero, we activate this mode */
typedef RETSIGTYPE (*SIGHANDLER_T)(int);
+#ifdef SIGHUP
static SIGHANDLER_T old_sighup_handler = SIG_ERR;
+#endif
+
+#ifdef SIGPIPE
static SIGHANDLER_T old_sigpipe_handler = SIG_ERR;
+#endif
+
+#ifdef SIGALRM
static SIGHANDLER_T old_sigalrm_handler = SIG_ERR;
+#endif
+
+#ifdef SIGINT
static SIGHANDLER_T old_sigint_handler = SIG_ERR;
+#endif
+
+#ifdef SIGTERM
static SIGHANDLER_T old_sigterm_handler = SIG_ERR;
+#endif
+
+#if defined(SIGBREAK) && defined(WIN32)
+static SIGHANDLER_T old_sigbreak_handler = SIG_ERR;
+#endif
/* var which if set indicates that the program should finish execution */
static RETSIGTYPE exit_signal_handler(int signum)
{
- int old_errno = ERRNO;
+ int old_errno = errno;
if(got_exit_signal == 0) {
got_exit_signal = 1;
exit_signal = signum;
}
(void)signal(signum, exit_signal_handler);
- SET_ERRNO(old_errno);
+ errno = old_errno;
}
static void install_signal_handlers(void)
#ifdef SIGHUP
/* ignore SIGHUP signal */
if((old_sighup_handler = signal(SIGHUP, SIG_IGN)) == SIG_ERR)
- logmsg("cannot install SIGHUP handler: %s", strerror(ERRNO));
+ logmsg("cannot install SIGHUP handler: %s", strerror(errno));
#endif
#ifdef SIGPIPE
/* ignore SIGPIPE signal */
if((old_sigpipe_handler = signal(SIGPIPE, SIG_IGN)) == SIG_ERR)
- logmsg("cannot install SIGPIPE handler: %s", strerror(ERRNO));
+ logmsg("cannot install SIGPIPE handler: %s", strerror(errno));
#endif
#ifdef SIGALRM
/* ignore SIGALRM signal */
if((old_sigalrm_handler = signal(SIGALRM, SIG_IGN)) == SIG_ERR)
- logmsg("cannot install SIGALRM handler: %s", strerror(ERRNO));
+ logmsg("cannot install SIGALRM handler: %s", strerror(errno));
#endif
#ifdef SIGINT
/* handle SIGINT signal with our exit_signal_handler */
if((old_sigint_handler = signal(SIGINT, exit_signal_handler)) == SIG_ERR)
- logmsg("cannot install SIGINT handler: %s", strerror(ERRNO));
+ logmsg("cannot install SIGINT handler: %s", strerror(errno));
else
siginterrupt(SIGINT, 1);
#endif
#ifdef SIGTERM
/* handle SIGTERM signal with our exit_signal_handler */
if((old_sigterm_handler = signal(SIGTERM, exit_signal_handler)) == SIG_ERR)
- logmsg("cannot install SIGTERM handler: %s", strerror(ERRNO));
+ logmsg("cannot install SIGTERM handler: %s", strerror(errno));
else
siginterrupt(SIGTERM, 1);
#endif
+#if defined(SIGBREAK) && defined(WIN32)
+ /* handle SIGBREAK signal with our exit_signal_handler */
+ if((old_sigbreak_handler = signal(SIGBREAK, exit_signal_handler)) == SIG_ERR)
+ logmsg("cannot install SIGBREAK handler: %s", strerror(errno));
+ else
+ siginterrupt(SIGBREAK, 1);
+#endif
}
static void restore_signal_handlers(void)
if(SIG_ERR != old_sigterm_handler)
(void)signal(SIGTERM, old_sigterm_handler);
#endif
+#if defined(SIGBREAK) && defined(WIN32)
+ if(SIG_ERR != old_sigbreak_handler)
+ (void)signal(SIGBREAK, old_sigbreak_handler);
+#endif
+}
+
+#ifdef WIN32
+/*
+ * read-wrapper to support reading from stdin on Windows.
+ */
+static ssize_t read_wincon(int fd, void *buf, size_t count)
+{
+ HANDLE handle = NULL;
+ DWORD mode, rcount = 0;
+ BOOL success;
+
+ if(fd == fileno(stdin)) {
+ handle = GetStdHandle(STD_INPUT_HANDLE);
+ }
+ else {
+ return read(fd, buf, count);
+ }
+
+ if(GetConsoleMode(handle, &mode)) {
+ success = ReadConsole(handle, buf, count, &rcount, NULL);
+ }
+ else {
+ success = ReadFile(handle, buf, count, &rcount, NULL);
+ }
+ if(success) {
+ return rcount;
+ }
+
+ errno = GetLastError();
+ return -1;
}
+#undef read
+#define read(a,b,c) read_wincon(a,b,c)
+
+/*
+ * write-wrapper to support writing to stdout and stderr on Windows.
+ */
+static ssize_t write_wincon(int fd, const void *buf, size_t count)
+{
+ HANDLE handle = NULL;
+ DWORD mode, wcount = 0;
+ BOOL success;
+
+ if(fd == fileno(stdout)) {
+ handle = GetStdHandle(STD_OUTPUT_HANDLE);
+ }
+ else if(fd == fileno(stderr)) {
+ handle = GetStdHandle(STD_ERROR_HANDLE);
+ }
+ else {
+ return write(fd, buf, count);
+ }
+
+ if(GetConsoleMode(handle, &mode)) {
+ success = WriteConsole(handle, buf, count, &wcount, NULL);
+ }
+ else {
+ success = WriteFile(handle, buf, count, &wcount, NULL);
+ }
+ if(success) {
+ return wcount;
+ }
+
+ errno = GetLastError();
+ return -1;
+}
+#undef write
+#define write(a,b,c) write_wincon(a,b,c)
+#endif
/*
* fullread is a wrapper around the read() function. This will repeat the call
}
if(rc < 0) {
- error = ERRNO;
+ error = errno;
if((error == EINTR) || (error == EAGAIN))
continue;
- logmsg("unrecoverable read() failure: %s", strerror(error));
+ logmsg("reading from file descriptor: %d,", filedes);
+ logmsg("unrecoverable read() failure: (%d) %s",
+ error, strerror(error));
return -1;
}
}
if(wc < 0) {
- error = ERRNO;
+ error = errno;
if((error == EINTR) || (error == EAGAIN))
continue;
- logmsg("unrecoverable write() failure: %s", strerror(error));
+ logmsg("writing to file descriptor: %d,", filedes);
+ logmsg("unrecoverable write() failure: (%d) %s",
+ error, strerror(error));
return -1;
}
logmsg("'%s'", data);
}
+#ifdef USE_WINSOCK
+/*
+ * WinSock select() does not support standard file descriptors,
+ * it can only check SOCKETs. The following function is an attempt
+ * to re-create a select() function with support for other handle types.
+ *
+ * select() function with support for WINSOCK2 sockets and all
+ * other handle types supported by WaitForMultipleObjectsEx() as
+ * well as disk files, anonymous and names pipes, and character input.
+ *
+ * http://msdn.microsoft.com/en-us/library/windows/desktop/ms687028.aspx
+ * http://msdn.microsoft.com/en-us/library/windows/desktop/ms741572.aspx
+ */
+struct select_ws_wait_data {
+ HANDLE handle; /* actual handle to wait for during select */
+ HANDLE event; /* internal event to abort waiting thread */
+};
+static DWORD WINAPI select_ws_wait_thread(LPVOID lpParameter)
+{
+ struct select_ws_wait_data *data;
+ HANDLE handle, handles[2];
+ INPUT_RECORD inputrecord;
+ LARGE_INTEGER size, pos;
+ DWORD type, length;
+
+ /* retrieve handles from internal structure */
+ data = (struct select_ws_wait_data *) lpParameter;
+ if(data) {
+ handle = data->handle;
+ handles[0] = data->event;
+ handles[1] = handle;
+ free(data);
+ }
+ else
+ return -1;
+
+ /* retrieve the type of file to wait on */
+ type = GetFileType(handle);
+ switch(type) {
+ case FILE_TYPE_DISK:
+ /* The handle represents a file on disk, this means:
+ * - WaitForMultipleObjectsEx will always be signalled for it.
+ * - comparison of current position in file and total size of
+ * the file can be used to check if we reached the end yet.
+ *
+ * Approach: Loop till either the internal event is signalled
+ * or if the end of the file has already been reached.
+ */
+ while(WaitForMultipleObjectsEx(2, handles, FALSE, INFINITE, FALSE)
+ == WAIT_OBJECT_0 + 1) {
+ /* get total size of file */
+ size.QuadPart = 0;
+ if(GetFileSizeEx(handle, &size)) {
+ /* get the current position within the file */
+ pos.QuadPart = 0;
+ if(SetFilePointerEx(handle, pos, &pos, FILE_CURRENT)) {
+ /* compare position with size, abort if not equal */
+ if(size.QuadPart == pos.QuadPart) {
+ /* sleep and continue waiting */
+ SleepEx(100, FALSE);
+ continue;
+ }
+ }
+ }
+ /* there is some data available, stop waiting */
+ break;
+ }
+ break;
+
+ case FILE_TYPE_CHAR:
+ /* The handle represents a character input, this means:
+ * - WaitForMultipleObjectsEx will be signalled on any kind of input,
+ * including mouse and window size events we do not care about.
+ *
+ * Approach: Loop till either the internal event is signalled
+ * or we get signalled for an actual key-event.
+ */
+ while(WaitForMultipleObjectsEx(2, handles, FALSE, INFINITE, FALSE)
+ == WAIT_OBJECT_0 + 1) {
+ /* check if this is an actual console handle */
+ if(GetConsoleMode(handle, &length)) {
+ /* retrieve an event from the console buffer */
+ length = 0;
+ if(PeekConsoleInput(handle, &inputrecord, 1, &length)) {
+ /* check if the event is not an actual key-event */
+ if(length == 1 && inputrecord.EventType != KEY_EVENT) {
+ /* purge the non-key-event and continue waiting */
+ ReadConsoleInput(handle, &inputrecord, 1, &length);
+ continue;
+ }
+ }
+ }
+ /* there is some data available, stop waiting */
+ break;
+ }
+ break;
+
+ case FILE_TYPE_PIPE:
+ /* The handle represents an anonymous or named pipe, this means:
+ * - WaitForMultipleObjectsEx will always be signalled for it.
+ * - peek into the pipe and retrieve the amount of data available.
+ *
+ * Approach: Loop till either the internal event is signalled
+ * or there is data in the pipe available for reading.
+ */
+ while(WaitForMultipleObjectsEx(2, handles, FALSE, INFINITE, FALSE)
+ == WAIT_OBJECT_0 + 1) {
+ /* peek into the pipe and retrieve the amount of data available */
+ if(PeekNamedPipe(handle, NULL, 0, NULL, &length, NULL)) {
+ /* if there is no data available, sleep and continue waiting */
+ if(length == 0) {
+ SleepEx(100, FALSE);
+ continue;
+ }
+ }
+ else {
+ /* if the pipe has been closed, sleep and continue waiting */
+ if(GetLastError() == ERROR_BROKEN_PIPE) {
+ SleepEx(100, FALSE);
+ continue;
+ }
+ }
+ /* there is some data available, stop waiting */
+ break;
+ }
+ break;
+
+ default:
+ /* The handle has an unknown type, try to wait on it */
+ WaitForMultipleObjectsEx(2, handles, FALSE, INFINITE, FALSE);
+ break;
+ }
+
+ return 0;
+}
+static HANDLE select_ws_wait(HANDLE handle, HANDLE event)
+{
+ struct select_ws_wait_data *data;
+ HANDLE thread = NULL;
+
+ /* allocate internal waiting data structure */
+ data = malloc(sizeof(struct select_ws_wait_data));
+ if(data) {
+ data->handle = handle;
+ data->event = event;
+
+ /* launch waiting thread */
+ thread = CreateThread(NULL, 0,
+ &select_ws_wait_thread,
+ data, 0, NULL);
+
+ /* free data if thread failed to launch */
+ if(!thread) {
+ free(data);
+ }
+ }
+
+ return thread;
+}
+static int select_ws(int nfds, fd_set *readfds, fd_set *writefds,
+ fd_set *exceptfds, struct timeval *timeout)
+{
+ DWORD milliseconds, wait, idx;
+ WSAEVENT wsaevent, *wsaevents;
+ WSANETWORKEVENTS wsanetevents;
+ HANDLE handle, *handles, *threads;
+ curl_socket_t sock, *fdarr, *wsasocks;
+ long networkevents;
+ int error, fds;
+ HANDLE waitevent = NULL;
+ DWORD nfd = 0, thd = 0, wsa = 0;
+ int ret = 0;
+
+ /* check if the input value is valid */
+ if(nfds < 0) {
+ errno = EINVAL;
+ return -1;
+ }
+
+ /* check if we got descriptors, sleep in case we got none */
+ if(!nfds) {
+ Sleep((timeout->tv_sec * 1000) + (timeout->tv_usec / 1000));
+ return 0;
+ }
+
+ /* create internal event to signal waiting threads */
+ waitevent = CreateEvent(NULL, TRUE, FALSE, NULL);
+ if(!waitevent) {
+ errno = ENOMEM;
+ return -1;
+ }
+
+ /* allocate internal array for the original input handles */
+ fdarr = malloc(nfds * sizeof(curl_socket_t));
+ if(fdarr == NULL) {
+ errno = ENOMEM;
+ return -1;
+ }
+
+ /* allocate internal array for the internal event handles */
+ handles = malloc(nfds * sizeof(HANDLE));
+ if(handles == NULL) {
+ free(fdarr);
+ errno = ENOMEM;
+ return -1;
+ }
+
+ /* allocate internal array for the internal threads handles */
+ threads = malloc(nfds * sizeof(HANDLE));
+ if(threads == NULL) {
+ free(handles);
+ free(fdarr);
+ errno = ENOMEM;
+ return -1;
+ }
+
+ /* allocate internal array for the internal socket handles */
+ wsasocks = malloc(nfds * sizeof(curl_socket_t));
+ if(wsasocks == NULL) {
+ free(threads);
+ free(handles);
+ free(fdarr);
+ errno = ENOMEM;
+ return -1;
+ }
+
+ /* allocate internal array for the internal WINSOCK2 events */
+ wsaevents = malloc(nfds * sizeof(WSAEVENT));
+ if(wsaevents == NULL) {
+ free(threads);
+ free(wsasocks);
+ free(handles);
+ free(fdarr);
+ errno = ENOMEM;
+ return -1;
+ }
+
+ /* loop over the handles in the input descriptor sets */
+ for(fds = 0; fds < nfds; fds++) {
+ networkevents = 0;
+ handles[nfd] = 0;
+
+ if(FD_ISSET(fds, readfds))
+ networkevents |= FD_READ|FD_ACCEPT|FD_CLOSE;
+
+ if(FD_ISSET(fds, writefds))
+ networkevents |= FD_WRITE|FD_CONNECT;
+
+ if(FD_ISSET(fds, exceptfds))
+ networkevents |= FD_OOB|FD_CLOSE;
+
+ /* only wait for events for which we actually care */
+ if(networkevents) {
+ fdarr[nfd] = curlx_sitosk(fds);
+ if(fds == fileno(stdin)) {
+ handle = GetStdHandle(STD_INPUT_HANDLE);
+ handle = select_ws_wait(handle, waitevent);
+ handles[nfd] = handle;
+ threads[thd] = handle;
+ thd++;
+ }
+ else if(fds == fileno(stdout)) {
+ handles[nfd] = GetStdHandle(STD_OUTPUT_HANDLE);
+ }
+ else if(fds == fileno(stderr)) {
+ handles[nfd] = GetStdHandle(STD_ERROR_HANDLE);
+ }
+ else {
+ wsaevent = WSACreateEvent();
+ if(wsaevent != WSA_INVALID_EVENT) {
+ error = WSAEventSelect(fds, wsaevent, networkevents);
+ if(error != SOCKET_ERROR) {
+ handle = (HANDLE) wsaevent;
+ handles[nfd] = handle;
+ wsasocks[wsa] = curlx_sitosk(fds);
+ wsaevents[wsa] = wsaevent;
+ wsa++;
+ }
+ else {
+ WSACloseEvent(wsaevent);
+ handle = (HANDLE) curlx_sitosk(fds);
+ handle = select_ws_wait(handle, waitevent);
+ handles[nfd] = handle;
+ threads[thd] = handle;
+ thd++;
+ }
+ }
+ }
+ nfd++;
+ }
+ }
+
+ /* convert struct timeval to milliseconds */
+ if(timeout) {
+ milliseconds = ((timeout->tv_sec * 1000) + (timeout->tv_usec / 1000));
+ }
+ else {
+ milliseconds = INFINITE;
+ }
+
+ /* wait for one of the internal handles to trigger */
+ wait = WaitForMultipleObjectsEx(nfd, handles, FALSE, milliseconds, FALSE);
+
+ /* signal the event handle for the waiting threads */
+ SetEvent(waitevent);
+
+ /* loop over the internal handles returned in the descriptors */
+ for(idx = 0; idx < nfd; idx++) {
+ handle = handles[idx];
+ sock = fdarr[idx];
+ fds = curlx_sktosi(sock);
+
+ /* check if the current internal handle was triggered */
+ if(wait != WAIT_FAILED && (wait - WAIT_OBJECT_0) <= idx &&
+ WaitForSingleObjectEx(handle, 0, FALSE) == WAIT_OBJECT_0) {
+ /* first handle stdin, stdout and stderr */
+ if(fds == fileno(stdin)) {
+ /* stdin is never ready for write or exceptional */
+ FD_CLR(sock, writefds);
+ FD_CLR(sock, exceptfds);
+ }
+ else if(fds == fileno(stdout) || fds == fileno(stderr)) {
+ /* stdout and stderr are never ready for read or exceptional */
+ FD_CLR(sock, readfds);
+ FD_CLR(sock, exceptfds);
+ }
+ else {
+ /* try to handle the event with the WINSOCK2 functions */
+ wsanetevents.lNetworkEvents = 0;
+ error = WSAEnumNetworkEvents(fds, handle, &wsanetevents);
+ if(error != SOCKET_ERROR) {
+ /* remove from descriptor set if not ready for read/accept/close */
+ if(!(wsanetevents.lNetworkEvents & (FD_READ|FD_ACCEPT|FD_CLOSE)))
+ FD_CLR(sock, readfds);
+
+ /* remove from descriptor set if not ready for write/connect */
+ if(!(wsanetevents.lNetworkEvents & (FD_WRITE|FD_CONNECT)))
+ FD_CLR(sock, writefds);
+
+ /* HACK:
+ * use exceptfds together with readfds to signal
+ * that the connection was closed by the client.
+ *
+ * Reason: FD_CLOSE is only signaled once, sometimes
+ * at the same time as FD_READ with data being available.
+ * This means that recv/sread is not reliable to detect
+ * that the connection is closed.
+ */
+ /* remove from descriptor set if not exceptional */
+ if(!(wsanetevents.lNetworkEvents & (FD_OOB|FD_CLOSE)))
+ FD_CLR(sock, exceptfds);
+ }
+ }
+
+ /* check if the event has not been filtered using specific tests */
+ if(FD_ISSET(sock, readfds) || FD_ISSET(sock, writefds) ||
+ FD_ISSET(sock, exceptfds)) {
+ ret++;
+ }
+ }
+ else {
+ /* remove from all descriptor sets since this handle did not trigger */
+ FD_CLR(sock, readfds);
+ FD_CLR(sock, writefds);
+ FD_CLR(sock, exceptfds);
+ }
+ }
+
+ for(idx = 0; idx < wsa; idx++) {
+ WSAEventSelect(wsasocks[idx], NULL, 0);
+ WSACloseEvent(wsaevents[idx]);
+ }
+
+ for(idx = 0; idx < thd; idx++) {
+ WaitForSingleObject(threads[thd], INFINITE);
+ CloseHandle(threads[thd]);
+ }
+
+ CloseHandle(waitevent);
+
+ free(wsaevents);
+ free(wsasocks);
+ free(threads);
+ free(handles);
+ free(fdarr);
+
+ return ret;
+}
+#define select(a,b,c,d,e) select_ws(a,b,c,d,e)
+#endif /* USE_WINSOCK */
+
/*
sockfdp is a pointer to an established stream or CURL_SOCKET_BAD
fd_set fds_read;
fd_set fds_write;
fd_set fds_err;
- curl_socket_t sockfd;
- curl_socket_t maxfd;
+ curl_socket_t sockfd = CURL_SOCKET_BAD;
+ int maxfd = -99;
ssize_t rc;
ssize_t nread_socket;
ssize_t bytes_written;
ssize_t buffer_len;
- int error;
+ int error = 0;
/* 'buffer' is this excessively large only to be able to support things like
test 1003 which tests exceedingly large server response lines */
FD_ZERO(&fds_write);
FD_ZERO(&fds_err);
- FD_SET(fileno(stdin), &fds_read);
+ FD_SET((curl_socket_t)fileno(stdin), &fds_read);
switch(*mode) {
sockfd = listenfd;
/* there's always a socket to wait for */
FD_SET(sockfd, &fds_read);
- maxfd = sockfd;
+ maxfd = (int)sockfd;
break;
case PASSIVE_CONNECT:
else {
/* there's always a socket to wait for */
FD_SET(sockfd, &fds_read);
- maxfd = sockfd;
+#ifdef USE_WINSOCK
+ FD_SET(sockfd, &fds_err);
+#endif
+ maxfd = (int)sockfd;
}
break;
/* sockfd turns CURL_SOCKET_BAD when our connection has been closed */
if(CURL_SOCKET_BAD != sockfd) {
FD_SET(sockfd, &fds_read);
- maxfd = sockfd;
+#ifdef USE_WINSOCK
+ FD_SET(sockfd, &fds_err);
+#endif
+ maxfd = (int)sockfd;
}
else {
logmsg("No socket to read on");
do {
- rc = select((int)maxfd + 1, &fds_read, &fds_write, &fds_err, &timeout);
+ /* select() blocking behavior call on blocking descriptors please */
+
+ rc = select(maxfd + 1, &fds_read, &fds_write, &fds_err, &timeout);
if(got_exit_signal) {
logmsg("signalled to die, exiting...");
return FALSE;
}
- } while((rc == -1) && ((error = SOCKERRNO) == EINTR));
+ } while((rc == -1) && ((error = errno) == EINTR));
if(rc < 0) {
logmsg("select() failed with error: (%d) %s",
else if(!memcmp("PORT", buffer, 4)) {
/* Question asking us what PORT number we are listening to.
Replies to PORT with "IPv[num]/[port]" */
- sprintf((char *)buffer, "IPv%d/%d\n", use_ipv6?6:4, (int)port);
+ sprintf((char *)buffer, "%s/%hu\n", ipv_inuse, port);
buffer_len = (ssize_t)strlen((char *)buffer);
- snprintf(data, sizeof(data), "PORT\n%04x\n", buffer_len);
+ snprintf(data, sizeof(data), "PORT\n%04zx\n", buffer_len);
if(!write_stdout(data, 10))
return FALSE;
if(!write_stdout(buffer, buffer_len))
if((sockfd != CURL_SOCKET_BAD) && (FD_ISSET(sockfd, &fds_read)) ) {
+ curl_socket_t newfd = CURL_SOCKET_BAD; /* newly accepted socket */
+
if(*mode == PASSIVE_LISTEN) {
/* there's no stream set up yet, this is an indication that there's a
client connecting. */
- sockfd = accept(sockfd, NULL, NULL);
- if(CURL_SOCKET_BAD == sockfd)
- logmsg("accept() failed");
+ newfd = accept(sockfd, NULL, NULL);
+ if(CURL_SOCKET_BAD == newfd) {
+ error = SOCKERRNO;
+ logmsg("accept(%d, NULL, NULL) failed with error: (%d) %s",
+ sockfd, error, strerror(error));
+ }
else {
logmsg("====> Client connect");
if(!write_stdout("CNCT\n", 5))
return FALSE;
- *sockfdp = sockfd; /* store the new socket */
+ *sockfdp = newfd; /* store the new socket */
*mode = PASSIVE_CONNECT; /* we have connected */
}
return TRUE;
/* read from socket, pass on data to stdout */
nread_socket = sread(sockfd, buffer, sizeof(buffer));
- if(nread_socket <= 0) {
+ if(nread_socket > 0) {
+ snprintf(data, sizeof(data), "DATA\n%04zx\n", nread_socket);
+ if(!write_stdout(data, 10))
+ return FALSE;
+ if(!write_stdout(buffer, nread_socket))
+ return FALSE;
+
+ logmsg("< %zd bytes data, client => server", nread_socket);
+ lograw(buffer, nread_socket);
+ }
+
+ if(nread_socket <= 0
+#ifdef USE_WINSOCK
+ || FD_ISSET(sockfd, &fds_err)
+#endif
+ ) {
logmsg("====> Client disconnect");
if(!write_stdout("DISC\n", 5))
return FALSE;
*mode = ACTIVE_DISCONNECT;
return TRUE;
}
-
- snprintf(data, sizeof(data), "DATA\n%04x\n", nread_socket);
- if(!write_stdout(data, 10))
- return FALSE;
- if(!write_stdout(buffer, nread_socket))
- return FALSE;
-
- logmsg("< %zd bytes data, client => server", nread_socket);
- lograw(buffer, nread_socket);
}
return TRUE;
unsigned short *listenport)
{
/* passive daemon style */
- struct sockaddr_in me;
-#ifdef ENABLE_IPV6
- struct sockaddr_in6 me6;
-#endif /* ENABLE_IPV6 */
- int flag = 1;
+ srvr_sockaddr_union_t listener;
+ int flag;
int rc;
int totdelay = 0;
int maxretr = 10;
do {
attempt++;
+ flag = 1;
rc = setsockopt(sock, SOL_SOCKET, SO_REUSEADDR,
(void *)&flag, sizeof(flag));
if(rc) {
error = SOCKERRNO;
+ logmsg("setsockopt(SO_REUSEADDR) failed with error: (%d) %s",
+ error, strerror(error));
if(maxretr) {
rc = wait_ms(delay);
if(rc) {
/* should not happen */
- error = SOCKERRNO;
- logmsg("wait_ms() failed: (%d) %s", error, strerror(error));
+ error = errno;
+ logmsg("wait_ms() failed with error: (%d) %s",
+ error, strerror(error));
sclose(sock);
return CURL_SOCKET_BAD;
}
logmsg("Continuing anyway...");
}
+ /* When the specified listener port is zero, it is actually a
+ request to let the system choose a non-zero available port. */
+
#ifdef ENABLE_IPV6
if(!use_ipv6) {
#endif
- memset(&me, 0, sizeof(me));
- me.sin_family = AF_INET;
- me.sin_addr.s_addr = INADDR_ANY;
- me.sin_port = htons(*listenport);
- rc = bind(sock, (struct sockaddr *) &me, sizeof(me));
+ memset(&listener.sa4, 0, sizeof(listener.sa4));
+ listener.sa4.sin_family = AF_INET;
+ listener.sa4.sin_addr.s_addr = INADDR_ANY;
+ listener.sa4.sin_port = htons(*listenport);
+ rc = bind(sock, &listener.sa, sizeof(listener.sa4));
#ifdef ENABLE_IPV6
}
else {
- memset(&me6, 0, sizeof(me6));
- me6.sin6_family = AF_INET6;
- me6.sin6_addr = in6addr_any;
- me6.sin6_port = htons(*listenport);
- rc = bind(sock, (struct sockaddr *) &me6, sizeof(me6));
+ memset(&listener.sa6, 0, sizeof(listener.sa6));
+ listener.sa6.sin6_family = AF_INET6;
+ listener.sa6.sin6_addr = in6addr_any;
+ listener.sa6.sin6_port = htons(*listenport);
+ rc = bind(sock, &listener.sa, sizeof(listener.sa6));
}
#endif /* ENABLE_IPV6 */
if(rc) {
error = SOCKERRNO;
- logmsg("Error binding socket: (%d) %s", error, strerror(error));
+ logmsg("Error binding socket on port %hu: (%d) %s",
+ *listenport, error, strerror(error));
sclose(sock);
return CURL_SOCKET_BAD;
}
if(!*listenport) {
- /* The system picked a port number, now figure out which port we actually
- got */
- /* we succeeded to bind */
- struct sockaddr_in add;
- socklen_t socksize = sizeof(add);
-
- if(getsockname(sock, (struct sockaddr *) &add,
- &socksize)<0) {
+ /* The system was supposed to choose a port number, figure out which
+ port we actually got and update the listener port value with it. */
+ curl_socklen_t la_size;
+ srvr_sockaddr_union_t localaddr;
+#ifdef ENABLE_IPV6
+ if(!use_ipv6)
+#endif
+ la_size = sizeof(localaddr.sa4);
+#ifdef ENABLE_IPV6
+ else
+ la_size = sizeof(localaddr.sa6);
+#endif
+ memset(&localaddr.sa, 0, (size_t)la_size);
+ if(getsockname(sock, &localaddr.sa, &la_size) < 0) {
error = SOCKERRNO;
logmsg("getsockname() failed with error: (%d) %s",
error, strerror(error));
sclose(sock);
return CURL_SOCKET_BAD;
}
- *listenport = ntohs(add.sin_port);
+ switch (localaddr.sa.sa_family) {
+ case AF_INET:
+ *listenport = ntohs(localaddr.sa4.sin_port);
+ break;
+#ifdef ENABLE_IPV6
+ case AF_INET6:
+ *listenport = ntohs(localaddr.sa6.sin6_port);
+ break;
+#endif
+ default:
+ break;
+ }
+ if(!*listenport) {
+ /* Real failure, listener port shall not be zero beyond this point. */
+ logmsg("Apparently getsockname() succeeded, with listener port zero.");
+ logmsg("A valid reason for this failure is a binary built without");
+ logmsg("proper network library linkage. This might not be the only");
+ logmsg("reason, but double check it before anything else.");
+ sclose(sock);
+ return CURL_SOCKET_BAD;
+ }
+ }
+
+ /* bindonly option forces no listening */
+ if(bind_only) {
+ logmsg("instructed to bind port without listening");
+ return sock;
}
/* start accepting connections */
rc = listen(sock, 5);
if(0 != rc) {
error = SOCKERRNO;
- logmsg("listen() failed with error: (%d) %s",
- error, strerror(error));
+ logmsg("listen(%d, 5) failed with error: (%d) %s",
+ sock, error, strerror(error));
sclose(sock);
return CURL_SOCKET_BAD;
}
int main(int argc, char *argv[])
{
- struct sockaddr_in me;
-#ifdef ENABLE_IPV6
- struct sockaddr_in6 me6;
-#endif /* ENABLE_IPV6 */
+ srvr_sockaddr_union_t me;
curl_socket_t sock = CURL_SOCKET_BAD;
curl_socket_t msgsock = CURL_SOCKET_BAD;
int wrotepidfile = 0;
char *pidname= (char *)".sockfilt.pid";
+ bool juggle_again;
int rc;
int error;
int arg=1;
}
else if(!strcmp("--ipv6", argv[arg])) {
#ifdef ENABLE_IPV6
- use_ipv6=TRUE;
+ ipv_inuse = "IPv6";
+ use_ipv6 = TRUE;
#endif
arg++;
}
else if(!strcmp("--ipv4", argv[arg])) {
/* for completeness, we support this option as well */
- use_ipv6=FALSE;
+#ifdef ENABLE_IPV6
+ ipv_inuse = "IPv4";
+ use_ipv6 = FALSE;
+#endif
+ arg++;
+ }
+ else if(!strcmp("--bindonly", argv[arg])) {
+ bind_only = TRUE;
arg++;
}
else if(!strcmp("--port", argv[arg])) {
arg++;
if(argc>arg) {
- port = (unsigned short)atoi(argv[arg]);
+ char *endptr;
+ unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
+ if((endptr != argv[arg] + strlen(argv[arg])) ||
+ ((ulnum != 0UL) && ((ulnum < 1025UL) || (ulnum > 65535UL)))) {
+ fprintf(stderr, "sockfilt: invalid --port argument (%s)\n",
+ argv[arg]);
+ return 0;
+ }
+ port = curlx_ultous(ulnum);
arg++;
}
}
doing a passive server-style listening. */
arg++;
if(argc>arg) {
- connectport = (unsigned short)atoi(argv[arg]);
+ char *endptr;
+ unsigned long ulnum = strtoul(argv[arg], &endptr, 10);
+ if((endptr != argv[arg] + strlen(argv[arg])) ||
+ (ulnum < 1025UL) || (ulnum > 65535UL)) {
+ fprintf(stderr, "sockfilt: invalid --connect argument (%s)\n",
+ argv[arg]);
+ return 0;
+ }
+ connectport = curlx_ultous(ulnum);
arg++;
}
}
" --pidfile [file]\n"
" --ipv4\n"
" --ipv6\n"
+ " --bindonly\n"
" --port [port]\n"
" --connect [port]\n"
" --addr [address]");
#ifdef WIN32
win32_init();
atexit(win32_cleanup);
+
+ setmode(fileno(stdin), O_BINARY);
+ setmode(fileno(stdout), O_BINARY);
+ setmode(fileno(stderr), O_BINARY);
#endif
install_signal_handlers();
error = SOCKERRNO;
logmsg("Error creating socket: (%d) %s",
error, strerror(error));
+ write_stdout("FAIL\n", 5);
goto sockfilt_cleanup;
}
#ifdef ENABLE_IPV6
if(!use_ipv6) {
#endif
- memset(&me, 0, sizeof(me));
- me.sin_family = AF_INET;
- me.sin_port = htons(connectport);
- me.sin_addr.s_addr = INADDR_ANY;
+ memset(&me.sa4, 0, sizeof(me.sa4));
+ me.sa4.sin_family = AF_INET;
+ me.sa4.sin_port = htons(connectport);
+ me.sa4.sin_addr.s_addr = INADDR_ANY;
if (!addr)
addr = "127.0.0.1";
- Curl_inet_pton(AF_INET, addr, &me.sin_addr);
+ Curl_inet_pton(AF_INET, addr, &me.sa4.sin_addr);
- rc = connect(sock, (struct sockaddr *) &me, sizeof(me));
+ rc = connect(sock, &me.sa, sizeof(me.sa4));
#ifdef ENABLE_IPV6
}
else {
- memset(&me6, 0, sizeof(me6));
- me6.sin6_family = AF_INET6;
- me6.sin6_port = htons(connectport);
+ memset(&me.sa6, 0, sizeof(me.sa6));
+ me.sa6.sin6_family = AF_INET6;
+ me.sa6.sin6_port = htons(connectport);
if (!addr)
addr = "::1";
- Curl_inet_pton(AF_INET6, addr, &me6.sin6_addr);
+ Curl_inet_pton(AF_INET6, addr, &me.sa6.sin6_addr);
- rc = connect(sock, (struct sockaddr *) &me6, sizeof(me6));
+ rc = connect(sock, &me.sa, sizeof(me.sa6));
}
#endif /* ENABLE_IPV6 */
if(rc) {
error = SOCKERRNO;
logmsg("Error connecting to port %hu: (%d) %s",
connectport, error, strerror(error));
+ write_stdout("FAIL\n", 5);
goto sockfilt_cleanup;
}
logmsg("====> Client connect");
else {
/* passive daemon style */
sock = sockdaemon(sock, &port);
- if(CURL_SOCKET_BAD == sock)
+ if(CURL_SOCKET_BAD == sock) {
+ write_stdout("FAIL\n", 5);
goto sockfilt_cleanup;
+ }
msgsock = CURL_SOCKET_BAD; /* no stream socket yet */
}
- logmsg("Running IPv%d version",
- (use_ipv6?6:4));
+ logmsg("Running %s version", ipv_inuse);
if(connectport)
logmsg("Connected to port %hu", connectport);
+ else if(bind_only)
+ logmsg("Bound without listening on port %hu", port);
else
logmsg("Listening on port %hu", port);
wrotepidfile = write_pidfile(pidname);
- if(!wrotepidfile)
+ if(!wrotepidfile) {
+ write_stdout("FAIL\n", 5);
goto sockfilt_cleanup;
+ }
- while(juggle(&msgsock, sock, &mode));
+ do {
+ juggle_again = juggle(&msgsock, sock, &mode);
+ } while(juggle_again);
sockfilt_cleanup:
projects / platform / upstream / curl.git / blobdiff