X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;ds=sidebyside;f=comstack%2Ftcpip.c;h=f65f2da9b58546294474f1cef0713e257bd704c5;hb=6a39772ad0cbd1bcb5d0984cd783d4a9e06bdfdb;hp=884e6ff7fb769118d3cd1386d46a2a5cf9af9af9;hpb=e1be891b28d0123675ddcefe37587b0546f95936;p=yaz-moved-to-github.git diff --git a/comstack/tcpip.c b/comstack/tcpip.c index 884e6ff..f65f2da 100644 --- a/comstack/tcpip.c +++ b/comstack/tcpip.c @@ -4,7 +4,21 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: tcpip.c,v $ - * Revision 1.20 1998-05-18 10:10:40 adam + * 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 @@ -153,7 +167,10 @@ 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); @@ -166,6 +183,7 @@ void *tcpip_straddr(COMSTACK h, const char *str); /*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 @@ -405,12 +423,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; @@ -429,10 +462,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 WINDOWS + closesocket(h->iofile); +#else + close(h->iofile); +#endif + return -1; + } h->state = CS_INCON; return 0; } @@ -519,8 +563,12 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) #ifdef WINDOWS if (WSAGetLastError() == WSAEWOULDBLOCK) #else +#ifdef EINPROGRESS + if (errno == EINPROGRESS || errno == EWOULDBLOCK) +#else if (errno == EWOULDBLOCK) #endif +#endif break; else return -1;