X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-z-assoc.cpp;h=94b8638281b388fb87fcd65dda9c93acf5dcef11;hb=50f38dcd58cdf62b3380710bdd7f23d6f88c555c;hp=04c437544529aa2c677098c0af91650cd4055ce6;hpb=316df82985a4207a7d52e7d88567bf26d5c2c7c8;p=yazpp-moved-to-github.git

diff --git a/src/yaz-z-assoc.cpp b/src/yaz-z-assoc.cpp
index 04c4375..94b8638 100644
--- a/src/yaz-z-assoc.cpp
+++ b/src/yaz-z-assoc.cpp
@@ -1,9 +1,28 @@
 /*
- * Copyright (c) 1998-2000, Index Data.
+ * Copyright (c) 1998-2001, Index Data.
  * See the file LICENSE for details.
  * 
  * $Log: yaz-z-assoc.cpp,v $
- * Revision 1.13  2000-09-08 10:23:42  adam
+ * Revision 1.19  2001-03-27 14:47:45  adam
+ * New server facility scheme.
+ *
+ * Revision 1.18  2001/03/26 14:43:49  adam
+ * New threaded PDU association.
+ *
+ * Revision 1.17  2001/01/04 14:25:25  heikki
+ * No SIGPIPES in windows...
+ *
+ * Revision 1.16  2000/12/14 16:00:39  adam
+ * Ignoring signal SIGPIPE.
+ *
+ * Revision 1.15  2000/10/11 11:58:17  adam
+ * Moved header files to include/yaz++. Switched to libtool and automake.
+ * Configure script creates yaz++-config script.
+ *
+ * Revision 1.14  2000/09/12 16:40:33  heikki
+ * minor
+ *
+ * Revision 1.13  2000/09/08 10:23:42  adam
  * Added skeleton of yaz-z-server.
  *
  * Revision 1.12  2000/09/05 13:57:28  adam
@@ -53,18 +72,22 @@
  */
 
 #include <assert.h>
+#include <signal.h>
 
 #include <yaz/log.h>
-#include <yaz-z-assoc.h>
+#include <yaz++/yaz-z-assoc.h>
 #include <yaz/otherinfo.h>
 
 int Yaz_Z_Assoc::yaz_init_func()
 {
+#ifndef WIN32
+    signal (SIGPIPE, SIG_IGN);
+#endif
     nmem_init();
     return 1;
 }
 
-int Yaz_Z_Assoc::yaz_init_flag = Yaz_Z_Assoc::yaz_init_func();
+int Yaz_Z_Assoc::yaz_init_flag =  Yaz_Z_Assoc::yaz_init_func();  
 
 Yaz_Z_Assoc::Yaz_Z_Assoc(IYaz_PDU_Observable *the_PDU_Observable)
 {
@@ -88,7 +111,7 @@ void Yaz_Z_Assoc::set_APDU_log(const char *fname)
     delete [] m_APDU_fname;
     m_APDU_fname = 0;
 
-    if (fname)
+    if (fname) 
     {
 	m_APDU_fname = new char[strlen(fname)+1];
 	strcpy (m_APDU_fname, fname);
@@ -107,7 +130,7 @@ const char *Yaz_Z_Assoc::get_APDU_log()
 
 Yaz_Z_Assoc::~Yaz_Z_Assoc()
 {
-    m_PDU_Observable->destroy();
+    m_PDU_Observable->destroy();  
     delete m_PDU_Observable;
     odr_destroy (m_odr_print);     // note: also runs fclose on m_APDU_file ..
     odr_destroy (m_odr_out);
@@ -124,6 +147,10 @@ void Yaz_Z_Assoc::recv_PDU(const char *buf, int len)
     {
 	recv_Z_PDU (apdu);
     }
+    else
+    {
+	close();
+    }
 }
 
 Z_APDU *Yaz_Z_Assoc::create_Z_PDU(int type)
@@ -175,13 +202,13 @@ Z_APDU *Yaz_Z_Assoc::decode_Z_PDU(const char *buf, int len)
 
 int Yaz_Z_Assoc::encode_Z_PDU(Z_APDU *apdu, char **buf, int *len)
 {
+    if (m_APDU_file)
+	z_APDU(m_odr_print, &apdu, 0, "encode");
     if (!z_APDU(m_odr_out, &apdu, 0, 0))
     {
 	logf (LOG_LOG, "yaz_Z_Assoc::encode_Z_PDU failed");
         return -1;
     }
-    if (m_APDU_file)
-	z_APDU(m_odr_print, &apdu, 0, "encode");
     *buf = odr_getbuf (m_odr_out, len, 0);
     odr_reset (m_odr_out);
     return *len;
@@ -335,13 +362,12 @@ Z_ReferenceId* Yaz_Z_Assoc::getRefID(char* str)
 {
     Z_ReferenceId* id = NULL;
 
-    if ( str )
+    if (str)
     {
         id = (Z_ReferenceId*) odr_malloc (m_odr_out, sizeof(*id));
         id->size = id->len = strlen(str);
         id->buf = (unsigned char *) str;
     }
-
     return id;
 }