/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2001, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
- * $Log: yaz-z-assoc.cpp,v $
- * 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.
- * Added send_deleteResultSetRequest
- *
- * Revision 1.6 1999/12/06 13:52:45 adam
- * Modified for new location of YAZ header files. Experimental threaded
- * operation.
- *
- * Revision 1.5 1999/11/10 10:02:34 adam
- * Work on proxy.
- *
- * Revision 1.4 1999/09/13 12:53:44 adam
- * Proxy removes OtherInfo Proxy Address and Session ID. Other
- * Otherinfo remains untouched.
- *
- * Revision 1.3 1999/04/21 12:09:01 adam
- * Many improvements. Modified to proxy server to work with "sessions"
- * based on cookies.
- *
- * Revision 1.2 1999/04/20 10:30:05 adam
- * Implemented various stuff for client and proxy. Updated calls
- * to ODR to reflect new name parameter.
- *
- * Revision 1.1 1999/04/09 11:46:57 adam
- * Added object Yaz_Z_Assoc. Much more functional client.
- *
+ * $Id: yaz-z-assoc.cpp,v 1.26 2003-10-01 13:13:51 adam Exp $
*/
#include <assert.h>
+#include <signal.h>
#include <yaz/log.h>
-#include <yaz-z-assoc.h>
+#include <yaz++/z-assoc.h>
#include <yaz/otherinfo.h>
int Yaz_Z_Assoc::yaz_init_func()
{
- nmem_init();
+#ifndef WIN32
+ signal (SIGPIPE, SIG_IGN);
+#endif
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)
{
delete [] m_APDU_fname;
m_APDU_fname = 0;
- if (fname)
+ if (fname)
{
m_APDU_fname = new char[strlen(fname)+1];
strcpy (m_APDU_fname, fname);
- if (*fname)
+ if (*fname && strcmp(fname, "-"))
m_APDU_file = fopen (fname, "a");
else
m_APDU_file = stderr;
Yaz_Z_Assoc::~Yaz_Z_Assoc()
{
- m_PDU_Observable->destroy();
+ m_PDU_Observable->destroy();
delete m_PDU_Observable;
odr_destroy (m_odr_print); // note: also runs fclose on m_APDU_file ..
odr_destroy (m_odr_out);
void Yaz_Z_Assoc::recv_PDU(const char *buf, int len)
{
- logf (m_log, "recv_PDU len=%d", len);
+ yaz_log (m_log, "recv_PDU len=%d", len);
Z_APDU *apdu = decode_Z_PDU (buf, len);
if (apdu)
{
- recv_Z_PDU (apdu);
+ recv_Z_PDU (apdu, len);
+ }
+ else
+ {
+ close();
}
}
return apdu;
}
-int Yaz_Z_Assoc::send_Z_PDU(Z_APDU *apdu)
+Z_ReferenceId **Yaz_Z_Assoc::get_referenceIdP(Z_APDU *apdu)
+{
+ switch (apdu->which)
+ {
+ case Z_APDU_initRequest:
+ return &apdu->u.initRequest->referenceId;
+ case Z_APDU_initResponse:
+ return &apdu->u.initResponse->referenceId;
+ case Z_APDU_searchRequest:
+ return &apdu->u.searchRequest->referenceId;
+ case Z_APDU_searchResponse:
+ return &apdu->u.searchResponse->referenceId;
+ case Z_APDU_presentRequest:
+ return &apdu->u.presentRequest->referenceId;
+ case Z_APDU_presentResponse:
+ return &apdu->u.presentResponse->referenceId;
+ case Z_APDU_deleteResultSetRequest:
+ return &apdu->u.deleteResultSetRequest->referenceId;
+ case Z_APDU_deleteResultSetResponse:
+ return &apdu->u.deleteResultSetResponse->referenceId;
+ case Z_APDU_accessControlRequest:
+ return &apdu->u.accessControlRequest->referenceId;
+ case Z_APDU_accessControlResponse:
+ return &apdu->u.accessControlResponse->referenceId;
+ case Z_APDU_resourceControlRequest:
+ return &apdu->u.resourceControlRequest->referenceId;
+ case Z_APDU_resourceControlResponse:
+ return &apdu->u.resourceControlResponse->referenceId;
+ case Z_APDU_triggerResourceControlRequest:
+ return &apdu->u.triggerResourceControlRequest->referenceId;
+ case Z_APDU_resourceReportRequest:
+ return &apdu->u.resourceReportRequest->referenceId;
+ case Z_APDU_resourceReportResponse:
+ return &apdu->u.resourceReportResponse->referenceId;
+ case Z_APDU_scanRequest:
+ return &apdu->u.scanRequest->referenceId;
+ case Z_APDU_scanResponse:
+ return &apdu->u.scanResponse->referenceId;
+ case Z_APDU_sortRequest:
+ return &apdu->u.sortRequest->referenceId;
+ case Z_APDU_sortResponse:
+ return &apdu->u.sortResponse->referenceId;
+ case Z_APDU_segmentRequest:
+ return &apdu->u.segmentRequest->referenceId;
+ case Z_APDU_extendedServicesRequest:
+ return &apdu->u.extendedServicesRequest->referenceId;
+ case Z_APDU_extendedServicesResponse:
+ return &apdu->u.extendedServicesResponse->referenceId;
+ case Z_APDU_close:
+ return &apdu->u.close->referenceId;
+ }
+ return 0;
+}
+
+void Yaz_Z_Assoc::transfer_referenceId(Z_APDU *from, Z_APDU *to)
+{
+ Z_ReferenceId **id_from = get_referenceIdP(from);
+ Z_ReferenceId **id_to = get_referenceIdP(to);
+ if (id_from && *id_from && id_to)
+ {
+ *id_to = (Z_ReferenceId*) odr_malloc (m_odr_out, sizeof(**id_to));
+ (*id_to)->size = (*id_to)->len = (*id_from)->len;
+ (*id_to)->buf = (unsigned char*) odr_malloc (m_odr_out, (*id_to)->len);
+ memcpy ((*id_to)->buf, (*id_from)->buf, (*id_to)->len);
+ }
+ else if (id_to)
+ *id_to = 0;
+}
+
+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;
}
if (!z_APDU(m_odr_in, &apdu, 0, 0))
{
- logf(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ",
+ yaz_log(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ",
odr_errmsg(odr_geterror(m_odr_in)),
odr_offset(m_odr_in));
- logf(LOG_LOG, "PDU dump:");
- odr_dumpBER(log_file(), buf, len);
+ yaz_log(LOG_LOG, "PDU dump:");
+ odr_dumpBER(yaz_log_file(), buf, len);
return 0;
}
else
{
if (m_APDU_file)
+ {
z_APDU(m_odr_print, &apdu, 0, "decode");
+ fflush(m_APDU_file);
+ }
return apdu;
}
}
int Yaz_Z_Assoc::encode_Z_PDU(Z_APDU *apdu, char **buf, int *len)
{
+ if (m_APDU_file)
+ {
+ z_APDU(m_odr_print, &apdu, 0, "encode");
+ fflush(m_APDU_file);
+ }
if (!z_APDU(m_odr_out, &apdu, 0, 0))
{
- logf (LOG_LOG, "yaz_Z_Assoc::encode_Z_PDU failed");
+ if (m_APDU_file)
+ fprintf (m_APDU_file, "PDU encode failed (above)");
+ yaz_log (LOG_LOG, "yaz_Z_Assoc::encode_Z_PDU failed");
return -1;
}
- 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;
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;
{
Z_ReferenceId* id = NULL;
- if ( str )
+ if (str)
{
id = (Z_ReferenceId*) odr_malloc (m_odr_out, sizeof(*id));
id->size = id->len = strlen(str);
id->buf = (unsigned char *) str;
}
-
return id;
}
projects / yazpp-moved-to-github.git / blobdiff