X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-z-assoc.cpp;h=d62bed26222774512e8c4a47d286ebf5ccbfbbec;hb=9e0a9b423b46c3b4f6a247ee29291c376df7554d;hp=198a3f3fcb89ee1d767decd4d400e340b462c9ad;hpb=1063240efa2d4f03a72353936e8a7b73ee249b0d;p=yazpp-moved-to-github.git

diff --git a/src/yaz-z-assoc.cpp b/src/yaz-z-assoc.cpp
index 198a3f3..d62bed2 100644
--- a/src/yaz-z-assoc.cpp
+++ b/src/yaz-z-assoc.cpp
@@ -4,7 +4,20 @@
  * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-z-assoc.cpp,v $
- * Revision 1.7  2000-05-10 11:36:58  ian
+ * Revision 1.11  2000-09-04 08:59:16  adam
+ * Changed call to logging functions (yaz_ added).
+ *
+ * Revision 1.10  2000/09/04 08:29:22  adam
+ * Fixed memory leak(s). Added re-use of associations, rather than
+ * re-init, when maximum number of targets are in use.
+ *
+ * Revision 1.9  2000/08/10 08:42:42  adam
+ * Fixes for {set,get}_APDU_log.
+ *
+ * Revision 1.8  2000/08/07 14:19:59  adam
+ * Fixed serious bug regarding timeouts. Improved logging for proxy.
+ *
+ * Revision 1.7  2000/05/10 11:36:58  ian
  * Added default parameters for refid to request functions.
  * Added default parameter for result set name to search and present request.
  * Commented out forced logging of PDU contents.
@@ -55,15 +68,47 @@ Yaz_Z_Assoc::Yaz_Z_Assoc(IYaz_PDU_Observable *the_PDU_Observable)
     m_odr_out = odr_createmem (ODR_ENCODE);
     m_odr_print = odr_createmem (ODR_PRINT);
     m_log = LOG_DEBUG;
+    m_APDU_file = 0;
+    m_APDU_fname = 0;
+    m_hostname = 0;
+}
+
+void Yaz_Z_Assoc::set_APDU_log(const char *fname)
+{
+    if (m_APDU_file && m_APDU_file != stderr)
+    {
+	fclose (m_APDU_file);
+	m_APDU_file = 0;
+    }
+    delete [] m_APDU_fname;
+    m_APDU_fname = 0;
+
+    if (fname)
+    {
+	m_APDU_fname = new char[strlen(fname)+1];
+	strcpy (m_APDU_fname, fname);
+	if (*fname && strcmp(fname, "-"))
+	    m_APDU_file = fopen (fname, "a");
+	else
+	    m_APDU_file = stderr;
+	odr_setprint(m_odr_print, m_APDU_file);
+    }
+}
+
+const char *Yaz_Z_Assoc::get_APDU_log()
+{
+    return m_APDU_fname;
 }
 
 Yaz_Z_Assoc::~Yaz_Z_Assoc()
 {
     m_PDU_Observable->destroy();
     delete m_PDU_Observable;
-    odr_destroy (m_odr_print);
+    odr_destroy (m_odr_print);     // note: also runs fclose on m_APDU_file ..
     odr_destroy (m_odr_out);
     odr_destroy (m_odr_in);
+    delete [] m_APDU_fname;
+    delete [] m_hostname;
 }
 
 void Yaz_Z_Assoc::recv_PDU(const char *buf, int len)
@@ -112,12 +157,13 @@ Z_APDU *Yaz_Z_Assoc::decode_Z_PDU(const char *buf, int len)
              odr_errmsg(odr_geterror(m_odr_in)),
              odr_offset(m_odr_in));
         logf(LOG_LOG, "PDU dump:");
-        odr_dumpBER(log_file(), buf, len);
+        odr_dumpBER(yaz_log_file(), buf, len);
         return 0;
     }
     else
     {
-	// z_APDU(m_odr_print, &apdu, 0, "decode");
+	if (m_APDU_file)
+	    z_APDU(m_odr_print, &apdu, 0, "decode");
         return apdu;
     }
 }
@@ -129,14 +175,23 @@ int Yaz_Z_Assoc::encode_Z_PDU(Z_APDU *apdu, char **buf, int *len)
 	logf (LOG_LOG, "yaz_Z_Assoc::encode_Z_PDU failed");
         return -1;
     }
-    // z_APDU(m_odr_print, &apdu, 0, "encode");
+    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;
 }
 
+const char *Yaz_Z_Assoc::get_hostname()
+{
+    return m_hostname;
+}
+
 void Yaz_Z_Assoc::client(const char *addr)
 {
+    delete [] m_hostname;
+    m_hostname = new char[strlen(addr)+1];
+    strcpy (m_hostname, addr);
     m_PDU_Observable->connect (this, addr);
 }
 
@@ -147,6 +202,9 @@ void Yaz_Z_Assoc::close()
 
 void 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);
 }
 
@@ -169,7 +227,6 @@ void Yaz_Z_Assoc::timeout(int timeout)
     m_PDU_Observable->idleTime(timeout);
 }
 
-
 void Yaz_Z_Assoc::get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip)
 {
     switch (apdu->which)