mirrors/bird
mirrors/bird
0
0
Fork 0
mirror of https://gitlab.nic.cz/labs/bird.git synced 2024-10-18 09:58:43 +00:00
Code Releases Activity

Flock: better cbor

Browse Source
This commit is contained in:
Maria Matejka 2024-10-05 15:47:49 +02:00
parent 17899c0559
commit 62bca8e882
2 changed files with 19 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flock/container.c
View File

@ -1066,10 +1066,9 @@ hcf_parse(byte *buf, int size)
/* Code to run at the end of the mapping */ /* Code to run at the end of the mapping */
case 0: /* toplevel item ended */ case 0: /* toplevel item ended */
/* Reinit the parser */ /* Reinit the parser */
ctx->type = 0xff;
ccx->major_state = 0; ccx->major_state = 0;
ctx->stack_countdown[0] = 1;
ccx->bytes_consumed = 0; ccx->bytes_consumed = 0;
cbor_parser_reset(ccx->ctx);
if (size > pos + 1) if (size > pos + 1)
hcf_parse(buf + pos + 1, size - pos - 1); hcf_parse(buf + pos + 1, size - pos - 1);

92
flock/ctl.c
View File

@ -80,13 +80,11 @@ hcs_parse(struct hcs_parser_context *htx, const byte *buf, s64 size)
break; break;
case 1: /* inside toplevel mapping */ case 1: /* inside toplevel mapping */
if (ctx->type != 0) CBOR_PARSE_ONLY(ctx, POSINT, htx->major_state);
CBOR_PARSER_ERROR("Expected integer, got %u", ctx->type); if (htx->major_state >= 5)
CBOR_PARSER_ERROR("Command key too high, got %lu", htx->major_state);
if (ctx->value >= 5) htx->major_state += 2;
CBOR_PARSER_ERROR("Command key too high, got %lu", ctx->value);
htx->major_state = ctx->value + 2;
break; break;
case 2: /* shutdown command: expected null */ case 2: /* shutdown command: expected null */
@ -114,13 +112,10 @@ hcs_parse(struct hcs_parser_context *htx, const byte *buf, s64 size)
break; break;
} }
else if (ctx->type != 3) else CBOR_PARSE_IF(ctx, TEXT, htx->cfg.cf.name)
CBOR_PARSER_ERROR("Expected null or string, got %u-%u", ctx->type, ctx->value); ;
else
ASSERT_DIE(!ctx->target_buf); CBOR_PARSER_ERROR("Expected null or string, got %s", cbor_type_str(ctx->type));
htx->cfg.cf.name = ctx->target_buf = lp_alloc(ctx->lp, ctx->value + 1);
ctx->target_len = ctx->value;
break; break;
case 4: /* telnet listener close */ case 4: /* telnet listener close */
@ -150,97 +145,46 @@ hcs_parse(struct hcs_parser_context *htx, const byte *buf, s64 size)
break; break;
case 501: /* machine creation argument */ case 501: /* machine creation argument */
if (ctx->type != 0) CBOR_PARSE_ONLY(ctx, POSINT, htx->major_state);
CBOR_PARSER_ERROR("Expected integer, got %u", ctx->type);
if (ctx->value >= 5) if (ctx->value >= 5)
CBOR_PARSER_ERROR("Command key too high, got %lu", ctx->value); CBOR_PARSER_ERROR("Command key too high, got %lu", ctx->value);
htx->major_state = ctx->value + 502; htx->major_state += 502;
break; break;
case 502: /* machine creation argument 0: name */ case 502: /* machine creation argument 0: name */
if (ctx->type != 3) CBOR_PARSE_ONLY(ctx, TEXT, htx->cfg.cf.name);
CBOR_PARSER_ERROR("Expected string, got %u", ctx->type);
if (ctx->tflags & CPT_VARLEN)
CBOR_PARSER_ERROR("Variable length string not supported yet");
if (htx->cfg.cf.name)
CBOR_PARSER_ERROR("Duplicate argument 0 / name");
ASSERT_DIE(!ctx->target_buf);
htx->cfg.cf.name = ctx->target_buf = lp_alloc(ctx->lp, ctx->value + 1);
ctx->target_len = ctx->value;
break; break;
case 503: /* machine creation argument 1: type */ case 503: /* machine creation argument 1: type */
if (ctx->type != 0) CBOR_PARSE_ONLY(ctx, POSINT, htx->cfg.cf.type);
CBOR_PARSER_ERROR("Expected integer, got %u", ctx->type);
if (htx->cfg.cf.type)
CBOR_PARSER_ERROR("Duplicate argument 1 / type, already have %d", htx->cfg.cf.type);
if ((ctx->value < 1) && (ctx->value > 1) ) if ((ctx->value < 1) && (ctx->value > 1) )
CBOR_PARSER_ERROR("Unexpected type, got %lu", ctx->value); CBOR_PARSER_ERROR("Unexpected type, got %lu", ctx->value);
htx->cfg.cf.type = ctx->value;
htx->major_state = 501; htx->major_state = 501;
break; break;
case 504: /* machine creation argument 2: basedir */ case 504: /* machine creation argument 2: basedir */
if (ctx->type != 2) CBOR_PARSE_ONLY(ctx, BYTES, htx->cfg.container.basedir);
CBOR_PARSER_ERROR("Expected bytestring, got %u", ctx->type);
if (ctx->tflags & CPT_VARLEN)
CBOR_PARSER_ERROR("Variable length string not supported yet");
if (htx->cfg.container.basedir)
CBOR_PARSER_ERROR("Duplicate argument 2 / basedir");
ASSERT_DIE(!ctx->target_buf);
htx->cfg.container.basedir = ctx->target_buf = lp_alloc(ctx->lp, ctx->value + 1);
ctx->target_len = ctx->value;
break; break;
case 505: /* machine creation argument 3: workdir */ case 505: /* machine creation argument 3: workdir */
if (ctx->type != 2) CBOR_PARSE_ONLY(ctx, BYTES, htx->cfg.container.workdir);
CBOR_PARSER_ERROR("Expected bytestring, got %u", ctx->type);
if (ctx->tflags & CPT_VARLEN)
CBOR_PARSER_ERROR("Variable length string not supported yet");
if (htx->cfg.container.workdir)
CBOR_PARSER_ERROR("Duplicate argument 3 / workdir");
ASSERT_DIE(!ctx->target_buf);
htx->cfg.container.workdir = ctx->target_buf = lp_alloc(ctx->lp, ctx->value + 1);
ctx->target_len = ctx->value;
break; break;
case 601: /* machine shutdown argument */ case 601: /* machine shutdown argument */
if (ctx->type != 0) CBOR_PARSE_ONLY(ctx, POSINT, htx->major_state);
CBOR_PARSER_ERROR("Expected integer, got %u", ctx->type);
if (ctx->value >= 1) if (ctx->value >= 5)
CBOR_PARSER_ERROR("Command key too high, got %lu", ctx->value); CBOR_PARSER_ERROR("Command key too high, got %lu", ctx->value);
htx->major_state = ctx->value + 602; htx->major_state += 602;
break; break;
case 602: /* machine creation argument 0: name */ case 602: /* machine creation argument 0: name */
if (ctx->type != 3) CBOR_PARSE_ONLY(ctx, TEXT, htx->cfg.cf.name);
CBOR_PARSER_ERROR("Expected string, got %u", ctx->type);
if (ctx->tflags & CPT_VARLEN)
CBOR_PARSER_ERROR("Variable length string not supported yet");
if (htx->cfg.cf.name)
CBOR_PARSER_ERROR("Duplicate argument 0 / name");
ASSERT_DIE(!ctx->target_buf);
htx->cfg.cf.name = ctx->target_buf = lp_alloc(ctx->lp, ctx->value + 1);
ctx->target_len = ctx->value;
break; break;
default: default: