* Sebastian Hammer, Adam Dickmeiss
*
* $Log: proto.c,v $
- * Revision 1.21 1995-05-16 08:50:24 quinn
+ * 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
* License, documentation, and memory fixes
*
* Revision 1.20 1995/05/15 11:55:25 quinn
/* ---------------------- INITIALIZE SERVICE ------------------- */
+#if 0
int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
odr_visiblestring(o, &(*p)->account, 0) &&
odr_sequence_end(o);
}
+#endif
int z_IdPass(ODR o, Z_IdPass **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}
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
return 1;
*p = 0;
- return opt && !o->error;
+ return opt && odr_ok(o);
}
int z_InitRequest(ODR o, Z_InitRequest **p, int opt)
Z_InitRequest *pp;
if (!odr_sequence_begin(o, p, sizeof(**p)))
- return opt;
+ return opt && odr_ok(o);
pp = *p;
return
z_ReferenceId(o, &pp->referenceId, 1) &&
odr_implicit(o, odr_visiblestring, &pp->implementationVersion,
ODR_CONTEXT, 112, 1) &&
z_UserInformationField(o, &pp->userInformationField, 1) &&
+#ifdef Z_OTHERINFO
+ z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
odr_sequence_end(o);
}
Z_InitResponse *pp;
if (!odr_sequence_begin(o, p, sizeof(**p)))
- return opt;
+ return opt && odr_ok(o);
pp = *p;
return
z_ReferenceId(o, &pp->referenceId, 1) &&
odr_implicit(o, odr_visiblestring, &pp->implementationVersion,
ODR_CONTEXT, 112, 1) &&
z_UserInformationField(o, &pp->userInformationField, 1) &&
+#ifdef Z_OTHERINFO
+ z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
odr_sequence_end(o);
}
int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
- return opt;
+ return opt && odr_ok(o);
return
z_ReferenceId(o, &(*p)->referenceId, 1) &&
odr_implicit(o, odr_integer, &(*p)->requestedAction, ODR_CONTEXT,
ODR_CONTEXT, 47, 1) &&
odr_implicit(o, odr_bool, &(*p)->resultSetWanted, ODR_CONTEXT,
48, 1) &&
+#ifdef Z_OTHERINFO
+ z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
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 opt && odr_ok(o);
return
z_ReferenceId(o, &(*p)->referenceId, 1) &&
odr_implicit(o, odr_bool, &(*p)->suspendedFlag, ODR_CONTEXT, 39, 1)&&
42, 0) &&
odr_implicit(o, odr_bool, &(*p)->triggeredRequestFlag,
ODR_CONTEXT, 43, 1) &&
+#ifdef Z_OTHERINFO
+ z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
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 opt && odr_ok(o);
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) &&
+#ifdef Z_OTHERINFO
+ z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
odr_sequence_end(o);
}
int z_DatabaseSpecificUnit(ODR o, Z_DatabaseSpecificUnit **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
- return opt;
+ return opt && odr_ok(o);
return
z_DatabaseName(o, &(*p)->databaseName, 0) &&
z_ElementSetName(o, &(*p)->elementSetName, 0) &&
};
if (!odr_constructed_begin(o, p, ODR_CONTEXT, 19))
- return opt;
+ return opt && odr_ok(o);
if (o->direction == ODR_DECODE)
*p = odr_malloc(o, sizeof(**p));
int z_AttributeElement(ODR o, Z_AttributeElement **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
- return opt;
+ return opt && odr_ok(o);
return
odr_implicit(o, odr_integer, &(*p)->attributeType, ODR_CONTEXT,
120, 0) &&
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
return 1;
*p = 0;
- return opt && !o->error;
+ return opt && odr_ok(o);
}
#endif
{
if (!(odr_implicit_settag(o, ODR_CONTEXT, 102) &&
odr_sequence_begin(o, p, sizeof(**p))))
- return opt;
+ return opt && odr_ok(o);
return
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);
+}
+
+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);
}
{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;
if (!odr_constructed_begin(o, p, ODR_CONTEXT, 46))
- return opt;
+ return opt && odr_ok(o);
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))
ODR_CONTEXT, 100, 1) &&
odr_explicit(o, z_ElementSetNames, &pp->mediumSetElementSetNames,
ODR_CONTEXT, 101, 1) &&
- z_PreferredRecordSyntax(o, &pp->preferredRecordSyntax, 1) &&
+ odr_implicit(o, z_PreferredRecordSyntax, &pp->preferredRecordSyntax,
+ ODR_CONTEXT, 104, 1) &&
odr_explicit(o, z_Query, &pp->query, ODR_CONTEXT, 21, 0) &&
+#ifdef Z_OTHERINFO
+ odr_implicit(o, z_OtherInformation, &(*p)->additionalSearchInfo,
+ ODR_CONTEXT, 203, 1) &&
+ z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
odr_sequence_end(o);
}
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)
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
+ odr_implicit(o, z_OtherInformation, &(*p)->additionalSearchInfo,
+ ODR_CONTEXT, 203, 1) &&
+ z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
odr_sequence_end(o);
}
odr_sequence_end(o);
}
+/* ----------------------DELETE -------------------------- */
+
+int z_DeleteSetStatus(ODR o, int **p, int opt)
+{
+ return odr_implicit(o, odr_integer, p, ODR_CONTEXT, 33, opt);
+}
+
+int z_ListStatus(ODR o, Z_ListStatus **p, int opt)
+{
+ if (!odr_sequence_begin(o, p, sizeof(**p)))
+ return opt && odr_ok(o);
+ return
+ z_ResultSetId(o, &(*p)->id, 0) &&
+ z_DeleteSetStatus(o, &(*p)->status, 0) &&
+ odr_sequence_end(o);
+}
+
+int z_DeleteResultSetRequest(ODR o, Z_DeleteResultSetRequest **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)->deleteFunction, ODR_CONTEXT, 32,
+ 0) &&
+ (odr_sequence_of(o, z_ListStatus, &(*p)->resultSetList,
+ &(*p)->num_ids) || odr_ok(o)) &&
+#ifdef Z_OTHERINFO
+ z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+#endif
+ odr_sequence_end(o);
+}
+
+int z_DeleteResultSetResponse(ODR o, Z_DeleteResultSetResponse **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, z_DeleteSetStatus, &(*p)->deleteOperationStatus,
+ ODR_CONTEXT, 0, 1) &&
+ odr_implicit_settag(o, ODR_CONTEXT, 1) &&
+ (odr_sequence_of(o, z_ListStatus, &(*p)->deleteListStatuses,
+ &(*p)->num_statuses) || odr_ok(o)) &&
+ odr_implicit(o, odr_integer, &(*p)->numberNotDeleted, ODR_CONTEXT,
+ 34, 1) &&
+ odr_implicit_settag(o, ODR_CONTEXT, 35) &&
+ (odr_sequence_of(o, z_ListStatus, &(*p)->bulkStatuses,
+ &(*p)->num_bulkStatuses) || odr_ok(o)) &&
+ odr_implicit(o, odr_visiblestring, &(*p)->deleteMessage, ODR_CONTEXT,
+ 36, 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_PresentRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 25, Z_APDU_presentResponse,
z_PresentResponse},
+ {ODR_IMPLICIT, ODR_CONTEXT, 26, Z_APDU_deleteResultSetRequest,
+ z_DeleteResultSetRequest},
+ {ODR_IMPLICIT, ODR_CONTEXT, 27, Z_APDU_deleteResultSetResponse,
+ z_DeleteResultSetResponse},
{ODR_IMPLICIT, ODR_CONTEXT, 30, Z_APDU_resourceControlRequest,
z_ResourceControlRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 31, Z_APDU_resourceControlResponse,