*** empty log message ***

[yaz-moved-to-github.git] / asn / proto.c

diff --git a/asn/proto.c b/asn/proto.c
index 6b6995a..f7437ee 100644 (file)
--- a/asn/proto.c
+++ b/asn/proto.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $
- * Revision 1.8  1995-03-14 16:59:24  quinn
+ * Revision 1.13  1995-03-20 11:26:52  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.12  1995/03/20  09:45:09  quinn
+ * Working towards v3
+ *
+ * Revision 1.11  1995/03/17  10:17:25  quinn
+ * Added memory management.
+ *
+ * Revision 1.10  1995/03/15  11:17:40  quinn
+ * Fixed some return-checks from choice.. need better ay to handle those..
+ *
+ * Revision 1.9  1995/03/15  08:37:06  quinn
+ * Fixed protocol bugs.
+ *
+ * Revision 1.8  1995/03/14  16:59:24  quinn
  * Fixed OPTIONAL flag in attributeelement
  *
  * Revision 1.7  1995/03/07  16:29:33  quinn
@@ -61,6 +76,42 @@ int z_UserInformationField(ODR o, Z_UserInformationField **p, int opt)
 
 /* ---------------------- INITIALIZE SERVICE ------------------- */
 
+int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+       return opt;
+    return
+       odr_visiblestring(o, &(*p)->user, 0) &&
+       odr_visiblestring(o, &(*p)->password, 0) &&
+       odr_visiblestring(o, &(*p)->account, 0) &&
+       odr_sequence_end(o);
+}
+
+int z_StrAuthentication(ODR o, char **p, int opt)
+{
+    return odr_visiblestring(o, p, opt);
+}
+
+#if 0
+int z_IdAuthentication(ODR o, Z_IdAuthentication **p, int opt)
+{
+    static Odr_arm arm[] =
+    {
+       {-1, -1, -1, Z_IdAuthentication_open, z_StrAuthentication},
+       {-1, -1, -1, Z_IdAuthentication_NSR, z_NSRAuthentication},
+       {-1, -1, -1, -1, 0}
+    };
+
+    if (o->direction == ODR_DECODE)
+       *p = odr_malloc(o, sizeof(**p));
+
+    if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
+       return 1;
+    *p = 0;
+    return opt && !o->error;
+}
+#endif
+
 int z_InitRequest(ODR o, Z_InitRequest **p, int opt)
 {
     Z_InitRequest *pp;
@@ -77,7 +128,7 @@ int z_InitRequest(ODR o, Z_InitRequest **p, int opt)
            5, 0) &&
        odr_implicit(o, odr_integer, &pp->maximumRecordSize, ODR_CONTEXT,
            6, 0) &&
-       odr_explicit(o, odr_any, &pp->idAuthentication, ODR_CONTEXT,
+       odr_explicit(o, odr_null, &pp->idAuthentication, ODR_CONTEXT,
            7, 1) &&
        odr_implicit(o, odr_visiblestring, &pp->implementationId, ODR_CONTEXT,
            110, 1) &&
@@ -116,22 +167,6 @@ int z_InitResponse(ODR o, Z_InitResponse **p, int opt)
        odr_sequence_end(o);
 }
 
-int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
-{
-    if (!odr_sequence_begin(o, p, sizeof(**p)))
-       return opt;
-    return
-       odr_visiblestring(o, &(*p)->user, 0) &&
-       odr_visiblestring(o, &(*p)->password, 0) &&
-       odr_visiblestring(o, &(*p)->account, 0) &&
-       odr_sequence_end(o);
-}
-
-int z_StrAuthentication(ODR o, char **p, int opt)
-{
-    return odr_visiblestring(o, p, opt);
-}
-
 /* ------------------------ SEARCH SERVICE ----------------------- */
 
 int z_ElementSetName(ODR o, char **p, int opt)
@@ -158,7 +193,7 @@ int z_DatabaseSpecificUnit(ODR o, Z_DatabaseSpecificUnit **p, int opt)
 int z_DatabaseSpecific(ODR o, Z_DatabaseSpecific **p, int opt)
 {
     if (o->direction == ODR_DECODE)
-       *p = nalloc(o, sizeof(**p));
+       *p = odr_malloc(o, sizeof(**p));
     else if (!*p)
        return opt;
 
@@ -185,7 +220,7 @@ int z_ElementSetNames(ODR o, Z_ElementSetNames **p, int opt)
        return opt;
 
     if (o->direction == ODR_DECODE)
-       *p = nalloc(o, sizeof(**p));
+       *p = odr_malloc(o, sizeof(**p));
 
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which) &&
        odr_constructed_end(o))
