-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2008 Index Data
* See the file LICENSE for details.
- *
- * $Id: comstack.c,v 1.20 2007-10-07 08:53:26 adam Exp $
*/
/**
#define strncasecmp _strnicmp
#endif
+#if HAVE_GNUTLS_H
+#define ENABLE_SSL 1
+#endif
+
+#if HAVE_OPENSSL_SSL_H
+#define ENABLE_SSL 1
+#endif
+
static const char *cs_errlist[] =
{
"No error or unspecified error",
if (cp)
{
size_t len = cp - (uri + 8);
- *connect_host = xmalloc(len+1);
+ *connect_host = (char *) xmalloc(len+1);
memcpy(*connect_host, uri + 8, len);
(*connect_host)[len] = '\0';
uri = cp+1;
}
else if (strncmp (uri, "ssl:", 4) == 0)
{
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
*t = ssl_type;
*host = uri + 4;
*proto = PROTO_Z3950;
}
else if (strncmp(uri, "https:", 6) == 0)
{
-#if HAVE_OPENSSL_SSL_H
+#if ENABLE_SSL
*t = ssl_type;
*host = uri + 6;
while (**host == '/')
return 0;
}
-static int cs_complete_auto_x(const unsigned char *buf, int len, int head_only)
+static int cs_complete_auto_x(const char *buf, int len, int head_only)
{
if (len > 5 && buf[0] >= 0x20 && buf[0] < 0x7f
&& buf[1] >= 0x20 && buf[1] < 0x7f
&& buf[2] >= 0x20 && buf[2] < 0x7f)
{
- int r = cs_complete_http((const char *) buf, len, head_only);
+ int r = cs_complete_http(buf, len, head_only);
return r;
}
- return completeBER(buf, len);
+ return completeBER((const unsigned char *) buf, len);
}
-int cs_complete_auto(const unsigned char *buf, int len)
+int cs_complete_auto(const char *buf, int len)
{
return cs_complete_auto_x(buf, len, 0);
}
-int cs_complete_auto_head(const unsigned char *buf, int len)
+int cs_complete_auto_head(const char *buf, int len)
{
return cs_complete_auto_x(buf, len, 1);
}