X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=asn%2Fproto.c;h=874830d70a226dc293b1c2d128984855e6706b1a;hb=6295998029aa62f64729e15d4a7ffb0038045d78;hp=a886b068396cdcdd5a24f111e8cf80f7e9586744;hpb=37a5a5d8d849029f134e4fcef8f6b360a6420c38;p=yaz-moved-to-github.git

diff --git a/asn/proto.c b/asn/proto.c
index a886b06..874830d 100644
--- a/asn/proto.c
+++ b/asn/proto.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $
- * Revision 1.22  1995-05-17 08:40:56  quinn
+ * Revision 1.27  1995-06-07 14:36:22  quinn
+ * Added CLOSE
+ *
+ * Revision 1.26  1995/06/02  09:49:13  quinn
+ * Adding access control
+ *
+ * Revision 1.25  1995/05/25  11:00:08  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.24  1995/05/22  13:58:18  quinn
+ * Fixed an ODR_NULLVAL.
+ *
+ * Revision 1.23  1995/05/22  11:30:18  quinn
+ * Adding Z39.50-1992 stuff to proto.c. Adding zget.c
+ *
+ * Revision 1.22  1995/05/17  08:40:56  quinn
  * Added delete. Fixed some sequence_begins. Smallish.
  *
  * Revision 1.21  1995/05/16  08:50:24  quinn
@@ -101,8 +116,100 @@ int z_UserInformationField(ODR o, Z_UserInformationField **p, int opt)
     	11, opt);
 }
 
+int z_InfoCategory(ODR o, Z_InfoCategory **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	odr_implicit(o, odr_oid, &(*p)->categoryTypeId, ODR_CONTEXT, 1, 1) &&
+	odr_implicit(o, odr_integer, &(*p)->categoryValue, ODR_CONTEXT, 2, 0) &&
+	odr_sequence_end(o);
+}
+
+int z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt)
+{
+    static Odr_arm arm[] =
+    {
+    	{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_OtherInfo_characterInfo,
+	    odr_visiblestring},
+	{ODR_IMPLICIT, ODR_CONTEXT, 3, Z_OtherInfo_binaryInfo,
+	    odr_octetstring},
+	{ODR_IMPLICIT, ODR_CONTEXT, 4, Z_OtherInfo_externallyDefinedInfo,
+	    odr_external},
+	{ODR_IMPLICIT, ODR_CONTEXT, 5, Z_OtherInfo_oid, odr_oid},
+	{-1, -1, -1, -1, 0}
+    };
+
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	odr_implicit(o, z_InfoCategory, &(*p)->category, ODR_CONTEXT, 1, 1) &&
+	odr_choice(o, arm, &(*p)->which, &(*p)->information) &&
+	odr_sequence_end(o);
+}
+    
+int z_OtherInformation(ODR o, Z_OtherInformation **p, int opt)
+{
+    if (o->direction == ODR_ENCODE)
+    	*p = odr_malloc(o, sizeof(**p));
+
+    odr_implicit_settag(o, ODR_CONTEXT, 201);
+    if (odr_sequence_of(o, z_OtherInformationUnit, &(*p)->list,
+	&(*p)->num_elements))
+	return 1;
+    *p = 0;
+    return opt && odr_ok(o);
+}
+
+int z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt)
+{
+    static Odr_arm arm[] =
+    {
+    	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_StringOrNumeric_string,
+	    odr_visiblestring},
+	{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_StringOrNumeric_numeric,
+	    odr_integer},
+	{-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 && odr_ok(o);
+}
+
+/*
+ * check tagging!!
+ */
+int z_Unit(ODR o, Z_Unit **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	odr_implicit(o, odr_visiblestring, &(*p)->unitSystem, ODR_CONTEXT,
+	    1, 1) &&
+	odr_explicit(o, z_StringOrNumeric, &(*p)->unitType, ODR_CONTEXT,
+	    2, 1) &&
+	odr_explicit(o, z_StringOrNumeric, &(*p)->unit, ODR_CONTEXT, 3, 1) &&
+	odr_implicit(o, odr_integer, &(*p)->scaleFactor, ODR_CONTEXT, 4, 1) &&
+	odr_sequence_end(o);
+}
+
+int z_IntUnit(ODR o, Z_IntUnit **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	odr_implicit(o, odr_integer, &(*p)->value, ODR_CONTEXT, 1, 0) &&
+	odr_implicit(o, z_Unit, &(*p)->unitUsed, ODR_CONTEXT, 2, 0) &&
+	odr_sequence_end(o);
+}
+
 /* ---------------------- INITIALIZE SERVICE ------------------- */
 
+#if 0
 int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
@@ -113,16 +220,17 @@ int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
     	odr_visiblestring(o, &(*p)->account, 0) &&
     	odr_sequence_end(o);
 }
