X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=comstack%2Ftcpip.c;h=f68577ce31d3fa9e4d37632457161f73bd976a9b;hb=85a2e7affad79fd8bd59b403ba7b5f7867d60523;hp=4e2ab4f4fc987909b4b8bf5d0525e1cf9bdd4696;hpb=29818ed78e32998641adcf5f23d3b854355918b5;p=yaz-moved-to-github.git diff --git a/comstack/tcpip.c b/comstack/tcpip.c index 4e2ab4f..f68577c 100644 --- a/comstack/tcpip.c +++ b/comstack/tcpip.c @@ -4,7 +4,25 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: tcpip.c,v $ - * Revision 1.7 1995-10-30 12:41:16 quinn + * 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 + * WAIS protocol support. + * + * Revision 1.9 1996/02/10 12:23:11 quinn + * Enablie inetd operations fro TCP/IP stack + * + * Revision 1.8 1995/11/01 13:54:27 quinn + * Minor adjustments + * + * Revision 1.7 1995/10/30 12:41:16 quinn * Added hostname lookup for server. * * Revision 1.6 1995/09/29 17:12:00 quinn @@ -101,10 +119,6 @@ #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); @@ -116,7 +130,11 @@ int tcpip_listen(COMSTACK h, char *addrp, int *addrlen); COMSTACK tcpip_accept(COMSTACK h); char *tcpip_addrstr(COMSTACK h); -int completeBER(unsigned char *buf, int len); +/* + * 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 */ #ifdef TRACE_TCPIP #define TRC(x) x @@ -129,18 +147,23 @@ static int initialized = 0; typedef struct tcpip_state { char *altbuf; /* alternate buffer for surplus data */ - int altsize; /* size as malloced */ + int altsize; /* size as xmalloced */ int altlen; /* length of data or 0 if none */ int written; /* -1 if we aren't writing */ int towrite; /* to verify against user input */ + int (*complete)(unsigned char *buf, int len); /* length/completeness */ } tcpip_state; -COMSTACK tcpip_type(int blocking, int protocol) +/* + * This function is always called through the cs_create() macro. + * s >= 0: socket has already been established for us. + */ +COMSTACK tcpip_type(int s, int blocking, int protocol) { COMSTACK p; tcpip_state *state; - int s; + int new_socket; #ifdef WINDOWS unsigned long tru = 1; #else @@ -160,24 +183,32 @@ COMSTACK tcpip_type(int blocking, int protocol) initialized = 1; } + if (s < 0) + { #ifndef WINDOWS - if (!(proto = getprotobyname("tcp"))) - return 0; - if ((s = socket(AF_INET, SOCK_STREAM, proto->p_proto)) < 0) + if (!(proto = getprotobyname("tcp"))) + return 0; + if ((s = socket(AF_INET, SOCK_STREAM, proto->p_proto)) < 0) #else - if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) + if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) #endif - return 0; - if (!(p = malloc(sizeof(struct comstack)))) - return 0; - if (!(state = p->private = malloc(sizeof(tcpip_state)))) - return 0; + return 0; + new_socket = 1; + } + else + new_socket = 0; + if (!(p = xmalloc(sizeof(struct comstack)))) + return 0; + if (!(state = p->private = xmalloc(sizeof(tcpip_state)))) + return 0; + #ifdef WINDOWS if (!(p->blocking = blocking) && ioctlsocket(s, FIONBIO, &tru) < 0) #else if (!(p->blocking = blocking) && fcntl(s, F_SETFL, O_NONBLOCK) < 0) #endif - return 0; + return 0; + p->iofile = s; p->type = tcpip_type; p->protocol = protocol; @@ -193,7 +224,7 @@ COMSTACK tcpip_type(int blocking, int protocol) p->f_accept = tcpip_accept; p->f_addrstr = tcpip_addrstr; - p->state = CS_UNBND; + p->state = new_socket ? CS_UNBND : CS_IDLE; /* state of line */ p->event = CS_NONE; p->cerrno = 0; p->stackerr = 0; @@ -201,6 +232,10 @@ COMSTACK tcpip_type(int blocking, int protocol) state->altbuf = 0; state->altsize = state->altlen = 0; state->towrite = state->written = -1; + if (protocol == PROTO_WAIS) + state->complete = completeWAIS; + else + state->complete = completeBER; p->timeout = COMSTACK_DEFAULT_TIMEOUT; TRC(fprintf(stderr, "Created new TCPIP comstack\n")); @@ -240,7 +275,8 @@ int tcpip_more(COMSTACK h) { tcpip_state *sp = h->private; - return sp->altlen && completeBER((unsigned char *) sp->altbuf, sp->altlen); + return sp->altlen && (*sp->complete)((unsigned char *) sp->altbuf, + sp->altlen); } /* @@ -336,7 +372,7 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen) COMSTACK tcpip_accept(COMSTACK h) { COMSTACK new; - tcpip_state *state; + tcpip_state *state, *st = h->private; #ifdef WINDOWS unsigned long tru = 1; #endif @@ -347,14 +383,14 @@ COMSTACK tcpip_accept(COMSTACK h) h->cerrno = CSOUTSTATE; return 0; } - if (!(new = malloc(sizeof(*new)))) + if (!(new = xmalloc(sizeof(*new)))) { h->cerrno = CSYSERR; return 0; } memcpy(new, h, sizeof(*h)); new->iofile = h->newfd; - if (!(state = new->private = malloc(sizeof(tcpip_state)))) + if (!(state = new->private = xmalloc(sizeof(tcpip_state)))) { h->cerrno = CSYSERR; return 0; @@ -368,6 +404,7 @@ COMSTACK tcpip_accept(COMSTACK h) state->altbuf = 0; state->altsize = state->altlen = 0; state->towrite = state->written = -1; + state->complete = st->complete; new->state = CS_DATAXFER; h->state = CS_IDLE; return new; @@ -400,15 +437,15 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) sp->altbuf = tmpc; sp->altsize = tmpi; } - while (!(berlen = completeBER((unsigned char *)*buf, hasread))) + while (!(berlen = (*sp->complete)((unsigned char *)*buf, hasread))) { if (!*bufsize) { - if (!(*buf = malloc(*bufsize = CS_TCPIP_BUFCHUNK))) + if (!(*buf = xmalloc(*bufsize = CS_TCPIP_BUFCHUNK))) return -1; } else if (*bufsize - hasread < CS_TCPIP_BUFCHUNK) - if (!(*buf = realloc(*buf, *bufsize *= 2))) + if (!(*buf =xrealloc(*buf, *bufsize *= 2))) return -1; if ((res = recv(h->iofile, *buf + hasread, CS_TCPIP_BUFCHUNK, 0)) < 0) #ifdef WINDOWS @@ -435,10 +472,10 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) req += CS_TCPIP_BUFCHUNK - rest; if (!sp->altbuf) { - if (!(sp->altbuf = malloc(sp->altsize = req))) + if (!(sp->altbuf = xmalloc(sp->altsize = req))) return -1; } else if (sp->altsize < req) - if (!(sp->altbuf = realloc(sp->altbuf, sp->altsize = req))) + if (!(sp->altbuf =xrealloc(sp->altbuf, sp->altsize = req))) return -1; TRC(fprintf(stderr, " Moving %d bytes to altbuf(0x%x)\n", tomove, (unsigned) sp->altbuf)); @@ -501,11 +538,15 @@ int tcpip_close(COMSTACK h) tcpip_state *sp = h->private; TRC(fprintf(stderr, "tcpip_close\n")); +#ifdef WINDOWS + closesocket(h->iofile); +#else close(h->iofile); +#endif if (sp->altbuf) - free(sp->altbuf); - free(sp); - free(h); + xfree(sp->altbuf); + xfree(sp); + xfree(h); return 0; }