X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=asn%2Fproto.c;h=d5910ea05341e366ce83c0da574beebd327582d1;hp=a69d49bd88c851a8720e71f7d5c41736ae3f9e79;hb=63cafe41a93427118959a74201b3e331169a71d9;hpb=78f86cdd3cc8d44fb8c4329e408a3aa679bd8b9e diff --git a/asn/proto.c b/asn/proto.c index a69d49b..d5910ea 100644 --- a/asn/proto.c +++ b/asn/proto.c @@ -4,7 +4,34 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: proto.c,v $ - * Revision 1.30 1995-06-15 15:42:01 quinn + * Revision 1.39 1995-09-29 17:11:53 quinn + * Smallish + * + * 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 + * Added Explain + * + * Revision 1.34 1995/06/19 17:01:48 quinn + * This should bring us in sync with the version distributed as 1.0b + * + * Revision 1.33 1995/06/19 13:39:56 quinn + * *** empty log message *** + * + * Revision 1.32 1995/06/19 12:37:28 quinn + * Fixed a bug in the compspec. + * + * Revision 1.31 1995/06/16 13:15:56 quinn + * Fixed Defaultdiagformat. + * + * Revision 1.30 1995/06/15 15:42:01 quinn * Fixed some v3 bugs * * Revision 1.29 1995/06/15 07:44:49 quinn @@ -102,6 +129,16 @@ /* ---------------------- GLOBAL DEFS ------------------- */ +/* + * 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) +{ + return odr_implicit(o, odr_octetstring, p, ODR_UNIVERSAL, + ODR_GENERALSTRING, opt); +} + int z_ReferenceId(ODR o, Z_ReferenceId **p, int opt) { return odr_implicit(o, odr_octetstring, (Odr_oct**) p, ODR_CONTEXT, 2, opt); @@ -119,12 +156,22 @@ int z_ResultSetId(ODR o, char **p, int opt) opt); } -int z_UserInformationField(ODR o, Odr_external **p, int opt) +int z_ElementSetName(ODR o, char **p, int opt) +{ + return odr_implicit(o, odr_visiblestring, p, ODR_CONTEXT, 103, opt); +} + +int z_UserInformationField(ODR o, Z_External **p, int opt) { - return odr_explicit(o, odr_external, (Odr_external **)p, ODR_CONTEXT, + return odr_explicit(o, z_External, (Z_External **)p, ODR_CONTEXT, 11, opt); } +int z_InternationalString(ODR o, char **p, int opt) +{ + return odr_generalstring(o, p, opt); +} + int z_InfoCategory(ODR o, Z_InfoCategory **p, int opt) { if (!odr_sequence_begin(o, p, sizeof(**p))) @@ -144,7 +191,7 @@ int z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt) {ODR_IMPLICIT, ODR_CONTEXT, 3, Z_OtherInfo_binaryInfo, odr_octetstring}, {ODR_IMPLICIT, ODR_CONTEXT, 4, Z_OtherInfo_externallyDefinedInfo, - odr_external}, + z_External}, {ODR_IMPLICIT, ODR_CONTEXT, 5, Z_OtherInfo_oid, odr_oid}, {-1, -1, -1, -1, 0} }; @@ -258,7 +305,7 @@ int z_IdAuthentication(ODR o, Z_IdAuthentication **p, int opt) {-1, -1, -1, Z_IdAuthentication_open, z_StrAuthentication}, {-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, Z_IdAuthentication_other, z_External}, {-1, -1, -1, -1, 0} }; @@ -362,7 +409,7 @@ int z_ResourceControlRequest(ODR o, Z_ResourceControlRequest **p, int 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, + odr_explicit(o, z_External, &(*p)->resourceReport, ODR_CONTEXT, 40, 1) && odr_implicit(o, odr_integer, &(*p)->partialResultsAvailable, ODR_CONTEXT, 41, 1) && @@ -393,12 +440,6 @@ int z_ResourceControlResponse(ODR o, Z_ResourceControlResponse **p, int opt) /* ------------------------ SEARCH SERVICE ----------------------- */ -int z_ElementSetName(ODR o, char **p, int opt) -{ - return odr_implicit(o, odr_visiblestring, (char**) p, ODR_CONTEXT, 103, - opt); -} - int z_DatabaseSpecificUnit(ODR o, Z_DatabaseSpecificUnit **p, int opt) { if (!odr_sequence_begin(o, p, sizeof(**p))) @@ -435,14 +476,12 @@ int z_ElementSetNames(ODR o, Z_ElementSetNames **p, int opt) {-1, -1, -1, -1, 0} }; - if (!odr_constructed_begin(o, p, ODR_CONTEXT, 19)) - return opt && odr_ok(o); - if (o->direction == ODR_DECODE) *p = odr_malloc(o, sizeof(**p)); + else if (!*p) + return opt && odr_ok(o); - if (odr_choice(o, arm, &(*p)->u, &(*p)->which) && - odr_constructed_end(o)) + if (odr_choice(o, arm, &(*p)->u, &(*p)->which)) return 1; *p = 0; return 0; @@ -504,7 +543,7 @@ int z_Term(ODR o, Z_Term **p, int opt) 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}, + {ODR_IMPLICIT, ODR_CONTEXT, 219, Z_Term_external, z_External}, /* add intUnit here */ {ODR_IMPLICIT, ODR_CONTEXT, 221, Z_Term_null, odr_null}, {-1, -1, -1, -1, 0} @@ -717,13 +756,21 @@ int z_SearchRequest(ODR o, Z_SearchRequest **p, int opt) int z_DatabaseRecord(ODR o, Z_DatabaseRecord **p, int opt) { - return odr_external(o, (Odr_external **) p, opt); + return z_External(o, (Z_External **) p, opt); } #ifdef Z_95 int z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt) { + static Odr_arm arm[] = + { + {-1, -1, -1, Z_DiagForm_v2AddInfo, odr_visiblestring}, + {-1, -1, -1, Z_DiagForm_v3AddInfo, z_InternationalString}, + {ODR_IMPLICIT, ODR_CONTEXT, ODR_VISIBLESTRING, Z_DiagForm_v2AddInfo, + odr_visiblestring}, /* To cater to a bug in the CNIDR servers */ + {-1, -1, -1, -1, 0} + }; if (!odr_sequence_begin(o, p, sizeof(**p))) return opt && odr_ok(o); return @@ -735,9 +782,7 @@ int z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt) * 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_choice(o, arm, &(*p)->addinfo, &(*p)->which) && odr_sequence_end(o); } @@ -746,7 +791,7 @@ int z_DiagRec(ODR o, Z_DiagRec **p, int opt) static Odr_arm arm[] = { {-1, -1, -1, Z_DiagRec_defaultFormat, z_DefaultDiagFormat}, - {-1, -1, -1, Z_DiagRec_externallyDefined, odr_external}, + {-1, -1, -1, Z_DiagRec_externallyDefined, z_External}, {-1, -1, -1, -1, 0} }; @@ -862,7 +907,7 @@ int z_AccessControlRequest(ODR o, Z_AccessControlRequest **p, int opt) {ODR_IMPLICIT, ODR_CONTEXT, 37, Z_AccessRequest_simpleForm, odr_octetstring}, {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_AccessRequest_externallyDefined, - odr_external}, + z_External}, {-1, -1, -1, -1, 0} }; if (!odr_sequence_begin(o, p, sizeof(**p))) @@ -883,7 +928,7 @@ int z_AccessControlResponse(ODR o, Z_AccessControlResponse **p, int opt) {ODR_IMPLICIT, ODR_CONTEXT, 38, Z_AccessResponse_simpleForm, odr_octetstring}, {ODR_EXPLICIT, ODR_CONTEXT, 0, Z_AccessResponse_externallyDefined, - odr_external}, + z_External}, {-1, -1, -1, -1, 0} }; if (!odr_sequence_begin(o, p, sizeof(**p))) @@ -1141,7 +1186,7 @@ int z_ElementSpec(ODR o, Z_ElementSpec **p, int opt) {ODR_IMPLICIT, ODR_CONTEXT, 1, Z_ElementSpec_elementSetName, odr_visiblestring}, {ODR_IMPLICIT, ODR_CONTEXT, 2, Z_ElementSpec_externalSpec, - odr_external}, + z_External}, {-1, -1, -1, -1, 0} }; @@ -1198,7 +1243,7 @@ int z_RecordComposition(ODR o, Z_RecordComposition **p, int opt) { static Odr_arm arm[] = { - {ODR_EXPLICIT, ODR_CONTEXT, 1, Z_RecordComp_simple, + {ODR_EXPLICIT, ODR_CONTEXT, 19, Z_RecordComp_simple, z_ElementSetNames}, {ODR_IMPLICIT, ODR_CONTEXT, 209, Z_RecordComp_complex, z_CompSpec}, @@ -1248,7 +1293,8 @@ int z_PresentRequest(ODR o, Z_PresentRequest **p, int opt) &(*p)->num_ranges) || odr_ok(o)) && z_RecordComposition(o, &(*p)->recordComposition, 1) && #else - z_ElementSetNames(o, &pp->elementSetNames, 1) && + odr_explicit(o, z_ElementSetNames, &pp->elementSetNames, ODR_CONTEXT, + 19, 1) && #endif odr_implicit(o, odr_oid, &(*p)->preferredRecordSyntax, ODR_CONTEXT, 104, 1) && @@ -1370,7 +1416,7 @@ int z_Close(ODR o, Z_Close **p, int opt) ODR_CONTEXT, 3, 1) && odr_implicit(o, odr_oid, &(*p)->resourceReportFormat, ODR_CONTEXT, 4, 1) && - odr_implicit(o, odr_external, &(*p)->resourceReport, ODR_CONTEXT, + odr_implicit(o, z_External, &(*p)->resourceReport, ODR_CONTEXT, 5, 1) && #ifdef Z_95 z_OtherInformation(o, &(*p)->otherInfo, 1) && @@ -1380,6 +1426,56 @@ int z_Close(ODR o, Z_Close **p, int opt) /* ------------------------ APDU ------------------------- */ +int 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 z_APDU(ODR o, Z_APDU **p, int opt) { static Odr_arm arm[] = @@ -1406,6 +1502,10 @@ int z_APDU(ODR o, Z_APDU **p, int opt) {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}