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

Add hop limit to json and proto formats.

Browse Source
This commit is contained in:
Ian Gulliver
2016-03-03 22:00:02 -08:00
parent 455bee2676
commit 45abe06467
10 changed files with 78 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
adsbus/json.c
View File

@@ -34,6 +34,7 @@ static void json_serialize_to_buf(json_t *obj, struct buf *buf) {
}
static void json_add_common(struct packet *packet, json_t *obj) {
json_object_set_new(obj, "hops", json_integer(packet->hops));
json_object_set_new(obj, "type", json_string(packet_type_names[packet->type]));
json_object_set_new(obj, "source_id", json_string((const char *) packet->source_id));
if (packet->mlat_timestamp) {
@@ -78,10 +79,6 @@ static bool json_parse_header(json_t *in, struct packet *packet, struct json_par
return false;
}
state->mlat_timestamp_mhz = (uint16_t) mlat_timestamp_mhz;
state->mlat_timestamp_max = (uint64_t) mlat_timestamp_max;
state->rssi_max = (uint32_t) rssi_max;
if (!strcmp(json_server_id, (const char *) server_id)) {
fprintf(stderr, "R %s: Attempt to receive json data from our own server ID (%s); loop!\n", packet->source_id, server_id);
return false;
@@ -89,6 +86,10 @@ static bool json_parse_header(json_t *in, struct packet *packet, struct json_par
fprintf(stderr, "R %s: Connected to server ID: %s\n", packet->source_id, json_server_id);
state->mlat_timestamp_mhz = (uint16_t) mlat_timestamp_mhz;
state->mlat_timestamp_max = (uint64_t) mlat_timestamp_max;
state->rssi_max = (uint32_t) rssi_max;
state->have_header = true;
packet->type = PACKET_TYPE_NONE;
return true;
@@ -99,7 +100,12 @@ static bool json_parse_common(json_t *in, struct packet *packet, struct json_par
return false;
}
if (json_unpack(in, "{s:s}", "source_id", &packet->source_id)) {
json_int_t hops;
if (json_unpack(
in, "{s:s, s:I}",
"source_id", &packet->source_id,
"hops", &hops)) {
return false;
}
@@ -107,6 +113,11 @@ static bool json_parse_common(json_t *in, struct packet *packet, struct json_par
return false;
}
if (hops < 0 || hops > UINT32_MAX) {
return false;
}
packet->hops = (uint16_t) hops;
json_t *mlat_timestamp = json_object_get(in, "mlat_timestamp");
if (mlat_timestamp && json_is_integer(mlat_timestamp)) {
json_int_t val = json_integer_value(mlat_timestamp);