X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=comstack%2Ftcpip.c;h=36cc696551b5af4acf6ef7a963757829826d993d;hp=0163f3c1c56bfb18951640791827e4c7215951c3;hb=c03149b852e2937bd0637b21c3058a48dd25a739;hpb=c287183a2eb9f42d40b8ba1293d98068ebe02002

diff --git a/comstack/tcpip.c b/comstack/tcpip.c
index 0163f3c..36cc696 100644
--- a/comstack/tcpip.c
+++ b/comstack/tcpip.c
@@ -1,10 +1,27 @@
 /*
- * 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.18  1997-09-29 07:15:25  adam
+ * 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
  * Changed use of setsockopt to avoid warnings on MSVC.
  *
  * Revision 1.17  1997/09/17 12:10:30  adam
@@ -136,6 +153,10 @@
 #include <comstack.h>
 #include <tcpip.h>
 
+/* Chas added the following 2, 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);
 int tcpip_get(COMSTACK h, char **buf, int *bufsize);
@@ -143,7 +164,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);
@@ -151,9 +175,12 @@ void *tcpip_straddr(COMSTACK h, const char *str);
 /*
  * Determine length/completeness of incoming packages
  */
-int completeBER(unsigned char *buf, int len); /* from the ODR module */
+/* 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
 #else
@@ -226,9 +253,10 @@ COMSTACK tcpip_type(int s, int blocking, int protocol)
     }
     else
 	new_socket = 0;
-    if (!(p = xmalloc(sizeof(struct comstack))))
+    if (!(p = (struct comstack *)xmalloc(sizeof(struct comstack))))
 	return 0;
-    if (!(state = p->cprivate = xmalloc(sizeof(tcpip_state))))
+    if (!(state = (struct tcpip_state *)(p->cprivate =
+                                         xmalloc(sizeof(tcpip_state)))))
 	return 0;
 
 #ifdef WINDOWS
@@ -240,7 +268,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;
@@ -305,7 +333,7 @@ static int tcpip_strtoaddr_ex(const char *str, struct sockaddr_in *add)
 
 void *tcpip_straddr(COMSTACK h, const char *str)
 {
-    tcpip_state *sp = h->cprivate;
+    tcpip_state *sp = (tcpip_state *)h->cprivate;
 
     if (!tcpip_strtoaddr_ex (str, &sp->addr))
 	return 0;
@@ -323,7 +351,7 @@ struct sockaddr_in *tcpip_strtoaddr(const char *str)
 
 int tcpip_more(COMSTACK h)
 {
-    tcpip_state *sp = h->cprivate;
+    tcpip_state *sp = (tcpip_state *)h->cprivate;
     
     return sp->altlen && (*sp->complete)((unsigned char *) sp->altbuf,
 	sp->altlen);
@@ -336,7 +364,7 @@ int tcpip_more(COMSTACK h)
  */
 int tcpip_connect(COMSTACK h, void *address)
 {
-    struct sockaddr_in *add = address;
+    struct sockaddr_in *add = (struct sockaddr_in *)address;
 
     TRC(fprintf(stderr, "tcpip_connect\n"));
     if (connect(h->iofile, (struct sockaddr *) add, sizeof(*add)) < 0)
@@ -364,7 +392,7 @@ int tcpip_rcvconnect(COMSTACK h)
 
 int tcpip_bind(COMSTACK h, void *address, int mode)
 {
-    struct sockaddr *addr = address;
+    struct sockaddr *addr = (struct sockaddr *)address;
 #ifdef WINDOWS
     BOOL one = 1;
 #else
@@ -372,7 +400,7 @@ int tcpip_bind(COMSTACK h, void *address, int mode)
 #endif
 
     TRC(fprintf(stderr, "tcpip_bind\n"));
-    if (setsockopt(h->iofile, SOL_SOCKET, SO_REUSEADDR, (void*) 
+    if (setsockopt(h->iofile, SOL_SOCKET, SO_REUSEADDR, (char*) 
 	&one, sizeof(one)) < 0)
     {
         h->cerrno = CSYSERR;
@@ -392,12 +420,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;
@@ -416,10 +459,20 @@ 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 1
+    if (check_ip && (*check_ip)(cd, (const char *) &addr.sin_addr,
+        sizeof(addr.sin_addr), AF_INET))
+    {
+	h->cerrno = CSDENY;
+	close (h->newfd);
+	return -1;
+    }
+#endif
     h->state = CS_INCON;
     return 0;
 }
@@ -427,7 +480,7 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen)
 COMSTACK tcpip_accept(COMSTACK h)
 {
     COMSTACK cnew;
-    tcpip_state *state, *st = h->cprivate;
+    tcpip_state *state, *st = (tcpip_state *)h->cprivate;
 #ifdef WINDOWS
     unsigned long tru = 1;
 #endif
@@ -438,14 +491,14 @@ COMSTACK tcpip_accept(COMSTACK h)
         h->cerrno = CSOUTSTATE;
         return 0;
     }
-    if (!(cnew = xmalloc(sizeof(*cnew))))
+    if (!(cnew = (COMSTACK)xmalloc(sizeof(*cnew))))
     {
         h->cerrno = CSYSERR;
         return 0;
     }
     memcpy(cnew, h, sizeof(*h));
     cnew->iofile = h->newfd;
-    if (!(state = cnew->cprivate = xmalloc(sizeof(tcpip_state))))
+    if (!(state = (tcpip_state *)(cnew->cprivate = xmalloc(sizeof(tcpip_state)))))
     {
         h->cerrno = CSYSERR;
         return 0;
@@ -473,7 +526,7 @@ COMSTACK tcpip_accept(COMSTACK h)
  */
 int tcpip_get(COMSTACK h, char **buf, int *bufsize)
 {
-    tcpip_state *sp = h->cprivate;
+    tcpip_state *sp = (tcpip_state *)h->cprivate;
     char *tmpc;
     int tmpi, berlen, rest, req, tomove;
     int hasread = 0, res;
@@ -496,18 +549,22 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize)
     {
         if (!*bufsize)
         {
-            if (!(*buf = xmalloc(*bufsize = CS_TCPIP_BUFCHUNK)))
+            if (!(*buf = (char *)xmalloc(*bufsize = CS_TCPIP_BUFCHUNK)))
                 return -1;
         }
         else if (*bufsize - hasread < CS_TCPIP_BUFCHUNK)
-            if (!(*buf =xrealloc(*buf, *bufsize *= 2)))
+            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;
@@ -527,10 +584,10 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize)
             req += CS_TCPIP_BUFCHUNK - rest;
         if (!sp->altbuf)
         {
-            if (!(sp->altbuf = xmalloc(sp->altsize = req)))
+            if (!(sp->altbuf = (char *)xmalloc(sp->altsize = req)))
                 return -1;
         } else if (sp->altsize < req)
-            if (!(sp->altbuf =xrealloc(sp->altbuf, sp->altsize = req)))
+            if (!(sp->altbuf =(char *)xrealloc(sp->altbuf, sp->altsize = req)))
                 return -1;
         TRC(fprintf(stderr, "  Moving %d bytes to altbuf(0x%x)\n", tomove,
             (unsigned) sp->altbuf));
@@ -549,7 +606,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->cprivate;
+    struct tcpip_state *state = (struct tcpip_state *)h->cprivate;
 
     TRC(fprintf(stderr, "tcpip_put: size=%d\n", size));
     if (state->towrite < 0)
@@ -590,7 +647,7 @@ int tcpip_put(COMSTACK h, char *buf, int size)
 
 int tcpip_close(COMSTACK h)
 {
-    tcpip_state *sp = h->cprivate;
+    tcpip_state *sp = (struct tcpip_state *)h->cprivate;
 
     TRC(fprintf(stderr, "tcpip_close\n"));
     if (h->iofile != -1)
@@ -609,7 +666,7 @@ int tcpip_close(COMSTACK h)
 char *tcpip_addrstr(COMSTACK h)
 {
     struct sockaddr_in addr;
-    tcpip_state *sp = h->cprivate;
+    tcpip_state *sp = (struct tcpip_state *)h->cprivate;
     char *r, *buf = sp->buf;
     int len;
     struct hostent *host;