*
*/
/*
- Copyright (C) 2001-2004 Kern Sibbald and John Walker
+ Copyright (C) 2001-2005 Kern Sibbald
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.
+ modify it under the terms of the GNU General Public License
+ version 2 as amended with additional clauses defined in the
+ file LICENSE in the main source directory.
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.
-
- You should have received a copy of the GNU General Public
- License along with this program; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ the file LICENSE for additional details.
*/
* Returns number of bytes read (may return zero)
* Returns -1 on signal (BNET_SIGNAL)
* Returns -2 on hard end of file (BNET_HARDEOF)
- * Returns -3 on error (BNET_ERROR)
+ * Returns -3 on error (BNET_ERROR)
*/
int bget_msg(BSOCK *sock)
{
int n;
for ( ;; ) {
n = bnet_recv(sock);
- if (n >= 0) { /* normal return */
- return n;
+ if (n >= 0) { /* normal return */
+ return n;
}
if (is_bnet_stop(sock)) { /* error return */
- return n;
+ return n;
}
/* BNET_SIGNAL (-1) return from bnet_recv() => network signal */
switch (sock->msglen) {
- case BNET_EOD: /* end of data */
- Dmsg0(msglvl, "Got BNET_EOD\n");
- return n;
+ case BNET_EOD: /* end of data */
+ Dmsg0(msglvl, "Got BNET_EOD\n");
+ return n;
case BNET_EOD_POLL:
- Dmsg0(msglvl, "Got BNET_EOD_POLL\n");
- if (sock->terminated) {
- bnet_fsend(sock, TERM_msg);
- } else {
- bnet_fsend(sock, OK_msg); /* send response */
- }
- return n; /* end of data */
+ Dmsg0(msglvl, "Got BNET_EOD_POLL\n");
+ if (sock->terminated) {
+ bnet_fsend(sock, TERM_msg);
+ } else {
+ bnet_fsend(sock, OK_msg); /* send response */
+ }
+ return n; /* end of data */
case BNET_TERMINATE:
- Dmsg0(msglvl, "Got BNET_TERMINATE\n");
- sock->terminated = 1;
- return n;
+ Dmsg0(msglvl, "Got BNET_TERMINATE\n");
+ sock->terminated = 1;
+ return n;
case BNET_POLL:
- Dmsg0(msglvl, "Got BNET_POLL\n");
- if (sock->terminated) {
- bnet_fsend(sock, TERM_msg);
- } else {
- bnet_fsend(sock, OK_msg); /* send response */
- }
- break;
+ Dmsg0(msglvl, "Got BNET_POLL\n");
+ if (sock->terminated) {
+ bnet_fsend(sock, TERM_msg);
+ } else {
+ bnet_fsend(sock, OK_msg); /* send response */
+ }
+ break;
case BNET_HEARTBEAT:
case BNET_HB_RESPONSE:
- break;
+ break;
case BNET_STATUS:
- /* *****FIXME***** Implement BNET_STATUS */
- Dmsg0(msglvl, "Got BNET_STATUS\n");
- bnet_fsend(sock, _("Status OK\n"));
- bnet_sig(sock, BNET_EOD);
- break;
+ /* *****FIXME***** Implement BNET_STATUS */
+ Dmsg0(msglvl, "Got BNET_STATUS\n");
+ bnet_fsend(sock, _("Status OK\n"));
+ bnet_sig(sock, BNET_EOD);
+ break;
default:
- Emsg1(M_ERROR, 0, _("bget_msg: unknown signal %d\n"), sock->msglen);
- break;
+ Emsg1(M_ERROR, 0, _("bget_msg: unknown signal %d\n"), sock->msglen);
+ break;
}
}
}
nleft = nbytes;
while (nleft > 0) {
- do {
- errno = 0;
- nread = socketRead(bsock->fd, ptr, nleft);
- if (bsock->timed_out || bsock->terminated) {
- return nread;
+ errno = 0;
+ nread = socketRead(bsock->fd, ptr, nleft);
+ if (bsock->timed_out || bsock->terminated) {
+ return nread;
+ }
+ if (nread == -1) {
+ if (errno == EINTR) {
+ continue;
}
- } while (nread == -1 && (errno == EINTR || errno == EAGAIN));
+ if (errno == EAGAIN) {
+ bmicrosleep(0, 200000); /* try again in 200ms */
+ continue;
+ }
+ }
if (nread <= 0) {
return nread; /* error, or EOF */
}
return 0;
case -1:
bsock->b_errno = errno;
- if (errno == EINTR || errno == EAGAIN) {
+ if (errno == EINTR) {
continue;
}
return -1; /* error return */
int oflags;
/* Get current flags */
- if((oflags = fcntl(bsock->fd, F_GETFL, 0)) < 0) {
+ if ((oflags = fcntl(bsock->fd, F_GETFL, 0)) < 0) {
berrno be;
- Emsg1(M_ABORT, 0, _("fcntl F_GETFL error. ERR=%s\n"), be.strerror());
+ Jmsg1(bsock->jcr, M_ABORT, 0, _("fcntl F_GETFL error. ERR=%s\n"), be.strerror());
}
/* Set O_NONBLOCK flag */
- if((fcntl(bsock->fd, F_SETFL, oflags|O_NONBLOCK)) < 0) {
+ if ((fcntl(bsock->fd, F_SETFL, oflags|O_NONBLOCK)) < 0) {
berrno be;
- Emsg1(M_ABORT, 0, _("fcntl F_SETFL error. ERR=%s\n"), be.strerror());
+ Jmsg1(bsock->jcr, M_ABORT, 0, _("fcntl F_SETFL error. ERR=%s\n"), be.strerror());
}
bsock->blocking = 0;
ioctlsocket(bsock->fd, FIONBIO, &ioctlArg);
bsock->blocking = 0;
- return (flags);
+ return flags;
#endif
}
* Set socket blocking
* Returns previous socket flags
*/
-int bnet_set_blocking (BSOCK *bsock) {
+int bnet_set_blocking (BSOCK *bsock)
+{
#ifndef WIN32
int oflags;
/* Get current flags */
- if((oflags = fcntl(bsock->fd, F_GETFL, 0)) < 0) {
+ if ((oflags = fcntl(bsock->fd, F_GETFL, 0)) < 0) {
berrno be;
- Emsg1(M_ABORT, 0, _("fcntl F_GETFL error. ERR=%s\n"), be.strerror());
+ Jmsg1(bsock->jcr, M_ABORT, 0, _("fcntl F_GETFL error. ERR=%s\n"), be.strerror());
}
/* Set O_NONBLOCK flag */
- if((fcntl(bsock->fd, F_SETFL, oflags & ~O_NONBLOCK)) < 0) {
+ if ((fcntl(bsock->fd, F_SETFL, oflags & ~O_NONBLOCK)) < 0) {
berrno be;
- Emsg1(M_ABORT, 0, _("fcntl F_SETFL error. ERR=%s\n"), be.strerror());
+ Jmsg1(bsock->jcr, M_ABORT, 0, _("fcntl F_SETFL error. ERR=%s\n"), be.strerror());
}
bsock->blocking = 1;
- return (oflags);
+ return oflags;
#else
int flags;
u_long ioctlArg = 0;
ioctlsocket(bsock->fd, FIONBIO, &ioctlArg);
bsock->blocking = 1;
- return (flags);
+ return flags;
#endif
}
/*
* Restores socket flags
*/
-void bnet_restore_blocking (BSOCK *bsock, int flags) {
+void bnet_restore_blocking (BSOCK *bsock, int flags)
+{
#ifndef WIN32
- if((fcntl(bsock->fd, F_SETFL, flags)) < 0) {
+ if ((fcntl(bsock->fd, F_SETFL, flags)) < 0) {
berrno be;
- Emsg1(M_ABORT, 0, _("fcntl F_SETFL error. ERR=%s\n"), be.strerror());
+ Jmsg1(bsock->jcr, M_ABORT, 0, _("fcntl F_SETFL error. ERR=%s\n"), be.strerror());
}
bsock->blocking = (flags & O_NONBLOCK);
/*
- Copyright (C) 2000-2004 Kern Sibbald and John Walker
+ Copyright (C) 2000-2005 Kern Sibbald
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.
+ modify it under the terms of the GNU General Public License
+ version 2 as amended with additional clauses defined in the
+ file LICENSE in the main source directory.
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.
-
- You should have received a copy of the GNU General Public
- License along with this program; if not, write to the Free
- Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
- MA 02111-1307, USA.
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ the file LICENSE for additional details.
*/
/*
}
/*
- Become Threaded Network Server
+ Become Threaded Network Server
This function is able to handle multiple server ips in
ipv4 and ipv6 style. The Addresse are give in a comma
seperated string in bind_addr
*/
void
bnet_thread_server(dlist *addrs, int max_clients, workq_t *client_wq,
- void *handle_client_request(void *bsock))
+ void *handle_client_request(void *bsock))
{
int newsockfd, stat;
socklen_t clilen;
#endif
IPADDR *p;
struct s_sockfd {
- dlink link; /* this MUST be the first item */
+ dlink link; /* this MUST be the first item */
int fd;
int port;
} *fd_ptr = NULL;
* Open a TCP socket
*/
for (tlog= 60; (fd_ptr->fd=socket(p->get_family(), SOCK_STREAM, 0)) < 0; tlog -= 10) {
- if (tlog <= 0) {
- berrno be;
- char curbuf[256];
+ if (tlog <= 0) {
+ berrno be;
+ char curbuf[256];
Emsg3(M_ABORT, 0, _("Cannot open stream socket. ERR=%s. Current %s All %s\n"),
- be.strerror(),
- p->build_address_str(curbuf, sizeof(curbuf)),
- build_addresses_str(addrs, allbuf, sizeof(allbuf)));
- }
- bmicrosleep(10, 0);
+ be.strerror(),
+ p->build_address_str(curbuf, sizeof(curbuf)),
+ build_addresses_str(addrs, allbuf, sizeof(allbuf)));
+ }
+ bmicrosleep(10, 0);
}
/*
* Reuse old sockets
*/
if (setsockopt(fd_ptr->fd, SOL_SOCKET, SO_REUSEADDR, (sockopt_val_t)&turnon,
- sizeof(turnon)) < 0) {
- berrno be;
+ sizeof(turnon)) < 0) {
+ berrno be;
Emsg1(M_WARNING, 0, _("Cannot set SO_REUSEADDR on socket: %s\n"),
- be.strerror());
+ be.strerror());
}
int tmax = 30 * (60 / 5); /* wait 30 minutes max */
- /* FIXME i can go to a endless loop i get a invalid address */
for (tlog = 0; bind(fd_ptr->fd, p->get_sockaddr(), p->get_sockaddr_len()) < 0; tlog -= 5) {
- berrno be;
- if (tlog <= 0) {
- tlog = 2 * 60; /* Complain every 2 minutes */
+ berrno be;
+ if (tlog <= 0) {
+ tlog = 2 * 60; /* Complain every 2 minutes */
Emsg2(M_WARNING, 0, _("Cannot bind port %d: ERR=%s: Retrying ...\n"),
- ntohs(fd_ptr->port), be.strerror());
- }
- bmicrosleep(5, 0);
- if (--tmax <= 0) {
+ ntohs(fd_ptr->port), be.strerror());
+ }
+ bmicrosleep(5, 0);
+ if (--tmax <= 0) {
Emsg2(M_ABORT, 0, _("Cannot bind port %d: ERR=%s.\n"), ntohs(fd_ptr->port),
- be.strerror());
- }
+ be.strerror());
+ }
}
- listen(fd_ptr->fd, 5); /* tell system we are ready */
+ listen(fd_ptr->fd, 5); /* tell system we are ready */
sockfds.append(fd_ptr);
}
/* Start work queue thread */
fd_set sockset;
FD_ZERO(&sockset);
foreach_dlist(fd_ptr, &sockfds) {
- FD_SET((unsigned)fd_ptr->fd, &sockset);
- maxfd = maxfd > (unsigned)fd_ptr->fd ? maxfd : fd_ptr->fd;
+ FD_SET((unsigned)fd_ptr->fd, &sockset);
+ maxfd = maxfd > (unsigned)fd_ptr->fd ? maxfd : fd_ptr->fd;
}
errno = 0;
if ((stat = select(maxfd + 1, &sockset, NULL, NULL, NULL)) < 0) {
- berrno be; /* capture errno */
- if (errno == EINTR || errno == EAGAIN) {
- continue;
- }
- /* Error, get out */
- foreach_dlist(fd_ptr, &sockfds) {
- close(fd_ptr->fd);
- free((void *)fd_ptr);
- }
+ berrno be; /* capture errno */
+ if (errno == EINTR) {
+ continue;
+ }
+ /* Error, get out */
+ foreach_dlist(fd_ptr, &sockfds) {
+ close(fd_ptr->fd);
+ free((void *)fd_ptr);
+ }
Emsg1(M_FATAL, 0, _("Error in select: %s\n"), be.strerror());
- break;
+ break;
}
foreach_dlist(fd_ptr, &sockfds) {
- if (FD_ISSET(fd_ptr->fd, &sockset)) {
- /* Got a connection, now accept it. */
- do {
- clilen = sizeof(cli_addr);
- newsockfd = accept(fd_ptr->fd, &cli_addr, &clilen);
- } while (newsockfd < 0 && (errno == EINTR || errno == EAGAIN));
- if (newsockfd < 0) {
- continue;
- }
+ if (FD_ISSET(fd_ptr->fd, &sockset)) {
+ /* Got a connection, now accept it. */
+ do {
+ clilen = sizeof(cli_addr);
+ newsockfd = accept(fd_ptr->fd, &cli_addr, &clilen);
+ } while (newsockfd < 0 && errno == EINTR);
+ if (newsockfd < 0) {
+ continue;
+ }
#ifdef HAVE_LIBWRAP
- P(mutex); /* hosts_access is not thread safe */
- request_init(&request, RQ_DAEMON, my_name, RQ_FILE, newsockfd, 0);
- fromhost(&request);
- if (!hosts_access(&request)) {
- V(mutex);
- Jmsg2(NULL, M_SECURITY, 0,
+ P(mutex); /* hosts_access is not thread safe */
+ request_init(&request, RQ_DAEMON, my_name, RQ_FILE, newsockfd, 0);
+ fromhost(&request);
+ if (!hosts_access(&request)) {
+ V(mutex);
+ Jmsg2(NULL, M_SECURITY, 0,
_("Connection from %s:%d refused by hosts.access\n"),
- sockaddr_to_ascii(&cli_addr, buf, sizeof(buf)),
- sockaddr_get_port(&cli_addr));
- close(newsockfd);
- continue;
- }
- V(mutex);
+ sockaddr_to_ascii(&cli_addr, buf, sizeof(buf)),
+ sockaddr_get_port(&cli_addr));
+ close(newsockfd);
+ continue;
+ }
+ V(mutex);
#endif
- /*
- * Receive notification when connection dies.
- */
- if (setsockopt(newsockfd, SOL_SOCKET, SO_KEEPALIVE, (sockopt_val_t)&turnon,
- sizeof(turnon)) < 0) {
- berrno be;
+ /*
+ * Receive notification when connection dies.
+ */
+ if (setsockopt(newsockfd, SOL_SOCKET, SO_KEEPALIVE, (sockopt_val_t)&turnon,
+ sizeof(turnon)) < 0) {
+ berrno be;
Emsg1(M_WARNING, 0, _("Cannot set SO_KEEPALIVE on socket: %s\n"),
- be.strerror());
- }
-
- /* see who client is. i.e. who connected to us. */
- P(mutex);
- sockaddr_to_ascii(&cli_addr, buf, sizeof(buf));
- V(mutex);
- BSOCK *bs;
+ be.strerror());
+ }
+
+ /* see who client is. i.e. who connected to us. */
+ P(mutex);
+ sockaddr_to_ascii(&cli_addr, buf, sizeof(buf));
+ V(mutex);
+ BSOCK *bs;
+ int oflags = fcntl(newsockfd, F_GETFL, 0);
+ if (oflags & O_NONBLOCK) {
+ Jmsg1(NULL, M_ABORT, 0, _("Nonblocking socket %d.\n"), newsockfd);
+ }
bs = init_bsock(NULL, newsockfd, "client", buf, fd_ptr->port, &cli_addr);
- if (bs == NULL) {
+ if (bs == NULL) {
Jmsg0(NULL, M_ABORT, 0, _("Could not create client BSOCK.\n"));
- }
+ }
- /* Queue client to be served */
- if ((stat = workq_add(client_wq, (void *)bs, NULL, 0)) != 0) {
- berrno be;
- be.set_errno(stat);
+ /* Queue client to be served */
+ if ((stat = workq_add(client_wq, (void *)bs, NULL, 0)) != 0) {
+ berrno be;
+ be.set_errno(stat);
Jmsg1(NULL, M_ABORT, 0, _("Could not add job to client queue: ERR=%s\n"),
- be.strerror());
- }
- }
+ be.strerror());
+ }
+ }
}
}
berrno be;
be.set_errno(stat);
Emsg1(M_FATAL, 0, _("Could not destroy client queue: ERR=%s\n"),
- be.strerror());
+ be.strerror());
}
}
*/
for (tlog = 0; (sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0; tlog -= 10) {
if (errno == EINTR || errno == EAGAIN) {
- continue;
+ continue;
}
if (tlog <= 0) {
- tlog = 2 * 60;
+ tlog = 2 * 60;
Emsg1(M_ERROR, 0, _("Cannot open stream socket: %s\n"), strerror(errno));
}
bmicrosleep(60, 0);
*/
if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (sockopt_val_t)&turnon, sizeof(turnon)) < 0) {
Emsg1(M_WARNING, 0, _("Cannot set SO_REUSEADDR on socket: %s\n"),
- strerror(errno));
+ strerror(errno));
}
/*
serv_addr.sin_port = htons(port);
for (tlog = 0; bind(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0;
- tlog -= 5) {
+ tlog -= 5) {
berrno be;
if (errno == EINTR || errno == EAGAIN) {
- continue;
+ continue;
}
if (tlog <= 0) {
- tlog = 2 * 60;
+ tlog = 2 * 60;
Emsg2(M_WARNING, 0, _("Cannot bind port %d: ERR=%s: retrying ...\n"), port,
- be.strerror());
+ be.strerror());
}
bmicrosleep(5, 0);
}
- listen(sockfd, 1); /* tell system we are ready */
+ listen(sockfd, 1); /* tell system we are ready */
return init_bsock(NULL, sockfd, _("Server socket"), _("client"), port,
- &serv_addr);
+ &serv_addr);
}
/*
*/
ready = sockset;
if ((stat = select(bsock->fd + 1, &ready, NULL, NULL, NULL)) < 0) {
- if (errno == EINTR || errno = EAGAIN) {
- errno = 0;
- continue;
- }
+ if (errno == EINTR || errno = EAGAIN) {
+ errno = 0;
+ continue;
+ }
Emsg1(M_FATAL, 0, _("Error in select: %s\n"), strerror(errno));
- newsockfd = -1;
- break;
+ newsockfd = -1;
+ break;
}
do {
- clilen = sizeof(cli_addr);
- newsockfd = accept(bsock->fd, (struct sockaddr *)&cli_addr, &clilen);
+ clilen = sizeof(cli_addr);
+ newsockfd = accept(bsock->fd, (struct sockaddr *)&cli_addr, &clilen);
} while (newsockfd < 0 && (errno == EINTR || errno = EAGAIN));
if (newsockfd >= 0) {
- break;
+ break;
}
}
if (!hosts_access(&request)) {
V(mutex);
Emsg2(M_SECURITY, 0, _("Connection from %s:%d refused by hosts.access\n"),
- inet_ntoa(cli_addr.sin_addr), ntohs(cli_addr.sin_port));
+ inet_ntoa(cli_addr.sin_addr), ntohs(cli_addr.sin_port));
close(newsockfd);
return NULL;
}
*/
if (setsockopt(newsockfd, SOL_SOCKET, SO_KEEPALIVE, (sockopt_val_t)&turnon, sizeof(turnon)) < 0) {
Emsg1(M_WARNING, 0, _("Cannot set SO_KEEPALIVE on socket: %s\n"),
- strerror(errno));
+ strerror(errno));
}
/* see who client is. I.e. who connected to us.
if (newsockfd < 0) {
Emsg2(M_FATAL, 0, _("Socket accept error for %s. ERR=%s\n"), who,
- strerror(errno));
+ strerror(errno));
return NULL;
} else {
if (caller == NULL) {
bstrncat(buf, len, caller);
bs = init_bsock(NULL, newsockfd, _("client"), buf, bsock->port, &cli_addr);
free(buf);
- return bs; /* return new BSOCK */
+ return bs; /* return new BSOCK */
}
}
projects / bacula / bacula / commitdiff