/*
- * Copyright (c) 1995-1998, Index Data
+ * Copyright (c) 1995-1999, Index Data
* See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: tcpip.c,v $
- * Revision 1.20 1998-05-18 10:10:40 adam
+ * Revision 1.32 1999-11-30 13:47:11 adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.31 1999/04/29 07:31:23 adam
+ * Changed tcpip_strtoaddr_ex so that only part 'till '/' is considered
+ * part of hostname.
+ *
+ * Revision 1.30 1999/04/20 09:56:48 adam
+ * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun).
+ * Modified all encoders/decoders to reflect this change.
+ *
+ * Revision 1.29 1999/04/16 14:45:55 adam
+ * Added interface for tcpd wrapper for access control.
+ *
+ * Revision 1.28 1999/03/31 11:11:14 adam
+ * Function getprotobyname only called once. Minor change in tcpip_get
+ * to handle multi-threaded conditions.
+ *
+ * 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
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
-#ifndef WINDOWS
+#ifndef WIN32
#include <unistd.h>
#endif
#include <errno.h>
#include <fcntl.h>
-#include <comstack.h>
-#include <tcpip.h>
+#include <yaz/comstack.h>
+#include <yaz/tcpip.h>
+#include <yaz/log.h>
-/* Chas added the following 2, so we get the definition of completeBER */
-#include <odr.h>
-#include <prt.h>
+/* Chas added the following, so we get the definition of completeBER */
+#include <yaz/odr.h>
int tcpip_close(COMSTACK h);
int tcpip_put(COMSTACK h, char *buf, int size);
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
- */
-/* Chas: Removed the definition of completeBERfrom here, use the one in the */
-/* include directory as that as the extern "C" around it */
-/*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
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;
return 1;
}
#else
+
+static int proto_number = 0;
+
static int tcpip_init (void)
{
+ struct protoent *proto;
+ /* only call getprotobyname once, in case it allocates memory */
+ if (!(proto = getprotobyname("tcp")))
+ return 0;
+ proto_number = proto->p_proto;
return 1;
}
#endif
COMSTACK p;
tcpip_state *state;
int new_socket;
-#ifdef WINDOWS
+#ifdef WIN32
unsigned long tru = 1;
-#else
- struct protoent *proto;
#endif
if (!tcpip_init ())
return 0;
if (s < 0)
{
-#ifndef WINDOWS
- if (!(proto = getprotobyname("tcp")))
+#ifdef WIN32
+ if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0)
return 0;
- if ((s = socket(AF_INET, SOCK_STREAM, proto->p_proto)) < 0)
#else
- if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0)
-#endif
+ if ((s = socket(AF_INET, SOCK_STREAM, proto_number)) < 0)
return 0;
+#endif
new_socket = 1;
}
else
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)
return p;
}
-static int tcpip_strtoaddr_ex(const char *str, struct sockaddr_in *add)
+int tcpip_strtoaddr_ex(const char *str, struct sockaddr_in *add)
{
struct hostent *hp;
char *p, buf[512];
return 0;
TRC(fprintf(stderr, "tcpip_strtoaddress: %s\n", str ? str : "NULL"));
add->sin_family = AF_INET;
- strcpy(buf, str);
+ strncpy(buf, str, 511);
+ buf[511] = 0;
+ if ((p = strchr(buf, '/')))
+ *p = 0;
if ((p = strchr(buf, ':')))
{
*p = 0;
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)
int tcpip_bind(COMSTACK h, void *address, int mode)
{
struct sockaddr *addr = (struct sockaddr *)address;
-#ifdef WINDOWS
+#ifdef WIN32
BOOL one = 1;
#else
unsigned long one = 1;
return 0;
}
-int tcpip_listen(COMSTACK h, char *raddr, int *addrlen)
+int tcpip_listen(COMSTACK h, char *raddr, int *addrlen,
+ int (*check_ip)(void *cd, const char *a, int len, int t),
+ 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;
}
if ((h->newfd = accept(h->iofile, (struct sockaddr*)&addr, &len)) < 0)
{
-#ifdef WINDOWS
+#ifdef WIN32
if (WSAGetLastError() == WSAEWOULDBLOCK)
#else
if (errno == EWOULDBLOCK)
h->cerrno = CSYSERR;
return -1;
}
- if (addrlen && *addrlen > sizeof(struct sockaddr_in))
+ if (addrlen && (size_t) (*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,
+ sizeof(addr), AF_INET))
+ {
+ h->cerrno = CSDENY;
+#ifdef WIN32
+ closesocket(h->newfd);
+#else
+ close(h->newfd);
+#endif
+ return -1;
+ }
h->state = CS_INCON;
return 0;
}
{
COMSTACK cnew;
tcpip_state *state, *st = (tcpip_state *)h->cprivate;
-#ifdef WINDOWS
+#ifdef WIN32
unsigned long tru = 1;
#endif
}
memcpy(cnew, h, sizeof(*h));
cnew->iofile = h->newfd;
- if (!(state = (tcpip_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)
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)
+ break;
+ else
+ return -1;
#else
- if (errno == EWOULDBLOCK)
+ if (errno == EWOULDBLOCK
+#ifdef EINPROGRESS
+ || errno == EINPROGRESS
#endif
- break;
- else
+ )
+ break;
+ else if (errno == 0)
+ continue;
+ else
return -1;
+#endif
+ }
if (!res)
return 0;
hasread += res;
if ((res = send(h->iofile, buf + state->written, size -
state->written, 0)) < 0)
{
-#ifdef WINDOWS
+#ifdef WIN32
if (WSAGetLastError() == WSAEWOULDBLOCK)
#else
if (errno == EAGAIN)
TRC(fprintf(stderr, "tcpip_close\n"));
if (h->iofile != -1)
-#ifdef WINDOWS
+#ifdef WIN32
closesocket(h->iofile);
#else
close(h->iofile);
struct sockaddr_in addr;
tcpip_state *sp = (struct tcpip_state *)h->cprivate;
char *r, *buf = sp->buf;
- int len;
+ size_t len;
struct hostent *host;
len = sizeof(addr);
projects / yaz-moved-to-github.git / blobdiff