projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix.
[yaz-moved-to-github.git]
/
comstack
/
tcpip.c
diff --git
a/comstack/tcpip.c
b/comstack/tcpip.c
index
36cc696
..
667accf
100644
(file)
--- a/
comstack/tcpip.c
+++ b/
comstack/tcpip.c
@@
-4,7
+4,13
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: tcpip.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: tcpip.c,v $
- * Revision 1.23 1998-06-23 15:37:50 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 type cast to prevent warning.
*
* Revision 1.22 1998/06/22 11:32:36 adam
@@
-463,16
+469,17
@@
int tcpip_listen(COMSTACK h, char *raddr, int *addrlen,
memcpy(raddr, &addr, *addrlen = sizeof(struct sockaddr_in));
else if (addrlen)
*addrlen = 0;
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;
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;
}
return -1;
}
-#endif
h->state = CS_INCON;
return 0;
}
h->state = CS_INCON;
return 0;
}
@@
-556,6
+563,7
@@
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)
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 WINDOWS
if (WSAGetLastError() == WSAEWOULDBLOCK)
#else
@@
-568,6
+576,7
@@
int tcpip_get(COMSTACK h, char **buf, int *bufsize)
break;
else
return -1;
break;
else
return -1;
+ }
if (!res)
return 0;
hasread += res;
if (!res)
return 0;
hasread += res;