X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=comstack%2Ftcpip.c;h=f3efddb440ccbc5e37979ad34605490b5b889482;hb=546c28ba38f70ca66b6ce522df97645d9d5cefb9;hp=add37919caa891d80c2e36f5ac09fb603063cbe0;hpb=6517fa53d35512887780fd07de5667940da18a9e;p=yaz-moved-to-github.git diff --git a/comstack/tcpip.c b/comstack/tcpip.c index add3791..f3efddb 100644 --- a/comstack/tcpip.c +++ b/comstack/tcpip.c @@ -1,10 +1,43 @@ /* - * Copyright (c) 1995-1997, Index Data + * Copyright (c) 1995-1999, 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.27 1999-02-02 13:57:31 adam + * Uses preprocessor define WIN32 instead of WINDOWS to build code + * for Microsoft WIN32. + * + * 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 + * 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 * YAZ version 1.4. * * Revision 1.16 1997/09/01 08:49:14 adam @@ -124,7 +157,7 @@ #include #include #include -#ifndef WINDOWS +#ifndef WIN32 #include #endif #include @@ -133,6 +166,9 @@ #include #include +/* Chas added the following, so we get the definition of completeBER */ +#include + int tcpip_close(COMSTACK h); int tcpip_put(COMSTACK h, char *buf, int size); int tcpip_get(COMSTACK h, char **buf, int *bufsize); @@ -140,17 +176,15 @@ 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); -/* - * Determine length/completeness of incoming packages - */ -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 @@ -165,12 +199,12 @@ typedef struct tcpip_state 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; -#ifdef WINDOWS +#ifdef WIN32 static int tcpip_init (void) { static int initialized = 0; @@ -201,7 +235,7 @@ COMSTACK tcpip_type(int s, int blocking, int protocol) COMSTACK p; tcpip_state *state; int new_socket; -#ifdef WINDOWS +#ifdef WIN32 unsigned long tru = 1; #else struct protoent *proto; @@ -211,7 +245,7 @@ COMSTACK tcpip_type(int s, int blocking, int protocol) return 0; if (s < 0) { -#ifndef WINDOWS +#ifndef WIN32 if (!(proto = getprotobyname("tcp"))) return 0; if ((s = socket(AF_INET, SOCK_STREAM, proto->p_proto)) < 0) @@ -223,12 +257,13 @@ 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 +#ifdef WIN32 if (!(p->blocking = blocking) && ioctlsocket(s, FIONBIO, &tru) < 0) #else if (!(p->blocking = blocking) && fcntl(s, F_SETFL, O_NONBLOCK) < 0) @@ -237,7 +272,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 +337,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 +355,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,12 +368,12 @@ 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) { -#ifdef WINDOWS +#ifdef WIN32 if (WSAGetLastError() == WSAEWOULDBLOCK) #else if (errno == EINPROGRESS) @@ -361,11 +396,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 WIN32 + 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; @@ -384,12 +424,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; @@ -397,7 +452,7 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen) } if ((h->newfd = accept(h->iofile, (struct sockaddr*)&addr, &len)) < 0) { -#ifdef WINDOWS +#ifdef WIN32 if (WSAGetLastError() == WSAEWOULDBLOCK) #else if (errno == EWOULDBLOCK) @@ -408,10 +463,21 @@ 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 (check_ip && (*check_ip)(cd, (const char *) &addr.sin_addr, + sizeof(addr.sin_addr), AF_INET)) + { + h->cerrno = CSDENY; +#ifdef WIN32 + closesocket(h->iofile); +#else + close(h->iofile); +#endif + return -1; + } h->state = CS_INCON; return 0; } @@ -419,8 +485,8 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen) COMSTACK tcpip_accept(COMSTACK h) { COMSTACK cnew; - tcpip_state *state, *st = h->cprivate; -#ifdef WINDOWS + tcpip_state *state, *st = (tcpip_state *)h->cprivate; +#ifdef WIN32 unsigned long tru = 1; #endif @@ -430,19 +496,19 @@ 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; } -#ifdef WINDOWS +#ifdef WIN32 if (!cnew->blocking && ioctlsocket(cnew->iofile, FIONBIO, &tru) < 0) #else if (!cnew->blocking && fcntl(cnew->iofile, F_SETFL, O_NONBLOCK) < 0) @@ -465,7 +531,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,21 +554,27 @@ 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 + { +#ifdef WIN32 if (WSAGetLastError() == WSAEWOULDBLOCK) #else +#ifdef EINPROGRESS + if (errno == EINPROGRESS || errno == EWOULDBLOCK) +#else if (errno == EWOULDBLOCK) #endif +#endif break; else return -1; + } if (!res) return 0; hasread += res; @@ -519,10 +591,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 +613,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) @@ -559,7 +631,7 @@ int tcpip_put(COMSTACK h, char *buf, int size) if ((res = send(h->iofile, buf + state->written, size - state->written, 0)) < 0) { -#ifdef WINDOWS +#ifdef WIN32 if (WSAGetLastError() == WSAEWOULDBLOCK) #else if (errno == EAGAIN) @@ -582,11 +654,11 @@ 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) -#ifdef WINDOWS +#ifdef WIN32 closesocket(h->iofile); #else close(h->iofile); @@ -601,7 +673,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;