/*
* Amanda, The Advanced Maryland Automatic Network Disk Archiver
* Copyright (c) 1991-1998 University of Maryland at College Park
+ * Copyright (c) 2007-2012 Zmanda, Inc. All Rights Reserved.
* All Rights Reserved.
*
* Permission to use, copy, modify, distribute, and sell this software and its
int priv)
{
int server_socket, retries;
- socklen_t len;
+ socklen_t_equiv len;
#if defined(SO_KEEPALIVE) || defined(USE_REUSEADDR)
const int on = 1;
int r;
#endif
- struct sockaddr_storage server;
+ sockaddr_union server;
int save_errno;
int *portrange;
- socklen_t socklen;
+ socklen_t_equiv socklen;
int socket_family;
*portp = USHRT_MAX; /* in case we error exit */
} else {
socket_family = family;
}
+ g_debug("stream_server opening socket with family %d (requested family was %d)", socket_family, family);
server_socket = socket(socket_family, SOCK_STREAM, 0);
-
+
#ifdef WORKING_IPV6
/* if that address family actually isn't supported, just try AF_INET */
if (server_socket == -1 && errno == EAFNOSUPPORT) {
+ g_debug("stream_server retrying socket with AF_INET");
socket_family = AF_INET;
server_socket = socket(AF_INET, SOCK_STREAM, 0);
}
#endif
if (server_socket == -1) {
save_errno = errno;
- dbprintf(_("stream_server: socket() failed: %s\n"),
+ g_debug(_("stream_server: socket() failed: %s"),
strerror(save_errno));
errno = save_errno;
return -1;
aclose(server_socket);
errno = EMFILE; /* out of range */
save_errno = errno;
- dbprintf(_("stream_server: socket out of range: %d\n"),
+ g_debug(_("stream_server: socket out of range: %d"),
server_socket);
errno = save_errno;
return -1;
}
- SS_INIT(&server, socket_family);
- SS_SET_INADDR_ANY(&server);
+ SU_INIT(&server, socket_family);
+ SU_SET_INADDR_ANY(&server);
#ifdef USE_REUSEADDR
r = setsockopt(server_socket, SOL_SOCKET, SO_REUSEADDR,
- (void *)&on, (socklen_t)sizeof(on));
+ (void *)&on, (socklen_t_equiv)sizeof(on));
if (r < 0) {
- dbprintf(_("stream_server: setsockopt(SO_REUSEADDR) failed: %s\n"),
+ g_debug(_("stream_server: setsockopt(SO_REUSEADDR) failed: %s"),
strerror(errno));
}
#endif
if (bind_portrange(server_socket, &server, (in_port_t)portrange[0],
(in_port_t)portrange[1], "tcp") == 0)
goto out;
- dbprintf(_("stream_server: Could not bind to port in range: %d - %d.\n"),
+ g_debug(_("stream_server: Could not bind to port in range: %d - %d."),
portrange[0], portrange[1]);
} else {
socklen = SS_LEN(&server);
if (bind(server_socket, (struct sockaddr *)&server, socklen) == 0)
goto out;
- dbprintf(_("stream_server: Could not bind to any port: %s\n"),
+ g_debug(_("stream_server: Could not bind to any port: %s"),
strerror(errno));
}
if (retries >= BIND_CYCLE_RETRIES)
break;
- dbprintf(_("stream_server: Retrying entire range after 10 second delay.\n"));
+ g_debug(_("stream_server: Retrying entire range after 10 second delay."));
sleep(15);
}
save_errno = errno;
- dbprintf(_("stream_server: bind(in6addr_any) failed: %s\n"),
+ g_debug(_("stream_server: bind(in6addr_any) failed: %s"),
strerror(save_errno));
aclose(server_socket);
errno = save_errno;
len = SIZEOF(server);
if(getsockname(server_socket, (struct sockaddr *)&server, &len) == -1) {
save_errno = errno;
- dbprintf(_("stream_server: getsockname() failed: %s\n"),
+ g_debug(_("stream_server: getsockname() failed: %s"),
strerror(save_errno));
aclose(server_socket);
errno = save_errno;
#ifdef SO_KEEPALIVE
r = setsockopt(server_socket, SOL_SOCKET, SO_KEEPALIVE,
- (void *)&on, (socklen_t)sizeof(on));
+ (void *)&on, (socklen_t_equiv)sizeof(on));
if(r == -1) {
save_errno = errno;
- dbprintf(_("stream_server: setsockopt(SO_KEEPALIVE) failed: %s\n"),
+ g_debug(_("stream_server: setsockopt(SO_KEEPALIVE) failed: %s"),
strerror(save_errno));
aclose(server_socket);
errno = save_errno;
}
#endif
- *portp = SS_GET_PORT(&server);
- dbprintf(_("stream_server: waiting for connection: %s\n"),
+ *portp = SU_GET_PORT(&server);
+ g_debug(_("stream_server: waiting for connection: %s"),
str_sockaddr(&server));
return server_socket;
}
int nonblock,
int priv)
{
- struct sockaddr_storage svaddr, claddr;
- int save_errno;
- char *f;
- int client_socket;
- int *portrange;
+ sockaddr_union svaddr, claddr;
+ int save_errno = 0;
+ int client_socket = 0;
+ int *portrange = NULL;
int result;
struct addrinfo *res, *res_addr;
- f = priv ? "stream_client_privileged" : "stream_client";
-
result = resolve_hostname(hostname, SOCK_STREAM, &res, NULL);
if(result != 0) {
- dbprintf(_("resolve_hostname(%s): %s\n"), hostname, gai_strerror(result));
+ g_debug(_("resolve_hostname(%s): %s"), hostname, gai_strerror(result));
errno = EHOSTUNREACH;
return -1;
}
if(!res) {
- dbprintf(_("resolve_hostname(%s): no results\n"), hostname);
+ g_debug(_("resolve_hostname(%s): no results"), hostname);
errno = EHOSTUNREACH;
return -1;
}
for (res_addr = res; res_addr != NULL; res_addr = res_addr->ai_next) {
/* copy the first (preferred) address we found */
- copy_sockaddr(&svaddr, res_addr->ai_addr);
- SS_SET_PORT(&svaddr, port);
+ copy_sockaddr(&svaddr, (sockaddr_union *)res_addr->ai_addr);
+ SU_SET_PORT(&svaddr, port);
- SS_INIT(&claddr, svaddr.ss_family);
- SS_SET_INADDR_ANY(&claddr);
+ SU_INIT(&claddr, SU_GET_FAMILY(&svaddr));
+ SU_SET_INADDR_ANY(&claddr);
/*
* If a privileged port range was requested, we try to get a port in
if (client_socket > 0)
goto out;
- dbprintf(_("stream_client: Could not bind to port in range %d-%d.\n"),
+ g_debug(_("stream_client: Could not bind to port in range %d-%d."),
portrange[0], portrange[1]);
errno = save_errno;
try_socksize(client_socket, SO_SNDBUF, sendsize);
try_socksize(client_socket, SO_RCVBUF, recvsize);
if (localport != NULL)
- *localport = SS_GET_PORT(&claddr);
+ *localport = SU_GET_PORT(&claddr);
return client_socket;
}
}
/* don't care about these values */
-static struct sockaddr_storage addr;
-static socklen_t addrlen;
+static sockaddr_union addr;
+static socklen_t_equiv addrlen;
+
+static gboolean
+stream_accept_prolong(
+ gpointer data)
+{
+ time_t *tp = data;
+ return time(NULL) <= *tp;
+}
int
stream_accept(
size_t sendsize,
size_t recvsize)
{
- SELECT_ARG_TYPE readset;
- struct timeval tv;
- int nfound, connected_socket;
+ time_t timeout_time;
+ int connected_socket;
int save_errno;
- int ntries = 0;
in_port_t port;
assert(server_socket >= 0);
- do {
- ntries++;
- memset(&tv, 0, SIZEOF(tv));
- tv.tv_sec = timeout;
- memset(&readset, 0, SIZEOF(readset));
- FD_ZERO(&readset);
- FD_SET(server_socket, &readset);
- nfound = select(server_socket+1, &readset, NULL, NULL, &tv);
- if(nfound <= 0 || !FD_ISSET(server_socket, &readset)) {
- save_errno = errno;
- if(nfound < 0) {
- dbprintf(_("stream_accept: select() failed: %s\n"),
- strerror(save_errno));
- } else if(nfound == 0) {
- dbprintf(plural(_("stream_accept: timeout after %d second\n"),
- _("stream_accept: timeout after %d seconds\n"),
- timeout),
- timeout);
- errno = ENOENT; /* ??? */
- return -1;
- } else if (!FD_ISSET(server_socket, &readset)) {
- int i;
-
- for(i = 0; i < server_socket + 1; i++) {
- if(FD_ISSET(i, &readset)) {
- dbprintf(_("stream_accept: got fd %d instead of %d\n"),
- i,
- server_socket);
- }
- }
- save_errno = EBADF;
- }
- if (ntries > 5) {
- errno = save_errno;
- return -1;
- }
- }
- } while (nfound <= 0);
+ /* set the time we want to stop accepting */
+ timeout_time = time(NULL) + timeout;
while(1) {
- addrlen = (socklen_t)sizeof(struct sockaddr_storage);
- connected_socket = accept(server_socket,
+ addrlen = (socklen_t_equiv)sizeof(sockaddr_union);
+ connected_socket = interruptible_accept(server_socket,
(struct sockaddr *)&addr,
- &addrlen);
+ &addrlen, stream_accept_prolong,
+ &timeout_time);
if(connected_socket < 0) {
+ if (errno == 0) {
+ g_debug(plural(_("stream_accept: timeout after %d second"),
+ _("stream_accept: timeout after %d seconds"),
+ timeout),
+ timeout);
+ errno = ETIMEDOUT;
+ return -1;
+ }
break;
}
- dbprintf(_("stream_accept: connection from %s\n"),
+ g_debug(_("stream_accept: connection from %s"),
str_sockaddr(&addr));
/*
* Make certain we got an inet connection and that it is not
* from port 20 (a favorite unauthorized entry tool).
*/
- if (addr.ss_family == (sa_family_t)AF_INET
+ if (SU_GET_FAMILY(&addr) == AF_INET
#ifdef WORKING_IPV6
- || addr.ss_family == (sa_family_t)AF_INET6
+ || SU_GET_FAMILY(&addr) == AF_INET6
#endif
){
- port = SS_GET_PORT(&addr);
+ port = SU_GET_PORT(&addr);
if (port != (in_port_t)20) {
try_socksize(connected_socket, SO_SNDBUF, sendsize);
try_socksize(connected_socket, SO_RCVBUF, recvsize);
return connected_socket;
} else {
- dbprintf(_("remote port is %u: ignored\n"),
+ g_debug(_("remote port is %u: ignored"),
(unsigned int)port);
}
} else {
#ifdef WORKING_IPV6
- dbprintf(_("family is %d instead of %d(AF_INET)"
- " or %d(AF_INET6): ignored\n"),
- addr.ss_family,
+ g_debug(_("family is %d instead of %d(AF_INET)"
+ " or %d(AF_INET6): ignored"),
+ SU_GET_FAMILY(&addr),
AF_INET, AF_INET6);
#else
- dbprintf(_("family is %d instead of %d(AF_INET)"
- ": ignored\n"),
- addr.ss_family,
+ g_debug(_("family is %d instead of %d(AF_INET)"
+ ": ignored"),
+ SU_GET_FAMILY(&addr),
AF_INET);
#endif
}
}
save_errno = errno;
- dbprintf(_("stream_accept: accept() failed: %s\n"),
+ g_debug(_("stream_accept: accept() failed: %s"),
strerror(save_errno));
errno = save_errno;
return -1;
/* keep trying, get as big a buffer as possible */
while((isize > 1024) &&
(setsockopt(sock, SOL_SOCKET,
- which, (void *) &isize, (socklen_t)sizeof(isize)) < 0)) {
+ which, (void *) &isize, (socklen_t_equiv)sizeof(isize)) < 0)) {
isize -= 1024;
}
if(isize > 1024) {
- dbprintf(_("try_socksize: %s buffer size is %d\n"),
+ g_debug(_("try_socksize: %s buffer size is %d"),
(which == SO_SNDBUF) ? _("send") : _("receive"),
isize);
} else {
- dbprintf(_("try_socksize: could not allocate %s buffer of %zu\n"),
+ g_debug(_("try_socksize: could not allocate %s buffer of %zu"),
(which == SO_SNDBUF) ? _("send") : _("receive"),
origsize);
}
projects / debian / amanda / blobdiff