- /*
- * Originally written by Kern Sibbald for inclusion in apcupsd,
- * but heavily modified for Bacula
- *
- * Version $Id$
- */
-
/*
Bacula® - The Network Backup Solution
- Copyright (C) 2000-2006 Free Software Foundation Europe e.V.
+ Copyright (C) 2000-2011 Free Software Foundation Europe e.V.
The main author of Bacula is Kern Sibbald, with contributions from
many others, a complete list can be found in the file AUTHORS.
This program is Free Software; you can redistribute it and/or
- modify it under the terms of version two of the GNU General Public
- License as published by the Free Software Foundation plus additions
- that are listed in the file LICENSE.
+ modify it under the terms of version three of the GNU Affero General Public
+ License as published by the Free Software Foundation and included
+ in the file LICENSE.
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
+ You should have received a copy of the GNU Affero General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
02110-1301, USA.
- Bacula® is a registered trademark of John Walker.
+ Bacula® is a registered trademark of Kern Sibbald.
The licensor of Bacula is the Free Software Foundation Europe
(FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
Switzerland, email:ftf@fsfeurope.org.
*/
-
+ /*
+ * Originally written by Kern Sibbald for inclusion in apcupsd,
+ * but heavily modified for Bacula
+ *
+ */
#include "bacula.h"
#include <netinet/in.h>
#include <arpa/nameser.h>
#endif
#ifdef HAVE_RESOLV_H
-#include <resolv.h>
+//#include <resolv.h>
#endif
Dmsg1(100, "Addresses %s\n", build_addresses_str(addrs, allbuf, sizeof(allbuf)));
foreach_dlist(p, addrs) {
- /* Allocate on stack frame -- no need to free */
+ /* Allocate on stack from -- no need to free */
fd_ptr = (s_sockfd *)alloca(sizeof(s_sockfd));
fd_ptr->port = p->get_port_net_order();
/*
berrno be;
char curbuf[256];
Emsg3(M_ABORT, 0, _("Cannot open stream socket. ERR=%s. Current %s All %s\n"),
- be.strerror(),
+ be.bstrerror(),
p->build_address_str(curbuf, sizeof(curbuf)),
build_addresses_str(addrs, allbuf, sizeof(allbuf)));
}
sizeof(turnon)) < 0) {
berrno be;
Emsg1(M_WARNING, 0, _("Cannot set SO_REUSEADDR on socket: %s\n"),
- be.strerror());
+ be.bstrerror());
}
int tmax = 30 * (60 / 5); /* wait 30 minutes max */
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());
+ ntohs(fd_ptr->port), be.bstrerror());
}
bmicrosleep(5, 0);
if (--tmax <= 0) {
Emsg2(M_ABORT, 0, _("Cannot bind port %d: ERR=%s.\n"), ntohs(fd_ptr->port),
- be.strerror());
+ be.bstrerror());
}
}
- listen(fd_ptr->fd, 5); /* tell system we are ready */
+ listen(fd_ptr->fd, 50); /* tell system we are ready */
sockfds.append(fd_ptr);
}
/* Start work queue thread */
if ((stat = workq_init(client_wq, max_clients, handle_client_request)) != 0) {
berrno be;
be.set_errno(stat);
- Emsg1(M_ABORT, 0, _("Could not init client queue: ERR=%s\n"), be.strerror());
+ Emsg1(M_ABORT, 0, _("Could not init client queue: ERR=%s\n"), be.bstrerror());
}
/*
* Wait for a connection from the client process.
if (errno == EINTR) {
continue;
}
- /* Error, get out */
- foreach_dlist(fd_ptr, &sockfds) {
- close(fd_ptr->fd);
- }
- Emsg1(M_FATAL, 0, _("Error in select: %s\n"), be.strerror());
+ Emsg1(M_FATAL, 0, _("Error in select: %s\n"), be.bstrerror());
break;
}
sizeof(turnon)) < 0) {
berrno be;
Emsg1(M_WARNING, 0, _("Cannot set SO_KEEPALIVE on socket: %s\n"),
- be.strerror());
+ be.bstrerror());
}
/* see who client is. i.e. who connected to us. */
sockaddr_to_ascii(&cli_addr, buf, sizeof(buf));
V(mutex);
BSOCK *bs;
- bs = init_bsock(NULL, newsockfd, "client", buf, fd_ptr->port, &cli_addr);
+ bs = init_bsock(NULL, newsockfd, "client", buf, ntohs(fd_ptr->port), &cli_addr);
if (bs == NULL) {
Jmsg0(NULL, M_ABORT, 0, _("Could not create client BSOCK.\n"));
}
berrno be;
be.set_errno(stat);
Jmsg1(NULL, M_ABORT, 0, _("Could not add job to client queue: ERR=%s\n"),
- be.strerror());
+ be.bstrerror());
}
}
}
}
+ /* Cleanup open files and pointers to them */
+ while ((fd_ptr = (s_sockfd *)sockfds.first())) {
+ close(fd_ptr->fd);
+ sockfds.remove(fd_ptr); /* don't free() item it is on stack */
+ }
+
/* Stop work queue thread */
if ((stat = workq_destroy(client_wq)) != 0) {
berrno be;
be.set_errno(stat);
Emsg1(M_FATAL, 0, _("Could not destroy client queue: ERR=%s\n"),
- be.strerror());
- }
-}
-
-
-#ifdef REALLY_USED
-/*
- * Bind an address so that we may accept connections
- * one at a time.
- */
-BSOCK *bnet_bind(int port)
-{
- int sockfd;
- struct sockaddr_in serv_addr; /* our address */
- int tlog;
- int turnon = 1;
-
- /*
- * Open a TCP socket
- */
- for (tlog = 0; (sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0; tlog -= 10) {
- if (errno == EINTR || errno == EAGAIN) {
- continue;
- }
- if (tlog <= 0) {
- tlog = 2 * 60;
- Emsg1(M_ERROR, 0, _("Cannot open stream socket: %s\n"), strerror(errno));
- }
- bmicrosleep(60, 0);
- }
-
- /*
- * Reuse old sockets
- */
- 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));
- }
-
- /*
- * Bind our local address so that the client can send to us.
- */
- bzero((char *)&serv_addr, sizeof(serv_addr));
- serv_addr.sin_family = AF_INET;
- serv_addr.sin_addr.s_addr = htonl(INADDR_ANY);
- serv_addr.sin_port = htons(port);
-
- for (tlog = 0; bind(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) < 0;
- tlog -= 5) {
- berrno be;
- if (errno == EINTR || errno == EAGAIN) {
- continue;
- }
- if (tlog <= 0) {
- tlog = 2 * 60;
- Emsg2(M_WARNING, 0, _("Cannot bind port %d: ERR=%s: retrying ...\n"), port,
- be.strerror());
- }
- bmicrosleep(5, 0);
+ be.bstrerror());
}
- listen(sockfd, 1); /* tell system we are ready */
- return init_bsock(NULL, sockfd, _("Server socket"), _("client"), port,
- &serv_addr);
}
-
-/*
- * Accept a single connection
- */
-BSOCK *bnet_accept(BSOCK * bsock, char *who)
-{
- fd_set ready, sockset;
- int newsockfd, stat, len;
- socklen_t clilen;
- struct sockaddr_in cli_addr; /* client's address */
- char *caller, *buf;
- BSOCK *bs;
- int turnon = 1;
-#ifdef HAVE_LIBWRAP
- struct request_info request;
-#endif
-
- /*
- * Wait for a connection from the client process.
- */
- FD_ZERO(&sockset);
- FD_SET((unsigned)bsock->fd, &sockset);
-
- for (;;) {
- /*
- * Wait for a connection from a client process.
- */
- ready = sockset;
- if ((stat = select(bsock->fd + 1, &ready, NULL, NULL, NULL)) < 0) {
- if (errno == EINTR || errno = EAGAIN) {
- errno = 0;
- continue;
- }
- Emsg1(M_FATAL, 0, _("Error in select: %s\n"), strerror(errno));
- newsockfd = -1;
- break;
- }
- do {
- clilen = sizeof(cli_addr);
- newsockfd = accept(bsock->fd, (struct sockaddr *)&cli_addr, &clilen);
- } while (newsockfd < 0 && (errno == EINTR || errno = EAGAIN));
- if (newsockfd >= 0) {
- break;
- }
- }
-
-#ifdef HAVE_LIBWRAP
- P(mutex);
- request_init(&request, RQ_DAEMON, my_name, RQ_FILE, newsockfd, 0);
- fromhost(&request);
- 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));
- close(newsockfd);
- return NULL;
- }
- V(mutex);
-#endif
-
- /*
- * Receive notification when connection dies.
- */
- 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));
- }
-
- /* see who client is. I.e. who connected to us.
- * return it in the input message buffer.
- */
- if ((caller = inet_ntoa(cli_addr.sin_addr)) != NULL) {
- pm_strcpy(&bsock->msg, caller);
- } else {
- bsock->msg[0] = 0;
- }
- bsock->msglen = strlen(bsock->msg);
-
- if (newsockfd < 0) {
- Emsg2(M_FATAL, 0, _("Socket accept error for %s. ERR=%s\n"), who,
- strerror(errno));
- return NULL;
- } else {
- if (caller == NULL) {
- caller = _("unknown");
- }
- len = strlen(caller) + strlen(who) + 3;
- buf = (char *)malloc(len);
- bstrncpy(buf, len, who);
- bstrncat(buf, len, ": ");
- bstrncat(buf, len, caller);
- bs = init_bsock(NULL, newsockfd, _("client"), buf, bsock->port, &cli_addr);
- free(buf);
- return bs; /* return new BSOCK */
- }
-}
-
-#endif