Moved WINSOCK init. code to tcpip_init routine.

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

diff --git a/comstack/tcpip.c b/comstack/tcpip.c
index dae32b9..17c31a9 100644 (file)
--- a/comstack/tcpip.c
+++ b/comstack/tcpip.c
@@ -4,7 +4,25 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: tcpip.c,v $
- * Revision 1.8  1995-11-01 13:54:27  quinn
+ * Revision 1.14  1997-05-01 15:06:32  adam
+ * Moved WINSOCK init. code to tcpip_init routine.
+ *
+ * Revision 1.13  1996/11/01 08:45:18  adam
+ * Bug fix: used close on MS-Windows. Fixed to closesocket.
+ *
+ * Revision 1.12  1996/07/06 19:58:30  quinn
+ * System headerfiles gathered in yconfig
+ *
+ * Revision 1.11  1996/02/23  10:00:39  quinn
+ * WAIS Work
+ *
+ * Revision 1.10  1996/02/20  12:52:11  quinn
+ * WAIS protocol support.
+ *
+ * Revision 1.9  1996/02/10  12:23:11  quinn
+ * Enablie inetd operations fro TCP/IP stack
+ *
+ * Revision 1.8  1995/11/01  13:54:27  quinn
  * Minor adjustments
  *
  * Revision 1.7  1995/10/30  12:41:16  quinn
@@ -97,17 +115,15 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#ifndef WINDOWS
 #include <unistd.h>
+#endif
 #include <errno.h>
 #include <fcntl.h>
 
 #include <comstack.h>
 #include <tcpip.h>
 
-#ifndef WINDOWS
-#include <sys/time.h>
-#endif
-
 int tcpip_close(COMSTACK h);
 int tcpip_put(COMSTACK h, char *buf, int size);
 int tcpip_get(COMSTACK h, char **buf, int *bufsize);
@@ -119,7 +135,11 @@ int tcpip_listen(COMSTACK h, char *addrp, int *addrlen);
 COMSTACK tcpip_accept(COMSTACK h);
 char *tcpip_addrstr(COMSTACK h);
 
-int completeBER(unsigned char *buf, int len);
+/*
+ * Determine length/completeness of incoming packages
+ */
+int completeBER(unsigned char *buf, int len); /* from the ODR module */
+int completeWAIS(unsigned char *buf, int len); /* from waislen.c */
 
 #ifdef TRACE_TCPIP
 #define TRC(x) x
@@ -127,8 +147,6 @@ int completeBER(unsigned char *buf, int len);
 #define TRC(X)
 #endif
 
-static int initialized = 0;
-
 typedef struct tcpip_state
 {
     char *altbuf; /* alternate buffer for surplus data */
@@ -137,50 +155,74 @@ typedef struct tcpip_state
 
     int written;  /* -1 if we aren't writing */
     int towrite;  /* to verify against user input */
+    int (*complete)(unsigned char *buf, int len); /* length/completeness */
 } tcpip_state;
 
-COMSTACK tcpip_type(int blocking, int protocol)
-{
-    COMSTACK p;
-    tcpip_state *state;
-    int s;
 #ifdef WINDOWS
-    unsigned long tru = 1;
-#else
-    struct protoent *proto;
-#endif
-
+static int tcpip_init (void)
+{
+    static int initialized = 0;
     if (!initialized)
     {
-#ifdef WINDOWS
         WORD requested;
         WSADATA wd;
 
         requested = MAKEWORD(1, 1);
         if (WSAStartup(requested, &wd))
             return 0;
-#endif
         initialized = 1;
     }
+    return 1;
+}
+#else
+static int tcpip_init (void)
+{
+    return 1;
+}
+#endif
+/*
+ * This function is always called through the cs_create() macro.
+ * s >= 0: socket has already been established for us.
+ */
+COMSTACK tcpip_type(int s, int blocking, int protocol)
+{
+    COMSTACK p;
+    tcpip_state *state;
+    int new_socket;
+#ifdef WINDOWS
+    unsigned long tru = 1;
+#else
+    struct protoent *proto;
+#endif
 
-#ifndef WINDOWS
-    if (!(proto = getprotobyname("tcp")))
+    if (!tcpip_init ())
         return 0;
-    if ((s = socket(AF_INET, SOCK_STREAM, proto->p_proto)) < 0)
+    if (s < 0)
+    {
+#ifndef WINDOWS
+       if (!(proto = getprotobyname("tcp")))
+           return 0;
+       if ((s = socket(AF_INET, SOCK_STREAM, proto->p_proto)) < 0)
 #else
-    if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0)
+       if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0)
 #endif
-        return 0;
+           return 0;
+       new_socket = 1;
+    }
+    else
+       new_socket = 0;
     if (!(p = xmalloc(sizeof(struct comstack))))
