X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-z-assoc.cpp;h=b832572f56cf15ffd35219b4a601c2970b346344;hb=d8c09f27e7a06712a0c76adb1ff3a366fb69edf0;hp=08e197652fe4709826be6393c5778ed3f1d73cdf;hpb=50fbcf20ab48480e819ec5aef312a72c684bf213;p=yazpp-moved-to-github.git

diff --git a/src/yaz-z-assoc.cpp b/src/yaz-z-assoc.cpp
index 08e1976..b832572 100644
--- a/src/yaz-z-assoc.cpp
+++ b/src/yaz-z-assoc.cpp
@@ -1,8 +1,8 @@
 /*
- * Copyright (c) 1998-2001, Index Data.
+ * Copyright (c) 1998-2003, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-z-assoc.cpp,v 1.28 2003-10-16 16:10:43 adam Exp $
+ * $Id: yaz-z-assoc.cpp,v 1.31 2003-10-23 13:49:58 adam Exp $
  */
 
 #include <assert.h>
@@ -63,6 +63,7 @@ int Yaz_Z_Assoc::set_APDU_yazlog(int v)
 {
     int old = m_APDU_yazlog;
     m_APDU_yazlog = v;
+    return old;
 }
 
 const char *Yaz_Z_Assoc::get_APDU_log()
@@ -92,6 +93,7 @@ void Yaz_Z_Assoc::recv_PDU(const char *buf, int len)
     else
     {
 	close();
+	failNotify();
     }
 }
 
@@ -216,6 +218,7 @@ Z_APDU *Yaz_Z_Assoc::decode_Z_PDU(const char *buf, int len)
 	    odr_setprint(m_odr_print, yaz_log_file());
 	    z_APDU(m_odr_print, &apdu, 0, "decode");
 	    m_APDU_file = save;
+	    odr_setprint(m_odr_print, save);
 	}
 	if (m_APDU_file)
         {
@@ -234,6 +237,7 @@ int Yaz_Z_Assoc::encode_Z_PDU(Z_APDU *apdu, char **buf, int *len)
 	odr_setprint(m_odr_print, yaz_log_file()); // use YAZ log FILE
 	z_APDU(m_odr_print, &apdu, 0, "encode");
 	m_APDU_file = save;
+	odr_setprint(m_odr_print, save);
     }
     if (m_APDU_file)
     {
@@ -270,12 +274,12 @@ void Yaz_Z_Assoc::close()
     m_PDU_Observable->close ();
 }
 
-void Yaz_Z_Assoc::server(const char *addr)
+int Yaz_Z_Assoc::server(const char *addr)
 {
     delete [] m_hostname;
     m_hostname = new char[strlen(addr)+1];
     strcpy (m_hostname, addr);
-    m_PDU_Observable->listen (this, addr);
+    return m_PDU_Observable->listen (this, addr);
 }
 
 ODR Yaz_Z_Assoc::odr_encode()