When invoking the mysql script, pass in $*

[bacula/bacula] / bacula / src / lib / bnet_server.c

diff --git a/bacula/src/lib/bnet_server.c b/bacula/src/lib/bnet_server.c
index 040a773fb93dffb1b7eab8b5b212e7f88f365e0f..308ef2c87e0cb3be1606997b2ceb5c2476ff2f05 100644 (file)
--- a/bacula/src/lib/bnet_server.c
+++ b/bacula/src/lib/bnet_server.c
@@ -25,22 +25,31 @@
   */
 
 #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;
@@ -63,13 +72,13 @@ bnet_thread_server(char *bind_addr, int port, int max_clients, workq_t *client_w
         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));
    }
 
@@ -99,7 +108,7 @@ bnet_thread_server(char *bind_addr, int port, int max_clients, workq_t *client_w
         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));
       }
@@ -119,17 +128,23 @@ bnet_thread_server(char *bind_addr, int port, int max_clients, workq_t *client_w
        * Wait for a connection from a client process.
        */
       ready = sockset;
-      if ((stat = select(sockfd+1, &ready, NULL, NULL, NULL)) < 0) {
-        if (errno == EINTR || errno == EAGAIN) {
-           errno = 0;
-           continue;
-        }
+      do {
+        errno = 0;
+        stat = select(sockfd+1, &ready, NULL, NULL, NULL);       
+      } while(stat == -1 && (errno == EINTR || errno == EAGAIN));
+      if (stat < 0) {
         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);
+      do {
+        clilen = sizeof(cli_addr);
+        errno = 0;
+        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 */
@@ -148,21 +163,28 @@ bnet_thread_server(char *bind_addr, int port, int max_clients, workq_t *client_w
       /*
        * 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);
+      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);
    }
 }   
 
@@ -184,17 +206,20 @@ bnet_bind(int port)
     * Open a TCP socket  
     */
    for (tlog=0; (sockfd = socket(AF_INET, SOCK_STREAM, 0)) < 0; tlog -= 10 ) {
+      if (errno == EINTR) {
+        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));
    }
 
@@ -207,11 +232,14 @@ bnet_bind(int port)
    serv_addr.sin_port = htons(port);
 
    for (tlog=0; bind(sockfd, (struct sockaddr *) &serv_addr, sizeof(serv_addr)) < 0; tlog -= 5 ) {
+      if (errno == EINTR) {
+        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);
@@ -254,9 +282,13 @@ bnet_accept(BSOCK *bsock, char *who)
         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);
+      if (newsockfd >= 0) {
+        break;
+      }
    }
 
 #ifdef HAVE_LIBWRAP
@@ -276,7 +308,7 @@ bnet_accept(BSOCK *bsock, char *who)
    /*
     * 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));
    }