X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=comstack%2Fcomstack.c;h=1027792d2342b4da60f5c7ff79770f77937b42c6;hb=26d07328e36c41d39216d66d742d133cf7512995;hp=f1892eabac51c3a21e1767784cf6667f34524270;hpb=48096bb041fcc45b11666ad058963a633a0ec3db;p=yaz-moved-to-github.git

diff --git a/comstack/comstack.c b/comstack/comstack.c
index f1892ea..1027792 100644
--- a/comstack/comstack.c
+++ b/comstack/comstack.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: comstack.c,v $
- * Revision 1.5  1998-06-22 11:32:35  adam
+ * Revision 1.7  2001-03-21 12:43:36  adam
+ * Implemented cs_create_host. Better error reporting for SSL comstack.
+ *
+ * Revision 1.6  1999/11/30 13:47:11  adam
+ * Improved installation. Moved header files to include/yaz.
+ *
+ * Revision 1.5  1998/06/22 11:32:35  adam
  * Added 'conditional cs_listen' feature.
  *
  * Revision 1.4  1997/09/29 07:16:14  adam
@@ -28,7 +34,8 @@
  *
  */
 
-#include <comstack.h>
+#include <yaz/comstack.h>
+#include <yaz/tcpip.h>
 
 static const char *cs_errlist[] =
 {
@@ -37,10 +44,56 @@ static const char *cs_errlist[] =
     "Operation out of state",
     "No data (operation would block)",
     "New data while half of old buffer is on the line (flow control)",
-    "Permission denied"
+    "Permission denied",
+    "SSL error"
 };
 
 const char *cs_errmsg(int n)
 {
+    if (n < 0 || n > 6)
+	n = 0;
     return cs_errlist[n];
 }
+
+const char *cs_strerror(COMSTACK h)
+{
+    return cs_errmsg(h->cerrno);
+}
+
+COMSTACK cs_create_host(const char *type_and_host, int blocking, void **vp)
+{
+    const char *host = 0;
+    COMSTACK cs;
+    CS_TYPE t;
+
+    if (strncmp (type_and_host, "tcp:", 4) == 0)
+    {
+	t = tcpip_type;
+        host = type_and_host + 4;
+    }
+    else if (strncmp (type_and_host, "ssl:", 4) == 0)
+    {
+#if HAVE_OPENSSL_SSL_H
+	t = ssl_type;
+        host = type_and_host + 4;
+#else
+	return 0;
+#endif
+    }
+    else
+    {
+	t = tcpip_type;
+	host = type_and_host;
+
+    }
+    cs = cs_create (t, blocking, PROTO_Z3950);
+    if (!cs)
+	return 0;
+
+    if (!(*vp = cs_straddr(cs, host)))
+    {
+	cs_close (cs);
+	return 0;
+    }    
+    return cs;
+}