X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Funix.c;h=c5f55af99e48fc5827d84e545a7d6f5cf32428cc;hb=60a702f390f7e2addfdab79f2328db3ba2897c8b;hp=c38c205fb831125466fd4c741e92245b7f44363f;hpb=54462bdd66000b20ff13b8545ed58a838a12b793;p=yaz-moved-to-github.git

diff --git a/src/unix.c b/src/unix.c
index c38c205..c5f55af 100644
--- a/src/unix.c
+++ b/src/unix.c
@@ -1,31 +1,46 @@
 /*
- * Copyright (c) 1995-2003, Index Data
+ * Copyright (C) 1995-2005, Index Data ApS
  * See the file LICENSE for details.
  *
- * $Id: unix.c,v 1.2 2003-10-29 13:26:34 adam Exp $
+ * $Id: unix.c,v 1.13 2005-02-08 13:23:23 adam Exp $
  * UNIX socket COMSTACK. By Morten Bøgeskov.
  */
+/**
+ * \file unix.c
+ * \brief Implements UNIX domain socket COMSTACK
+ */
+
 #ifndef WIN32
 
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include <unistd.h>
 #include <errno.h>
+#if HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
+#if HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#if HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
 #include <fcntl.h>
 #include <signal.h>
 
 #include <grp.h>
+#if HAVE_PWD_H
 #include <pwd.h>
-#include <sys/types.h>
+#endif
 
-#include <sys/socket.h>
+#if HAVE_SYS_STAT_H
 #include <sys/stat.h>
+#endif
+#if HAVE_SYS_UN_H
 #include <sys/un.h>
+#endif
 
-#include <yaz/comstack.h>
 #include <yaz/unix.h>
-#include <yaz/log.h>
 #include <yaz/nmem.h>
 
 #ifndef YAZ_SOCKLEN_T
@@ -137,6 +152,7 @@ COMSTACK unix_type(int s, int blocking, int protocol, void *vp)
     p->event = CS_NONE;
     p->cerrno = 0;
     p->stackerr = 0;
+    p->user = 0;
 
     state->altbuf = 0;
     state->altsize = state->altlen = 0;
@@ -177,11 +193,11 @@ static void *unix_straddr(COMSTACK h, const char *str)
 
     sp->uid = sp->gid = sp->umask = -1;
 
-    if (eol = strchr(s, ','))
+    if ((eol = strchr(s, ',')))
     {
 	do
 	{
-	    if (eol = strchr(s, ','))
+	    if ((eol = strchr(s, ',')))
 		*eol++ = '\0';
 	    if (sp->uid  == -1 && strncmp(s, "user=",  5) == 0)
 	    {
@@ -197,7 +213,7 @@ static void *unix_straddr(COMSTACK h, const char *str)
 		    {
 			printf("No such user\n");
 			free(f);
-			return;
+			return 0;
 		    }
 		    sp->uid = pw->pw_uid;
 		}
@@ -216,7 +232,7 @@ static void *unix_straddr(COMSTACK h, const char *str)
 		    {
 			printf("No such group\n");
 			free(f);
-			return;
+			return 0;
 		    }
 		    sp->gid = gr->gr_gid;
 		}
@@ -232,7 +248,7 @@ static void *unix_straddr(COMSTACK h, const char *str)
 		{
 		    printf("Invalid umask\n");
 		    free(f);
-		    return;
+		    return 0;
 		}
 	    }
 	    else if (file == NULL && strncmp(s, "file=", 5) == 0)
@@ -244,9 +260,9 @@ static void *unix_straddr(COMSTACK h, const char *str)
 	    {
 		printf("invalid or double argument: %s\n", s);
 		free(f);
-		return;
+		return 0;
 	    }
-	} while(s = eol);
+	} while((s = eol));
     }
     else
     {
@@ -297,6 +313,7 @@ static int unix_connect(COMSTACK h, void *address)
 {
     struct sockaddr_un *add = (struct sockaddr_un *)address;
     int r;
+    int i;
 
     TRC(fprintf(stderr, "unix_connect\n"));
     h->io_pending = 0;
@@ -305,14 +322,28 @@ static int unix_connect(COMSTACK h, void *address)
 	h->cerrno = CSOUTSTATE;
 	return -1;
     }
-    r = connect(h->iofile, (struct sockaddr *) add, SUN_LEN(add));
+    for (i = 0; i<3; i++)
+    {
+	r = connect(h->iofile, (struct sockaddr *) add, SUN_LEN(add));
+	if (r < 0 && yaz_errno() == EAGAIN)
+	{
+#if HAVE_USLEEP   
+	    usleep(i*10000+1000); /* 1ms, 11ms, 21ms */
+#else
+	    sleep(1);
+#endif
+	    continue;
+	}
+	else
+	    break;
+    }
     if (r < 0)
     {
 	if (yaz_errno() == EINPROGRESS)
 	{
 	    h->event = CS_CONNECT;
 	    h->state = CS_ST_CONNECTING;
-	    h->io_pending = CS_WANT_WRITE|CS_WANT_READ;
+	    h->io_pending = CS_WANT_WRITE;
 	    return 1;
 	}
 	h->cerrno = CSYSERR;
@@ -343,9 +374,6 @@ static int unix_rcvconnect(COMSTACK h)
     return 0;
 }
 
-#define CERTF "ztest.pem"
-#define KEYF "ztest.pem"
-
 static int unix_bind(COMSTACK h, void *address, int mode)
 {
     unix_state *sp = (unix_state *)h->cprivate;
@@ -568,7 +596,7 @@ static int unix_get(COMSTACK h, char **buf, int *bufsize)
 		return -1;
 	}
 	else if (!res)
-	    return 0;
+	    return hasread;
 	hasread += res;
     }
     TRC (fprintf (stderr, "  Out of read loop with hasread=%d, berlen=%d\n",
@@ -698,4 +726,4 @@ static int unix_set_blocking(COMSTACK p, int blocking)
     p->blocking = blocking;
     return 1;
 }
-#endif
+#endif /* WIN32 */