* Copyright (c) 1995-2004, Index Data
* See the file LICENSE for details.
*
- * $Id: client.c,v 1.231 2004-02-16 21:40:39 adam Exp $
+ * $Id: client.c,v 1.239 2004-04-28 12:10:51 adam Exp $
*/
#include <stdio.h>
#include <langinfo.h>
#endif
+#if HAVE_OPENSSL_SSL_H
+#include <openssl/crypto.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#endif
+
#include <time.h>
#include <ctype.h>
static char *outputCharset = 0;
static char *marcCharset = 0;
static char* yazLang = 0;
+static char* http_version = "1.1";
static char last_cmd[32] = "?";
static FILE *marc_file = 0;
yaz_oi_APDU(apdu, &p);
if ((p0=yaz_oi_update(p, out, NULL, 0, 0))) {
- ODR_MASK_SET(req->options, Z_Options_negotiationModel);
-
- p0->which = Z_OtherInfo_externallyDefinedInfo;
- p0->information.externallyDefinedInfo =
- yaz_set_proposal_charneg(
- out,
- (const char**)&negotiationCharset,
- negotiationCharset ? 1 : 0,
- (const char**)&yazLang, yazLang ? 1 : 0, 1);
+ ODR_MASK_SET(req->options, Z_Options_negotiationModel);
+
+ p0->which = Z_OtherInfo_externallyDefinedInfo;
+ p0->information.externallyDefinedInfo =
+ yaz_set_proposal_charneg(
+ out,
+ (const char**)&negotiationCharset,
+ negotiationCharset ? 1 : 0,
+ (const char**)&yazLang, yazLang ? 1 : 0, 1);
}
}
void *add;
char type_and_host[101];
const char *basep = 0;
+#if HAVE_OPENSSL_SSL_H
+ SSL *ssl;
+#endif
if (conn)
{
cs_close (conn);
return 0;
}
printf("OK.\n");
+#if HAVE_OPENSSL_SSL_H
+ if ((ssl = (SSL *) cs_get_ssl(conn)))
+ {
+ X509 *server_cert = SSL_get_peer_certificate (ssl);
+ char *str;
+ if (server_cert)
+ {
+ printf ("Server certificate:\n");
+
+ str = X509_NAME_oneline (X509_get_subject_name (server_cert),0,0);
+ if (str)
+ {
+ printf ("\t subject: %s\n", str);
+ free (str);
+ }
+ str = X509_NAME_oneline (X509_get_issuer_name (server_cert),0,0);
+ if (str)
+ {
+ printf ("\t issuer: %s\n", str);
+ free (str);
+ }
+ X509_free (server_cert);
+ }
+ }
+#endif
if (basep && *basep)
set_base (basep);
if (protocol == PROTO_Z3950)
}
}
}
- if (ent && ent->oclass != CLASS_RECSYN)
- return;
if (ent && ent->value == VAL_SOIF)
print_record((const unsigned char *) r->u.octet_aligned->buf,
r->u.octet_aligned->len);
else if (r->which == Z_External_octet)
{
const char *octet_buf = (char*)r->u.octet_aligned->buf;
- if (ent->value == VAL_TEXT_XML || ent->value == VAL_APPLICATION_XML ||
- ent->value == VAL_HTML)
+ if (ent->oclass == CLASS_RECSYN &&
+ (ent->value == VAL_TEXT_XML ||
+ ent->value == VAL_APPLICATION_XML ||
+ ent->value == VAL_HTML))
{
print_record((const unsigned char *) octet_buf,
r->u.octet_aligned->len);
printf ("shelvingLocation: %s\n", data->shelvingLocation);
if (data->callNumber)
printf ("callNumber: %s\n", data->callNumber);
+ if (data->shelvingData)
+ printf ("shelvingData: %s\n", data->shelvingData);
if (data->copyNumber)
printf ("copyNumber: %s\n", data->copyNumber);
if (data->publicNote)
strcpy(path+1, databaseNames[0]);
gdu = z_get_HTTP_Request(out);
+ gdu->u.HTTP_Request->version = http_version;
gdu->u.HTTP_Request->path = odr_strdup(out, path);
if (host_port)
if (record_schema)
sr->u.request->recordSchema = record_schema;
+ if (recordsyntax == VAL_TEXT_XML)
+ sr->u.explain_request->recordPacking = "xml";
return send_srw(sr);
}
#endif
/* save this for later .. when fetching individual records */
sr = yaz_srw_get(out, Z_SRW_explain_request);
+ if (recordsyntax == VAL_TEXT_XML)
+ sr->u.explain_request->recordPacking = "xml";
send_srw(sr);
return 2;
}
sr->u.request->maximumRecords = odr_intdup(out, nos);
if (record_schema)
sr->u.request->recordSchema = record_schema;
+ if (recordsyntax == VAL_TEXT_XML)
+ sr->u.request->recordPacking = "xml";
return send_srw(sr);
}
#endif