-/*
- * Copyright (C) 1995-2006, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
- *
- * $Id: tcpip.c,v 1.31 2006-09-21 15:55:25 adam Exp $
*/
/**
* \file tcpip.c
#endif
#ifdef WIN32
+
+/* VS 2003 or later has getaddrinfo; older versions do not */
#include <winsock2.h>
+#if _MSC_VER >= 1300
#include <ws2tcpip.h>
#define HAVE_GETADDRINFO 1
#else
+#define HAVE_GETADDRINFO 0
+#endif
+
+#else
#include <netinet/in.h>
#include <netdb.h>
#include <arpa/inet.h>
#if HAVE_SYS_SOCKET_H
#include <sys/socket.h>
#endif
-#if HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
#if HAVE_SYS_WAIT_H
#include <sys/wait.h>
#endif
+#if HAVE_GNUTLS_H
+#include <gnutls/openssl.h>
+#define ENABLE_SSL 1
+#endif
+
#if HAVE_OPENSSL_SSL_H
#include <openssl/ssl.h>
#include <openssl/err.h>
+#define ENABLE_SSL 1
#endif
#include <yaz/comstack.h>
static int tcpip_close(COMSTACK h);
static int tcpip_put(COMSTACK h, char *buf, int size);
static int tcpip_get(COMSTACK h, char **buf, int *bufsize);
+static int tcpip_put_connect(COMSTACK h, char *buf, int size);
+static int tcpip_get_connect(COMSTACK h, char **buf, int *bufsize);
static int tcpip_connect(COMSTACK h, void *address);
static int tcpip_more(COMSTACK h);
static int tcpip_rcvconnect(COMSTACK h);
void *cd);
static int tcpip_set_blocking(COMSTACK p, int blocking);
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
static int ssl_get(COMSTACK h, char **buf, int *bufsize);
static int ssl_put(COMSTACK h, char *buf, int size);
#endif
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. */
+ int (*complete)(const char *buf, int len); /* length/complete. */
#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
+#if ENABLE_SSL
SSL_CTX *ctx; /* current CTX. */
SSL_CTX *ctx_alloc; /* If =ctx it is owned by CS. If 0 it is not owned */
SSL *ssl;
char cert_fname[256];
#endif
+ char *connect_request_buf;
+ int connect_request_len;
+ char *connect_response_buf;
+ int connect_response_len;
} tcpip_state;
#ifdef WIN32
p->stackerr = 0;
p->user = 0;
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
sp->ctx = sp->ctx_alloc = 0;
sp->ssl = 0;
strcpy(sp->cert_fname, "yaz.pem");
else
sp->complete = cs_complete_auto;
+ sp->connect_request_buf = 0;
+ sp->connect_request_len = 0;
+ sp->connect_response_buf = 0;
+ sp->connect_response_len = 0;
+
p->timeout = COMSTACK_DEFAULT_TIMEOUT;
TRC(fprintf(stderr, "Created new TCPIP comstack\n"));
return p;
}
-#if HAVE_OPENSSL_SSL_H
+COMSTACK yaz_tcpip_create(int s, int flags, int protocol,
+ const char *connect_host)
+{
+ COMSTACK p = tcpip_type(s, flags, protocol, 0);
+ if (!p)
+ return 0;
+ if (connect_host)
+ {
+ tcpip_state *sp = (tcpip_state *) p->cprivate;
+ sp->connect_request_buf = (char *) xmalloc(strlen(connect_host) + 30);
+ sprintf(sp->connect_request_buf, "CONNECT %s HTTP/1.0\r\n\r\n",
+ connect_host);
+ sp->connect_request_len = strlen(sp->connect_request_buf);
+ p->f_put = tcpip_put_connect;
+ p->f_get = tcpip_get_connect;
+ sp->complete = cs_complete_auto_head; /* only want HTTP header */
+ }
+ return p;
+}
+
+
+#if ENABLE_SSL
COMSTACK ssl_type(int s, int flags, int protocol, void *vp)
{
{
tcpip_state *sp = (tcpip_state *)h->cprivate;
- return sp->altlen && (*sp->complete)((unsigned char *) sp->altbuf,
- sp->altlen);
+ return sp->altlen && (*sp->complete)(sp->altbuf, sp->altlen);
}
/*
*/
int tcpip_rcvconnect(COMSTACK h)
{
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
tcpip_state *sp = (tcpip_state *)h->cprivate;
#endif
TRC(fprintf(stderr, "tcpip_rcvconnect\n"));
h->cerrno = CSOUTSTATE;
return -1;
}
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
if (h->type == ssl_type && !sp->ctx)
{
+ SSL_library_init();
SSL_load_error_strings();
- SSLeay_add_all_algorithms();
- sp->ctx = sp->ctx_alloc = SSL_CTX_new (SSLv23_method());
+ sp->ctx = sp->ctx_alloc = SSL_CTX_new (SSLv23_client_method());
if (!sp->ctx)
{
h->cerrno = CSERRORSSL;
sp->ssl = SSL_new (sp->ctx);
SSL_set_fd (sp->ssl, h->iofile);
}
- res = SSL_connect (sp->ssl);
+ res = SSL_connect(sp->ssl);
+#if HAVE_OPENSSL_SSL_H
if (res <= 0)
{
int err = SSL_get_error(sp->ssl, res);
h->cerrno = CSERRORSSL;
return -1;
}
+#else
+ TRC(fprintf(stderr, "SSL_connect res=%d last_error=%d\n",
+ res, sp->ssl->last_error));
+ if (res == 0 && sp->ssl->last_error == GNUTLS_E_AGAIN)
+ {
+ h->io_pending = CS_WANT_READ;
+ return 1;
+ }
+ else if (res <= 0)
+ {
+ h->cerrno = CSERRORSSL;
+ return -1;
+ }
+#endif
}
#endif
h->event = CS_DATA;
}
#endif
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
if (h->type == ssl_type && !sp->ctx)
{
+ SSL_library_init();
SSL_load_error_strings();
- SSLeay_add_all_algorithms();
- sp->ctx = sp->ctx_alloc = SSL_CTX_new (SSLv23_method());
+ sp->ctx = sp->ctx_alloc = SSL_CTX_new (SSLv23_server_method());
if (!sp->ctx)
{
h->cerrno = CSERRORSSL;
if (sp->ctx_alloc)
{
int res;
- res = SSL_CTX_use_certificate_chain_file(sp->ctx, sp->cert_fname);
+ res = SSL_CTX_use_certificate_file(sp->ctx, sp->cert_fname,
+ SSL_FILETYPE_PEM);
if (res <= 0)
{
+#if HAVE_OPENSSL_SSL_H
ERR_print_errors_fp(stderr);
+#else
+ fprintf(stderr, " SSL_CTX_use_certificate_file %s failed\n",
+ sp->cert_fname);
+#endif
exit (2);
}
res = SSL_CTX_use_PrivateKey_file (sp->ctx, sp->cert_fname,
SSL_FILETYPE_PEM);
if (res <= 0)
{
+#if HAVE_OPENSSL_SSL_H
ERR_print_errors_fp(stderr);
+#else
+ fprintf(stderr, " SSL_CTX_use_certificate_file %s failed\n",
+ sp->cert_fname);
+#endif
exit (3);
}
+#if HAVE_OPENSSL_SSL_H
res = SSL_CTX_check_private_key (sp->ctx);
if (res <= 0)
{
ERR_print_errors_fp(stderr);
exit(5);
}
+#endif
}
TRC (fprintf (stderr, "ssl_bind\n"));
}
)
h->cerrno = CSNODATA;
else
+ {
+#ifdef WIN32
+ shutdown(h->iofile, SD_RECEIVE);
+#else
+ shutdown(h->iofile, SHUT_RD);
+#endif
+ listen(h->iofile, SOMAXCONN);
h->cerrno = CSYSERR;
+ }
return -1;
}
if (addrlen && (size_t) (*addrlen) >= sizeof(struct sockaddr_in))
cnew->state = CS_ST_ACCEPT;
h->state = CS_ST_IDLE;
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
state->ctx = st->ctx;
state->ctx_alloc = 0;
state->ssl = st->ssl;
SSL_set_fd (state->ssl, cnew->iofile);
}
#endif
+ state->connect_request_buf = 0;
+ state->connect_response_buf = 0;
h = cnew;
}
if (h->state == CS_ST_ACCEPT)
{
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
tcpip_state *state = (tcpip_state *)h->cprivate;
if (state->ctx)
{
- int res = SSL_accept (state->ssl);
+ int res;
TRC(fprintf(stderr, "SSL_accept\n"));
+ res = SSL_accept (state->ssl);
+#if HAVE_OPENSSL_SSL_H
if (res <= 0)
{
int err = SSL_get_error(state->ssl, res);
cs_close (h);
return 0;
}
+#else
+ TRC(fprintf(stderr, "SSL_accept res=%d last_error=%d\n",
+ res, state->ssl->last_error));
+ if (res == 0 && state->ssl->last_error == GNUTLS_E_AGAIN)
+ {
+ h->io_pending = CS_WANT_READ;
+ return h;
+ }
+ else if (res <= 0) /* assume real error */
+ {
+ cs_close(h);
+ return 0;
+ }
+#endif
}
#endif
}
sp->altsize = tmpi;
}
h->io_pending = 0;
- while (!(berlen = (*sp->complete)((unsigned char *)*buf, hasread)))
+ while (!(berlen = (*sp->complete)(*buf, hasread)))
{
if (!*bufsize)
{
}
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
/*
* Return: -1 error, >1 good, len of buffer, ==1 incomplete buffer,
* 0=connection closed.
sp->altsize = tmpi;
}
h->io_pending = 0;
- while (!(berlen = (*sp->complete)((unsigned char *)*buf, hasread)))
+ while (!(berlen = (*sp->complete)(*buf, hasread)))
{
if (!*bufsize)
{
}
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
/*
* Returns 1, 0 or -1
* In nonblocking mode, you must call again with same buffer while
TRC(fprintf(stderr, "tcpip_close\n"));
if (h->iofile != -1)
{
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
if (sp->ssl)
{
SSL_shutdown (sp->ssl);
}
if (sp->altbuf)
xfree(sp->altbuf);
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
if (sp->ssl)
{
TRC (fprintf(stderr, "SSL_free\n"));
if (sp->ai)
freeaddrinfo(sp->ai);
#endif
+ xfree(sp->connect_request_buf);
+ xfree(sp->connect_response_buf);
xfree(sp);
xfree(h);
return 0;
sprintf(buf, "http:%s", r);
else
sprintf(buf, "tcp:%s", r);
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
if (sp->ctx)
{
if (h->protocol == PROTO_HTTP)
return 1;
}
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
int cs_set_ssl_ctx(COMSTACK cs, void *ctx)
{
struct tcpip_state *sp;
SSL *ssl = (SSL *) cs_get_ssl(cs);
if (ssl)
{
+#if HAVE_OPENSSL_SSL_H
X509 *server_cert = SSL_get_peer_certificate (ssl);
if (server_cert)
{
BIO_free(bio);
return 1;
}
+#endif
}
return 0;
}
}
#endif
+
+static int tcpip_put_connect(COMSTACK h, char *buf, int size)
+{
+ struct tcpip_state *state = (struct tcpip_state *)h->cprivate;
+
+ int r = tcpip_put(h, state->connect_request_buf,
+ state->connect_request_len);
+ if (r == 0)
+ {
+ /* it's sent */
+ h->f_put = tcpip_put; /* switch to normal tcpip put */
+ r = tcpip_put(h, buf, size);
+ }
+ return r;
+}
+
+static int tcpip_get_connect(COMSTACK h, char **buf, int *bufsize)
+{
+ struct tcpip_state *state = (struct tcpip_state *)h->cprivate;
+ int r;
+
+ r = tcpip_get(h, &state->connect_response_buf,
+ &state->connect_response_len);
+ if (r < 1)
+ return r;
+ /* got the connect response completely */
+ state->complete = cs_complete_auto; /* switch to normal tcpip get */
+ h->f_get = tcpip_get;
+ return tcpip_get(h, buf, bufsize);
+}
+
+
/*
* Local variables:
* c-basic-offset: 4
projects / yaz-moved-to-github.git / blobdiff