+#endif
 
 int z_IdPass(ODR o, Z_IdPass **p, int opt)
 {
     if (!odr_sequence_begin(o, p, sizeof(**p)))
     	return opt && odr_ok(o);
     return
-    	odr_implicit(o, odr_visiblestring, &(*p)->groupId, ODR_CONTEXT, 0, 0) &&
-    	odr_implicit(o, odr_visiblestring, &(*p)->userId, ODR_CONTEXT, 1, 0) &&
+    	odr_implicit(o, odr_visiblestring, &(*p)->groupId, ODR_CONTEXT, 0, 1) &&
+    	odr_implicit(o, odr_visiblestring, &(*p)->userId, ODR_CONTEXT, 1, 1) &&
     	odr_implicit(o, odr_visiblestring, &(*p)->password, ODR_CONTEXT, 2,
-	    0) &&
+	    1) &&
     	odr_sequence_end(o);
 }
 
@@ -136,7 +244,7 @@ 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_idPass, z_NSRAuthentication},
+	{-1, -1, -1, Z_IdAuthentication_idPass, z_IdPass},
 	{-1, -1, -1, Z_IdAuthentication_anonymous, odr_null},
 	{-1, -1, -1, Z_IdAuthentication_other, odr_external},
 	{-1, -1, -1, -1, 0}
@@ -388,6 +496,28 @@ int z_AttributesPlusTerm(ODR o, Z_AttributesPlusTerm **p, int opt)
 	odr_sequence_end(o);
 }
 
+int z_ProximityOperator(ODR o, Z_ProximityOperator **p, int opt)
+{
+    static Odr_arm arm[] =
+    {
+    	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ProxCode_known, odr_integer},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ProxCode_private, odr_integer},
+    	{-1, -1, -1, -1, 0}
+    };
+
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	odr_implicit(o, odr_bool, &(*p)->exclusion, ODR_CONTEXT, 1, 1) &&
+	odr_implicit(o, odr_integer, &(*p)->distance, ODR_CONTEXT, 2, 0) &&
+	odr_implicit(o, odr_bool, &(*p)->ordered, ODR_CONTEXT, 3, 0) &&
+	odr_implicit(o, odr_integer, &(*p)->relationType, ODR_CONTEXT, 4, 0) &&
+	odr_constructed_begin(o, &(*p)->proximityUnitCode, ODR_CONTEXT, 5) &&
+	odr_choice(o, arm, &(*p)->proximityUnitCode, &(*p)->which) &&
+	odr_constructed_end(o) &&
+	odr_sequence_end(o);
+}
+
 int z_Operator(ODR o, Z_Operator **p, int opt)
 {
     static Odr_arm arm[] =
@@ -395,9 +525,9 @@ int z_Operator(ODR o, Z_Operator **p, int opt)
     	{ODR_IMPLICIT, ODR_CONTEXT, 0, Z_Operator_and, odr_null},
     	{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Operator_or, odr_null},
     	{ODR_IMPLICIT, ODR_CONTEXT, 2, Z_Operator_and_not, odr_null},
+    	{ODR_IMPLICIT, ODR_CONTEXT, 3, Z_Operator_prox, z_ProximityOperator},
     	{-1, -1, -1, -1, 0}
     };
-    int dummy = 999;
 
     if (!*p && o->direction != ODR_DECODE)
     	return opt;
