/*
- * Copyright (C) 1995-2005, Index Data ApS
+ * Copyright (C) 1995-2006, Index Data ApS
* See the file LICENSE for details.
*
- * $Id: tcpip.c,v 1.15 2005-02-01 14:37:47 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>
static int tcpip_rcvconnect(COMSTACK h);
static int tcpip_bind(COMSTACK h, void *address, int mode);
static int tcpip_listen(COMSTACK h, char *raddr, int *addrlen,
- int (*check_ip)(void *cd, const char *a, int len, int type),
- void *cd);
+ int (*check_ip)(void *cd, const char *a, int len, int type),
+ void *cd);
static int tcpip_set_blocking(COMSTACK p, int blocking);
#if HAVE_OPENSSL_SSL_H
int written; /* -1 if we aren't writing */
int towrite; /* to verify against user input */
int (*complete)(const unsigned char *buf, int len); /* length/comple. */
+#if HAVE_GETADDRINFO
+ struct addrinfo *ai;
+#else
struct sockaddr_in addr; /* returned by cs_straddr */
+#endif
char buf[128]; /* returned by cs_addrstr */
#if HAVE_OPENSSL_SSL_H
SSL_CTX *ctx; /* current CTX. */
* 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;
+ return 0;
if (!(sp = (struct tcpip_state *)(p->cprivate =
xmalloc(sizeof(tcpip_state)))))
- return 0;
+ 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_addrstr = tcpip_addrstr;
p->f_straddr = tcpip_straddr;
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;
strcpy(sp->cert_fname, "yaz.pem");
#endif
+#if HAVE_GETADDRINFO
+ sp->ai = 0;
+#endif
sp->altbuf = 0;
sp->altsize = sp->altlen = 0;
sp->towrite = sp->written = -1;
if (protocol == PROTO_WAIS)
- sp->complete = completeWAIS;
+ sp->complete = completeWAIS;
else
- sp->complete = cs_complete_auto;
+ sp->complete = cs_complete_auto;
p->timeout = COMSTACK_DEFAULT_TIMEOUT;
TRC(fprintf(stderr, "Created new TCPIP comstack\n"));
#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;
+ return 0;
p->f_get = ssl_get;
p->f_put = ssl_put;
p->type = ssl_type;
}
#endif
+#if HAVE_GETADDRINFO
+/* resolve using getaddrinfo */
+struct addrinfo *tcpip_getaddrinfo(const char *str, const char *port)
+{
+ struct addrinfo hints, *res;
+ int error;
+ char host[512], *p;
+
+ hints.ai_flags = 0;
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+ hints.ai_protocol = 0;
+ hints.ai_addrlen = 0;
+ hints.ai_addr = NULL;
+ hints.ai_canonname = NULL;
+ hints.ai_next = NULL;
+
+ strncpy(host, str, sizeof(host)-1);
+ host[sizeof(host)-1] = 0;
+ if ((p = strchr(host, '/')))
+ *p = 0;
+ if ((p = strrchr(host, ':')))
+ {
+ *p = '\0';
+ port = p+1;
+ }
+
+ if (!strcmp("@", host))
+ {
+ hints.ai_flags = AI_PASSIVE;
+ error = getaddrinfo(0, port, &hints, &res);
+ }
+ else
+ {
+ error = getaddrinfo(host, port, &hints, &res);
+ }
+ if (error)
+ return 0;
+ return res;
+}
+
+#endif
+/* gethostbyname .. old systems */
int tcpip_strtoaddr_ex(const char *str, struct sockaddr_in *add,
int default_port)
{
struct hostent *hp;
char *p, buf[512];
short int port = default_port;
- unsigned tmpadd;
-
- if (!tcpip_init ())
- return 0;
+#ifdef WIN32
+ unsigned long tmpadd;
+#else
+ in_addr_t tmpadd;
+#endif
TRC(fprintf(stderr, "tcpip_strtoaddress: %s\n", str ? str : "NULL"));
add->sin_family = AF_INET;
- strncpy(buf, str, 511);
- buf[511] = 0;
+ strncpy(buf, str, sizeof(buf)-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);
}
add->sin_port = htons(port);
if (!strcmp("@", buf))
+ {
add->sin_addr.s_addr = INADDR_ANY;
+ }
+ else if ((tmpadd = inet_addr(buf)) != -1)
+ {
+ memcpy(&add->sin_addr.s_addr, &tmpadd, sizeof(struct in_addr));
+ }
else if ((hp = gethostbyname(buf)))
+ {
memcpy(&add->sin_addr.s_addr, *hp->h_addr_list,
- sizeof(struct in_addr));
- else if ((tmpadd = (unsigned) inet_addr(buf)) != 0)
- memcpy(&add->sin_addr.s_addr, &tmpadd, sizeof(struct in_addr));
+ sizeof(struct in_addr));
+ }
else
return 0;
return 1;
}
+
+#if HAVE_GETADDRINFO
void *tcpip_straddr(COMSTACK h, const char *str)
{
tcpip_state *sp = (tcpip_state *)h->cprivate;
- int port = 210;
+ const char *port = "210";
+ if (h->protocol == PROTO_HTTP)
+ port = "80";
+ if (!tcpip_init ())
+ return 0;
+ 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)
+{
+ tcpip_state *sp = (tcpip_state *)h->cprivate;
+ int port = 210;
if (h->protocol == PROTO_HTTP)
port = 80;
+ if (!tcpip_init ())
+ return 0;
if (!tcpip_strtoaddr_ex (str, &sp->addr, port))
- return 0;
- return &sp->addr;
-}
+ 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;
-struct sockaddr_in *tcpip_strtoaddr(const char *str)
-{
- static struct sockaddr_in add;
-
- if (!tcpip_strtoaddr_ex (str, &add, 210))
- return 0;
- return &add;
+ if (!tcpip_set_blocking(h, h->blocking))
+ return 0;
+ }
+ return &sp->addr;
}
+#endif
int tcpip_more(COMSTACK h)
{
tcpip_state *sp = (tcpip_state *)h->cprivate;
return sp->altlen && (*sp->complete)((unsigned char *) sp->altbuf,
- sp->altlen);
+ sp->altlen);
}
/*
*/
int tcpip_connect(COMSTACK h, void *address)
{
- struct sockaddr_in *add = (struct sockaddr_in *)address;
+#if HAVE_GETADDRINFO
+ tcpip_state *sp = (tcpip_state *)h->cprivate;
+#else
+ struct sockaddr_in *add = (struct sockaddr_in *) address;
+#endif
int r;
#ifdef __sun__
int recbuflen;
if (h->state != CS_ST_UNBND)
{
h->cerrno = CSOUTSTATE;
- return -1;
+ 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
return -1;
}
TRC(fprintf( stderr, "Current Size of TCP Receive Buffer= %d\n",
- recbuflen ));
+ recbuflen ));
recbuflen *= 10; /* lets be optimistic */
if ( setsockopt(h->iofile, SOL_SOCKET, SO_RCVBUF, (void *)&recbuflen, rbufsize ) < 0 )
{
return -1;
}
TRC(fprintf( stderr, "New Size of TCP Receive Buffer = %d\n",
- recbuflen ));
+ recbuflen ));
#endif
+
+#if HAVE_GETADDRINFO
+ 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
if (r < 0)
{
#ifdef WIN32
if (h->state != CS_ST_CONNECTING)
{
h->cerrno = CSOUTSTATE;
- return -1;
+ return -1;
}
#if HAVE_OPENSSL_SSL_H
if (h->type == ssl_type && !sp->ctx)
{
- SSL_load_error_strings();
- SSLeay_add_all_algorithms();
-
- sp->ctx = sp->ctx_alloc = SSL_CTX_new (SSLv23_method());
- if (!sp->ctx)
- {
- h->cerrno = CSERRORSSL;
- return -1;
- }
+ SSL_load_error_strings();
+ SSLeay_add_all_algorithms();
+
+ sp->ctx = sp->ctx_alloc = SSL_CTX_new (SSLv23_method());
+ if (!sp->ctx)
+ {
+ h->cerrno = CSERRORSSL;
+ return -1;
+ }
}
if (sp->ctx)
{
- int res;
-
- if (!sp->ssl)
- {
- sp->ssl = SSL_new (sp->ctx);
- SSL_set_fd (sp->ssl, h->iofile);
- }
- res = SSL_connect (sp->ssl);
- if (res <= 0)
- {
- int err = SSL_get_error(sp->ssl, res);
- if (err == SSL_ERROR_WANT_READ)
- {
- h->io_pending = CS_WANT_READ;
- return 1;
- }
- if (err == SSL_ERROR_WANT_WRITE)
- {
- h->io_pending = CS_WANT_WRITE;
- return 1;
- }
- h->cerrno = CSERRORSSL;
- return -1;
- }
+ int res;
+
+ if (!sp->ssl)
+ {
+ sp->ssl = SSL_new (sp->ctx);
+ SSL_set_fd (sp->ssl, h->iofile);
+ }
+ res = SSL_connect (sp->ssl);
+ if (res <= 0)
+ {
+ int err = SSL_get_error(sp->ssl, res);
+ if (err == SSL_ERROR_WANT_READ)
+ {
+ h->io_pending = CS_WANT_READ;
+ return 1;
+ }
+ if (err == SSL_ERROR_WANT_WRITE)
+ {
+ h->io_pending = CS_WANT_WRITE;
+ return 1;
+ }
+ h->cerrno = CSERRORSSL;
+ return -1;
+ }
}
#endif
h->event = CS_DATA;
static int tcpip_bind(COMSTACK h, void *address, int mode)
{
+ int r;
+ tcpip_state *sp = (tcpip_state *)h->cprivate;
+#if HAVE_GETADDRINFO
+#else
struct sockaddr *addr = (struct sockaddr *)address;
+#endif
#ifdef WIN32
BOOL one = 1;
#else
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();
- SSLeay_add_all_algorithms();
-
- sp->ctx = sp->ctx_alloc = SSL_CTX_new (SSLv23_method());
- if (!sp->ctx)
- {
- h->cerrno = CSERRORSSL;
- return -1;
- }
+ SSL_load_error_strings();
+ SSLeay_add_all_algorithms();
+
+ sp->ctx = sp->ctx_alloc = SSL_CTX_new (SSLv23_method());
+ if (!sp->ctx)
+ {
+ h->cerrno = CSERRORSSL;
+ return -1;
+ }
}
if (sp->ctx)
{
- if (sp->ctx_alloc)
- {
- int res;
- res = SSL_CTX_use_certificate_file (sp->ctx, sp->cert_fname,
- SSL_FILETYPE_PEM);
- if (res <= 0)
- {
- ERR_print_errors_fp(stderr);
- exit (2);
- }
- res = SSL_CTX_use_PrivateKey_file (sp->ctx, sp->cert_fname,
- SSL_FILETYPE_PEM);
- if (res <= 0)
- {
- ERR_print_errors_fp(stderr);
- exit (3);
- }
- res = SSL_CTX_check_private_key (sp->ctx);
- if (res <= 0)
- {
- ERR_print_errors_fp(stderr);
- exit(5);
- }
- }
- TRC (fprintf (stderr, "ssl_bind\n"));
+ if (sp->ctx_alloc)
+ {
+ int res;
+ res = SSL_CTX_use_certificate_chain_file(sp->ctx, sp->cert_fname);
+ if (res <= 0)
+ {
+ ERR_print_errors_fp(stderr);
+ exit (2);
+ }
+ res = SSL_CTX_use_PrivateKey_file (sp->ctx, sp->cert_fname,
+ SSL_FILETYPE_PEM);
+ if (res <= 0)
+ {
+ ERR_print_errors_fp(stderr);
+ exit (3);
+ }
+ res = SSL_CTX_check_private_key (sp->ctx);
+ if (res <= 0)
+ {
+ ERR_print_errors_fp(stderr);
+ exit(5);
+ }
+ }
+ TRC (fprintf (stderr, "ssl_bind\n"));
}
else
{
- TRC (fprintf (stderr, "tcpip_bind\n"));
+ TRC (fprintf (stderr, "tcpip_bind\n"));
}
#else
TRC (fprintf (stderr, "tcpip_bind\n"));
#endif
#ifndef WIN32
if (setsockopt(h->iofile, SOL_SOCKET, SO_REUSEADDR, (char*)
- &one, sizeof(one)) < 0)
+ &one, sizeof(one)) < 0)
{
h->cerrno = CSYSERR;
return -1;
}
#endif
tcpip_setsockopt(h->iofile);
- if (bind(h->iofile, addr, sizeof(struct sockaddr_in)))
+#if HAVE_GETADDRINFO
+ 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
+ if (r)
{
h->cerrno = CSYSERR;
return -1;
}
- if (mode == CS_SERVER && listen(h->iofile, 3) < 0)
+ /* Allow a maximum-sized backlog of waiting-to-connect clients */
+ if (mode == CS_SERVER && listen(h->iofile, SOMAXCONN) < 0)
{
h->cerrno = CSYSERR;
return -1;
}
int tcpip_listen(COMSTACK h, char *raddr, int *addrlen,
- int (*check_ip)(void *cd, const char *a, int len, int t),
- void *cd)
+ int (*check_ip)(void *cd, const char *a, int len, int t),
+ void *cd)
{
struct sockaddr_in addr;
YAZ_SOCKLEN_T len = sizeof(addr);
h->newfd = accept(h->iofile, (struct sockaddr*)&addr, &len);
if (h->newfd < 0)
{
- if (
+ if (
#ifdef WIN32
- WSAGetLastError() == WSAEWOULDBLOCK
+ WSAGetLastError() == WSAEWOULDBLOCK
#else
- yaz_errno() == EWOULDBLOCK
+ yaz_errno() == EWOULDBLOCK
#ifdef EAGAIN
#if EAGAIN != EWOULDBLOCK
|| yaz_errno() == EAGAIN
#endif
#endif
#endif
- )
- h->cerrno = CSNODATA;
- else
- h->cerrno = CSYSERR;
+ )
+ h->cerrno = CSNODATA;
+ else
+ h->cerrno = CSYSERR;
return -1;
}
if (addrlen && (size_t) (*addrlen) >= sizeof(struct sockaddr_in))
if (check_ip && (*check_ip)(cd, (const char *) &addr,
sizeof(addr), AF_INET))
{
- h->cerrno = CSDENY;
+ h->cerrno = CSDENY;
#ifdef WIN32
closesocket(h->newfd);
#else
close(h->newfd);
#endif
- h->newfd = -1;
- return -1;
+ h->newfd = -1;
+ return -1;
}
h->state = CS_ST_INCON;
tcpip_setsockopt (h->newfd);
TRC(fprintf(stderr, "tcpip_accept\n"));
if (h->state == CS_ST_INCON)
{
- if (!(cnew = (COMSTACK)xmalloc(sizeof(*cnew))))
- {
- h->cerrno = CSYSERR;
-#ifdef WIN32
- closesocket(h->newfd);
-#else
- close(h->newfd);
-#endif
- h->newfd = -1;
- return 0;
- }
- memcpy(cnew, h, sizeof(*h));
- cnew->iofile = h->newfd;
- cnew->io_pending = 0;
- if (!(state = (tcpip_state *)
- (cnew->cprivate = xmalloc(sizeof(tcpip_state)))))
- {
- h->cerrno = CSYSERR;
- if (h->newfd != -1)
- {
+ if (!(cnew = (COMSTACK)xmalloc(sizeof(*cnew))))
+ {
+ h->cerrno = CSYSERR;
#ifdef WIN32
- closesocket(h->newfd);
+ closesocket(h->newfd);
#else
- close(h->newfd);
+ close(h->newfd);
#endif
- h->newfd = -1;
- }
- return 0;
- }
- if (!(cnew->blocking&1) &&
+ h->newfd = -1;
+ return 0;
+ }
+ memcpy(cnew, h, sizeof(*h));
+ cnew->iofile = h->newfd;
+ cnew->io_pending = 0;
+ if (!(state = (tcpip_state *)
+ (cnew->cprivate = xmalloc(sizeof(tcpip_state)))))
+ {
+ h->cerrno = CSYSERR;
+ if (h->newfd != -1)
+ {
#ifdef WIN32
- (ioctlsocket(cnew->iofile, FIONBIO, &tru) < 0)
+ closesocket(h->newfd);
#else
- (fcntl(cnew->iofile, F_SETFL, O_NONBLOCK) < 0)
+ close(h->newfd);
#endif
- )
- {
- h->cerrno = CSYSERR;
- if (h->newfd != -1)
- {
+ h->newfd = -1;
+ }
+ return 0;
+ }
+ if (!tcpip_set_blocking(cnew, cnew->flags))
+ {
+ h->cerrno = CSYSERR;
+ if (h->newfd != -1)
+ {
#ifdef WIN32
- closesocket(h->newfd);
+ closesocket(h->newfd);
#else
- close(h->newfd);
-#endif
- h->newfd = -1;
- }
- xfree (cnew);
- xfree (state);
- return 0;
- }
- h->newfd = -1;
- state->altbuf = 0;
- state->altsize = state->altlen = 0;
- state->towrite = state->written = -1;
- state->complete = st->complete;
- cnew->state = CS_ST_ACCEPT;
- h->state = CS_ST_IDLE;
-
+ close(h->newfd);
+#endif
+ h->newfd = -1;
+ }
+ xfree (cnew);
+ xfree (state);
+ return 0;
+ }
+ h->newfd = -1;
+ state->altbuf = 0;
+ 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;
+
#if HAVE_OPENSSL_SSL_H
- state->ctx = st->ctx;
- state->ctx_alloc = 0;
- state->ssl = st->ssl;
- if (state->ctx)
- {
- state->ssl = SSL_new (state->ctx);
- SSL_set_fd (state->ssl, cnew->iofile);
- }
-#endif
- h = cnew;
+ state->ctx = st->ctx;
+ state->ctx_alloc = 0;
+ state->ssl = st->ssl;
+ if (state->ctx)
+ {
+ state->ssl = SSL_new (state->ctx);
+ SSL_set_fd (state->ssl, cnew->iofile);
+ }
+#endif
+ h = cnew;
}
if (h->state == CS_ST_ACCEPT)
{
#if HAVE_OPENSSL_SSL_H
- tcpip_state *state = (tcpip_state *)h->cprivate;
- if (state->ctx)
- {
- int res = SSL_accept (state->ssl);
- TRC(fprintf(stderr, "SSL_accept\n"));
- if (res <= 0)
- {
- int err = SSL_get_error(state->ssl, res);
- if (err == SSL_ERROR_WANT_READ)
- {
- h->io_pending = CS_WANT_READ;
- return h;
- }
- if (err == SSL_ERROR_WANT_WRITE)
- {
- h->io_pending = CS_WANT_WRITE;
- return h;
- }
- cs_close (h);
- return 0;
- }
- }
+ tcpip_state *state = (tcpip_state *)h->cprivate;
+ if (state->ctx)
+ {
+ int res = SSL_accept (state->ssl);
+ TRC(fprintf(stderr, "SSL_accept\n"));
+ if (res <= 0)
+ {
+ int err = SSL_get_error(state->ssl, res);
+ if (err == SSL_ERROR_WANT_READ)
+ {
+ h->io_pending = CS_WANT_READ;
+ return h;
+ }
+ if (err == SSL_ERROR_WANT_WRITE)
+ {
+ h->io_pending = CS_WANT_WRITE;
+ return h;
+ }
+ cs_close (h);
+ return 0;
+ }
+ }
#endif
}
else
if (!*bufsize)
{
if (!(*buf = (char *)xmalloc(*bufsize = CS_TCPIP_BUFCHUNK)))
+ {
+ h->cerrno = CSYSERR;
return -1;
+ }
}
else if (*bufsize - hasread < CS_TCPIP_BUFCHUNK)
if (!(*buf =(char *)xrealloc(*buf, *bufsize *= 2)))
+ {
+ h->cerrno = CSYSERR;
return -1;
+ }
#ifdef __sun__
- yaz_set_errno( 0 );
- /* unfortunatly, sun sometimes forgets to set errno in recv
- when EWOULDBLOCK etc. would be required (res = -1) */
-#endif
- res = recv(h->iofile, *buf + hasread, CS_TCPIP_BUFCHUNK, 0);
- TRC(fprintf(stderr, " recv res=%d, hasread=%d\n", res, hasread));
- if (res < 0)
- {
- TRC(fprintf(stderr, " recv errno=%d, (%s)\n", yaz_errno(),
- strerror(yaz_errno())));
+ yaz_set_errno( 0 );
+ /* unfortunatly, sun sometimes forgets to set errno in recv
+ when EWOULDBLOCK etc. would be required (res = -1) */
+#endif
+ res = recv(h->iofile, *buf + hasread, CS_TCPIP_BUFCHUNK, 0);
+ TRC(fprintf(stderr, " recv res=%d, hasread=%d\n", res, hasread));
+ if (res < 0)
+ {
+ TRC(fprintf(stderr, " recv errno=%d, (%s)\n", yaz_errno(),
+ strerror(yaz_errno())));
#ifdef WIN32
- if (WSAGetLastError() == WSAEWOULDBLOCK)
- {
- h->io_pending = CS_WANT_READ;
- break;
- }
- else
- return -1;
+ if (WSAGetLastError() == WSAEWOULDBLOCK)
+ {
+ h->io_pending = CS_WANT_READ;
+ break;
+ }
+ else
+ {
+ h->cerrno = CSYSERR;
+ return -1;
+ }
#else
- if (yaz_errno() == EWOULDBLOCK
+ if (yaz_errno() == EWOULDBLOCK
#ifdef EAGAIN
#if EAGAIN != EWOULDBLOCK
|| yaz_errno() == EAGAIN
#endif
#endif
- || yaz_errno() == EINPROGRESS
+ || yaz_errno() == EINPROGRESS
#ifdef __sun__
- || yaz_errno() == ENOENT /* Sun's sometimes set errno to this */
-#endif
- )
- {
- h->io_pending = CS_WANT_READ;
- break;
- }
- else if (yaz_errno() == 0)
- continue;
- else
- return -1;
-#endif
- }
- else if (!res)
- return hasread;
+ || yaz_errno() == ENOENT /* Sun's sometimes set errno to this */
+#endif
+ )
+ {
+ h->io_pending = CS_WANT_READ;
+ break;
+ }
+ else if (yaz_errno() == 0)
+ continue;
+ else
+ {
+ h->cerrno = CSYSERR;
+ return -1;
+ }
+#endif
+ }
+ else if (!res)
+ return hasread;
hasread += res;
+ if (hasread > h->max_recv_bytes)
+ {
+ h->cerrno = CSBUFSIZE;
+ return -1;
+ }
}
TRC (fprintf (stderr, " Out of read loop with hasread=%d, berlen=%d\n",
- hasread, berlen));
+ hasread, berlen));
/* move surplus buffer (or everything if we didn't get a BER rec.) */
if (hasread > berlen)
{
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);
else if (*bufsize - hasread < CS_TCPIP_BUFCHUNK)
if (!(*buf =(char *)xrealloc(*buf, *bufsize *= 2)))
return -1;
- res = SSL_read (sp->ssl, *buf + hasread, CS_TCPIP_BUFCHUNK);
- TRC(fprintf(stderr, " SSL_read res=%d, hasread=%d\n", res, hasread));
- if (res <= 0)
- {
- int ssl_err = SSL_get_error(sp->ssl, res);
- if (ssl_err == SSL_ERROR_WANT_READ)
- {
- h->io_pending = CS_WANT_READ;
- break;
- }
- if (ssl_err == SSL_ERROR_WANT_WRITE)
- {
- h->io_pending = CS_WANT_WRITE;
- break;
- }
- if (res == 0)
- return 0;
- h->cerrno = CSERRORSSL;
- return -1;
- }
- hasread += res;
+ res = SSL_read (sp->ssl, *buf + hasread, CS_TCPIP_BUFCHUNK);
+ TRC(fprintf(stderr, " SSL_read res=%d, hasread=%d\n", res, hasread));
+ if (res <= 0)
+ {
+ int ssl_err = SSL_get_error(sp->ssl, res);
+ if (ssl_err == SSL_ERROR_WANT_READ)
+ {
+ h->io_pending = CS_WANT_READ;
+ break;
+ }
+ if (ssl_err == SSL_ERROR_WANT_WRITE)
+ {
+ h->io_pending = CS_WANT_WRITE;
+ break;
+ }
+ if (res == 0)
+ return 0;
+ h->cerrno = CSERRORSSL;
+ return -1;
+ }
+ hasread += res;
}
TRC (fprintf (stderr, " Out of read loop with hasread=%d, berlen=%d\n",
hasread, berlen));
}
while (state->towrite > state->written)
{
- if ((res =
- send(h->iofile, buf + state->written, size -
- state->written,
+ if ((res =
+ send(h->iofile, buf + state->written, size -
+ state->written,
#ifdef MSG_NOSIGNAL
- MSG_NOSIGNAL
+ MSG_NOSIGNAL
#else
- 0
+ 0
#endif
- )) < 0)
- {
- if (
+ )) < 0)
+ {
+ if (
#ifdef WIN32
- WSAGetLastError() == WSAEWOULDBLOCK
+ WSAGetLastError() == WSAEWOULDBLOCK
#else
- yaz_errno() == EWOULDBLOCK
+ yaz_errno() == EWOULDBLOCK
#ifdef EAGAIN
#if EAGAIN != EWOULDBLOCK
|| yaz_errno() == EAGAIN
#ifdef __sun__
|| yaz_errno() == ENOENT /* Sun's sometimes set errno to this value! */
#endif
- || yaz_errno() == EINPROGRESS
-#endif
- )
- {
- TRC(fprintf(stderr, " Flow control stop\n"));
- h->io_pending = CS_WANT_WRITE;
- return 1;
- }
- h->cerrno = CSYSERR;
- return -1;
- }
- state->written += res;
- TRC(fprintf(stderr, " Wrote %d, written=%d, nbytes=%d\n",
- res, state->written, size));
+ || yaz_errno() == EINPROGRESS
+#endif
+ )
+ {
+ TRC(fprintf(stderr, " Flow control stop\n"));
+ h->io_pending = CS_WANT_WRITE;
+ return 1;
+ }
+ h->cerrno = CSYSERR;
+ return -1;
+ }
+ state->written += res;
+ TRC(fprintf(stderr, " Wrote %d, written=%d, nbytes=%d\n",
+ res, state->written, size));
}
state->towrite = state->written = -1;
TRC(fprintf(stderr, " Ok\n"));
}
while (state->towrite > state->written)
{
- res = SSL_write (state->ssl, buf + state->written,
- size - state->written);
- if (res <= 0)
- {
- int ssl_err = SSL_get_error(state->ssl, res);
- if (ssl_err == SSL_ERROR_WANT_READ)
- {
- h->io_pending = CS_WANT_READ;
- return 1;
- }
- if (ssl_err == SSL_ERROR_WANT_WRITE)
- {
- h->io_pending = CS_WANT_WRITE;
- return 1;
- }
- h->cerrno = CSERRORSSL;
- return -1;
- }
- state->written += res;
- TRC(fprintf(stderr, " Wrote %d, written=%d, nbytes=%d\n",
- res, state->written, size));
+ res = SSL_write (state->ssl, buf + state->written,
+ size - state->written);
+ if (res <= 0)
+ {
+ int ssl_err = SSL_get_error(state->ssl, res);
+ if (ssl_err == SSL_ERROR_WANT_READ)
+ {
+ h->io_pending = CS_WANT_READ;
+ return 1;
+ }
+ if (ssl_err == SSL_ERROR_WANT_WRITE)
+ {
+ h->io_pending = CS_WANT_WRITE;
+ return 1;
+ }
+ h->cerrno = CSERRORSSL;
+ return -1;
+ }
+ state->written += res;
+ TRC(fprintf(stderr, " Wrote %d, written=%d, nbytes=%d\n",
+ res, state->written, size));
}
state->towrite = state->written = -1;
TRC(fprintf(stderr, " Ok\n"));
if (h->iofile != -1)
{
#if HAVE_OPENSSL_SSL_H
- if (sp->ssl)
- {
- SSL_shutdown (sp->ssl);
- }
+ if (sp->ssl)
+ {
+ SSL_shutdown (sp->ssl);
+ }
#endif
#ifdef WIN32
closesocket(h->iofile);
#if HAVE_OPENSSL_SSL_H
if (sp->ssl)
{
- TRC (fprintf(stderr, "SSL_free\n"));
- SSL_free (sp->ssl);
+ TRC (fprintf(stderr, "SSL_free\n"));
+ SSL_free (sp->ssl);
}
sp->ssl = 0;
if (sp->ctx_alloc)
- SSL_CTX_free (sp->ctx_alloc);
+ SSL_CTX_free (sp->ctx_alloc);
+#endif
+#if HAVE_GETADDRINFO
+ 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;
+ h->cerrno = CSYSERR;
+ return 0;
}
- if (!(h->blocking&2)) {
- if ((host = gethostbyaddr((char*)&addr.sin_addr, sizeof(addr.sin_addr),
- AF_INET)))
- r = (char*) host->h_name;
+ 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;
+ 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;
+ return 0;
#endif
- p->blocking = blocking;
+ p->flags = flags;
return 1;
}
return 0;
sp = (struct tcpip_state *) cs->cprivate;
if (sp->ctx_alloc)
- return 0;
+ return 0;
sp->ctx = (SSL_CTX *) ctx;
return 1;
}
{
struct tcpip_state *sp;
if (!cs || cs->type != ssl_type)
- return 0;
+ return 0;
sp = (struct tcpip_state *) cs->cprivate;
strncpy(sp->cert_fname, fname, sizeof(sp->cert_fname)-1);
sp->cert_fname[sizeof(sp->cert_fname)-1] = '\0';
SSL *ssl = (SSL *) cs_get_ssl(cs);
if (ssl)
{
- X509 *server_cert = SSL_get_peer_certificate (ssl);
- if (server_cert)
- {
- BIO *bio = BIO_new(BIO_s_mem());
- char *pem_buf;
- /* get PEM buffer in memory */
- PEM_write_bio_X509(bio, server_cert);
- *len = BIO_get_mem_data(bio, &pem_buf);
- *buf = (char *) xmalloc(*len);
- memcpy(*buf, pem_buf, *len);
- BIO_free(bio);
- return 1;
- }
+ X509 *server_cert = SSL_get_peer_certificate (ssl);
+ if (server_cert)
+ {
+ BIO *bio = BIO_new(BIO_s_mem());
+ char *pem_buf;
+ /* get PEM buffer in memory */
+ PEM_write_bio_X509(bio, server_cert);
+ *len = BIO_get_mem_data(bio, &pem_buf);
+ *buf = (char *) xmalloc(*len);
+ memcpy(*buf, pem_buf, *len);
+ BIO_free(bio);
+ return 1;
+ }
}
return 0;
}
}
#endif
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+
projects / yaz-moved-to-github.git / blobdiff