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

Bad math calculating overlay start.

Browse Source
This commit is contained in:
Ian Gulliver
2016-02-27 22:19:02 -08:00
parent 4237f4f8c0
commit 66d21dcad9
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
adsbus/airspy_adsb.c
View File

@@ -77,7 +77,9 @@ bool airspy_adsb_parse(struct buf *buf, struct packet *packet, void *state_in) {
void airspy_adsb_serialize(struct packet *packet, struct buf *buf) { void airspy_adsb_serialize(struct packet *packet, struct buf *buf) {
size_t payload_bytes = packet_payload_len[packet->type]; size_t payload_bytes = packet_payload_len[packet->type];
struct airspy_adsb_overlay *overlay = (struct airspy_adsb_overlay *) buf_at(buf, 1 + payload_bytes); size_t overlay_start = 1 + (payload_bytes * 2);
struct airspy_adsb_overlay *overlay = (struct airspy_adsb_overlay *) buf_at(buf, overlay_start);
size_t total_len = overlay_start + sizeof(*overlay);
buf_chr(buf, 0) = '*'; buf_chr(buf, 0) = '*';
overlay->semicolon1 = overlay->semicolon2 = overlay->semicolon3 = overlay->semicolon4 =';'; overlay->semicolon1 = overlay->semicolon2 = overlay->semicolon3 = overlay->semicolon4 =';';
overlay->cr_lf = '\r'; overlay->cr_lf = '\r';
@@ -89,5 +91,5 @@ void airspy_adsb_serialize(struct packet *packet, struct buf *buf) {
sizeof(overlay->mlat_timestamp) / 2); sizeof(overlay->mlat_timestamp) / 2);
hex_from_int_upper(overlay->mlat_precision, SEND_MHZ / 2, sizeof(overlay->mlat_precision) / 2); hex_from_int_upper(overlay->mlat_precision, SEND_MHZ / 2, sizeof(overlay->mlat_precision) / 2);
hex_from_int_upper(overlay->rssi, packet_rssi_scale_out(packet->rssi, UINT16_MAX), sizeof(overlay->rssi) / 2); hex_from_int_upper(overlay->rssi, packet_rssi_scale_out(packet->rssi, UINT16_MAX), sizeof(overlay->rssi) / 2);
buf->length = 1 + payload_bytes + sizeof(*overlay); buf->length = total_len;
} }

8
adsbus/raw.c
View File

@@ -48,10 +48,12 @@ bool raw_parse(struct buf *buf, struct packet *packet, void __attribute__((unuse
void raw_serialize(struct packet *packet, struct buf *buf) { void raw_serialize(struct packet *packet, struct buf *buf) {
size_t payload_bytes = packet_payload_len[packet->type]; size_t payload_bytes = packet_payload_len[packet->type];
struct raw_overlay *overlay = (struct raw_overlay *) buf_at(buf, 1 + payload_bytes); size_t overlay_start = 1 + (payload_bytes * 2);
struct raw_overlay *overlay = (struct raw_overlay *) buf_at(buf, overlay_start);
size_t total_len = overlay_start + sizeof(*overlay);
buf_chr(buf, 0) = '*'; buf_chr(buf, 0) = '*';
overlay->semicolon = ';'; overlay->semicolon = ';';
overlay->lf = '\n'; overlay->cr_lf = '\n';
hex_from_bin_upper(buf_at(buf, 1), packet->payload, payload_bytes); hex_from_bin_upper(buf_at(buf, 1), packet->payload, payload_bytes);
buf->length = 1 + payload_bytes + sizeof(*overlay); buf->length = total_len - 1;
} }