Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 10:26:52 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Various BSON codec fixes. Simple load/save test is working now.

Browse Source
This commit is contained in:
px4dev
2012-08-20 04:06:44 -07:00
parent 56bba7816f
commit f20c61ccdf
1 changed files with 62 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/systemlib/bson/tinybson.c
+62 -63
View File
@@ -110,7 +110,7 @@ bson_decoder_next(bson_decoder_t decoder)
} }
/* if there are unread bytes pending in the stream, discard them */ /* if there are unread bytes pending in the stream, discard them */
while (decoder->pending != 0) { while (decoder->pending > 0) {
if (read_int8(decoder, &tbyte)) if (read_int8(decoder, &tbyte))
CODER_KILL(decoder, "read error discarding pending bytes"); CODER_KILL(decoder, "read error discarding pending bytes");
decoder->pending--; decoder->pending--;
@@ -122,46 +122,50 @@ bson_decoder_next(bson_decoder_t decoder)
decoder->node.type = tbyte; decoder->node.type = tbyte;
decoder->pending = 0; decoder->pending = 0;
/* get the node name */ debug("got type byte 0x%02x", decoder->node.type);
nlen = 0;
for (;;) {
if (nlen >= BSON_MAXNAME)
CODER_KILL(decoder, "node name overflow");
if (read_int8(decoder, (int8_t *)&decoder->node.name[nlen]))
CODER_KILL(decoder, "read error on node name");
if (decoder->node.name[nlen] == 0)
break;
nlen++;
}
switch (decoder->node.type) { /* EOO is special; it has no name/data following */
case BSON_EOO: if (decoder->node.type != BSON_EOO) {
/* nothing special to do here as we don't support nested objects yet */
break; /* get the node name */
case BSON_INT: nlen = 0;
if (read_int32(decoder, &decoder->node.i)) { for (;;) {
CODER_KILL(decoder, "read error on BSON_INT"); if (nlen >= BSON_MAXNAME)
CODER_KILL(decoder, "node name overflow");
if (read_int8(decoder, (int8_t *)&decoder->node.name[nlen]))
CODER_KILL(decoder, "read error on node name");
if (decoder->node.name[nlen] == '\0')
break;
nlen++;
} }
break;
case BSON_DOUBLE:
if (read_double(decoder, &decoder->node.d))
CODER_KILL(decoder, "read error on BSON_DOUBLE");
break;
case BSON_STRING:
if (read_int32(decoder, &decoder->pending))
CODER_KILL(decoder, "read error on BSON_STRING length");
break;
case BSON_BINDATA:
if (read_int32(decoder, &decoder->pending))
CODER_KILL(decoder, "read error on BSON_BINDATA size");
if (read_int8(decoder, &tbyte))
CODER_KILL(decoder, "read error on BSON_BINDATA subtype");
decoder->node.subtype = tbyte;
break;
/* XXX currently not supporting other types */ debug("got name '%s'", decoder->node.name);
default:
CODER_KILL(decoder, "unsupported node type"); switch (decoder->node.type) {
case BSON_INT:
if (read_int32(decoder, &decoder->node.i))
CODER_KILL(decoder, "read error on BSON_INT");
break;
case BSON_DOUBLE:
if (read_double(decoder, &decoder->node.d))
CODER_KILL(decoder, "read error on BSON_DOUBLE");
break;
case BSON_STRING:
if (read_int32(decoder, &decoder->pending))
CODER_KILL(decoder, "read error on BSON_STRING length");
break;
case BSON_BINDATA:
if (read_int32(decoder, &decoder->pending))
CODER_KILL(decoder, "read error on BSON_BINDATA size");
if (read_int8(decoder, &tbyte))
CODER_KILL(decoder, "read error on BSON_BINDATA subtype");
decoder->node.subtype = tbyte;
break;
/* XXX currently not supporting other types */
default:
CODER_KILL(decoder, "unsupported node type");
}
} }
/* call the callback and pass its results back */ /* call the callback and pass its results back */
@@ -254,10 +258,10 @@ bson_encoder_append_int(bson_encoder_t encoder, const char *name, int32_t value)
{ {
CODER_CHECK(encoder); CODER_CHECK(encoder);
if (write_name(encoder, name)) if (write_int8(encoder, BSON_INT) ||
CODER_KILL(encoder, "write error on BSON_INT name"); write_name(encoder, name) ||
if (write_int32(encoder, value)) write_int32(encoder, value))
CODER_KILL(encoder, "write error on BSON_INT value"); CODER_KILL(encoder, "write error on BSON_INT");
return 0; return 0;
} }
@@ -267,11 +271,11 @@ bson_encoder_append_double(bson_encoder_t encoder, const char *name, double valu
{ {
CODER_CHECK(encoder); CODER_CHECK(encoder);
if (write_name(encoder, name)) if (write_int8(encoder, BSON_DOUBLE) ||
CODER_KILL(encoder, "write error on BSON_DOUBLE name"); write_name(encoder, name) ||
write_double(encoder, value))
CODER_KILL(encoder, "write error on BSON_DOUBLE");
if (write_double(encoder, value))
CODER_KILL(encoder, "write error on BSON_DOUBLE value");
return 0; return 0;
} }
@@ -283,14 +287,13 @@ bson_encoder_append_string(bson_encoder_t encoder, const char *name, const char
CODER_CHECK(encoder); CODER_CHECK(encoder);
if (write_name(encoder, name))
CODER_KILL(encoder, "write error on BSON_STRING name");
len = strlen(string); len = strlen(string);
if (write_int32(encoder, len))
CODER_KILL(encoder, "write error on BSON_STRING length"); if (write_int8(encoder, BSON_DOUBLE) ||
if (write(encoder->fd, name, len + 1) != (int)(len + 1)) write_name(encoder, name) ||
CODER_KILL(encoder, "write error on BSON_STRING data"); write_int32(encoder, len) ||
write(encoder->fd, name, len + 1) != (int)(len + 1))
CODER_KILL(encoder, "write error on BSON_STRING");
return 0; return 0;
} }
@@ -299,15 +302,11 @@ bson_encoder_append_binary(bson_encoder_t encoder, const char *name, bson_binary
{ {
CODER_CHECK(encoder); CODER_CHECK(encoder);
if (write_name(encoder, name)) if (write_int8(encoder, BSON_BINDATA) ||
CODER_KILL(encoder, "write error on BSON_BINDATA name"); write_name(encoder, name) ||
if (write_int32(encoder, size)) write_int32(encoder, size) ||
CODER_KILL(encoder, "write error on BSON_BINDATA size"); write_int8(encoder, subtype) ||
if (write_int8(encoder, subtype)) write(encoder->fd, data, size) != (int)(size))
CODER_KILL(encoder, "write error on BSON_BINDATA subtype"); CODER_KILL(encoder, "write error on BSON_BINDATA");
if (write(encoder->fd, data, size) != (int)(size))
CODER_KILL(encoder, "write error on BSON_BINDATA data");
return 0; return 0;
} }