* Sebastian Hammer, Adam Dickmeiss
*
* $Log: proto.c,v $
- * Revision 1.6 1995-03-01 14:46:03 quinn
+ * Revision 1.18 1995-04-11 11:52:02 quinn
+ * Fixed possible buf in proto.c
+ *
+ * Revision 1.17 1995/04/10 10:22:22 quinn
+ * Added SCAN.
+ *
+ * Revision 1.16 1995/03/30 10:26:43 quinn
+ * Added Term structure
+ *
+ * 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
+ * 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
+ * Added authentication stuff.
+ *
+ * Revision 1.6 1995/03/01 14:46:03 quinn
* Fixed protocol bug in 8777query.
*
* Revision 1.5 1995/02/14 11:54:22 quinn
/* ---------------------- 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;
5, 0) &&
odr_implicit(o, odr_integer, &pp->maximumRecordSize, ODR_CONTEXT,
6, 0) &&
- odr_implicit(o, odr_visiblestring, &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) &&
odr_sequence_end(o);
}
+/* ------------------ RESOURCE CONTROL ----------------*/
+
+int z_TriggerResourceControlRequest(ODR o, Z_TriggerResourceControlRequest **p,
+ int opt)
+{
+ if (!odr_sequence_begin(o, p, sizeof(**p)))
+ return opt;
+ return
+ 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_ResourceControlRequest(ODR o, Z_ResourceControlRequest **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)->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 ----------------------- */
int z_ElementSetName(ODR o, char **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;
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))
return opt;
return
odr_implicit(o, odr_integer, &(*p)->attributeType, ODR_CONTEXT,
- 120, 1) &&
+ 120, 0) &&
odr_implicit(o, odr_integer, &(*p)->attributeValue, ODR_CONTEXT,
- 121, 1) &&
+ 121, 0) &&
odr_sequence_end(o);
}
+#ifdef Z_V3
+
+int z_Term(ODR o, Z_Term **p, int opt)
+{
+ static Odr_arm arm[] =
+ {
+ {ODR_IMPLICIT, ODR_CONTEXT, 45, Z_Term_general, odr_octetstring},
+ {ODR_IMPLICIT, ODR_CONTEXT, 215, Z_Term_numeric, odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 216, Z_Term_characterString,
+ odr_visiblestring},
+ {ODR_IMPLICIT, ODR_CONTEXT, 217, Z_Term_oid, odr_oid},
+ {ODR_IMPLICIT, ODR_CONTEXT, 218, Z_Term_dateTime, odr_cstring},
+ {ODR_IMPLICIT, ODR_CONTEXT, 219, Z_Term_external, odr_external},
+ /* add intUnit here */
+ {ODR_IMPLICIT, ODR_CONTEXT, 221, Z_Term_null, odr_null},
+ {-1, -1, -1, -1, 0}
+ };
+
+ if (o->direction ==ODR_DECODE)
+ *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 && !o->error;
+}
+
+#endif
+
int z_AttributesPlusTerm(ODR o, Z_AttributesPlusTerm **p, int opt)
{
if (!(odr_implicit_settag(o, ODR_CONTEXT, 102) &&
odr_implicit_settag(o, ODR_CONTEXT, 44) &&
odr_sequence_of(o, z_AttributeElement, &(*p)->attributeList,
&(*p)->num_attributes) &&
+#ifdef Z_V3
+ z_Term(o, &(*p)->term, 0) &&
+#else
odr_implicit(o, odr_octetstring, &(*p)->term, ODR_CONTEXT, 45, 0) &&
+#endif
odr_sequence_end(o);
}
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;
odr_constructed_end(o))
return 1;
*p = 0;
- return opt;
+ return opt && !o->error;
}
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);
};
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)
};
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)
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) &&
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;
};
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 && !o->error;
+}
+
+/* ------------------------ SCAN SERVICE -------------------- */
+
+int z_AttributeList(ODR o, Z_AttributeList **p, int opt)
+{
+ if (o->direction == ODR_DECODE)
+ *p = odr_malloc(o, sizeof(**p));
+ else if (!*p)
+ return opt;
+
+ odr_implicit_settag(o, ODR_CONTEXT, 44);
+ if (odr_sequence_of(o, z_AttributeElement, &(*p)->attributes,
+ &(*p)->num_attributes))
+ return 1;
+ *p = 0;
+ return 0;
+}
+
+/*
+ * This is a temporary hack. We don't know just *what* old version of the
+ * protocol willow uses, so we'll just patiently wait for them to update
+ */
+static int willow_scan = 0;
+
+int z_WillowAttributesPlusTerm(ODR o, Z_AttributesPlusTerm **p, int opt)
+{
+ if (!*p && o->direction != ODR_DECODE)
+ return opt;
+ if (!odr_constructed_begin(o, p, ODR_CONTEXT, 4))
+ {
+ o->t_class = -1;
+ return opt;
+ }
+ if (!odr_constructed_begin(o, p, ODR_CONTEXT, 1))
+ return 0;
+ if (!odr_constructed_begin(o, p, ODR_UNIVERSAL, ODR_SEQUENCE))
+ return 0;
+ if (!odr_implicit_settag(o, ODR_CONTEXT, 44))
+ return 0;
+ if (o->direction == ODR_DECODE)
+ *p = odr_malloc(o, sizeof(**p));
+ if (!odr_sequence_of(o, z_AttributeElement, &(*p)->attributeList,
+ &(*p)->num_attributes))
+ return 0;
+ if (!odr_sequence_end(o) || !odr_sequence_end(o))
+ return 0;
+ if (!z_Term(o, &(*p)->term, 0))
+ return 0;
+ if (!odr_constructed_end(o))
+ return 0;
+ willow_scan = 1;
+ return 1;
+}
+
+int z_AlternativeTerm(ODR o, Z_AlternativeTerm **p, int opt)
+{
+ if (o->direction == ODR_DECODE)
+ *p = odr_malloc(o, sizeof(**p));
+ else if (!*p)
+ {
+ o->t_class = -1;
+ return opt;
+ }
+
+ if (odr_sequence_of(o, z_AttributesPlusTerm, &(*p)->terms,
+ &(*p)->num_terms))
+ return 1;
+ *p = 0;
+ return opt && !o->error;
+}
+
+int z_OccurrenceByAttributes(ODR o, Z_OccurrenceByAttributes **p, int opt)
+{
+ if (!odr_sequence_begin(o, p, sizeof(**p)))
+ return opt;
+ return
+ odr_explicit(o, z_AttributeList, &(*p)->attributes, ODR_CONTEXT, 1, 1)&&
+ odr_explicit(o, odr_integer, &(*p)->global, ODR_CONTEXT, 2, 1) &&
+ odr_sequence_end(o);
+}
+
+int z_TermInfo(ODR o, Z_TermInfo **p, int opt)
+{
+ if (!odr_sequence_begin(o, p, sizeof(**p)))
+ return opt;
+ return
+ (willow_scan ?
+ odr_implicit(o, z_Term, &(*p)->term, ODR_CONTEXT, 1, 0) :
+ z_Term(o, &(*p)->term, 0)) &&
+ z_AttributeList(o, &(*p)->suggestedAttributes, 1) &&
+ odr_implicit(o, z_AlternativeTerm, &(*p)->alternativeTerm,
+ ODR_CONTEXT, 4, 1) &&
+ odr_implicit(o, odr_integer, &(*p)->globalOccurrences, ODR_CONTEXT,
+ 2, 1) &&
+ odr_implicit(o, z_OccurrenceByAttributes, &(*p)->byAttributes,
+ ODR_CONTEXT, 3, 1) &&
+ odr_sequence_end(o);
+}
+
+int z_Entry(ODR o, Z_Entry **p, int opt)
+{
+ static Odr_arm arm[] =
+ {
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Entry_termInfo, z_TermInfo},
+ {ODR_EXPLICIT, ODR_CONTEXT, 2, Z_Entry_surrogateDiagnostic,
+ z_DiagRec},
+ {-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_Entries(ODR o, Z_Entries **p, int opt)
+{
+ if (o->direction == ODR_DECODE)
+ *p = odr_malloc(o, sizeof(**p));
+ else if (!*p)
+ return opt;
+
+ if (odr_sequence_of(o, z_Entry, &(*p)->entries,
+ &(*p)->num_entries))
+ return 1;
+ *p = 0;
+ return 0;
+}
+
+int z_DiagRecs(ODR o, Z_DiagRecs **p, int opt)
+{
+ if (o->direction == ODR_DECODE)
+ *p = odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
+
+ if (odr_sequence_of(o, z_DiagRec, &(*p)->diagRecs,
+ &(*p)->num_diagRecs))
+ return 1;
+ *p = 0;
+ return 0;
+}
+
+int z_ListEntries(ODR o, Z_ListEntries **p, int opt)
+{
+ static Odr_arm arm[] =
+ {
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ListEntries_entries, z_Entries},
+ {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ListEntries_nonSurrogateDiagnostics,
+ z_DiagRecs},
+ {-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;
+ return opt && !o->error;
+}
+
+int z_ScanRequest(ODR o, Z_ScanRequest **p, int opt)
+{
+ if (!odr_sequence_begin(o, p, sizeof(**p)))
+ return opt;
+ willow_scan = 0;
+ return
+ z_ReferenceId(o, &(*p)->referenceId, 1) &&
+ odr_implicit_settag(o, ODR_CONTEXT, 3) &&
+ odr_sequence_of(o, z_DatabaseName, &(*p)->databaseNames,
+ &(*p)->num_databaseNames) &&
+ odr_oid(o, &(*p)->attributeSet, 1) &&
+ (z_AttributesPlusTerm(o, &(*p)->termListAndStartPoint, 1) ?
+ ((*p)->termListAndStartPoint ? 1 :
+ z_WillowAttributesPlusTerm(o, &(*p)->termListAndStartPoint, 0)) : 0) &&
+ odr_implicit(o, odr_integer, &(*p)->stepSize, ODR_CONTEXT, 5, 1) &&
+ odr_implicit(o, odr_integer, &(*p)->numberOfTermsRequested,
+ ODR_CONTEXT, 6, 0) &&
+ odr_implicit(o, odr_integer, &(*p)->preferredPositionInResponse,
+ ODR_CONTEXT, 7, 1) &&
+ odr_sequence_end(o);
+}
+
+int z_ScanResponse(ODR o, Z_ScanResponse **p, int opt)
+{
+ if (!odr_sequence_begin(o, p, sizeof(**p)))
+ return opt;
+ return
+ z_ReferenceId(o, &(*p)->referenceId, 1) &&
+ odr_implicit(o, odr_integer, &(*p)->stepSize, ODR_CONTEXT, 3, 1) &&
+ odr_implicit(o, odr_integer, &(*p)->scanStatus, ODR_CONTEXT, 4, 0) &&
+ odr_implicit(o, odr_integer, &(*p)->numberOfEntriesReturned,
+ ODR_CONTEXT, 5, 0) &&
+ odr_implicit(o, odr_integer, &(*p)->positionOfTerm, ODR_CONTEXT, 6, 1)&&
+ odr_explicit(o, z_ListEntries, &(*p)->entries, ODR_CONTEXT, 7, 1) &&
+ odr_implicit(o, odr_oid, &(*p)->attributeSet, ODR_CONTEXT, 8, 1) &&
+ odr_sequence_end(o);
}
/* ------------------------ SEARCHRESPONSE ----------------*/
{ODR_IMPLICIT, ODR_CONTEXT, 23, Z_APDU_searchResponse, z_SearchResponse},
{ODR_IMPLICIT, ODR_CONTEXT, 24, Z_APDU_presentRequest, z_PresentRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 25, Z_APDU_presentResponse, z_PresentResponse},
+ {ODR_IMPLICIT, ODR_CONTEXT, 35, Z_APDU_scanRequest, z_ScanRequest},
+ {ODR_IMPLICIT, ODR_CONTEXT, 36, Z_APDU_scanResponse, z_ScanResponse},
{-1, -1, -1, -1, 0}
};
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;
}
projects / yaz-moved-to-github.git / blobdiff