oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

asn1: propagate default values to JSON

Browse Source 
Propagate ASN.1 DEFAULT values to ASN.1 compiler JSON output, with the defval
key.
This commit is contained in:
Luke Howard
2022-11-14 12:02:26 +11:00
committed by Nico Williams
parent bc3d9c0115
commit 5398425cd2
1 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
lib/asn1/gen.c
View File

@@ -1408,16 +1408,43 @@ define_type(int level, const char *name, const char *basename, Type *pt, Type *t
HEIM_TAILQ_FOREACH(m, t->members, members) {
if (m->ellipsis) {
;
} else if (m->optional) {
char *n = NULL;
} else if (m->optional || m->defval) {
char *n = NULL, *defval = NULL;
const char *namep, *defvalp;
if (m->defval) {
switch (m->defval->type) {
case stringvalue:
defvalp = m->defval->u.stringvalue;
break;
case integervalue:
if (asprintf(&defval, "%lld", (long long)m->defval->u.integervalue) < 0 || defval == NULL)
errx(1, "malloc");
defvalp = defval;
break;
case booleanvalue:
defvalp = m->defval->u.booleanvalue ? "true" : "false";
break;
default:
abort();
}
} else
defvalp = "null";
if (m->optional) {
if (asprintf(&n, "*%s", m->gen_name) < 0 || n == NULL)
errx(1, "malloc");
namep = n;
} else
namep = m->gen_name;
if (asprintf(&n, "*%s", m->gen_name) < 0 || n == NULL)
errx(1, "malloc");
fprintf(jsonfile, "{\"name\":\"%s\",\"gen_name\":\"%s\","
"\"optional\":true,\"type\":", m->name, m->gen_name);
define_type(level + 1, n, newbasename, t, m->type, FALSE, FALSE);
"\"optional\":%s,\"defval\":%s,\"type\":",
m->name, m->gen_name, m->optional ? "true" : "false", defvalp);
define_type(level + 1, namep, newbasename, t, m->type, FALSE, FALSE);
fprintf(jsonfile, "}%s", last_member_p(m));
free (n);
free (defval);
} else {
fprintf(jsonfile, "{\"name\":\"%s\",\"gen_name\":\"%s\","
"\"optional\":false,\"type\":", m->name, m->gen_name);