* Sebastian Hammer, Adam Dickmeiss
*
* $Log: tcpip.c,v $
- * Revision 1.27 1999-02-02 13:57:31 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.
*
#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, so we get the definition of completeBER */
-#include <odr.h>
+#include <yaz/odr.h>
int tcpip_close(COMSTACK h);
int tcpip_put(COMSTACK h, char *buf, int size);
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
int new_socket;
#ifdef WIN32
unsigned long tru = 1;
-#else
- struct protoent *proto;
#endif
if (!tcpip_init ())
return 0;
if (s < 0)
{
-#ifndef WIN32
- 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
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;
return 0;
}
-#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),
+ int (*check_ip)(void *cd, const char *a, int len, int t),
void *cd)
{
struct sockaddr_in addr;
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.sin_addr,
- sizeof(addr.sin_addr), AF_INET))
+ if (check_ip && (*check_ip)(cd, (const char *) &addr,
+ sizeof(addr), AF_INET))
{
h->cerrno = CSDENY;
#ifdef WIN32
- closesocket(h->iofile);
+ closesocket(h->newfd);
#else
- close(h->iofile);
+ close(h->newfd);
#endif
return -1;
}
}
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 WIN32
if (WSAGetLastError() == WSAEWOULDBLOCK)
+ break;
+ else
+ return -1;
#else
+ if (errno == EWOULDBLOCK
#ifdef EINPROGRESS
- if (errno == EINPROGRESS || errno == EWOULDBLOCK)
-#else
- if (errno == EWOULDBLOCK)
-#endif
+ || errno == EINPROGRESS
#endif
- break;
- else
+ )
+ break;
+ else if (errno == 0)
+ continue;
+ else
return -1;
+#endif
}
if (!res)
return 0;
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);