@@ -406,7 +536,7 @@ int z_Operator(ODR o, Z_Operator **p, int opt)
     if (o->direction == ODR_DECODE)
     	*p = odr_malloc(o, sizeof(**p));
     else
-    	(*p)->u.and = &dummy;
+    	(*p)->u.and = ODR_NULLVAL;
 
     if (odr_choice(o, arm, &(*p)->u, &(*p)->which) &&
     	odr_constructed_end(o))
@@ -604,6 +734,51 @@ int z_Records(ODR o, Z_Records **p, int opt)
     return opt && odr_ok(o);
 }
 
+/* ------------------------ ACCESS CTRL SERVICE ----------------------- */
+
+int z_AccessControlRequest(ODR o, Z_AccessControlRequest **p, int opt)
+{
+    static Odr_arm arm[] = 
+    {
+	{ODR_IMPLICIT, ODR_CONTEXT, 37, Z_AccessRequest_simpleForm,
+	    odr_octetstring},
+	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_AccessRequest_externallyDefined,
+	    odr_external},
+    	{-1, -1, -1, -1, 0}
+    };
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	z_ReferenceId(o, &(*p)->referenceId, 1) &&
+	odr_choice(o, arm, &(*p)->u, &(*p)->which) &&
+#ifdef Z_OTHERINFO
+	z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
+	odr_sequence_end(o);
+}
+
+int z_AccessControlResponse(ODR o, Z_AccessControlResponse **p, int opt)
+{
+    static Odr_arm arm[] = 
+    {
+	{ODR_IMPLICIT, ODR_CONTEXT, 38, Z_AccessResponse_simpleForm,
+	    odr_octetstring},
+	{ODR_EXPLICIT, ODR_CONTEXT, 0, Z_AccessResponse_externallyDefined,
+	    odr_external},
+    	{-1, -1, -1, -1, 0}
+    };
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	z_ReferenceId(o, &(*p)->referenceId, 1) &&
+	odr_choice(o, arm, &(*p)->u, &(*p)->which) &&
+	odr_explicit(o, z_DiagRec, &(*p)->diagnostic, ODR_CONTEXT, 223, 1) &&
+#ifdef Z_OTHERINFO
+	z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
+	odr_sequence_end(o);
+}
+
 /* ------------------------ SCAN SERVICE -------------------- */
 
 int z_AttributeList(ODR o, Z_AttributeList **p, int opt)
@@ -941,6 +1116,27 @@ int z_DeleteResultSetResponse(ODR o, Z_DeleteResultSetResponse **p, int opt)
 	odr_sequence_end(o);
 }
 
+/* ------------------------ CLOSE SERVICE ---------------- */
+
+int z_Close(ODR o, Z_Close **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt && odr_ok(o);
+    return
+    	z_ReferenceId(o, &(*p)->referenceId, 1) &&
+	odr_implicit(o, odr_integer, &(*p)->closeReason, ODR_CONTEXT, 211, 0) &&
+	odr_implicit(o, odr_visiblestring, &(*p)->diagnosticInformation,
+	    ODR_CONTEXT, 3, 1) &&
+	odr_implicit(o, odr_oid, &(*p)->resourceReportFormat, ODR_CONTEXT,
+	    4, 1) &&
+	odr_implicit(o, odr_external, &(*p)->resourceReport, ODR_CONTEXT,
+	    5, 1) &&
+#ifdef Z_OTHERINFO
+	z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
+	odr_sequence_end(o);
+}
+
 /* ------------------------ APDU ------------------------- */
 
 int z_APDU(ODR o, Z_APDU **p, int opt)
@@ -968,6 +1164,7 @@ int z_APDU(ODR o, Z_APDU **p, int opt)
 	    z_TriggerResourceControlRequest},
 	{ODR_IMPLICIT, ODR_CONTEXT, 35, Z_APDU_scanRequest, z_ScanRequest},
 	{ODR_IMPLICIT, ODR_CONTEXT, 36, Z_APDU_scanResponse, z_ScanResponse},
+	{ODR_IMPLICIT, ODR_CONTEXT, 48, Z_APDU_close, z_Close},
 
     	{-1, -1, -1, -1, 0}
     };