Fix sample PQF

[yaz-moved-to-github.git] / comstack / unix.c

diff --git a/comstack/unix.c b/comstack/unix.c
index 960ccec..4efed27 100644 (file)
--- a/comstack/unix.c
+++ b/comstack/unix.c
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1995-2002, Index Data
+ * Copyright (c) 1995-2003, Index Data
  * See the file LICENSE for details.
  *
- * $Id: unix.c,v 1.7 2002-09-25 12:37:07 adam Exp $
+ * $Id: unix.c,v 1.14 2003-10-08 21:47:15 adam Exp $
  * UNIX socket COMSTACK. By Morten Bøgeskov.
  */
 #ifndef WIN32
@@ -22,30 +22,27 @@
 #include <yaz/comstack.h>
 #include <yaz/unix.h>
 #include <yaz/log.h>
-
-/* Chas added the following, so we get the definition of completeBER */
-#include <yaz/odr.h>
+#include <yaz/nmem.h>
 
 #ifndef YAZ_SOCKLEN_T
 #define YAZ_SOCKLEN_T int
 #endif
 
-int unix_close(COMSTACK h);
-int unix_put(COMSTACK h, char *buf, int size);
-int unix_get(COMSTACK h, char **buf, int *bufsize);
-int unix_connect(COMSTACK h, void *address);
-int unix_more(COMSTACK h);
-int unix_rcvconnect(COMSTACK h);
-int unix_bind(COMSTACK h, void *address, int mode);
-int unix_listen(COMSTACK h, char *raddr, int *addrlen,
+static int unix_close(COMSTACK h);
+static int unix_put(COMSTACK h, char *buf, int size);
+static int unix_get(COMSTACK h, char **buf, int *bufsize);
+static int unix_connect(COMSTACK h, void *address);
+static int unix_more(COMSTACK h);
+static int unix_rcvconnect(COMSTACK h);
+static int unix_bind(COMSTACK h, void *address, int mode);
+static int unix_listen(COMSTACK h, char *raddr, int *addrlen,
                int (*check_ip)(void *cd, const char *a, int len, int type),
                void *cd);
-int static unix_set_blocking(COMSTACK p, int blocking);
-
+static int unix_set_blocking(COMSTACK p, int blocking);
 
-COMSTACK unix_accept(COMSTACK h);
-char *unix_addrstr(COMSTACK h);
-void *unix_straddr(COMSTACK h, const char *str);
+static COMSTACK unix_accept(COMSTACK h);
+static char *unix_addrstr(COMSTACK h);
+static void *unix_straddr(COMSTACK h, const char *str);
 
 #ifndef SUN_LEN
 #define SUN_LEN(ptr) ((size_t) (((struct sockaddr_un *) 0)->sun_path) \
@@ -102,7 +99,7 @@ COMSTACK unix_type(int s, int blocking, int protocol, void *vp)
                                        xmalloc(sizeof(unix_state)))))
        return 0;
 
-    if (!(p->blocking = blocking))
+    if (!((p->blocking = blocking)&1))
     {
        if (fcntl(s, F_SETFL, O_NONBLOCK) < 0)
            return 0;
@@ -140,7 +137,7 @@ COMSTACK unix_type(int s, int blocking, int protocol, void *vp)
     if (protocol == PROTO_WAIS)
        state->complete = completeWAIS;
     else
-       state->complete = completeBER;
+       state->complete = cs_complete_auto;
 
     p->timeout = COMSTACK_DEFAULT_TIMEOUT;
     TRC(fprintf(stderr, "Created new UNIX comstack\n"));
@@ -149,7 +146,7 @@ COMSTACK unix_type(int s, int blocking, int protocol, void *vp)
 }
 
 
-int unix_strtoaddr_ex(const char *str, struct sockaddr_un *add)
+static int unix_strtoaddr_ex(const char *str, struct sockaddr_un *add)
 {
     char *cp;
     if (!unix_init ())
@@ -163,7 +160,7 @@ int unix_strtoaddr_ex(const char *str, struct sockaddr_un *add)
     return 1;
 }
 
-void *unix_straddr(COMSTACK h, const char *str)
+static void *unix_straddr(COMSTACK h, const char *str)
 {
     unix_state *sp = (unix_state *)h->cprivate;
 
@@ -185,7 +182,7 @@ struct sockaddr_un *unix_strtoaddr(const char *str)
     return &add;
 }
 
