* Sebastian Hammer, Adam Dickmeiss
*
* $Log: proto.c,v $
- * Revision 1.36 1995-08-15 11:59:39 quinn
+ * Revision 1.38 1995-09-27 15:02:40 quinn
+ * Modified function heads & prototypes.
+ *
+ * Revision 1.37 1995/08/21 09:10:15 quinn
+ * Smallish fixes to suppport new formats.
+ *
+ * Revision 1.36 1995/08/15 11:59:39 quinn
* Updated External
*
* Revision 1.35 1995/08/10 08:53:59 quinn
* We'll use a general octetstring here, since string operations are
* clumsy on long strings.
*/
-int z_SUTRS(ODR o, Odr_oct **p, int opt)
+int MDF z_SUTRS(ODR o, Odr_oct **p, int opt)
{
return odr_implicit(o, odr_octetstring, p, ODR_UNIVERSAL,
ODR_GENERALSTRING, opt);
return odr_implicit(o, odr_octetstring, (Odr_oct**) p, ODR_CONTEXT, 2, opt);
}
-int z_DatabaseName(ODR o, Z_DatabaseName **p, int opt)
+int MDF z_DatabaseName(ODR o, Z_DatabaseName **p, int opt)
{
return odr_implicit(o, odr_visiblestring, (char **) p, ODR_CONTEXT, 105,
opt);
opt);
}
-int z_ElementSetName(ODR o, char **p, int opt)
+int MDF z_ElementSetName(ODR o, char **p, int opt)
{
return odr_implicit(o, odr_visiblestring, p, ODR_CONTEXT, 103, opt);
}
11, opt);
}
-int z_InternationalString(ODR o, char **p, int opt)
+int MDF z_InternationalString(ODR o, char **p, int opt)
{
return odr_generalstring(o, p, opt);
}
odr_sequence_end(o);
}
-int z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt)
+int MDF z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt)
{
static Odr_arm arm[] =
{
odr_sequence_end(o);
}
-int z_OtherInformation(ODR o, Z_OtherInformation **p, int opt)
+int MDF z_OtherInformation(ODR o, Z_OtherInformation **p, int opt)
{
if (o->direction == ODR_DECODE)
*p = odr_malloc(o, sizeof(**p));
return opt && odr_ok(o);
}
-int z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt)
+int MDF z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt)
{
static Odr_arm arm[] =
{
/*
* check tagging!!
*/
-int z_Unit(ODR o, Z_Unit **p, int opt)
+int MDF z_Unit(ODR o, Z_Unit **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
odr_sequence_end(o);
}
-int z_IntUnit(ODR o, Z_IntUnit **p, int opt)
+int MDF z_IntUnit(ODR o, Z_IntUnit **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
/* ---------------------- INITIALIZE SERVICE ------------------- */
#if 0
-int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
+int MDF z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
odr_sequence_end(o);
}
-int z_StrAuthentication(ODR o, char **p, int opt)
+int MDF z_StrAuthentication(ODR o, char **p, int opt)
{
return odr_visiblestring(o, p, opt);
}
odr_sequence_end(o);
}
-int z_Term(ODR o, Z_Term **p, int opt)
+int MDF z_Term(ODR o, Z_Term **p, int opt)
{
static Odr_arm arm[] =
{
#ifdef Z_95
-int z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt)
+int MDF z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt)
{
static Odr_arm arm[] =
{
odr_sequence_end(o);
}
-int z_DiagRec(ODR o, Z_DiagRec **p, int opt)
+int MDF z_DiagRec(ODR o, Z_DiagRec **p, int opt)
{
static Odr_arm arm[] =
{
/* ------------------------ SCAN SERVICE -------------------- */
-int z_AttributeList(ODR o, Z_AttributeList **p, int opt)
+int MDF z_AttributeList(ODR o, Z_AttributeList **p, int opt)
{
if (o->direction == ODR_DECODE)
*p = odr_malloc(o, sizeof(**p));
return opt && odr_ok(o);
}
-int z_Specification(ODR o, Z_Specification **p, int opt)
+int MDF z_Specification(ODR o, Z_Specification **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
/* ------------------------ APDU ------------------------- */
-int z_APDU(ODR o, Z_APDU **p, int opt)
+int MDF z_Permissions(ODR o, Z_Permissions **p, int opt)
+{
+ if (!odr_sequence_begin(o, p, sizeof(**p)))
+ return opt && odr_ok(o);
+ return
+ odr_implicit(o, z_InternationalString, &(*p)->userId, ODR_CONTEXT,
+ 1, 0) &&
+ odr_implicit_settag(o, ODR_CONTEXT, 2) &&
+ odr_sequence_of(o, odr_integer, &(*p)->allowableFunctions,
+ &(*p)->num_allowableFunctions) &&
+ odr_sequence_end(o);
+}
+
+int z_ExtendedServicesRequest(ODR o, Z_ExtendedServicesRequest **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)->function, ODR_CONTEXT, 3, 0) &&
+ odr_implicit(o, odr_oid, &(*p)->packageType, ODR_CONTEXT, 4, 0) &&
+ odr_implicit(o, z_InternationalString, &(*p)->packageName, ODR_CONTEXT, 5, 1) &&
+ odr_implicit(o, z_InternationalString, &(*p)->userId, ODR_CONTEXT, 6, 1) &&
+ odr_implicit(o, z_IntUnit, &(*p)->retentionTime, ODR_CONTEXT, 7, 1) &&
+ odr_implicit(o, z_Permissions, &(*p)->permissions, ODR_CONTEXT, 8, 1) &&
+ odr_implicit(o, z_InternationalString, &(*p)->description, ODR_CONTEXT, 9, 1) &&
+ odr_implicit(o, z_External, &(*p)->taskSpecificParameters, ODR_CONTEXT, 10, 1) &&
+ odr_implicit(o, odr_integer, &(*p)->waitAction, ODR_CONTEXT, 11, 0) &&
+ z_ElementSetName(o, &(*p)->elements, 1) &&
+ z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+ odr_sequence_end(o);
+}
+
+int z_ExtendedServicesResponse(ODR o, Z_ExtendedServicesResponse **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)->operationStatus, ODR_CONTEXT, 3, 0) &&
+ odr_implicit_settag(o, ODR_CONTEXT, 4) &&
+ (odr_sequence_of(o, z_DiagRec, &(*p)->diagnostics,
+ &(*p)->num_diagnostics) || odr_ok(o)) &&
+ odr_implicit(o, z_External, &(*p)->taskPackage, ODR_CONTEXT, 5, 1) &&
+ z_OtherInformation(o, &(*p)->otherInfo, 1) &&
+ odr_sequence_end(o);
+}
+
+/* ------------------------ APDU ------------------------- */
+
+int MDF z_APDU(ODR o, Z_APDU **p, int opt)
{
static Odr_arm arm[] =
{
{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, 46, Z_APDU_extendedServicesRequest,
+ z_ExtendedServicesRequest},
+ {ODR_IMPLICIT, ODR_CONTEXT, 47, Z_APDU_extendedServicesResponse,
+ z_ExtendedServicesResponse},
{ODR_IMPLICIT, ODR_CONTEXT, 48, Z_APDU_close, z_Close},
{-1, -1, -1, -1, 0}