ZOOM: only supply clientIP for InitRequest

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

diff --git a/src/copy_types.c b/src/copy_types.c
index d6d6c55..9062d86 100644 (file)
--- a/src/copy_types.c
+++ b/src/copy_types.c
@@ -1,12 +1,15 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) Index Data
  * See the file LICENSE for details.
  */
-
 /** \file copy_types.c
     \brief Copies various Z39.50 types
  */
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 
+#include <string.h>
 #include <yaz/copy_types.h>
 
 /** macro clone_z_type copies a given ASN.1 type */
@@ -16,9 +19,7 @@ Z_##x *yaz_clone_z_##x(Z_##x *q, NMEM nmem_out) \
     Z_##x *q1 = 0; \
     ODR enc = odr_createmem(ODR_ENCODE); \
     ODR dec = odr_createmem(ODR_DECODE); \
-    if (!z_##x(enc, &q, 0, 0)) \
-        return 0; \
-    else \
+    if (z_##x(enc, &q, 0, 0)) \
     { \
         int len; \
         char *buf = odr_getbuf(enc, &len, 0); \
@@ -32,11 +33,34 @@ Z_##x *yaz_clone_z_##x(Z_##x *q, NMEM nmem_out) \
     odr_destroy(enc); \
     odr_destroy(dec); \
     return q1; \
+} \
+int yaz_compare_z_##x(Z_##x *a, Z_##x *b) \
+{ \
+    int ret = 0; \
+    ODR o_a = odr_createmem(ODR_ENCODE); \
+    ODR o_b = odr_createmem(ODR_ENCODE); \
+    int r_a = z_##x(o_a, &a, 1, 0); \
+    int r_b = z_##x(o_b, &b, 1, 0); \
+    if (r_a && r_b) \
+    { \
+        int len_a, len_b; \
+        char *buf_a = odr_getbuf(o_a, &len_a, 0); \
+        char *buf_b = odr_getbuf(o_b, &len_b, 0); \
+        if (buf_a && buf_b && len_a == len_b && !memcmp(buf_a, buf_b, len_a)) \
+            ret = 1; \
+        else if (!buf_a && !buf_b) \
+            ret = 1; \
+    } \
+    odr_destroy(o_a); \
+    odr_destroy(o_b); \
+    return ret; \
 }
 
 clone_z_type(NamePlusRecord)
 clone_z_type(RPNQuery)
 clone_z_type(Query)
+clone_z_type(RecordComposition)
+clone_z_type(OtherInformation)
 
 Z_RPNQuery *yaz_copy_z_RPNQuery(Z_RPNQuery *q, ODR out)
 {