projects
/
yaz-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixed uninitialized boolean.
[yaz-moved-to-github.git]
/
asn
/
proto.c
diff --git
a/asn/proto.c
b/asn/proto.c
index
c309e7b
..
29e652c
100644
(file)
--- a/
asn/proto.c
+++ b/
asn/proto.c
@@
-4,7
+4,16
@@
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: proto.c,v $
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: proto.c,v $
- * Revision 1.38 1995-09-27 15:02:40 quinn
+ * Revision 1.41 1996-01-10 15:21:24 quinn
+ * Added links to access control PDUs
+ *
+ * Revision 1.40 1996/01/02 11:46:40 quinn
+ * Changed 'operator' to 'roperator' to avoid C++ conflict.
+ *
+ * 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
* Modified function heads & prototypes.
*
* Revision 1.37 1995/08/21 09:10:15 quinn
@@
-130,7
+139,7
@@
* We'll use a general octetstring here, since string operations are
* clumsy on long strings.
*/
* We'll use a general octetstring here, since string operations are
* clumsy on long strings.
*/
-int MDF z_SUTRS(ODR o, Odr_oct **p, int opt)
+int 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, p, ODR_UNIVERSAL,
ODR_GENERALSTRING, opt);
@@
-141,7
+150,7
@@
int z_ReferenceId(ODR o, Z_ReferenceId **p, int opt)
return odr_implicit(o, odr_octetstring, (Odr_oct**) p, ODR_CONTEXT, 2, opt);
}
return odr_implicit(o, odr_octetstring, (Odr_oct**) p, ODR_CONTEXT, 2, opt);
}
-int MDF z_DatabaseName(ODR o, Z_DatabaseName **p, int opt)
+int z_DatabaseName(ODR o, Z_DatabaseName **p, int opt)
{
return odr_implicit(o, odr_visiblestring, (char **) p, ODR_CONTEXT, 105,
opt);
{
return odr_implicit(o, odr_visiblestring, (char **) p, ODR_CONTEXT, 105,
opt);
@@
-153,7
+162,7
@@
int z_ResultSetId(ODR o, char **p, int opt)
opt);
}
opt);
}
-int MDF z_ElementSetName(ODR o, char **p, int opt)
+int z_ElementSetName(ODR o, char **p, int opt)
{
return odr_implicit(o, odr_visiblestring, p, ODR_CONTEXT, 103, opt);
}
{
return odr_implicit(o, odr_visiblestring, p, ODR_CONTEXT, 103, opt);
}
@@
-164,7
+173,7
@@
int z_UserInformationField(ODR o, Z_External **p, int opt)
11, opt);
}
11, opt);
}
-int MDF z_InternationalString(ODR o, char **p, int opt)
+int z_InternationalString(ODR o, char **p, int opt)
{
return odr_generalstring(o, p, opt);
}
{
return odr_generalstring(o, p, opt);
}
@@
-179,7
+188,7
@@
int z_InfoCategory(ODR o, Z_InfoCategory **p, int opt)
odr_sequence_end(o);
}
odr_sequence_end(o);
}
-int MDF z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt)
+int z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt)
{
static Odr_arm arm[] =
{
{
static Odr_arm arm[] =
{
@@
-201,7
+210,7
@@
int MDF z_OtherInformationUnit(ODR o, Z_OtherInformationUnit **p, int opt)
odr_sequence_end(o);
}
odr_sequence_end(o);
}
-int MDF z_OtherInformation(ODR o, Z_OtherInformation **p, int opt)
+int z_OtherInformation(ODR o, Z_OtherInformation **p, int opt)
{
if (o->direction == ODR_DECODE)
*p = odr_malloc(o, sizeof(**p));
{
if (o->direction == ODR_DECODE)
*p = odr_malloc(o, sizeof(**p));
@@
-215,7
+224,7
@@
int MDF z_OtherInformation(ODR o, Z_OtherInformation **p, int opt)
return opt && odr_ok(o);
}
return opt && odr_ok(o);
}
-int MDF z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt)
+int z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt)
{
static Odr_arm arm[] =
{
{
static Odr_arm arm[] =
{
@@
-239,7
+248,7
@@
int MDF z_StringOrNumeric(ODR o, Z_StringOrNumeric **p, int opt)
/*
* check tagging!!
*/
/*
* check tagging!!
*/
-int MDF z_Unit(ODR o, Z_Unit **p, int opt)
+int z_Unit(ODR o, Z_Unit **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
@@
-253,7
+262,7
@@
int MDF z_Unit(ODR o, Z_Unit **p, int opt)
odr_sequence_end(o);
}
odr_sequence_end(o);
}
-int MDF z_IntUnit(ODR o, Z_IntUnit **p, int opt)
+int z_IntUnit(ODR o, Z_IntUnit **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
@@
-266,7
+275,7
@@
int MDF z_IntUnit(ODR o, Z_IntUnit **p, int opt)
/* ---------------------- INITIALIZE SERVICE ------------------- */
#if 0
/* ---------------------- INITIALIZE SERVICE ------------------- */
#if 0
-int MDF z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
+int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
@@
-290,7
+299,7
@@
int z_IdPass(ODR o, Z_IdPass **p, int opt)
odr_sequence_end(o);
}
odr_sequence_end(o);
}
-int MDF z_StrAuthentication(ODR o, char **p, int opt)
+int z_StrAuthentication(ODR o, char **p, int opt)
{
return odr_visiblestring(o, p, opt);
}
{
return odr_visiblestring(o, p, opt);
}
@@
-530,7
+539,7
@@
int z_AttributeElement(ODR o, Z_AttributeElement **p, int opt)
odr_sequence_end(o);
}
odr_sequence_end(o);
}
-int MDF z_Term(ODR o, Z_Term **p, int opt)
+int z_Term(ODR o, Z_Term **p, int opt)
{
static Odr_arm arm[] =
{
{
static Odr_arm arm[] =
{
@@
-658,7
+667,7
@@
int z_Complex(ODR o, Z_Complex **p, int opt)
return
z_RPNStructure(o, &(*p)->s1, 0) &&
z_RPNStructure(o, &(*p)->s2, 0) &&
return
z_RPNStructure(o, &(*p)->s1, 0) &&
z_RPNStructure(o, &(*p)->s2, 0) &&
- z_Operator(o, &(*p)->operator, 0) &&
+ z_Operator(o, &(*p)->roperator, 0) &&
odr_sequence_end(o);
}
odr_sequence_end(o);
}
@@
-758,7
+767,7
@@
int z_DatabaseRecord(ODR o, Z_DatabaseRecord **p, int opt)
#ifdef Z_95
#ifdef Z_95
-int MDF z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt)
+int z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt)
{
static Odr_arm arm[] =
{
{
static Odr_arm arm[] =
{
@@
-783,7
+792,7
@@
int MDF z_DefaultDiagFormat(ODR o, Z_DefaultDiagFormat **p, int opt)
odr_sequence_end(o);
}
odr_sequence_end(o);
}
-int MDF z_DiagRec(ODR o, Z_DiagRec **p, int opt)
+int z_DiagRec(ODR o, Z_DiagRec **p, int opt)
{
static Odr_arm arm[] =
{
{
static Odr_arm arm[] =
{
@@
-942,7
+951,7
@@
int z_AccessControlResponse(ODR o, Z_AccessControlResponse **p, int opt)
/* ------------------------ SCAN SERVICE -------------------- */
/* ------------------------ SCAN SERVICE -------------------- */
-int MDF z_AttributeList(ODR o, Z_AttributeList **p, int opt)
+int z_AttributeList(ODR o, Z_AttributeList **p, int opt)
{
if (o->direction == ODR_DECODE)
*p = odr_malloc(o, sizeof(**p));
{
if (o->direction == ODR_DECODE)
*p = odr_malloc(o, sizeof(**p));
@@
-1198,7
+1207,7
@@
int z_ElementSpec(ODR o, Z_ElementSpec **p, int opt)
return opt && odr_ok(o);
}
return opt && odr_ok(o);
}
-int MDF z_Specification(ODR o, Z_Specification **p, int opt)
+int z_Specification(ODR o, Z_Specification **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
@@
-1423,7
+1432,7
@@
int z_Close(ODR o, Z_Close **p, int opt)
/* ------------------------ APDU ------------------------- */
/* ------------------------ APDU ------------------------- */
-int MDF z_Permissions(ODR o, Z_Permissions **p, int opt)
+int z_Permissions(ODR o, Z_Permissions **p, int opt)
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
{
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
@@
-1473,7
+1482,7
@@
int z_ExtendedServicesResponse(ODR o, Z_ExtendedServicesResponse **p, int opt)
/* ------------------------ APDU ------------------------- */
/* ------------------------ APDU ------------------------- */
-int MDF z_APDU(ODR o, Z_APDU **p, int opt)
+int z_APDU(ODR o, Z_APDU **p, int opt)
{
static Odr_arm arm[] =
{
{
static Odr_arm arm[] =
{
@@
-1490,6
+1499,10
@@
int MDF z_APDU(ODR o, Z_APDU **p, int opt)
z_DeleteResultSetRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 27, Z_APDU_deleteResultSetResponse,
z_DeleteResultSetResponse},
z_DeleteResultSetRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 27, Z_APDU_deleteResultSetResponse,
z_DeleteResultSetResponse},
+ {ODR_IMPLICIT, ODR_CONTEXT, 28, Z_APDU_accessControlRequest,
+ z_AccessControlRequest},
+ {ODR_IMPLICIT, ODR_CONTEXT, 29, Z_APDU_accessControlResponse,
+ z_AccessControlResponse},
{ODR_IMPLICIT, ODR_CONTEXT, 30, Z_APDU_resourceControlRequest,
z_ResourceControlRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 31, Z_APDU_resourceControlResponse,
{ODR_IMPLICIT, ODR_CONTEXT, 30, Z_APDU_resourceControlRequest,
z_ResourceControlRequest},
{ODR_IMPLICIT, ODR_CONTEXT, 31, Z_APDU_resourceControlResponse,