X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=comstack%2Ftcpip.c;h=a71069e3510105dc031b41d1f078ff50c1330b74;hb=3aefb04b1ebd1a699ab732b7504fdf25a2c35fa7;hp=add37919caa891d80c2e36f5ac09fb603063cbe0;hpb=6517fa53d35512887780fd07de5667940da18a9e;p=yaz-moved-to-github.git diff --git a/comstack/tcpip.c b/comstack/tcpip.c index add3791..a71069e 100644 --- a/comstack/tcpip.c +++ b/comstack/tcpip.c @@ -1,10 +1,24 @@ /* - * 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.17 1997-09-17 12:10:30 adam + * 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 * YAZ version 1.4. * * Revision 1.16 1997/09/01 08:49:14 adam @@ -133,6 +147,10 @@ #include #include +/* Chas added the following 2, so we get the definition of completeBER */ +#include +#include + int tcpip_close(COMSTACK h); int tcpip_put(COMSTACK h, char *buf, int size); int tcpip_get(COMSTACK h, char **buf, int *bufsize); @@ -148,7 +166,9 @@ 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 */ #ifdef TRACE_TCPIP @@ -223,9 +243,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 @@ -237,7 +258,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; @@ -302,7 +323,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; @@ -320,7 +341,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); @@ -333,7 +354,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) @@ -361,11 +382,16 @@ 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 unsigned long one = 1; +#endif TRC(fprintf(stderr, "tcpip_bind\n")); - if (setsockopt(h->iofile, SOL_SOCKET, SO_REUSEADDR, &one, sizeof(one)) < 0) + if (setsockopt(h->iofile, SOL_SOCKET, SO_REUSEADDR, (char*) + &one, sizeof(one)) < 0) { h->cerrno = CSYSERR; return -1; @@ -419,7 +445,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 @@ -430,14 +456,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; @@ -465,7 +491,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; @@ -488,18 +514,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; @@ -519,10 +549,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)); @@ -541,7 +571,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) @@ -582,7 +612,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) @@ -601,7 +631,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;