X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=asn%2Fproto.c;h=a3edde1249510145d59477fee004938376ad0bcb;hp=019d1442764edb08f988946b861eb99c839b71a3;hb=c3a132ce4aea3bb358b185ef58781b4bef8745fc;hpb=892f7f56860a1ee8e8d816eeaec0387c54c1a0a7

diff --git a/asn/proto.c b/asn/proto.c
index 019d144..a3edde1 100644
--- a/asn/proto.c
+++ b/asn/proto.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: proto.c,v $
- * Revision 1.11  1995-03-17 10:17:25  quinn
+ * Revision 1.15  1995-03-30 09:08:39  quinn
+ * Added Resource control protocol
+ *
+ * Revision 1.14  1995/03/29  08:06:13  quinn
+ * Added a few v3 elements
+ *
+ * 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
@@ -70,6 +82,54 @@ 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_IdPass(ODR o, Z_IdPass **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt;
+    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)->password, ODR_CONTEXT, 2,
+	    0) &&
+    	odr_sequence_end(o);
+}
+
+int z_StrAuthentication(ODR o, char **p, int opt)
+{
+    return odr_visiblestring(o, p, opt);
+}
+
+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_anonymous, odr_null},
+	{-1, -1, -1, Z_IdAuthentication_other, odr_external},
+	{-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;
+}
+
 int z_InitRequest(ODR o, Z_InitRequest **p, int opt)
 {
     Z_InitRequest *pp;
@@ -86,7 +146,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, z_IdAuthentication, &pp->idAuthentication, ODR_CONTEXT,
 	    7, 1) &&
 	odr_implicit(o, odr_visiblestring, &pp->implementationId, ODR_CONTEXT,
 	    110, 1) &&
@@ -125,20 +185,52 @@ int z_InitResponse(ODR o, Z_InitResponse **p, int opt)
 	odr_sequence_end(o);
 }
 
-int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
+/* ------------------ RESOURCE CONTROL ----------------*/
+
+int z_TriggerResourceControlRequest(ODR o, Z_TriggerResourceControlRequest **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);
+    	z_ReferenceId(o, &(*p)->referenceId, 1) &&
+	odr_implicit(o, odr_integer, &(*p)->requestedAction, ODR_CONTEXT,
+	    46, 0) &&
+	odr_implicit(o, odr_oid, &(*p)->prefResourceReportFormat,
+	    ODR_CONTEXT, 47, 1) &&
+	odr_implicit(o, odr_bool, &(*p)->resultSetWanted, ODR_CONTEXT,
+	    48, 1) &&
+	odr_sequence_end(o);
 }
 
-int z_StrAuthentication(ODR o, char **p, int opt)
+int z_ResourceControlRequest(ODR o, Z_ResourceControlRequest **p, int opt)
 {
-    return odr_visiblestring(o, p, opt);
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt;
+    return
+    	z_ReferenceId(o, &(*p)->referenceId, 1) &&
+	odr_implicit(o, odr_bool, &(*p)->suspendedFlag, ODR_CONTEXT, 39, 1)&&
+	odr_explicit(o, odr_external, &(*p)->resourceReport, ODR_CONTEXT,
+	    40, 1) &&
+	odr_implicit(o, odr_integer, &(*p)->partialResultsAvailable,
+	    ODR_CONTEXT, 41, 1) &&
+	odr_implicit(o, odr_bool, &(*p)->responseRequired, ODR_CONTEXT,
+	    42, 0) &&
+	odr_implicit(o, odr_bool, &(*p)->triggeredRequestFlag,
+	    ODR_CONTEXT, 43, 1) &&
+	odr_sequence_end(o);
+}
+
+int z_ResourceControlResponse(ODR o, Z_ResourceControlResponse **p, int opt)
+{
+    if (!odr_sequence_begin(o, p, sizeof(**p)))
+    	return opt;
+    return
+    	z_ReferenceId(o, &(*p)->referenceId, 1) &&
+	odr_implicit(o, odr_bool, &(*p)->continueFlag, ODR_CONTEXT, 44, 0) &&
+	odr_implicit(o, odr_bool, &(*p)->resultSetWanted, ODR_CONTEXT,
+	    45, 1) &&
+	odr_sequence_end(o);
 }
 
 /* ------------------------ SEARCH SERVICE ----------------------- */
@@ -360,9 +452,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) &&