X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=comstack%2Fcomstack.c;h=6a4cc05c8660d058b0a5895a41fb7225d0ad129a;hb=767ff54e1425e6be8208fe3fee6e7e1b9cadcfb6;hp=d46b49ebc8af86cf525bb8cbeaff0d04be38ed5c;hpb=a2a7abe97309bb4b8e153145a00bd9817957dad7;p=yaz-moved-to-github.git

diff --git a/comstack/comstack.c b/comstack/comstack.c
index d46b49e..6a4cc05 100644
--- a/comstack/comstack.c
+++ b/comstack/comstack.c
@@ -1,10 +1,21 @@
 /*
- * Copyright (c) 1995-1997, Index Data
+ * Copyright (c) 1995-2001, Index Data
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: comstack.c,v $
- * Revision 1.4  1997-09-29 07:16:14  adam
+ * Revision 1.8  2001-07-19 19:49:02  adam
+ * Added include of string.h.
+ *
+ * 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
  * Array cs_errlist no longer global.
  *
  * Revision 1.3  1997/09/01 08:49:14  adam
@@ -25,7 +36,9 @@
  *
  */
 
-#include <comstack.h>
+#include <string.h>
+#include <yaz/comstack.h>
+#include <yaz/tcpip.h>
 
 static const char *cs_errlist[] =
 {
@@ -33,10 +46,57 @@ static const char *cs_errlist[] =
     "System (lower-layer) error",
     "Operation out of state",
     "No data (operation would block)",
-    "New data while half of old buffer is on the line (flow control)"
+    "New data while half of old buffer is on the line (flow control)",
+    "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;
+}