*/
#include "bacula.h"
+#undef DEV_BSIZE
#include <netinet/in.h>
#include <sys/socket.h>
#include <arpa/inet.h>
#include <netdb.h>
+#ifdef HAVE_ARPA_NAMESER_H
+#include <arpa/nameser.h>
+#endif
+#ifdef HAVE_RESOLV_H
+#include <resolv.h>
+#endif
+
+
+static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
#ifdef HAVE_LIBWRAP
#include "tcpd.h"
int allow_severity = LOG_NOTICE;
int deny_severity = LOG_WARNING;
-static pthread_mutex_t mutex = PTHREAD_MUTEX_INITIALIZER;
#endif
/* Become Threaded Network Server */
void
bnet_thread_server(char *bind_addr, int port, int max_clients, workq_t *client_wq,
- void handle_client_request(void *bsock))
+ void *handle_client_request(void *bsock))
{
int newsockfd, sockfd, stat;
socklen_t clilen;
struct sockaddr_in serv_addr; /* our address */
struct in_addr bind_ip; /* address to bind to */
int tlog;
- fd_set ready, sockset;
int turnon = 1;
char *caller;
#ifdef HAVE_LIBWRAP
tlog = 60;
Emsg1(M_ERROR, 0, _("Cannot open stream socket: %s. Retrying ...\n"), strerror(errno));
}
- sleep(10);
+ bmicrosleep(10, 0);
}
/*
* Reuse old sockets
*/
- if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &turnon, sizeof(turnon)) < 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));
}
tlog = 2*60; /* Complain every 2 minutes */
Emsg2(M_WARNING, 0, _("Cannot bind port %d: %s. Retrying ...\n"), port, strerror(errno));
}
- sleep(5);
+ bmicrosleep(5, 0);
if (--tmax <= 0) {
Emsg2(M_ABORT, 0, _("Cannot bind port %d: %s.\n"), port, strerror(errno));
}
}
listen(sockfd, 5); /* tell system we are ready */
- FD_ZERO(&sockset);
- FD_SET(sockfd, &sockset);
-
/* Start work queue thread */
if ((stat = workq_init(client_wq, max_clients, handle_client_request)) != 0) {
Emsg1(M_ABORT, 0, _("Could not init client queue: ERR=%s\n"), strerror(stat));
}
+ /*
+ * Wait for a connection from the client process.
+ */
for (;;) {
- /*
- * Wait for a connection from a client process.
- */
- ready = sockset;
- if ((stat = select(sockfd+1, &ready, NULL, NULL, NULL)) < 0) {
+ fd_set sockset;
+ FD_ZERO(&sockset);
+ FD_SET(sockfd, &sockset);
+ errno = 0;
+ if ((stat = select(sockfd+1, &sockset, NULL, NULL, NULL)) < 0) {
if (errno == EINTR || errno == EAGAIN) {
- errno = 0;
continue;
}
+ /* Error, get out */
close(sockfd);
Emsg1(M_FATAL, 0, _("Error in select: %s\n"), strerror(errno));
break;
}
- clilen = sizeof(cli_addr);
- newsockfd = accept(sockfd, (struct sockaddr *)&cli_addr, &clilen);
+
+ /* Got a connection, now accept it. */
+ do {
+ clilen = sizeof(cli_addr);
+ newsockfd = accept(sockfd, (struct sockaddr *)&cli_addr, &clilen);
+ } while (newsockfd < 0 && (errno == EINTR || errno == EAGAIN));
+ if (newsockfd < 0) {
+ continue;
+ }
+
#ifdef HAVE_LIBWRAP
P(mutex); /* hosts_access is not thread safe */
fromhost(&request);
if (!hosts_access(&request)) {
V(mutex);
- Jmsg2(NULL, M_WARNING, 0, _("Connection from %s:%d refused by hosts.access"),
+ Jmsg2(NULL, 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);
continue;
/*
* Receive notification when connection dies.
*/
- if (setsockopt(newsockfd, SOL_SOCKET, SO_KEEPALIVE, &turnon, sizeof(turnon)) < 0) {
+ 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. */
- caller = inet_ntoa(cli_addr.sin_addr);
+ P(mutex);
+ caller = inet_ntoa(cli_addr.sin_addr); /* NOT thread safe, use mutex */
if (caller == NULL) {
caller = "unknown client";
}
+ BSOCK *bs = init_bsock(NULL, newsockfd, "client", caller, port, &cli_addr);
+ 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 *)init_bsock(NULL, newsockfd, "client", caller, port))) != 0) {
+ if ((stat = workq_add(client_wq, (void *)bs, NULL, 0)) != 0) {
+ V(mutex);
Jmsg1(NULL, M_ABORT, 0, _("Could not add job to client queue: ERR=%s\n"), strerror(stat));
}
+ V(mutex);
+ }
+
+ /* Stop work queue thread */
+ if ((stat = workq_destroy(client_wq)) != 0) {
+ Emsg1(M_FATAL, 0, _("Could not destroy client queue: ERR=%s\n"), strerror(stat));
}
}
* 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));
}
- sleep(60);
+ bmicrosleep(60, 0);
}
/*
* Reuse old sockets
*/
- if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &turnon, sizeof(turnon)) < 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));
}
serv_addr.sin_port = htons(port);
for (tlog=0; bind(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0; tlog -= 5 ) {
+ if (errno == EINTR || errno == EAGAIN) {
+ continue;
+ }
if (tlog <= 0) {
tlog = 2*60;
Emsg2(M_WARNING, 0, _("Cannot bind port %d: %s: retrying ...\n"), port, strerror(errno));
}
- sleep(5);
+ bmicrosleep(5, 0);
}
listen(sockfd, 1); /* tell system we are ready */
- return init_bsock(NULL, sockfd, _("Server socket"), _("client"), port);
+ return init_bsock(NULL, sockfd, _("Server socket"), _("client"), port, &serv_addr);
}
/*
*/
ready = sockset;
if ((stat = select(bsock->fd+1, &ready, NULL, NULL, NULL)) < 0) {
- if (errno == EINTR || errno == EAGAIN) {
+ if (errno == EINTR || errno = EAGAIN) {
errno = 0;
continue;
}
newsockfd = -1;
break;
}
- clilen = sizeof(cli_addr);
- newsockfd = accept(bsock->fd, (struct sockaddr *)&cli_addr, &clilen);
- 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
fromhost(&request);
if (!hosts_access(&request)) {
V(mutex);
- Emsg2(M_WARNING, 0, _("Connection from %s:%d refused by hosts.access"),
+ 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;
/*
* Receive notification when connection dies.
*/
- if (setsockopt(newsockfd, SOL_SOCKET, SO_KEEPALIVE, &turnon, sizeof(turnon)) < 0) {
+ 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));
}
* return it in the input message buffer.
*/
if ((caller = inet_ntoa(cli_addr.sin_addr)) != NULL) {
- strcpy(bsock->msg, caller);
+ pm_strcpy(&bsock->msg, caller);
} else {
bsock->msg[0] = 0;
}
strcpy(buf, who);
strcat(buf, ": ");
strcat(buf, caller);
- bs = init_bsock(NULL, newsockfd, "client", buf, bsock->port);
+ bs = init_bsock(NULL, newsockfd, "client", buf, bsock->port, &cli_addr);
free(buf);
return bs; /* return new BSOCK */
}
projects / bacula / bacula / blobdiff