Added braces to avoid warning.

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

diff --git a/comstack/tcpip.c b/comstack/tcpip.c
index 3a99bd0..667accf 100644 (file)
--- a/comstack/tcpip.c
+++ b/comstack/tcpip.c
@@ -1,10 +1,30 @@
 /*
- * Copyright (c) 1995-1997, Index Data
+ * Copyright (c) 1995-1998, Index Data
  * See the file LICENSE for details.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: tcpip.c,v $
- * Revision 1.19  1998-02-11 11:53:33  adam
+ * 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
+ * Minor fix.
+ *
+ * Revision 1.23  1998/06/23 15:37:50  adam
+ * Added type cast to prevent warning.
+ *
+ * Revision 1.22  1998/06/22 11:32:36  adam
+ * Added 'conditional cs_listen' feature.
+ *
+ * Revision 1.21  1998/05/20 09:55:32  adam
+ * Function tcpip_get treats EINPROGRESS error in the same way as
+ * EWOULDBLOCK. EINPROGRESS shouldn't be returned - but it is on
+ * Solaris in some cases.
+ *
+ * Revision 1.20  1998/05/18 10:10:40  adam
+ * Minor change to avoid C++ warning.
+ *
+ * Revision 1.19  1998/02/11 11:53:33  adam
  * Changed code so that it compiles as C++.
  *
  * Revision 1.18  1997/09/29 07:15:25  adam
@@ -150,7 +170,10 @@ int tcpip_connect(COMSTACK h, void *address);
 int tcpip_more(COMSTACK h);
 int tcpip_rcvconnect(COMSTACK h);
 int tcpip_bind(COMSTACK h, void *address, int mode);
-int tcpip_listen(COMSTACK h, char *addrp, int *addrlen);
+int tcpip_listen(COMSTACK h, char *raddr, int *addrlen,
+                int (*check_ip)(void *cd, const char *a, int len, int type),
+                void *cd);
+
 COMSTACK tcpip_accept(COMSTACK h);
 char *tcpip_addrstr(COMSTACK h);
 void *tcpip_straddr(COMSTACK h, const char *str);
@@ -163,6 +186,7 @@ void *tcpip_straddr(COMSTACK h, const char *str);
 /*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
 #else
@@ -250,7 +274,7 @@ COMSTACK tcpip_type(int s, int blocking, int protocol)
 
     p->iofile = s;
     p->type = tcpip_type;
-    p->protocol = protocol;
+    p->protocol = (enum oid_proto) protocol;
 
     p->f_connect = tcpip_connect;
     p->f_rcvconnect = tcpip_rcvconnect;
@@ -402,12 +426,27 @@ int tcpip_bind(COMSTACK h, void *address, int mode)
     return 0;
 }
 
-int tcpip_listen(COMSTACK h, char *raddr, int *addrlen)
+#if 0
+void tcpip_get_ip(COMSTACK h, char *ip_buf)
+{
+    struct tcpip_state *sp = (tcpip_state *)h->cprivate;
+    const char *ip_addr = (const char *) (&sp->addr->sin_addr.s_addr);
+    int i;
+
+    for (i = 0; i<4; i++)
+       TRC (fprintf (stderr, "%u ", ip_addr[i]));
+    TRC (fprintf (stderr, "\n"));
+}
+#endif
+
+int tcpip_listen(COMSTACK h, char *raddr, int *addrlen,
+                int (*check_ip)(void *cd, const char *a, int len, int type),
+                void *cd)
 {
     struct sockaddr_in addr;
     int len = sizeof(addr);
 
-    TRC(fprintf(stderr, "tcpip_listen\n"));
+    TRC(fprintf(stderr, "tcpip_listen pid=%d\n", getpid()));
     if (h->state != CS_IDLE)
     {
         h->cerrno = CSOUTSTATE;
@@ -426,10 +465,21 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen)
             h->cerrno = CSYSERR;
         return -1;
     }
-    if (addrlen && *addrlen > sizeof(struct sockaddr_in))
+    if (addrlen && *addrlen >= sizeof(struct sockaddr_in))
         memcpy(raddr, &addr, *addrlen = sizeof(struct sockaddr_in));
     else if (addrlen)
         *addrlen = 0;
+    if (check_ip && (*check_ip)(cd, (const char *) &addr.sin_addr,
+        sizeof(addr.sin_addr), AF_INET))
+    {
+       h->cerrno = CSDENY;
+#ifdef WINDOWS
+        closesocket(h->iofile);
+#else
+        close(h->iofile);
+#endif
+       return -1;
+    }
     h->state = CS_INCON;
     return 0;
 }
@@ -513,14 +563,20 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize)
             if (!(*buf =(char *)xrealloc(*buf, *bufsize *= 2)))
                 return -1;
         if ((res = recv(h->iofile, *buf + hasread, CS_TCPIP_BUFCHUNK, 0)) < 0)
+       {
 #ifdef WINDOWS
             if (WSAGetLastError() == WSAEWOULDBLOCK)
 #else
+#ifdef EINPROGRESS
+           if (errno == EINPROGRESS || errno == EWOULDBLOCK)
+#else
             if (errno == EWOULDBLOCK)
 #endif
+#endif
                 break;
             else
                 return -1;
+       }
         if (!res)
             return 0;
         hasread += res;