* Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: tcpip.c,v 1.23 2006-08-30 18:58:59 adam Exp $
+ * $Id: tcpip.c,v 1.28 2006-09-06 15:01:53 adam Exp $
*/
/**
* \file tcpip.c
#endif
#ifdef WIN32
-#include <winsock.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#define HAVE_GETADDRINFO 1
#else
#include <netinet/in.h>
#include <netdb.h>
int towrite; /* to verify against user input */
int (*complete)(const unsigned char *buf, int len); /* length/comple. */
#if HAVE_GETADDRINFO
- struct addrinfo *res;
+ struct addrinfo *ai;
#else
struct sockaddr_in addr; /* returned by cs_straddr */
#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, void *vp)
+COMSTACK tcpip_type(int s, int flags, int protocol, void *vp)
{
COMSTACK p;
tcpip_state *sp;
- int new_socket;
-#ifdef WIN32
- unsigned long tru = 1;
-#endif
if (!tcpip_init ())
return 0;
- if (s < 0)
- {
- if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0)
- return 0;
- new_socket = 1;
- }
- else
- new_socket = 0;
if (!(p = (struct comstack *)xmalloc(sizeof(struct comstack))))
return 0;
if (!(sp = (struct tcpip_state *)(p->cprivate =
xmalloc(sizeof(tcpip_state)))))
return 0;
- if (!((p->blocking = blocking)&1))
- {
-#ifdef WIN32
- if (ioctlsocket(s, FIONBIO, &tru) < 0)
- return 0;
-#else
- if (fcntl(s, F_SETFL, O_NONBLOCK) < 0)
- return 0;
-#ifndef MSG_NOSIGNAL
- signal (SIGPIPE, SIG_IGN);
-#endif
-#endif
- }
+ p->flags = flags;
p->io_pending = 0;
p->iofile = s;
p->f_set_blocking = tcpip_set_blocking;
p->max_recv_bytes = 5000000;
- p->state = new_socket ? CS_ST_UNBND : CS_ST_IDLE; /* state of line */
+ p->state = s < 0 ? CS_ST_UNBND : CS_ST_IDLE; /* state of line */
p->event = CS_NONE;
p->cerrno = 0;
p->stackerr = 0;
#endif
#if HAVE_GETADDRINFO
- sp->res = 0;
+ sp->ai = 0;
#endif
sp->altbuf = 0;
sp->altsize = sp->altlen = 0;
#if HAVE_OPENSSL_SSL_H
-COMSTACK ssl_type(int s, int blocking, int protocol, void *vp)
+COMSTACK ssl_type(int s, int flags, int protocol, void *vp)
{
tcpip_state *sp;
COMSTACK p;
- p = tcpip_type (s, blocking, protocol, 0);
+ p = tcpip_type (s, flags, protocol, 0);
if (!p)
return 0;
p->f_get = ssl_get;
host[sizeof(host)-1] = 0;
if ((p = strchr(host, '/')))
*p = 0;
- if ((p = strchr(host, ':')))
+ if ((p = strrchr(host, ':')))
{
*p = '\0';
port = p+1;
buf[sizeof(buf)-1] = 0;
if ((p = strchr(buf, '/')))
*p = 0;
- if ((p = strchr(buf, ':')))
+ if ((p = strrchr(buf, ':')))
{
*p = 0;
port = atoi(p + 1);
if (!tcpip_init ())
return 0;
- if (sp->res)
- freeaddrinfo(sp->res);
- sp->res = tcpip_getaddrinfo(str, port);
- return sp->res;
+ if (sp->ai)
+ freeaddrinfo(sp->ai);
+ sp->ai = tcpip_getaddrinfo(str, port);
+ if (sp->ai && h->state == CS_ST_UNBND)
+ {
+ int s;
+ struct addrinfo *ai = sp->ai;
+ s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+ if (s < 0)
+ return 0;
+ h->iofile = s;
+
+ if (!tcpip_set_blocking(h, h->flags))
+ return 0;
+ }
+ return sp->ai;
}
#else
void *tcpip_straddr(COMSTACK h, const char *str)
return 0;
if (!tcpip_strtoaddr_ex (str, &sp->addr, port))
return 0;
+ if (h->state == CS_ST_UNBND)
+ {
+ int s;
+ s = socket(AF_INET, SOCK_STREAM, 0);
+ if (s < 0)
+ return 0;
+ h->iofile = s;
+
+ if (!tcpip_set_blocking(h, h->blocking))
+ return 0;
+ }
return &sp->addr;
}
#endif
int tcpip_connect(COMSTACK h, void *address)
{
#if HAVE_GETADDRINFO
- struct addrinfo *ai = (struct addrinfo *) address;
+ tcpip_state *sp = (tcpip_state *)h->cprivate;
#else
struct sockaddr_in *add = (struct sockaddr_in *) address;
#endif
h->cerrno = CSOUTSTATE;
return -1;
}
+#if HAVE_GETADDRINFO
+ if (sp->ai != (struct addrinfo *) address)
+ {
+ h->cerrno = CSOUTSTATE;
+ return -1;
+ }
+#endif
#ifdef __sun__
/* On Suns, you must set a bigger Receive Buffer BEFORE a call to connect
* This gives the connect a chance to negotiate with the other side
#endif
#if HAVE_GETADDRINFO
- r = connect(h->iofile, ai->ai_addr, ai->ai_addrlen);
+ r = connect(h->iofile, sp->ai->ai_addr, sp->ai->ai_addrlen);
+ freeaddrinfo(sp->ai);
+ sp->ai = 0;
#else
r = connect(h->iofile, (struct sockaddr *) add, sizeof(*add));
#endif
static int tcpip_bind(COMSTACK h, void *address, int mode)
{
int r;
+ tcpip_state *sp = (tcpip_state *)h->cprivate;
#if HAVE_GETADDRINFO
- struct addrinfo *ai = (struct addrinfo *)address;
#else
struct sockaddr *addr = (struct sockaddr *)address;
#endif
unsigned long one = 1;
#endif
+#if HAVE_GETADDRINFO
+ if (sp->ai != (struct addrinfo *) address)
+ {
+ h->cerrno = CSOUTSTATE;
+ return -1;
+ }
+#endif
+
#if HAVE_OPENSSL_SSL_H
- tcpip_state *sp = (tcpip_state *)h->cprivate;
if (h->type == ssl_type && !sp->ctx)
{
SSL_load_error_strings();
#endif
tcpip_setsockopt(h->iofile);
#if HAVE_GETADDRINFO
- r = bind(h->iofile, ai->ai_addr, ai->ai_addrlen);
+ r = bind(h->iofile, sp->ai->ai_addr, sp->ai->ai_addrlen);
+ freeaddrinfo(sp->ai);
+ sp->ai = 0;
#else
r = bind(h->iofile, addr, sizeof(struct sockaddr_in));
#endif
}
return 0;
}
- if (!(cnew->blocking&1) &&
-#ifdef WIN32
- (ioctlsocket(cnew->iofile, FIONBIO, &tru) < 0)
-#else
- (fcntl(cnew->iofile, F_SETFL, O_NONBLOCK) < 0)
-#endif
- )
+ if (!tcpip_set_blocking(cnew, cnew->flags))
{
h->cerrno = CSYSERR;
if (h->newfd != -1)
state->altsize = state->altlen = 0;
state->towrite = state->written = -1;
state->complete = st->complete;
+#if HAVE_GETADDRINFO
+ state->ai = 0;
+#endif
cnew->state = CS_ST_ACCEPT;
h->state = CS_ST_IDLE;
TRC(fprintf(stderr, " recv res=%d, hasread=%d\n", res, hasread));
if (res < 0)
{
- TRC(fprintf(stderr, " recv errno=%d, (%s)\n", yaz_errno(),
+ TRC(fprintf(stderr, " recv errno=%d, (%s)\n", yaz_errno(),
strerror(yaz_errno())));
#ifdef WIN32
if (WSAGetLastError() == WSAEWOULDBLOCK)
break;
}
else
+ {
+ h->cerrno = CSYSERR;
return -1;
+ }
#else
if (yaz_errno() == EWOULDBLOCK
#ifdef EAGAIN
else if (yaz_errno() == 0)
continue;
else
+ {
+ h->cerrno = CSYSERR;
return -1;
+ }
#endif
}
else if (!res)
if (!sp->altbuf)
{
if (!(sp->altbuf = (char *)xmalloc(sp->altsize = req)))
+ {
+ h->cerrno = CSYSERR;
return -1;
+ }
} else if (sp->altsize < req)
if (!(sp->altbuf =(char *)xrealloc(sp->altbuf, sp->altsize = req)))
+ {
+ h->cerrno = CSYSERR;
return -1;
+ }
TRC(fprintf(stderr, " Moving %d bytes to altbuf(0x%x)\n", tomove,
(unsigned) sp->altbuf));
memcpy(sp->altbuf, *buf + berlen, sp->altlen = tomove);
SSL_CTX_free (sp->ctx_alloc);
#endif
#if HAVE_GETADDRINFO
- if (sp->res)
- freeaddrinfo(sp->res);
+ if (sp->ai)
+ freeaddrinfo(sp->ai);
#endif
xfree(sp);
xfree(h);
char *tcpip_addrstr(COMSTACK h)
{
- struct sockaddr_in addr;
tcpip_state *sp = (struct tcpip_state *)h->cprivate;
char *r = 0, *buf = sp->buf;
- YAZ_SOCKLEN_T len;
+
+#if HAVE_GETADDRINFO
+ char host[120];
+ struct sockaddr_storage addr;
+ YAZ_SOCKLEN_T len = sizeof(addr);
+
+ if (getpeername(h->iofile, (struct sockaddr *)&addr, &len) < 0)
+ {
+ h->cerrno = CSYSERR;
+ return 0;
+ }
+ if (getnameinfo((struct sockaddr *) &addr, len, host, sizeof(host)-1,
+ 0, 0,
+ (h->flags & CS_FLAGS_NUMERICHOST) ? NI_NUMERICHOST : 0))
+ {
+ r = "unknown";
+ }
+ else
+ r = host;
+
+#else
+
+ struct sockaddr_in addr;
+ YAZ_SOCKLEN_T len = sizeof(addr);
struct hostent *host;
- len = sizeof(addr);
if (getpeername(h->iofile, (struct sockaddr*) &addr, &len) < 0)
{
h->cerrno = CSYSERR;
return 0;
}
- if (!(h->blocking&2)) {
- if ((host = gethostbyaddr((char*)&addr.sin_addr, sizeof(addr.sin_addr),
- AF_INET)))
+ if (!(h->flags & CS_FLAGS_NUMERICHOST))
+ {
+ if ((host = gethostbyaddr((char*)&addr.sin_addr,
+ sizeof(addr.sin_addr),
+ AF_INET)))
r = (char*) host->h_name;
}
if (!r)
- r = inet_ntoa(addr.sin_addr);
+ r = inet_ntoa(addr.sin_addr);
+#endif
+
if (h->protocol == PROTO_HTTP)
sprintf(buf, "http:%s", r);
else
return buf;
}
-int static tcpip_set_blocking(COMSTACK p, int blocking)
+int static tcpip_set_blocking(COMSTACK p, int flags)
{
unsigned long flag;
- if (p->blocking == blocking)
- return 1;
#ifdef WIN32
- flag = 1;
+ flag = (flags & CS_FLAGS_BLOCKING) ? 0 : 1;
if (ioctlsocket(p->iofile, FIONBIO, &flag) < 0)
return 0;
#else
flag = fcntl(p->iofile, F_GETFL, 0);
- if(!(blocking&1))
- flag = flag & ~O_NONBLOCK;
+ if (flags & CS_FLAGS_BLOCKING)
+ flag = flag & ~O_NONBLOCK; /* blocking */
else
- flag = flag | O_NONBLOCK;
+ {
+ flag = flag | O_NONBLOCK; /* non-blocking */
+ signal(SIGPIPE, SIG_IGN);
+ }
if (fcntl(p->iofile, F_SETFL, flag) < 0)
return 0;
#endif
- p->blocking = blocking;
+ p->flags = flags;
return 1;
}
projects / yaz-moved-to-github.git / blobdiff