* Sebastian Hammer, Adam Dickmeiss
*
* $Log: proto.c,v $
- * Revision 1.24 1995-05-22 13:58:18 quinn
+ * Revision 1.28 1995-06-14 15:26:35 quinn
+ * *** empty log message ***
+ *
+ * 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
opt);
}
-int z_UserInformationField(ODR o, Z_UserInformationField **p, int opt)
+int z_UserInformationField(ODR o, Odr_external **p, int opt)
{
return odr_explicit(o, odr_external, (Odr_external **)p, ODR_CONTEXT,
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
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);
}
odr_implicit(o, odr_visiblestring, &pp->implementationVersion,
ODR_CONTEXT, 112, 1) &&
z_UserInformationField(o, &pp->userInformationField, 1) &&
-#ifdef Z_OTHERINFO
+#ifdef Z_95
z_OtherInformation(o, &(*p)->otherInfo, 1) &&
#endif
odr_sequence_end(o);
odr_implicit(o, odr_visiblestring, &pp->implementationVersion,
ODR_CONTEXT, 112, 1) &&
z_UserInformationField(o, &pp->userInformationField, 1) &&
-#ifdef Z_OTHERINFO
+#ifdef Z_95
z_OtherInformation(o, &(*p)->otherInfo, 1) &&
#endif
odr_sequence_end(o);
opt);
}
-int z_PreferredRecordSyntax(ODR o, Z_PreferredRecordSyntax **p, int opt)
-{
- return odr_implicit(o, odr_oid, (Odr_oid**) p, ODR_CONTEXT, 104, opt);
-}
-
int z_DatabaseSpecificUnit(ODR o, Z_DatabaseSpecificUnit **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
/* ----------------------- RPN QUERY -----------------------*/
+int z_ComplexAttribute(ODR o, Z_ComplexAttribute **p, int opt)
+{
+ if (!odr_sequence_begin(o, p, sizeof(**p)))
+ return opt && odr_ok(o);
+ return
+ odr_implicit_settag(o, ODR_CONTEXT, 1) &&
+ odr_sequence_of(o, z_StringOrNumeric, &(*p)->list,
+ &(*p)->num_list) &&
+ odr_implicit_settag(o, ODR_CONTEXT, 2) &&
+ (odr_sequence_of(o, odr_integer, &(*p)->semanticAction,
+ &(*p)->num_semanticAction) || odr_ok(o)) &&
+ odr_sequence_end(o);
+}
+
int z_AttributeElement(ODR o, Z_AttributeElement **p, int opt)
{
+#ifdef Z_95
+ static Odr_arm arm[] =
+ {
+ {ODR_IMPLICIT, ODR_CONTEXT, 121, Z_AttributeValue_numeric,
+ odr_integer},
+ {ODR_IMPLICIT, ODR_CONTEXT, 224, Z_AttributeValue_complex,
+ z_ComplexAttribute},
+ {-1, -1, -1, -1, 0}
+ };
+#endif
+
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
return
+#ifdef Z_95
+ odr_implicit(o, odr_oid, &(*p)->attributeSet, ODR_CONTEXT, 1, 1) &&
+#endif
odr_implicit(o, odr_integer, &(*p)->attributeType, ODR_CONTEXT,
120, 0) &&
+#ifdef Z_95
+ odr_choice(o, arm, &(*p)->u, &(*p)->which) &&
+#else
odr_implicit(o, odr_integer, &(*p)->attributeValue, ODR_CONTEXT,
121, 0) &&
+#endif
odr_sequence_end(o);
}
-#ifdef Z_V3
-
int z_Term(ODR o, Z_Term **p, int opt)
{
static Odr_arm arm[] =
return opt && odr_ok(o);
}
-#endif
-
int z_AttributesPlusTerm(ODR o, Z_AttributesPlusTerm **p, int opt)
{
if (!(odr_implicit_settag(o, ODR_CONTEXT, 102) &&
odr_sequence_end(o);
}
+int z_ResultSetPlusAttributes(ODR o, Z_ResultSetPlusAttributes **p, int opt)
+{
+ if (!(odr_implicit_settag(o, ODR_CONTEXT, 214) &&
+ odr_sequence_begin(o, p, sizeof(**p))))
+ return opt && odr_ok(o);
+ return
+ z_ResultSetId(o, &(*p)->resultSet, 0) &&
+ odr_implicit_settag(o, ODR_CONTEXT, 44) &&
+ odr_sequence_of(o, z_AttributeElement, &(*p)->attributeList,
+ &(*p)->num_attributes) &&
+ odr_sequence_end(o);
+}
+
int z_ProximityOperator(ODR o, Z_ProximityOperator **p, int opt)
{
static Odr_arm arm[] =
{
{-1, -1, -1, Z_Operand_APT, z_AttributesPlusTerm},
{-1, -1, -1, Z_Operand_resultSetId, z_ResultSetId},
+ {-1, -1, -1, Z_Operand_resultAttr, z_ResultSetPlusAttributes},
{-1, -1, -1, -1, 0}
};
{
{ODR_IMPLICIT, ODR_CONTEXT, 1, Z_Query_type_1, z_RPNQuery},
{ODR_EXPLICIT, ODR_CONTEXT, 2, Z_Query_type_2, odr_octetstring},
+ {ODR_EXPLICIT, ODR_CONTEXT, 101, Z_Query_type_101, z_RPNQuery},
{-1, -1, -1, -1, 0}
};
ODR_CONTEXT, 100, 1) &&
odr_explicit(o, z_ElementSetNames, &pp->mediumSetElementSetNames,
ODR_CONTEXT, 101, 1) &&
- odr_implicit(o, z_PreferredRecordSyntax, &pp->preferredRecordSyntax,
+ odr_implicit(o, odr_oid, &pp->preferredRecordSyntax,
ODR_CONTEXT, 104, 1) &&
odr_explicit(o, z_Query, &pp->query, ODR_CONTEXT, 21, 0) &&
-#ifdef Z_OTHERINFO
+#ifdef Z_95
odr_implicit(o, z_OtherInformation, &(*p)->additionalSearchInfo,
ODR_CONTEXT, 203, 1) &&
z_OtherInformation(o, &(*p)->otherInfo, 1) &&
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
return
- odr_oid(o, &(*p)->diagnosticSetId, 1) && /* SHOULD NOT BE OPT */
+ odr_oid(o, &(*p)->diagnosticSetId, 1) && /* SHOULD NOT BE OPT! */
odr_integer(o, &(*p)->condition, 0) &&
+ /*
+ * I no longer recall what server tagged the addinfo.. but it isn't
+ * hurting anyone, so...
+ * We need to turn it into a choice, or something, because of
+ * that damn generalstring in v3.
+ */
(odr_visiblestring(o, &(*p)->addinfo, 0) ||
- odr_implicit(o, odr_cstring, &(*p)->addinfo, ODR_CONTEXT, ODR_VISIBLESTRING, 1)) &&
+ odr_implicit(o, odr_cstring, &(*p)->addinfo, ODR_CONTEXT,
+ ODR_VISIBLESTRING, 1)) &&
odr_sequence_end(o);
}
z_NumberOfRecordsReturned(o, &pp->numberOfRecordsReturned, 0) &&
z_NextResultSetPosition(o, &pp->nextResultSetPosition, 0) &&
odr_implicit(o, odr_bool, &pp->searchStatus, ODR_CONTEXT, 22, 0) &&
- odr_implicit(o, odr_integer, &pp->resultSetStatus, ODR_CONTEXT, 26, 1) &&
+ odr_implicit(o, odr_integer, &pp->resultSetStatus, ODR_CONTEXT, 26,
+ 1) &&
z_PresentStatus(o, &pp->presentStatus, 1) &&
z_Records(o, &pp->records, 1) &&
-#ifdef Z_OTHERINFO
+#ifdef Z_95
odr_implicit(o, z_OtherInformation, &(*p)->additionalSearchInfo,
ODR_CONTEXT, 203, 1) &&
z_OtherInformation(o, &(*p)->otherInfo, 1) &&
/* --------------------- PRESENT SERVICE ---------------------- */
+int z_ElementSpec(ODR o, Z_ElementSpec **p, int opt)
+{
+ static Odr_arm arm[] =
+ {
+ {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ElementSpec_elementSetName,
+ odr_visiblestring},
+ {ODR_IMPLICIT; ODR_CONTEXT, 2, Z_ElementSpec_externalSpec,
+ 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 && odr_ok(o);
+}
+
+int z_Specification(ODR o, Z_Specification **p, int opt)
+{
+ if (!odr_sequence_begin(o, p, sizeof(**p)))
+ return opt && odr_ok(o);
+ return
+ odr_implicit(o, odr_oid, &(*p)->schema, ODR_CONTEXT, 1, 1) &&
+ z_ElementSpec(o, &(*p)->elementSpec, 1) &&
+ odr_sequence_end(o);
+}
+
+int z_DbSpecific(ODR o, Z_DbSpecific **p, int opt)
+{
+ if (!odr_sequence_begin(o, p, sizeof(**p)))
+ return opt && odr_ok(o);
+ return
+ odr_explicit(o, z_DatabaseName, &(*p)->db, ODR_CONTEXT, 1, 0) &&
+ odr_implicit(o, z_Specification, &(*p)->spec, ODR_CONTEXT, 2, 0) &&
+ odr_sequence_end(o);
+}
+
+int z_CompSpec(ODR o, Z_CompSpec **p, int opt)
+{
+ if (!odr_sequence_begin(o, p, sizeof(**p)))
+ return opt && odr_ok(o);
+ return
+ odr_implicit(o, odr_bool, &(*p)->selectAlternativeSyntax, ODR_CONTEXT,
+ 1, 0) &&
+ odr_implicit(o, z_Specification, &(*p)->generic, ODR_CONTEXT, 2, 1) &&
+ odr_implicit_settag(o, ODR_CONTEXT, 3) &&
+ (odr_sequence_of(o, z_DbSpecific, &(*p)->num_dbSpecific,
+ &(*p)->dbSpecific) || odr_ok(o)) &&
+ odr_implicit_settag(o, ODR_CONTEXT, 4) &&
+ (odr_sequence_of(o, odr_oid, &(*p)->num_recordSyntax,
+ &(*p)->recordSyntax) || odr_ok(o)) &&
+ odr_sequence_end(o);
+}
+
+int z_RecordComposition(ODR o, Z_RecordComposition **p, int opt)
+{
+ static Odr_arm arm[] =
+ {
+ {ODR_EXPLICIT, ODR_CONTEXT, 1, Z_RecordComp_simple,
+ z_ElementSetNames},
+ {ODR_IMPLICIT, ODR_CONTEXT, 209, Z_RecordComp_complex,
+ z_CompSpec},
+ {-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);
+}
+
+int z_Range(ODR o, Z_Range **p, int opt)
+{
+ if (!odr_sequence_begin(o, p, sizeof(**p)))
+ return opt && odr_ok(o);
+ return
+ odr_implicit(o, odr_integer, &(*p)->startingPosition, ODR_CONTEXT,
+ 1, 0) &&
+ odr_implicit(o, odr_integer, &(*p)->numberOfRecords, ODR_CONTEXT,
+ 2, 0) &&
+ odr_sequence_end(o);
+}
+
int z_PresentRequest(ODR o, Z_PresentRequest **p, int opt)
{
Z_PresentRequest *pp;
30, 0) &&
odr_implicit(o, odr_integer, &pp->numberOfRecordsRequested, ODR_CONTEXT,
29, 0) &&
+#ifdef Z_95
+ odr_implicit_settag(o, ODR_CONTEXT, 212) &&
+ (odr_sequence_of(o, z_Range, &(*p)->num_ranges,
+ &(*p)->additionalRanges) || odr_ok(o)) &&
+ z_RecordComposition(o, &(*p)->recordComposition, 1) &&
+#else
z_ElementSetNames(o, &pp->elementSetNames, 1) &&
- z_PreferredRecordSyntax(o, &pp->preferredRecordSyntax, 1) &&
+#endif
+ odr_implicit(o, odr_oid, &(*p)->preferredRecordSyntax, ODR_CONTEXT,
+ 104, 1) &&
+#ifdef Z_95
+ odr_implicit(o, odr_integer, &(*p)->maxSegmentCount, ODR_CONTEXT,
+ 204, 1) &&
+ odr_implicit(o, odr_integer, &(*p)->maxRecordSize, ODR_CONTEXT,
+ 206, 1) &&
+ odr_impplicit(o, odr_integer, &(*p)->maxSegmentSize, ODR_CONTEXT,
+ 207, 1) &&
+ z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
odr_sequence_end(o);
}
z_NextResultSetPosition(o, &pp->nextResultSetPosition, 0) &&
z_PresentStatus(o, &pp->presentStatus, 0) &&
z_Records(o, &pp->records, 1) &&
+#ifdef Z_95
+ Z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
odr_sequence_end(o);
}
odr_sequence_end(o);
}
+/* ------------------------ SEGMENT SERVICE -------------- */
+
+int z_Segment(ODR o, Z_Segment **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)->numberOfRecordsReturned,
+ ODR_CONTEXT, 24, 0) &&
+ odr_implicit_settag(o, ODR_CONTEXT, 0) &&
+ odr_sequence_of(o, z_NamePlusRecord, &(*p)->num_segmentRecords,
+ &(*p)->segmentRecords) &&
+ z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+ 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)
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, 45, Z_APDU_segmentRequest, z_Segment},
+ {ODR_IMPLICIT, ODR_CONTEXT, 48, Z_APDU_close, z_Close},
{-1, -1, -1, -1, 0}
};