X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=libfcgi%2Fos_unix.c;h=7912c9b62f76d283391eeeb7bd3341a547d0d21c;hb=5215a48a265b9583234d1d3c105b0c1cfcf96d21;hp=8c672cc09fcca71ef141624fccc09b3675715826;hpb=2b391acad317f49369311d660c9b08297586e653;p=catagits%2Ffcgi2.git

diff --git a/libfcgi/os_unix.c b/libfcgi/os_unix.c
index 8c672cc..7912c9b 100755
--- a/libfcgi/os_unix.c
+++ b/libfcgi/os_unix.c
@@ -17,7 +17,7 @@
  */
 
 #ifndef lint
-static const char rcsid[] = "$Id: os_unix.c,v 1.18 2000/08/26 02:43:01 robs Exp $";
+static const char rcsid[] = "$Id: os_unix.c,v 1.26 2001/06/18 14:24:28 robs Exp $";
 #endif /* not lint */
 
 #include "fcgi_config.h"
@@ -60,12 +60,8 @@ static const char rcsid[] = "$Id: os_unix.c,v 1.18 2000/08/26 02:43:01 robs Exp
 #include "fcgimisc.h"
 #include "fcgios.h"
 
-#ifndef FALSE
-#define FALSE 0
-#endif
-
-#ifndef TRUE
-#define TRUE 1
+#ifndef INADDR_NONE
+#define INADDR_NONE ((unsigned long) -1)
 #endif
 
 /*
@@ -105,7 +101,6 @@ static fd_set writeFdSetPost;
 static int numWrPosted = 0;
 static int volatile maxFd = -1;
 
-
 /*
  *--------------------------------------------------------------
  *
@@ -146,7 +141,6 @@ int OS_LibInit(int stdioFds[3])
     return 0;
 }
 
-
 /*
  *--------------------------------------------------------------
  *
@@ -173,7 +167,6 @@ void OS_LibShutdown()
     return;
 }
 
-
 /*
  *----------------------------------------------------------------------
  *
@@ -220,13 +213,11 @@ static int OS_BuildSockAddrUn(const char *bindPath,
 #endif
     return 0;
 }
-
 union SockAddrUnion {
     struct  sockaddr_un	unixVariant;
     struct  sockaddr_in	inetVariant;
 };
 
-
 /*
  * OS_CreateLocalIpcFd --
  *
@@ -249,6 +240,7 @@ int OS_CreateLocalIpcFd(const char *bindPath, int backlog)
     int listenSock, servLen;
     union   SockAddrUnion sa;
     int	    tcp = FALSE;
+    unsigned long tcp_ia;
     char    *tp;
     short   port;
     char    host[MAXPATHLEN];
@@ -262,12 +254,26 @@ int OS_CreateLocalIpcFd(const char *bindPath, int backlog)
 	    tcp = TRUE;
 	 }
     }
-    if(tcp && (*host && strcmp(host, "localhost") != 0)) {
-	fprintf(stderr, "To start a service on a TCP port can not "
-			"specify a host name.\n"
-			"You should either use \"localhost:<port>\" or "
-			" just use \":<port>.\"\n");
-	exit(1);
+    if(tcp) {
+      if (!*host || !strcmp(host,"*")) {
+	tcp_ia = htonl(INADDR_ANY);
+      } else {
+	tcp_ia = inet_addr(host);
+	if (tcp_ia == INADDR_NONE) {
+	  struct hostent * hep;
+	  hep = gethostbyname(host);
+	  if ((!hep) || (hep->h_addrtype != AF_INET || !hep->h_addr_list[0])) {
+	    fprintf(stderr, "Cannot resolve host name %s -- exiting!\n", host);
+	    exit(1);
+	  }
+	  if (hep->h_addr_list[1]) {
+	    fprintf(stderr, "Host %s has multiple addresses ---\n", host);
+	    fprintf(stderr, "you must choose one explicitly!!!\n");
+	    exit(1);
+	  }
+	  tcp_ia = ((struct in_addr *) (hep->h_addr))->s_addr;
+	}
+      }
     }
 
     if(tcp) {
@@ -293,7 +299,7 @@ int OS_CreateLocalIpcFd(const char *bindPath, int backlog)
     if(tcp) {
 	memset((char *) &sa.inetVariant, 0, sizeof(sa.inetVariant));
 	sa.inetVariant.sin_family = AF_INET;
-	sa.inetVariant.sin_addr.s_addr = htonl(INADDR_ANY);
+	sa.inetVariant.sin_addr.s_addr = tcp_ia;
 	sa.inetVariant.sin_port = htons(port);
 	servLen = sizeof(sa.inetVariant);
     } else {
@@ -312,7 +318,6 @@ int OS_CreateLocalIpcFd(const char *bindPath, int backlog)
     return listenSock;
 }
 
-
 /*
  *----------------------------------------------------------------------
  *
@@ -386,7 +391,6 @@ int OS_FcgiConnect(char *bindPath)
     }
 }
 
-
 /*
  *--------------------------------------------------------------
  *
@@ -407,7 +411,7 @@ int OS_Read(int fd, char * buf, size_t len)
 {
     return(read(fd, buf, len));
 }
-
+
 /*
  *--------------------------------------------------------------
  *
@@ -429,7 +433,6 @@ int OS_Write(int fd, char * buf, size_t len)
     return(write(fd, buf, len));
 }
 
-
 /*
  *----------------------------------------------------------------------
  *
@@ -495,7 +498,6 @@ int OS_SpawnChild(char *appPath, int listenFd)
     return 0;
 }
 
-
 /*
  *--------------------------------------------------------------
  *
@@ -552,7 +554,6 @@ static void GrowAsyncTable(void)
 
 }
 
-
 /*
  *--------------------------------------------------------------
  *
@@ -603,7 +604,7 @@ int OS_AsyncRead(int fd, int offset, void *buf, int len,
     FD_SET(fd, &readFdSet);
     return 0;
 }
-
+
 /*
  *--------------------------------------------------------------
  *
@@ -652,7 +653,7 @@ int OS_AsyncWrite(int fd, int offset, void *buf, int len,
     FD_SET(fd, &writeFdSet);
     return 0;
 }
-
+
 /*
  *--------------------------------------------------------------
  *
@@ -671,7 +672,10 @@ int OS_AsyncWrite(int fd, int offset, void *buf, int len,
  */
 int OS_Close(int fd)
 {
-    if (asyncIo) {
+    if (fd == -1)
+        return 0;
+
+    if (asyncIoInUse) {
         int index = AIO_RD_IX(fd);
 
         FD_CLR(fd, &readFdSet);
@@ -693,7 +697,7 @@ int OS_Close(int fd)
     }
     return close(fd);
 }
-
+
 /*
  *--------------------------------------------------------------
  *
@@ -718,7 +722,6 @@ int OS_CloseRead(int fd)
     return shutdown(fd, 0);
 }
 
-
 /*
  *--------------------------------------------------------------
  *
@@ -835,7 +838,20 @@ int OS_DoIo(struct timeval *tmo)
     return 0;
 }
 
-
+/* 
+ * Not all systems have strdup().  
+ * @@@ autoconf should determine whether or not this is needed, but for now..
+ */
+char * str_dup(const char * str)
+{
+    char * sdup = (char *) malloc(strlen(str) + 1);
+
+    if (sdup)
+        strcpy(sdup, str);
+
+    return sdup;
+}
+
 /*
  *----------------------------------------------------------------------
  *
@@ -853,34 +869,28 @@ static int ClientAddrOK(struct sockaddr_in *saPtr, const char *clientList)
 {
     int result = FALSE;
     char *clientListCopy, *cur, *next;
-    char *newString = NULL;
-    int strLen;
 
-    if(clientList == NULL || *clientList == '\0') {
+    if (clientList == NULL || *clientList == '\0') {
         return TRUE;
     }
 
-    strLen = strlen(clientList);
-    clientListCopy = (char *)malloc(strLen + 1);
-    ASSERT(newString != NULL);
-    memcpy(newString, clientList, strLen);
-    newString[strLen] = '\000';
+    clientListCopy = str_dup(clientList);
 
-    for(cur = clientListCopy; cur != NULL; cur = next) {
+    for (cur = clientListCopy; cur != NULL; cur = next) {
         next = strchr(cur, ',');
-        if(next != NULL) {
+        if (next != NULL) {
             *next++ = '\0';
-	}
-        if(inet_addr(cur) == saPtr->sin_addr.s_addr) {
+        }
+        if (inet_addr(cur) == saPtr->sin_addr.s_addr) {
             result = TRUE;
             break;
         }
     }
+
     free(clientListCopy);
     return result;
 }
 
-
 /*
  *----------------------------------------------------------------------
  *
@@ -919,7 +929,7 @@ static int AcquireLock(int sock, int fail_on_intr)
     return 0;
 #endif
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -958,7 +968,6 @@ static int ReleaseLock(int sock)
 #endif
 }
 
-
 /**********************************************************************
  * Determine if the errno resulting from a failed accept() warrants a
  * retry or exit().  Based on Apache's http_main.c accept() handling
@@ -1114,7 +1123,7 @@ int OS_Accept(int listen_sock, int fail_on_intr, const char *webServerAddrs)
 
     return (socket);
 }
-
+
 /*
  *----------------------------------------------------------------------
  *
@@ -1135,7 +1144,6 @@ int OS_IpcClose(int ipcFd)
     return OS_Close(ipcFd);
 }
 
-
 /*
  *----------------------------------------------------------------------
  *
@@ -1163,6 +1171,8 @@ int OS_IsFcgi(int sock)
     int len = sizeof(sa);
 #endif
 
+    errno = 0;
+
     if (getpeername(sock, (struct sockaddr *)&sa, &len) != 0 && errno == ENOTCONN) {
         return TRUE;
     }
@@ -1170,7 +1180,7 @@ int OS_IsFcgi(int sock)
         return FALSE;
     }
 }
-
+
 /*
  *----------------------------------------------------------------------
  *