* Sebastian Hammer, Adam Dickmeiss
*
* $Log: yaz-z-assoc.cpp,v $
- * Revision 1.8 2000-08-07 14:19:59 adam
+ * 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
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;
+ m_APDU_file = 0;
+ }
delete [] m_APDU_fname;
m_APDU_fname = 0;
{
m_APDU_fname = new char[strlen(fname)+1];
strcpy (m_APDU_fname, fname);
- }
- if (fname)
- {
- if (*fname)
+ if (*fname && strcmp(fname, "-"))
m_APDU_file = fopen (fname, "a");
else
m_APDU_file = stderr;
{
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;
- if (m_APDU_file && m_APDU_file != stderr)
- fclose (m_APDU_file);
delete [] m_hostname;
}
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
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;