@@ -237,7 +272,7 @@ int z_Operator(ODR o, Z_Operator **p, int opt)
     if (!odr_constructed_begin(o, p, ODR_CONTEXT, 46))
        return opt;
     if (o->direction == ODR_DECODE)
-       *p = nalloc(o, sizeof(**p));
+       *p = odr_malloc(o, sizeof(**p));
     else
        (*p)->u.and = &dummy;
 
@@ -245,7 +280,7 @@ int z_Operator(ODR o, Z_Operator **p, int opt)
        odr_constructed_end(o))
        return 1;
     *p = 0;
-    return opt;
+    return opt && !o->error;
 }
 
 int z_Operand(ODR o, Z_Operand **p, int opt)
@@ -258,13 +293,13 @@ int z_Operand(ODR o, Z_Operand **p, int opt)
     };
 
     if (o->direction ==ODR_DECODE)
-       *p = nalloc(o, sizeof(**p));
+       *p = odr_malloc(o, sizeof(**p));
     else if (!*p)
        return opt;
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
        return 1;
     *p = 0;
-    return opt;
+    return opt && !o->error;
 }
 
 int z_RPNStructure(ODR o, Z_RPNStructure **p, int opt);
@@ -290,13 +325,13 @@ int z_RPNStructure(ODR o, Z_RPNStructure **p, int opt)
     };
 
     if (o->direction == ODR_DECODE)
-       *p = nalloc(o, sizeof(**p));
+       *p = odr_malloc(o, sizeof(**p));
     else if (!*p)
        return opt;
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
        return 1;
     *p = 0;
-    return opt;
+    return opt && !o->error;
 }
 
 int z_RPNQuery(ODR o, Z_RPNQuery **p, int opt)
@@ -321,13 +356,13 @@ int z_Query(ODR o, Z_Query **p, int opt)
     };
 
     if (o->direction == ODR_DECODE)
-       *p = nalloc(o, sizeof(**p));
+       *p = odr_malloc(o, sizeof(**p));
     else if (!*p)
        return opt;
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
        return 1;
     *p = 0;
-    return opt;
+    return opt && !o->error;
 }
 
 int z_SearchRequest(ODR o, Z_SearchRequest **p, int opt)
@@ -351,9 +386,9 @@ int z_SearchRequest(ODR o, Z_SearchRequest **p, int opt)
        odr_implicit_settag(o, ODR_CONTEXT, 18) &&
        odr_sequence_of(o, z_DatabaseName, &pp->databaseNames,
            &pp->num_databaseNames) &&
-       odr_implicit(o, z_ElementSetNames, &pp->smallSetElementSetNames,
+       odr_explicit(o, z_ElementSetNames, &pp->smallSetElementSetNames,
            ODR_CONTEXT, 100, 1) &&
-       odr_implicit(o, z_ElementSetNames, &pp->mediumSetElementSetNames,
+       odr_explicit(o, z_ElementSetNames, &pp->mediumSetElementSetNames,
            ODR_CONTEXT, 101, 1) &&
        z_PreferredRecordSyntax(o, &pp->preferredRecordSyntax, 1) &&
        odr_explicit(o, z_Query, &pp->query, ODR_CONTEXT, 21, 0) &&
@@ -404,7 +439,7 @@ int z_NamePlusRecord(ODR o, Z_NamePlusRecord **p, int opt)
 int z_NamePlusRecordList(ODR o, Z_NamePlusRecordList **p, int opt)
 {
     if (o->direction == ODR_DECODE)
-       *p = nalloc(o, sizeof(**p));
+       *p = odr_malloc(o, sizeof(**p));
     if (odr_sequence_of(o, z_NamePlusRecord, &(*p)->records,
        &(*p)->num_records))
        return 1;
@@ -422,13 +457,13 @@ int z_Records(ODR o, Z_Records **p, int opt)
     };
 
     if (o->direction == ODR_DECODE)
-       *p = nalloc(o, sizeof(**p));
+       *p = odr_malloc(o, sizeof(**p));
     else if (!*p)
        return opt;
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
        return 1;
     *p = 0;
-    return opt;
+    return opt && !o->error;
 }
 
 /* ------------------------ SEARCHRESPONSE ----------------*/
@@ -521,14 +556,12 @@ int z_APDU(ODR o, Z_APDU **p, int opt)
     };
 
     if (o->direction == ODR_DECODE)
-       *p = nalloc(o, sizeof(**p));
+       *p = odr_malloc(o, sizeof(**p));
     if (!odr_choice(o, arm, &(*p)->u, &(*p)->which))
     {
        if (o->direction == ODR_DECODE)
-       {
            *p = 0;
-           return opt;
-       }
+       return opt && !o->error;
     }
     return 1;
 }