X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=comstack%2Ftcpip.c;h=3cbf108fcfd5410fb04139050470fe1da7456554;hb=6438b1afb3455d2b0aba71e90c873e3b8a6d5e54;hp=f68577ce31d3fa9e4d37632457161f73bd976a9b;hpb=086436151f45e51a855c748010a95615bc5e30a0;p=yaz-moved-to-github.git

diff --git a/comstack/tcpip.c b/comstack/tcpip.c
index f68577c..3cbf108 100644
--- a/comstack/tcpip.c
+++ b/comstack/tcpip.c
@@ -4,7 +4,16 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: tcpip.c,v $
- * Revision 1.13  1996-11-01 08:45:18  adam
+ * Revision 1.16  1997-09-01 08:49:14  adam
+ * New windows NT/95 port using MSV5.0. Minor changes only.
+ *
+ * Revision 1.15  1997/05/14 06:53:33  adam
+ * C++ support.
+ *
+ * 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
@@ -112,7 +121,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#ifndef WINDOWS
 #include <unistd.h>
+#endif
 #include <errno.h>
 #include <fcntl.h>
 
@@ -142,8 +153,6 @@ int completeWAIS(unsigned char *buf, int len); /* from waislen.c */
 #define TRC(X)
 #endif
 
-static int initialized = 0;
-
 typedef struct tcpip_state
 {
     char *altbuf; /* alternate buffer for surplus data */
@@ -155,6 +164,28 @@ typedef struct tcpip_state
     int (*complete)(unsigned char *buf, int len); /* length/completeness */
 } tcpip_state;
 
+#ifdef WINDOWS
+static int tcpip_init (void)
+{
+    static int initialized = 0;
+    if (!initialized)
+    {
+        WORD requested;
+        WSADATA wd;
+
+        requested = MAKEWORD(1, 1);
+        if (WSAStartup(requested, &wd))
+            return 0;
+        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.
@@ -170,19 +201,8 @@ COMSTACK tcpip_type(int s, int blocking, int protocol)
     struct protoent *proto;
 #endif
 
-    if (!initialized)
-    {
-#ifdef WINDOWS
-        WORD requested;
-        WSADATA wd;
-
-        requested = MAKEWORD(1, 1);
-        if (WSAStartup(requested, &wd))
-            return 0;
-#endif
-        initialized = 1;
-    }
-
+    if (!tcpip_init ())
+        return 0;
     if (s < 0)
     {
 #ifndef WINDOWS
@@ -199,7 +219,7 @@ COMSTACK tcpip_type(int s, int blocking, int protocol)
 	new_socket = 0;
     if (!(p = xmalloc(sizeof(struct comstack))))
 	return 0;
-    if (!(state = p->private = xmalloc(sizeof(tcpip_state))))
+    if (!(state = p->cprivate = xmalloc(sizeof(tcpip_state))))
 	return 0;
 
 #ifdef WINDOWS
@@ -251,6 +271,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);
@@ -273,7 +295,7 @@ struct sockaddr_in *tcpip_strtoaddr(const char *str)
 
 int tcpip_more(COMSTACK h)
 {
-    tcpip_state *sp = h->private;
+    tcpip_state *sp = h->cprivate;
 
     return sp->altlen && (*sp->complete)((unsigned char *) sp->altbuf,
 	sp->altlen);
@@ -371,8 +393,8 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen)
 
 COMSTACK tcpip_accept(COMSTACK h)
 {
-    COMSTACK new;
-    tcpip_state *state, *st = h->private;
+    COMSTACK cnew;
+    tcpip_state *state, *st = h->cprivate;
 #ifdef WINDOWS
     unsigned long tru = 1;
 #endif
@@ -383,31 +405,31 @@ COMSTACK tcpip_accept(COMSTACK h)
         h->cerrno = CSOUTSTATE;
         return 0;
     }
-    if (!(new = xmalloc(sizeof(*new))))
+    if (!(cnew = xmalloc(sizeof(*cnew))))
     {
         h->cerrno = CSYSERR;
         return 0;
     }
-    memcpy(new, h, sizeof(*h));
-    new->iofile = h->newfd;
-    if (!(state = new->private = xmalloc(sizeof(tcpip_state))))
+    memcpy(cnew, h, sizeof(*h));
+    cnew->iofile = h->newfd;
+    if (!(state = cnew->cprivate = xmalloc(sizeof(tcpip_state))))
     {
         h->cerrno = CSYSERR;
         return 0;
     }
 #ifdef WINDOWS
-    if (!new->blocking && ioctlsocket(new->iofile, FIONBIO, &tru) < 0)
+    if (!cnew->blocking && ioctlsocket(cnew->iofile, FIONBIO, &tru) < 0)
 #else
-    if (!new->blocking && fcntl(new->iofile, F_SETFL, O_NONBLOCK) < 0)
+    if (!cnew->blocking && fcntl(cnew->iofile, F_SETFL, O_NONBLOCK) < 0)
 #endif
         return 0;
     state->altbuf = 0;
     state->altsize = state->altlen = 0;
     state->towrite = state->written = -1;
     state->complete = st->complete;
-    new->state = CS_DATAXFER;
+    cnew->state = CS_DATAXFER;
     h->state = CS_IDLE;
-    return new;
+    return cnew;
 }
 
 #define CS_TCPIP_BUFCHUNK 4096
@@ -418,7 +440,7 @@ COMSTACK tcpip_accept(COMSTACK h)
  */
 int tcpip_get(COMSTACK h, char **buf, int *bufsize)
 {
-    tcpip_state *sp = h->private;
+    tcpip_state *sp = h->cprivate;
     char *tmpc;
     int tmpi, berlen, rest, req, tomove;
     int hasread = 0, res;
@@ -494,7 +516,7 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize)
 int tcpip_put(COMSTACK h, char *buf, int size)
 {
     int res;
-    struct tcpip_state *state = h->private;
+    struct tcpip_state *state = h->cprivate;
 
     TRC(fprintf(stderr, "tcpip_put: size=%d\n", size));
     if (state->towrite < 0)
@@ -535,13 +557,14 @@ int tcpip_put(COMSTACK h, char *buf, int size)
 
 int tcpip_close(COMSTACK h)
 {
-    tcpip_state *sp = h->private;
+    tcpip_state *sp = h->cprivate;
 
     TRC(fprintf(stderr, "tcpip_close\n"));
+    if (h->iofile != -1)
 #ifdef WINDOWS
-    closesocket(h->iofile);
+        closesocket(h->iofile);
 #else
-    close(h->iofile);
+        close(h->iofile);
 #endif
     if (sp->altbuf)
         xfree(sp->altbuf);