* Sebastian Hammer, Adam Dickmeiss
*
* $Log: tcpip.c,v $
- * Revision 1.22 1998-06-22 11:32:36 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
memcpy(raddr, &addr, *addrlen = sizeof(struct sockaddr_in));
else if (addrlen)
*addrlen = 0;
-
-#if 1
- if (check_ip && (*check_ip)(cd, &addr.sin_addr, sizeof(addr.sin_addr),
- AF_INET))
+ 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;