-int unix_more(COMSTACK h)
+static int unix_more(COMSTACK h)
 {
     unix_state *sp = (unix_state *)h->cprivate;
 
@@ -198,7 +195,7 @@ int unix_more(COMSTACK h)
  * weird things like spawning subprocesses or threading or some weird junk
  * like that.
  */
-int unix_connect(COMSTACK h, void *address)
+static int unix_connect(COMSTACK h, void *address)
 {
     struct sockaddr_un *add = (struct sockaddr_un *)address;
     int r;
@@ -232,7 +229,7 @@ int unix_connect(COMSTACK h, void *address)
 /*
  * nop
  */
-int unix_rcvconnect(COMSTACK h)
+static int unix_rcvconnect(COMSTACK h)
 {
     TRC(fprintf(stderr, "unix_rcvconnect\n"));
 
@@ -251,7 +248,7 @@ int unix_rcvconnect(COMSTACK h)
 #define CERTF "ztest.pem"
 #define KEYF "ztest.pem"
 
-int unix_bind(COMSTACK h, void *address, int mode)
+static int unix_bind(COMSTACK h, void *address, int mode)
 {
     struct sockaddr *addr = (struct sockaddr *)address;
     const char * path = ((struct sockaddr_un *)addr)->sun_path;
@@ -294,6 +291,7 @@ int unix_bind(COMSTACK h, void *address, int mode)
        h->cerrno = CSYSERR;
        return -1;
     }
+    chmod(path, 0777);
     if (mode == CS_SERVER && listen(h->iofile, 3) < 0)
     {
        h->cerrno = CSYSERR;
@@ -304,12 +302,12 @@ int unix_bind(COMSTACK h, void *address, int mode)
     return 0;
 }
 
-int unix_listen(COMSTACK h, char *raddr, int *addrlen,
-               int (*check_ip)(void *cd, const char *a, int len, int t),
-               void *cd)
+static int unix_listen(COMSTACK h, char *raddr, int *addrlen,
+                    int (*check_ip)(void *cd, const char *a, int len, int t),
+                   void *cd)
 {
     struct sockaddr_un addr;
-    YAZ_SOCKLEN_T len = SUN_LEN(&addr);
+    YAZ_SOCKLEN_T len = sizeof(addr);
 
     TRC(fprintf(stderr, "unix_listen pid=%d\n", getpid()));
     if (h->state != CS_ST_IDLE)
@@ -341,7 +339,7 @@ int unix_listen(COMSTACK h, char *raddr, int *addrlen,
     return 0;
 }
 
-COMSTACK unix_accept(COMSTACK h)
+static COMSTACK unix_accept(COMSTACK h)
 {
     COMSTACK cnew;
     unix_state *state, *st = (unix_state *)h->cprivate;
@@ -370,8 +368,8 @@ COMSTACK unix_accept(COMSTACK h)
            }
            return 0;
        }
-       if (!cnew->blocking &&
-           (!cnew->blocking && fcntl(cnew->iofile, F_SETFL, O_NONBLOCK) < 0)
+       if (!(cnew->blocking&1) && 
+            (fcntl(cnew->iofile, F_SETFL, O_NONBLOCK) < 0)
            )
        {
            h->cerrno = CSYSERR;
@@ -389,6 +387,7 @@ COMSTACK unix_accept(COMSTACK h)
        state->altsize = state->altlen = 0;
        state->towrite = state->written = -1;
        state->complete = st->complete;
+       memcpy(&state->addr, &st->addr, sizeof(state->addr));
        cnew->state = CS_ST_ACCEPT;
        cnew->event = CS_NONE;
        h->state = CS_ST_IDLE;
@@ -415,7 +414,7 @@ COMSTACK unix_accept(COMSTACK h)
  * Return: -1 error, >1 good, len of buffer, ==1 incomplete buffer,
  * 0=connection closed.
  */
-int unix_get(COMSTACK h, char **buf, int *bufsize)
+static int unix_get(COMSTACK h, char **buf, int *bufsize)
 {
     unix_state *sp = (unix_state *)h->cprivate;
     char *tmpc;
@@ -504,7 +503,7 @@ int unix_get(COMSTACK h, char **buf, int *bufsize)
  * In nonblocking mode, you must call again with same buffer while
  * return value is 1.
  */
-int unix_put(COMSTACK h, char *buf, int size)
+static int unix_put(COMSTACK h, char *buf, int size)
 {
     int res;
     struct unix_state *state = (struct unix_state *)h->cprivate;
@@ -559,9 +558,7 @@ int unix_put(COMSTACK h, char *buf, int size)
     return 0;
 }
 
-
-
-int unix_close(COMSTACK h)
+static int unix_close(COMSTACK h)
 {
     unix_state *sp = (struct unix_state *)h->cprivate;
 
@@ -577,7 +574,7 @@ int unix_close(COMSTACK h)
     return 0;
 }
 
-char *unix_addrstr(COMSTACK h)
+static char *unix_addrstr(COMSTACK h)
 {
     unix_state *sp = (struct unix_state *)h->cprivate;
     char *buf = sp->buf;
@@ -585,7 +582,7 @@ char *unix_addrstr(COMSTACK h)
     return buf;
 }
 
-int static unix_set_blocking(COMSTACK p, int blocking)
+static int unix_set_blocking(COMSTACK p, int blocking)
 {
     unsigned long flag;