WIN32: dont mess with peer address

[yaz-moved-to-github.git] / src / seshigh.c

diff --git a/src/seshigh.c b/src/seshigh.c
index b05860f..594b21c 100644 (file)
--- a/src/seshigh.c
+++ b/src/seshigh.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2010 Index Data
  * See the file LICENSE for details.
  */
 /**
@@ -222,8 +222,8 @@ void destroy_association(association *h)
 static void do_close_req(association *a, int reason, char *message,
                          request *req)
 {
-    Z_APDU apdu;
-    Z_Close *cls = zget_Close(a->encode);
+    Z_APDU *apdu = zget_APDU(a->encode, Z_APDU_close);
+    Z_Close *cls = apdu->u.close;
     
     /* Purge request queue */
     while (request_deq(&a->incoming));
@@ -232,11 +232,9 @@ static void do_close_req(association *a, int reason, char *message,
     {
         yaz_log(log_requestdetail, "Sending Close PDU, reason=%d, message=%s",
             reason, message ? message : "none");
-        apdu.which = Z_APDU_close;
-        apdu.u.close = cls;
         *cls->closeReason = reason;
         cls->diagnosticInformation = message;
-        process_z_response(a, req, &apdu);
+        process_z_response(a, req, apdu);
         iochan_settimeout(a->client_chan, 20);
     }
     else
@@ -527,7 +525,7 @@ static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num, Z_S
         {
             Z_IdAuthentication *auth = (Z_IdAuthentication *)
                 odr_malloc(assoc->decode, sizeof(*auth));
-            int len;
+            size_t len;
 
             len = strlen(sr->username) + 1;
             if (sr->password)