/*
- * 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.25 2002-10-09 12:50:26 adam Exp $
+ * $Id: yaz-z-assoc.cpp,v 1.31 2003-10-23 13:49:58 adam Exp $
*/
#include <assert.h>
m_APDU_file = 0;
m_APDU_fname = 0;
m_hostname = 0;
+ m_APDU_yazlog = 0;
}
void Yaz_Z_Assoc::set_APDU_log(const char *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
+ if (!strcmp(fname, "-"))
m_APDU_file = stderr;
+ else if (*fname == '\0')
+ m_APDU_file = 0;
+ else
+ m_APDU_file = fopen (fname, "a");
odr_setprint(m_odr_print, m_APDU_file);
}
}
+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()
{
return m_APDU_fname;
Z_APDU *apdu = decode_Z_PDU (buf, len);
if (apdu)
{
- recv_Z_PDU (apdu);
+ recv_Z_PDU (apdu, len);
}
else
{
close();
+ failNotify();
}
}
*id_to = 0;
}
-int Yaz_Z_Assoc::send_Z_PDU(Z_APDU *apdu)
+int Yaz_Z_Assoc::send_Z_PDU(Z_APDU *apdu, int *plen)
{
char *buf;
int len;
if (encode_Z_PDU(apdu, &buf, &len) > 0)
+ {
+ if (plen)
+ *plen = len;
return m_PDU_Observable->send_PDU(buf, len);
+ }
return -1;
}
}
else
{
+ if (m_APDU_yazlog)
+ { // use YAZ log FILE
+ FILE *save = m_APDU_file;
+
+ 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)
{
z_APDU(m_odr_print, &apdu, 0, "decode");
int Yaz_Z_Assoc::encode_Z_PDU(Z_APDU *apdu, char **buf, int *len)
{
+ if (m_APDU_yazlog)
+ {
+ FILE *save = m_APDU_file;
+ 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)
{
z_APDU(m_odr_print, &apdu, 0, "encode");
return m_hostname;
}
-void Yaz_Z_Assoc::client(const char *addr)
+int 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);
+ return m_PDU_Observable->connect (this, addr);
}
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()