/*
- * 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.23 1998-06-23 15:37:50 adam
+ * 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
+ * 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
#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);
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
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;
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);
+#ifdef WINDOWS
+ closesocket(h->iofile);
+#else
+ close(h->iofile);
+#endif
return -1;
}
-#endif
h->state = CS_INCON;
return 0;
}
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
break;
else
return -1;
+ }
if (!res)
return 0;
hasread += res;