* Sebastian Hammer, Adam Dickmeiss
*
* $Log: tcpip.c,v $
- * Revision 1.6 1995-09-29 17:12:00 quinn
+ * 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
+ * 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
* Smallish
*
* Revision 1.5 1995/09/29 17:01:48 quinn
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
+#ifndef WINDOWS
#include <unistd.h>
+#endif
#include <errno.h>
#include <fcntl.h>
#include <comstack.h>
#include <tcpip.h>
-#ifndef WINDOWS
-#include <sys/time.h>
-#endif
-
int tcpip_close(COMSTACK h);
int tcpip_put(COMSTACK h, char *buf, int size);
int tcpip_get(COMSTACK h, char **buf, int *bufsize);
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);
-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
#define TRC(X)
#endif
-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)
-{
- COMSTACK p;
- tcpip_state *state;
- int s;
#ifdef WINDOWS
- unsigned long tru = 1;
-#else
- struct protoent *proto;
-#endif
-
+static int tcpip_init (void)
+{
+ static int initialized = 0;
if (!initialized)
{
-#ifdef WINDOWS
WORD requested;
WSADATA wd;
requested = MAKEWORD(1, 1);
if (WSAStartup(requested, &wd))
return 0;
-#endif
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.
+ */
+COMSTACK tcpip_type(int s, int blocking, int protocol)
+{
+ COMSTACK p;
+ tcpip_state *state;
+ int new_socket;
+#ifdef WINDOWS
+ unsigned long tru = 1;
+#else
+ struct protoent *proto;
+#endif
-#ifndef WINDOWS
- if (!(proto = getprotobyname("tcp")))
+ if (!tcpip_init ())
return 0;
- if ((s = socket(AF_INET, SOCK_STREAM, proto->p_proto)) < 0)
+ if (s < 0)
+ {
+#ifndef WINDOWS
+ 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;
p->f_bind = tcpip_bind;
p->f_listen = tcpip_listen;
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;
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"));
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;
strcpy(buf, str);
{
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);
}
/*
COMSTACK tcpip_accept(COMSTACK h)
{
COMSTACK new;
- tcpip_state *state;
+ tcpip_state *state, *st = h->private;
#ifdef WINDOWS
unsigned long tru = 1;
#endif
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;
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;
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
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));
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;
}
+
+char *tcpip_addrstr(COMSTACK h)
+{
+ struct sockaddr_in addr;
+ static char buf[64];
+ char *r;
+ int len;
+ struct hostent *host;
+
+ len = sizeof(addr);
+ if (getpeername(h->iofile, (struct sockaddr*) &addr, &len) < 0)
+ {
+ h->cerrno = CSYSERR;
+ return 0;
+ }
+ if ((host = gethostbyaddr((char*)&addr.sin_addr, sizeof(addr.sin_addr),
+ AF_INET)))
+ r = (char*) host->h_name;
+ else
+ r = inet_ntoa(addr.sin_addr);
+ sprintf(buf, "tcp:%s", r);
+ return buf;
+}
projects / yaz-moved-to-github.git / blobdiff