X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=client%2Fclient.c;h=b113f782b10860d5c94beacc91557a5bf01467c4;hp=f009640ccc7b4a52cc7c30b6c78bf6f20af4aca8;hb=e72e394106dd25d6a8a8c7c2fa677f40ef5e7eb6;hpb=975c22d3fb94aaf91399f1967dbb173129205888

diff --git a/client/client.c b/client/client.c
index f009640..b113f78 100644
--- a/client/client.c
+++ b/client/client.c
@@ -2,7 +2,7 @@
  * 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.241 2004-04-28 22:44:58 adam Exp $
  */
 
 #include <stdio.h>
@@ -16,6 +16,15 @@
 #include <langinfo.h>
 #endif
 
+#if HAVE_OPENSSL_SSL_H
+#include <openssl/bio.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>
 
@@ -97,6 +106,7 @@ static char *negotiationCharset = 0;
 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;
@@ -307,15 +317,15 @@ static void send_initRequest(const char* type_and_host)
     	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);
     	}
     }
     
@@ -528,6 +538,9 @@ int session_connect(const char *arg)
     void *add;
     char type_and_host[101];
     const char *basep = 0;
+#if HAVE_OPENSSL_SSL_H
+    SSL *ssl;
+#endif
     if (conn)
     {
         cs_close (conn);
@@ -585,6 +598,30 @@ int session_connect(const char *arg)
         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);
+
+	if (server_cert)
+	{
+	    char *pem_buf;
+	    int pem_len;
+	    BIO *bio = BIO_new(BIO_s_mem());
+
+	    /* get PEM buffer in memory */
+	    PEM_write_bio_X509(bio, server_cert);
+	    pem_len = BIO_get_mem_data(bio, &pem_buf);
+	    fwrite(pem_buf, pem_len, 1, stdout);
+	
+	    /* print all info on screen .. */
+	    X509_print_fp(stdout, server_cert);
+	    BIO_free(bio);
+
+	    X509_free (server_cert);
+	}
+    }
+#endif
     if (basep && *basep)
         set_base (basep);
     if (protocol == PROTO_Z3950)
@@ -740,16 +777,16 @@ static void display_record(Z_External *r)
             }
         }
     }
-    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);
@@ -915,6 +952,8 @@ static void display_record(Z_External *r)
 		    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)
@@ -1110,6 +1149,7 @@ static int send_srw(Z_SRW_PDU *sr)
     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)
@@ -1213,6 +1253,8 @@ static int send_SRW_searchRequest(const char *arg)
 
     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
@@ -2151,6 +2193,8 @@ static int cmd_explain(const char *arg)
 	
 	/* 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;
     }
@@ -2387,6 +2431,8 @@ static int send_SRW_presentRequest(const char *arg)
     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