X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=comstack%2Ftcpip.c;h=0163f3c1c56bfb18951640791827e4c7215951c3;hp=426f3ff9f7ce3f64d809ac8e0dbef3edc5d324d0;hb=a7827306d9d9fd634a4b4336944bee781fa61e32;hpb=214a19efbb9f3ccb3cfe678b5c9ba805774b3d12 diff --git a/comstack/tcpip.c b/comstack/tcpip.c index 426f3ff..0163f3c 100644 --- a/comstack/tcpip.c +++ b/comstack/tcpip.c @@ -1,10 +1,31 @@ /* - * Copyright (c) 1995, Index Data + * Copyright (c) 1995-1997, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: tcpip.c,v $ - * Revision 1.11 1996-02-23 10:00:39 quinn + * 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 + * New windows NT/95 port using MSV5.0. Minor changes only. + * + * Revision 1.15 1997/05/14 06:53:33 adam + * C++ support. + * + * Revision 1.14 1997/05/01 15:06:32 adam + * Moved WINSOCK init. code to tcpip_init routine. + * + * Revision 1.13 1996/11/01 08:45:18 adam + * Bug fix: used close on MS-Windows. Fixed to closesocket. + * + * Revision 1.12 1996/07/06 19:58:30 quinn + * System headerfiles gathered in yconfig + * + * Revision 1.11 1996/02/23 10:00:39 quinn * WAIS Work * * Revision 1.10 1996/02/20 12:52:11 quinn @@ -106,17 +127,15 @@ #include #include #include +#ifndef WINDOWS #include +#endif #include #include #include #include -#ifndef WINDOWS -#include -#endif - int tcpip_close(COMSTACK h); int tcpip_put(COMSTACK h, char *buf, int size); int tcpip_get(COMSTACK h, char **buf, int *bufsize); @@ -127,6 +146,7 @@ int tcpip_bind(COMSTACK h, void *address, int mode); int tcpip_listen(COMSTACK h, char *addrp, int *addrlen); COMSTACK tcpip_accept(COMSTACK h); char *tcpip_addrstr(COMSTACK h); +void *tcpip_straddr(COMSTACK h, const char *str); /* * Determine length/completeness of incoming packages @@ -140,8 +160,6 @@ int completeWAIS(unsigned char *buf, int len); /* from waislen.c */ #define TRC(X) #endif -static int initialized = 0; - typedef struct tcpip_state { char *altbuf; /* alternate buffer for surplus data */ @@ -151,8 +169,32 @@ 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 */ + struct sockaddr_in addr; /* returned by cs_straddr */ + char buf[128]; /* returned by cs_addrstr */ } tcpip_state; +#ifdef WINDOWS +static int tcpip_init (void) +{ + static int initialized = 0; + if (!initialized) + { + WORD requested; + WSADATA wd; + + requested = MAKEWORD(1, 1); + if (WSAStartup(requested, &wd)) + return 0; + initialized = 1; + } + return 1; +} +#else +static int tcpip_init (void) +{ + return 1; +} +#endif /* * This function is always called through the cs_create() macro. * s >= 0: socket has already been established for us. @@ -168,19 +210,8 @@ COMSTACK tcpip_type(int s, int blocking, int protocol) struct protoent *proto; #endif - if (!initialized) - { -#ifdef WINDOWS - WORD requested; - WSADATA wd; - - requested = MAKEWORD(1, 1); - if (WSAStartup(requested, &wd)) - return 0; -#endif - initialized = 1; - } - + if (!tcpip_init ()) + return 0; if (s < 0) { #ifndef WINDOWS @@ -197,7 +228,7 @@ COMSTACK tcpip_type(int s, int blocking, int protocol) new_socket = 0; if (!(p = xmalloc(sizeof(struct comstack)))) return 0; - if (!(state = p->private = xmalloc(sizeof(tcpip_state)))) + if (!(state = p->cprivate = xmalloc(sizeof(tcpip_state)))) return 0; #ifdef WINDOWS @@ -221,6 +252,7 @@ COMSTACK tcpip_type(int s, int blocking, int protocol) p->f_listen = tcpip_listen; p->f_accept = tcpip_accept; p->f_addrstr = tcpip_addrstr; + p->f_straddr = tcpip_straddr; p->state = new_socket ? CS_UNBND : CS_IDLE; /* state of line */ p->event = CS_NONE; @@ -241,38 +273,58 @@ COMSTACK tcpip_type(int s, int blocking, int protocol) return p; } -struct sockaddr_in *tcpip_strtoaddr(const char *str) +static int tcpip_strtoaddr_ex(const char *str, struct sockaddr_in *add) { - static struct sockaddr_in add; struct hostent *hp; char *p, buf[512]; short int port = 210; unsigned tmpadd; + if (!tcpip_init ()) + return 0; TRC(fprintf(stderr, "tcpip_strtoaddress: %s\n", str ? str : "NULL")); - add.sin_family = AF_INET; + add->sin_family = AF_INET; strcpy(buf, str); if ((p = strchr(buf, ':'))) { *p = 0; port = atoi(p + 1); } - add.sin_port = htons(port); + add->sin_port = htons(port); if (!strcmp("@", buf)) - add.sin_addr.s_addr = INADDR_ANY; + add->sin_addr.s_addr = INADDR_ANY; else if ((hp = gethostbyname(buf))) - memcpy(&add.sin_addr.s_addr, *hp->h_addr_list, sizeof(struct in_addr)); + memcpy(&add->sin_addr.s_addr, *hp->h_addr_list, + sizeof(struct in_addr)); else if ((tmpadd = (unsigned) inet_addr(buf)) != 0) - memcpy(&add.sin_addr.s_addr, &tmpadd, sizeof(struct in_addr)); + memcpy(&add->sin_addr.s_addr, &tmpadd, sizeof(struct in_addr)); else return 0; + return 1; +} + +void *tcpip_straddr(COMSTACK h, const char *str) +{ + tcpip_state *sp = h->cprivate; + + if (!tcpip_strtoaddr_ex (str, &sp->addr)) + return 0; + return &sp->addr; +} + +struct sockaddr_in *tcpip_strtoaddr(const char *str) +{ + static struct sockaddr_in add; + + if (!tcpip_strtoaddr_ex (str, &add)) + return 0; return &add; } int tcpip_more(COMSTACK h) { - tcpip_state *sp = h->private; - + tcpip_state *sp = h->cprivate; + return sp->altlen && (*sp->complete)((unsigned char *) sp->altbuf, sp->altlen); } @@ -313,10 +365,15 @@ int tcpip_rcvconnect(COMSTACK h) int tcpip_bind(COMSTACK h, void *address, int mode) { struct sockaddr *addr = 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, (void*) + &one, sizeof(one)) < 0) { h->cerrno = CSYSERR; return -1; @@ -369,8 +426,8 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen) COMSTACK tcpip_accept(COMSTACK h) { - COMSTACK new; - tcpip_state *state, *st = h->private; + COMSTACK cnew; + tcpip_state *state, *st = h->cprivate; #ifdef WINDOWS unsigned long tru = 1; #endif @@ -381,31 +438,31 @@ COMSTACK tcpip_accept(COMSTACK h) h->cerrno = CSOUTSTATE; return 0; } - if (!(new = xmalloc(sizeof(*new)))) + if (!(cnew = xmalloc(sizeof(*cnew)))) { h->cerrno = CSYSERR; return 0; } - memcpy(new, h, sizeof(*h)); - new->iofile = h->newfd; - if (!(state = new->private = xmalloc(sizeof(tcpip_state)))) + memcpy(cnew, h, sizeof(*h)); + cnew->iofile = h->newfd; + if (!(state = cnew->cprivate = xmalloc(sizeof(tcpip_state)))) { h->cerrno = CSYSERR; return 0; } #ifdef WINDOWS - if (!new->blocking && ioctlsocket(new->iofile, FIONBIO, &tru) < 0) + if (!cnew->blocking && ioctlsocket(cnew->iofile, FIONBIO, &tru) < 0) #else - if (!new->blocking && fcntl(new->iofile, F_SETFL, O_NONBLOCK) < 0) + if (!cnew->blocking && fcntl(cnew->iofile, F_SETFL, O_NONBLOCK) < 0) #endif return 0; state->altbuf = 0; state->altsize = state->altlen = 0; state->towrite = state->written = -1; state->complete = st->complete; - new->state = CS_DATAXFER; + cnew->state = CS_DATAXFER; h->state = CS_IDLE; - return new; + return cnew; } #define CS_TCPIP_BUFCHUNK 4096 @@ -416,7 +473,7 @@ COMSTACK tcpip_accept(COMSTACK h) */ int tcpip_get(COMSTACK h, char **buf, int *bufsize) { - tcpip_state *sp = h->private; + tcpip_state *sp = h->cprivate; char *tmpc; int tmpi, berlen, rest, req, tomove; int hasread = 0, res; @@ -492,7 +549,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->private; + struct tcpip_state *state = h->cprivate; TRC(fprintf(stderr, "tcpip_put: size=%d\n", size)); if (state->towrite < 0) @@ -533,10 +590,15 @@ int tcpip_put(COMSTACK h, char *buf, int size) int tcpip_close(COMSTACK h) { - tcpip_state *sp = h->private; + tcpip_state *sp = h->cprivate; TRC(fprintf(stderr, "tcpip_close\n")); - close(h->iofile); + if (h->iofile != -1) +#ifdef WINDOWS + closesocket(h->iofile); +#else + close(h->iofile); +#endif if (sp->altbuf) xfree(sp->altbuf); xfree(sp); @@ -547,11 +609,11 @@ int tcpip_close(COMSTACK h) char *tcpip_addrstr(COMSTACK h) { struct sockaddr_in addr; - static char buf[64]; - char *r; + tcpip_state *sp = h->cprivate; + char *r, *buf = sp->buf; int len; struct hostent *host; - + len = sizeof(addr); if (getpeername(h->iofile, (struct sockaddr*) &addr, &len) < 0) { @@ -559,7 +621,7 @@ char *tcpip_addrstr(COMSTACK h) return 0; } if ((host = gethostbyaddr((char*)&addr.sin_addr, sizeof(addr.sin_addr), - AF_INET))) + AF_INET))) r = (char*) host->h_name; else r = inet_ntoa(addr.sin_addr);