-        return 0;
+       return 0;
     if (!(state = p->private = xmalloc(sizeof(tcpip_state))))
-        return 0;
+       return 0;
+
 #ifdef WINDOWS
     if (!(p->blocking = blocking) && ioctlsocket(s, FIONBIO, &tru) < 0)
 #else
     if (!(p->blocking = blocking) && fcntl(s, F_SETFL, O_NONBLOCK) < 0)
 #endif
-        return 0;
+       return 0;
+
     p->iofile = s;
     p->type = tcpip_type;
     p->protocol = protocol;
@@ -196,7 +238,7 @@ COMSTACK tcpip_type(int blocking, int protocol)
     p->f_accept = tcpip_accept;
     p->f_addrstr = tcpip_addrstr;
 
-    p->state = CS_UNBND;
+    p->state = new_socket ? CS_UNBND : CS_IDLE; /* state of line */
     p->event = CS_NONE;
     p->cerrno = 0;
     p->stackerr = 0;
@@ -204,6 +246,10 @@ COMSTACK tcpip_type(int blocking, int protocol)
     state->altbuf = 0;
     state->altsize = state->altlen = 0;
     state->towrite = state->written = -1;
+    if (protocol == PROTO_WAIS)
+       state->complete = completeWAIS;
+    else
+       state->complete = completeBER;
 
     p->timeout = COMSTACK_DEFAULT_TIMEOUT;
     TRC(fprintf(stderr, "Created new TCPIP comstack\n"));
@@ -219,6 +265,8 @@ struct sockaddr_in *tcpip_strtoaddr(const char *str)
     short int port = 210;
     unsigned tmpadd;
 
+    if (!tcpip_init ())
+        return 0;
     TRC(fprintf(stderr, "tcpip_strtoaddress: %s\n", str ? str : "NULL"));
     add.sin_family = AF_INET;
     strcpy(buf, str);
@@ -243,7 +291,8 @@ int tcpip_more(COMSTACK h)
 {
     tcpip_state *sp = h->private;
 
-    return sp->altlen && completeBER((unsigned char *) sp->altbuf, sp->altlen);
+    return sp->altlen && (*sp->complete)((unsigned char *) sp->altbuf,
+       sp->altlen);
 }
 
 /*
@@ -339,7 +388,7 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen)
 COMSTACK tcpip_accept(COMSTACK h)
 {
     COMSTACK new;
-    tcpip_state *state;
+    tcpip_state *state, *st = h->private;
 #ifdef WINDOWS
     unsigned long tru = 1;
 #endif
@@ -371,6 +420,7 @@ COMSTACK tcpip_accept(COMSTACK h)
     state->altbuf = 0;
     state->altsize = state->altlen = 0;
     state->towrite = state->written = -1;
+    state->complete = st->complete;
     new->state = CS_DATAXFER;
     h->state = CS_IDLE;
     return new;
@@ -403,7 +453,7 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize)
         sp->altbuf = tmpc;
         sp->altsize = tmpi;
     }
-    while (!(berlen = completeBER((unsigned char *)*buf, hasread)))
+    while (!(berlen = (*sp->complete)((unsigned char *)*buf, hasread)))
     {
         if (!*bufsize)
         {
@@ -504,7 +554,11 @@ int tcpip_close(COMSTACK h)
     tcpip_state *sp = h->private;
 
     TRC(fprintf(stderr, "tcpip_close\n"));
+#ifdef WINDOWS
+    closesocket(h->iofile);
+#else
     close(h->iofile);
+#endif
     if (sp->altbuf)
         xfree(sp->altbuf);
     xfree(sp);