/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
* $Log: yaz-z-assoc.cpp,v $
- * Revision 1.7 2000-05-10 11:36:58 ian
+ * 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
+ * Fixed get_otherInfoAPDU to return otherInfo for extended services.
+ *
+ * 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.
*/
#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()
{
+ signal (SIGPIPE, SIG_IGN);
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)
{
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();
+ 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)
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;
}
}
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);
}
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);
}
m_PDU_Observable->idleTime(timeout);
}
-
void Yaz_Z_Assoc::get_otherInfoAPDU(Z_APDU *apdu, Z_OtherInformation ***oip)
{
switch (apdu->which)
case Z_APDU_scanRequest:
*oip = &apdu->u.scanRequest->otherInfo;
break;
+ case Z_APDU_extendedServicesRequest:
+ *oip = &apdu->u.extendedServicesRequest->otherInfo;
+ break;
+ case Z_APDU_deleteResultSetRequest:
+ *oip = &apdu->u.deleteResultSetRequest->otherInfo;
+ break;
case Z_APDU_initResponse:
*oip = &apdu->u.initResponse->otherInfo;
break;
case Z_APDU_scanResponse:
*oip = &apdu->u.scanResponse->otherInfo;
break;
+ case Z_APDU_extendedServicesResponse:
+ *oip = &apdu->u.extendedServicesResponse->otherInfo;
+ break;
+ case Z_APDU_deleteResultSetResponse:
+ *oip = &apdu->u.deleteResultSetResponse->otherInfo;
+ break;
default:
*oip = 0;
break;