* Sebastian Hammer, Adam Dickmeiss
*
* $Log: proto.c,v $
- * Revision 1.10 1995-03-15 11:17:40 quinn
+ * Revision 1.14 1995-03-29 08:06:13 quinn
+ * Added a few v3 elements
+ *
+ * Revision 1.13 1995/03/20 11:26:52 quinn
+ * *** empty log message ***
+ *
+ * Revision 1.12 1995/03/20 09:45:09 quinn
+ * Working towards v3
+ *
+ * Revision 1.11 1995/03/17 10:17:25 quinn
+ * Added memory management.
+ *
+ * Revision 1.10 1995/03/15 11:17:40 quinn
* Fixed some return-checks from choice.. need better ay to handle those..
*
* Revision 1.9 1995/03/15 08:37:06 quinn
/* ---------------------- INITIALIZE SERVICE ------------------- */
+int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
+{
+ if (!odr_sequence_begin(o, p, sizeof(**p)))
+ return opt;
+ return
+ odr_visiblestring(o, &(*p)->user, 0) &&
+ odr_visiblestring(o, &(*p)->password, 0) &&
+ odr_visiblestring(o, &(*p)->account, 0) &&
+ odr_sequence_end(o);
+}
+
+int z_IdPass(ODR o, Z_IdPass **p, int opt)
+{
+ if (!odr_sequence_begin(o, p, sizeof(**p)))
+ return opt;
+ return
+ odr_implicit(o, odr_visiblestring, &(*p)->groupId, ODR_CONTEXT, 0, 0) &&
+ odr_implicit(o, odr_visiblestring, &(*p)->userId, ODR_CONTEXT, 1, 0) &&
+ odr_implicit(o, odr_visiblestring, &(*p)->password, ODR_CONTEXT, 2,
+ 0) &&
+ odr_sequence_end(o);
+}
+
+int z_StrAuthentication(ODR o, char **p, int opt)
+{
+ return odr_visiblestring(o, p, opt);
+}
+
+int z_IdAuthentication(ODR o, Z_IdAuthentication **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_anonymous, odr_null},
+ {-1, -1, -1, Z_IdAuthentication_other, odr_external},
+ {-1, -1, -1, -1, 0}
+ };
+
+ if (o->direction == ODR_DECODE)
+ *p = odr_malloc(o, sizeof(**p));
+
+ if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
+ return 1;
+ *p = 0;
+ return opt && !o->error;
+}
+
int z_InitRequest(ODR o, Z_InitRequest **p, int opt)
{
Z_InitRequest *pp;
5, 0) &&
odr_implicit(o, odr_integer, &pp->maximumRecordSize, ODR_CONTEXT,
6, 0) &&
- odr_explicit(o, odr_any, &pp->idAuthentication, ODR_CONTEXT,
+ odr_explicit(o, z_IdAuthentication, &pp->idAuthentication, ODR_CONTEXT,
7, 1) &&
odr_implicit(o, odr_visiblestring, &pp->implementationId, ODR_CONTEXT,
110, 1) &&
odr_sequence_end(o);
}
-int z_NSRAuthentication(ODR o, Z_NSRAuthentication **p, int opt)
-{
- if (!odr_sequence_begin(o, p, sizeof(**p)))
- return opt;
- return
- odr_visiblestring(o, &(*p)->user, 0) &&
- odr_visiblestring(o, &(*p)->password, 0) &&
- odr_visiblestring(o, &(*p)->account, 0) &&
- odr_sequence_end(o);
-}
-
-int z_StrAuthentication(ODR o, char **p, int opt)
-{
- return odr_visiblestring(o, p, opt);
-}
-
/* ------------------------ SEARCH SERVICE ----------------------- */
int z_ElementSetName(ODR o, char **p, int opt)
int z_DatabaseSpecific(ODR o, Z_DatabaseSpecific **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = nalloc(o, sizeof(**p));
+ *p = odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
return opt;
if (o->direction == ODR_DECODE)
- *p = nalloc(o, sizeof(**p));
+ *p = odr_malloc(o, sizeof(**p));
if (odr_choice(o, arm, &(*p)->u, &(*p)->which) &&
odr_constructed_end(o))
if (!odr_constructed_begin(o, p, ODR_CONTEXT, 46))
return opt;
if (o->direction == ODR_DECODE)
- *p = nalloc(o, sizeof(**p));
+ *p = odr_malloc(o, sizeof(**p));
else
(*p)->u.and = &dummy;
};
if (o->direction ==ODR_DECODE)
- *p = nalloc(o, sizeof(**p));
+ *p = odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
};
if (o->direction == ODR_DECODE)
- *p = nalloc(o, sizeof(**p));
+ *p = odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
};
if (o->direction == ODR_DECODE)
- *p = nalloc(o, sizeof(**p));
+ *p = odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
odr_implicit_settag(o, ODR_CONTEXT, 18) &&
odr_sequence_of(o, z_DatabaseName, &pp->databaseNames,
&pp->num_databaseNames) &&
- odr_implicit(o, z_ElementSetNames, &pp->smallSetElementSetNames,
+ odr_explicit(o, z_ElementSetNames, &pp->smallSetElementSetNames,
ODR_CONTEXT, 100, 1) &&
- odr_implicit(o, z_ElementSetNames, &pp->mediumSetElementSetNames,
+ odr_explicit(o, z_ElementSetNames, &pp->mediumSetElementSetNames,
ODR_CONTEXT, 101, 1) &&
z_PreferredRecordSyntax(o, &pp->preferredRecordSyntax, 1) &&
odr_explicit(o, z_Query, &pp->query, ODR_CONTEXT, 21, 0) &&
int z_NamePlusRecordList(ODR o, Z_NamePlusRecordList **p, int opt)
{
if (o->direction == ODR_DECODE)
- *p = nalloc(o, sizeof(**p));
+ *p = odr_malloc(o, sizeof(**p));
if (odr_sequence_of(o, z_NamePlusRecord, &(*p)->records,
&(*p)->num_records))
return 1;
};
if (o->direction == ODR_DECODE)
- *p = nalloc(o, sizeof(**p));
+ *p = odr_malloc(o, sizeof(**p));
else if (!*p)
return opt;
if (odr_choice(o, arm, &(*p)->u, &(*p)->which))
};
if (o->direction == ODR_DECODE)
- *p = nalloc(o, sizeof(**p));
+ *p = odr_malloc(o, sizeof(**p));
if (!odr_choice(o, arm, &(*p)->u, &(*p)->which))
{
if (o->direction == ODR_DECODE)