* Sebastian Hammer, Adam Dickmeiss
*
* $Log: proto.c,v $
- * Revision 1.29 1995-06-15 07:44:49 quinn
+ * 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
* Moving to v3.
*
* Revision 1.28 1995/06/14 15:26:35 quinn
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)))
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 match some weird server.. */
+ {-1, -1, -1, -1, 0}
+ };
if (!odr_sequence_begin(o, p, sizeof(**p)))
return opt && odr_ok(o);
return
* 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);
}
#endif
+int z_DiagRecs(ODR o, Z_DiagRecs **p, int opt)
+{
+ if (o->direction == ODR_DECODE)
+ *p = odr_malloc(o, sizeof(**p));
+ else if (!*p)
+ return opt;
+
+ if (odr_sequence_of(o, z_DiagRec, &(*p)->diagRecs,
+ &(*p)->num_diagRecs))
+ return 1;
+ *p = 0;
+ return 0;
+}
+
int z_NamePlusRecord(ODR o, Z_NamePlusRecord **p, int opt)
{
static Odr_arm arm[] =
int z_Records(ODR o, Z_Records **p, int opt)
{
- Odr_arm arm[] =
+ static Odr_arm arm[] =
{
{ODR_IMPLICIT, ODR_CONTEXT, 28, Z_Records_DBOSD, z_NamePlusRecordList},
{ODR_IMPLICIT, ODR_CONTEXT, 130, Z_Records_NSD, z_DiagRec},
+ {ODR_IMPLICIT, ODR_CONTEXT, 205, Z_Records_multipleNSD,
+ z_DiagRecs},
{-1, -1, -1, -1, 0}
};
return 0;
}
-int z_DiagRecs(ODR o, Z_DiagRecs **p, int opt)
-{
- if (o->direction == ODR_DECODE)
- *p = odr_malloc(o, sizeof(**p));
- else if (!*p)
- return opt;
-
- if (odr_sequence_of(o, z_DiagRec, &(*p)->diagRecs,
- &(*p)->num_diagRecs))
- return 1;
- *p = 0;
- return 0;
-}
-
int z_ListEntries(ODR o, Z_ListEntries **p, int opt)
{
static Odr_arm arm[] =