misc/adsb-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make some JSON output fields optional rather than passing bogus data.

Browse Source
This commit is contained in:
Ian Gulliver
2016-02-17 11:59:37 -08:00
parent d60a2c9869
commit 318ddd2998
1 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
json.c
View File

@@ -24,43 +24,47 @@ int json_buf_append_callback(const char *buffer, size_t size, void *data) {
return 0; return 0;
} }
static void json_serialize_to_buf(json_t *obj, struct buf *buf) {
assert(json_dump_callback(obj, json_buf_append_callback, buf, 0) == 0);
json_decref(obj);
buf_chr(buf, buf->length++) = '\n';
}
static void json_hello(struct buf *buf) { static void json_hello(struct buf *buf) {
json_t *hello = json_pack("{sssIsIsI}", json_t *hello = json_pack("{sssIsIsI}",
"server_id", server_id, "server_id", server_id,
"mlat_timestamp_mhz", (json_int_t) MLAT_MHZ, "mlat_timestamp_mhz", (json_int_t) MLAT_MHZ,
"mlat_timestamp_max", (json_int_t) MLAT_MAX, "mlat_timestamp_max", (json_int_t) MLAT_MAX,
"rssi_max", (json_int_t) RSSI_MAX); "rssi_max", (json_int_t) RSSI_MAX);
assert(json_dump_callback(hello, json_buf_append_callback, buf, 0) == 0); json_serialize_to_buf(hello, buf);
json_decref(hello); }
buf_chr(buf, buf->length++) = '\n';
static void json_add_common(struct packet *packet, json_t *obj) {
json_object_set_new(obj, "backend_id", json_string(packet->backend->id));
if (packet->mlat_timestamp) {
json_object_set_new(obj, "mlat_timestamp", json_integer(packet->mlat_timestamp));
}
if (packet->rssi) {
json_object_set_new(obj, "rssi", json_integer(packet->rssi));
}
} }
static void json_serialize_mode_s_short(struct packet *packet, struct buf *buf) { static void json_serialize_mode_s_short(struct packet *packet, struct buf *buf) {
assert(packet->mlat_timestamp < MLAT_MAX); assert(packet->mlat_timestamp < MLAT_MAX);
char hexbuf[14]; char hexbuf[14];
hex_from_bin(hexbuf, packet->payload, 7); hex_from_bin(hexbuf, packet->payload, 7);
json_t *out = json_pack("{ssss#sIsI}", json_t *out = json_pack("{ss#}", "payload", hexbuf, 14);
"backend_id", packet->backend->id, json_add_common(packet, out);
"payload", hexbuf, 14, json_serialize_to_buf(out, buf);
"mlat_timestamp", (json_int_t) packet->mlat_timestamp,
"rssi", (json_int_t) packet->rssi);
assert(json_dump_callback(out, json_buf_append_callback, buf, 0) == 0);
json_decref(out);
buf_chr(buf, buf->length++) = '\n';
} }
static void json_serialize_mode_s_long(struct packet *packet, struct buf *buf) { static void json_serialize_mode_s_long(struct packet *packet, struct buf *buf) {
assert(packet->mlat_timestamp < MLAT_MAX); assert(packet->mlat_timestamp < MLAT_MAX);
char hexbuf[28]; char hexbuf[28];
hex_from_bin(hexbuf, packet->payload, 14); hex_from_bin(hexbuf, packet->payload, 14);
json_t *out = json_pack("{ssss#sIsI}", json_t *out = json_pack("{ss#}", "payload", hexbuf, 28);
"backend_id", packet->backend->id, json_add_common(packet, out);
"payload", hexbuf, 28, json_serialize_to_buf(out, buf);
"mlat_timestamp", (json_int_t) packet->mlat_timestamp,
"rssi", (json_int_t) packet->rssi);
assert(json_dump_callback(out, json_buf_append_callback, buf, 0) == 0);
json_decref(out);
buf_chr(buf, buf->length++) = '\n';
} }
void json_serialize(struct packet *packet, struct buf *buf) { void json_serialize(struct packet *packet, struct buf *buf) {