Uses preprocessor define WIN32 instead of WINDOWS to build code

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

diff --git a/comstack/tcpip.c b/comstack/tcpip.c
index 667accf..f3efddb 100644 (file)
--- a/comstack/tcpip.c
+++ b/comstack/tcpip.c
@@ -1,10 +1,17 @@
 /*
- * Copyright (c) 1995-1998, Index Data
+ * Copyright (c) 1995-1999, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: tcpip.c,v $
- * Revision 1.25  1998-07-07 15:49:23  adam
+ * Revision 1.27  1999-02-02 13:57:31  adam
+ * Uses preprocessor define WIN32 instead of WINDOWS to build code
+ * for Microsoft WIN32.
+ *
+ * Revision 1.26  1999/01/08 11:23:14  adam
+ * Added const modifier to some of the BER/ODR encoding routines.
+ *
+ * Revision 1.25  1998/07/07 15:49:23  adam
  * Added braces to avoid warning.
  *
  * Revision 1.24  1998/06/29 07:59:17  adam
@@ -150,7 +157,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#ifndef WINDOWS
+#ifndef WIN32
 #include <unistd.h>
 #endif
 #include <errno.h>
@@ -159,9 +166,8 @@
 #include <comstack.h>
 #include <tcpip.h>
 
-/* Chas added the following 2, so we get the definition of completeBER */
+/* Chas added the following, so we get the definition of completeBER */
 #include <odr.h>
-#include <prt.h>
 
 int tcpip_close(COMSTACK h);
 int tcpip_put(COMSTACK h, char *buf, int size);
@@ -178,14 +184,6 @@ COMSTACK tcpip_accept(COMSTACK h);
 char *tcpip_addrstr(COMSTACK h);
 void *tcpip_straddr(COMSTACK h, const char *str);
 
-/*
- * Determine length/completeness of incoming packages
- */
-/* Chas: Removed the definition of completeBERfrom here, use the one in the */
-/* include directory as that as the extern "C" around it */
-/*int completeBER(unsigned char *buf, int len); */ /* from the ODR module */
-int completeWAIS(unsigned char *buf, int len); /* from waislen.c */
-
 #undef TRACE_TCPIP
 #ifdef TRACE_TCPIP
 #define TRC(x) x
@@ -201,12 +199,12 @@ 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 */
+    int (*complete)(const unsigned char *buf, int len); /* length/comple. */
     struct sockaddr_in addr;  /* returned by cs_straddr */
     char buf[128]; /* returned by cs_addrstr */
 } tcpip_state;
 
-#ifdef WINDOWS
+#ifdef WIN32
 static int tcpip_init (void)
 {
     static int initialized = 0;
@@ -237,7 +235,7 @@ COMSTACK tcpip_type(int s, int blocking, int protocol)
     COMSTACK p;
     tcpip_state *state;
     int new_socket;
-#ifdef WINDOWS
+#ifdef WIN32
     unsigned long tru = 1;
 #else
     struct protoent *proto;
@@ -247,7 +245,7 @@ COMSTACK tcpip_type(int s, int blocking, int protocol)
         return 0;
     if (s < 0)
     {
-#ifndef WINDOWS
+#ifndef WIN32
        if (!(proto = getprotobyname("tcp")))
            return 0;
        if ((s = socket(AF_INET, SOCK_STREAM, proto->p_proto)) < 0)
@@ -265,7 +263,7 @@ COMSTACK tcpip_type(int s, int blocking, int protocol)
                                          xmalloc(sizeof(tcpip_state)))))
        return 0;
 
-#ifdef WINDOWS
+#ifdef WIN32
     if (!(p->blocking = blocking) && ioctlsocket(s, FIONBIO, &tru) < 0)
 #else
     if (!(p->blocking = blocking) && fcntl(s, F_SETFL, O_NONBLOCK) < 0)
@@ -375,7 +373,7 @@ int tcpip_connect(COMSTACK h, void *address)
     TRC(fprintf(stderr, "tcpip_connect\n"));
     if (connect(h->iofile, (struct sockaddr *) add, sizeof(*add)) < 0)
     {
-#ifdef WINDOWS
+#ifdef WIN32
         if (WSAGetLastError() == WSAEWOULDBLOCK)
 #else
         if (errno == EINPROGRESS)
@@ -399,7 +397,7 @@ int tcpip_rcvconnect(COMSTACK h)
 int tcpip_bind(COMSTACK h, void *address, int mode)
 {
     struct sockaddr *addr = (struct sockaddr *)address;
-#ifdef WINDOWS
+#ifdef WIN32
     BOOL one = 1;
 #else
     unsigned long one = 1;
@@ -454,7 +452,7 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen,
     }
     if ((h->newfd = accept(h->iofile, (struct sockaddr*)&addr, &len)) < 0)
     {
-#ifdef WINDOWS
+#ifdef WIN32
         if (WSAGetLastError() == WSAEWOULDBLOCK)
 #else
         if (errno == EWOULDBLOCK)
@@ -473,7 +471,7 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen,
         sizeof(addr.sin_addr), AF_INET))
     {
        h->cerrno = CSDENY;
-#ifdef WINDOWS
+#ifdef WIN32
         closesocket(h->iofile);
 #else
         close(h->iofile);
@@ -488,7 +486,7 @@ COMSTACK tcpip_accept(COMSTACK h)
 {
     COMSTACK cnew;
     tcpip_state *state, *st = (tcpip_state *)h->cprivate;
-#ifdef WINDOWS
+#ifdef WIN32
     unsigned long tru = 1;
 #endif
 
@@ -510,7 +508,7 @@ COMSTACK tcpip_accept(COMSTACK h)
         h->cerrno = CSYSERR;
         return 0;
     }
-#ifdef WINDOWS
+#ifdef WIN32
     if (!cnew->blocking && ioctlsocket(cnew->iofile, FIONBIO, &tru) < 0)
 #else
     if (!cnew->blocking && fcntl(cnew->iofile, F_SETFL, O_NONBLOCK) < 0)
@@ -564,7 +562,7 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize)
                 return -1;
         if ((res = recv(h->iofile, *buf + hasread, CS_TCPIP_BUFCHUNK, 0)) < 0)
        {
-#ifdef WINDOWS
+#ifdef WIN32
             if (WSAGetLastError() == WSAEWOULDBLOCK)
 #else
 #ifdef EINPROGRESS
@@ -633,7 +631,7 @@ int tcpip_put(COMSTACK h, char *buf, int size)
         if ((res = send(h->iofile, buf + state->written, size -
             state->written, 0)) < 0)
         {
-#ifdef WINDOWS
+#ifdef WIN32
             if (WSAGetLastError() == WSAEWOULDBLOCK)
 #else
             if (errno == EAGAIN)
@@ -660,7 +658,7 @@ int tcpip_close(COMSTACK h)
 
     TRC(fprintf(stderr, "tcpip_close\n"));
     if (h->iofile != -1)
-#ifdef WINDOWS
+#ifdef WIN32
         closesocket(h->iofile);
 #else
         close(h->iofile);