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

Support both types of line endings in airspy_adsb. Fix a bug in raw line ending handling that could delay packets.

Browse Source
This commit is contained in:
Ian Gulliver
2016-02-26 14:18:28 -08:00
parent e3a372e1ea
commit 8ed1f152a6
2 changed files with 26 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
adsbus/airspy_adsb.c
View File

@@ -26,7 +26,7 @@ struct __attribute__((packed)) airspy_adsb_mode_s_short_overlay {
uint8_t payload[14]; uint8_t payload[14];
char semicolon; char semicolon;
struct airspy_adsb_common_overlay common; struct airspy_adsb_common_overlay common;
char cr; char cr_lf;
char lf; char lf;
}; };
@@ -35,7 +35,7 @@ struct __attribute__((packed)) airspy_adsb_mode_s_long_overlay {
uint8_t payload[28]; uint8_t payload[28];
char semicolon; char semicolon;
struct airspy_adsb_common_overlay common; struct airspy_adsb_common_overlay common;
char cr; char cr_lf;
char lf; char lf;
}; };
@@ -63,42 +63,40 @@ static bool airspy_adsb_parse_common(const struct airspy_adsb_common_overlay *ov
} }
static bool airspy_adsb_parse_mode_s_short(struct buf *buf, struct packet *packet, struct airspy_adsb_parser_state *state) { static bool airspy_adsb_parse_mode_s_short(struct buf *buf, struct packet *packet, struct airspy_adsb_parser_state *state) {
struct airspy_adsb_mode_s_short_overlay *short_overlay = (struct airspy_adsb_mode_s_short_overlay *) buf_at(buf, 0); struct airspy_adsb_mode_s_short_overlay *overlay = (struct airspy_adsb_mode_s_short_overlay *) buf_at(buf, 0);
if (buf->length < sizeof(*short_overlay) || if (((buf->length < sizeof(*overlay) - 1 || overlay->cr_lf != '\n') &&
short_overlay->asterisk != '*' || (buf->length < sizeof(*overlay) || overlay->cr_lf != '\r' || overlay->lf != '\n')) ||
short_overlay->semicolon != ';' || overlay->asterisk != '*' ||
short_overlay->cr != '\r' || overlay->semicolon != ';') {
short_overlay->lf != '\n') {
return false; return false;
} }
if (!airspy_adsb_parse_common(&short_overlay->common, packet, state)) { if (!airspy_adsb_parse_common(&overlay->common, packet, state)) {
return false; return false;
} }
packet->type = PACKET_TYPE_MODE_S_SHORT; packet->type = PACKET_TYPE_MODE_S_SHORT;
if (!hex_to_bin(packet->payload, short_overlay->payload, sizeof(short_overlay->payload) / 2)) { if (!hex_to_bin(packet->payload, overlay->payload, sizeof(overlay->payload) / 2)) {
return false; return false;
} }
buf_consume(buf, sizeof(*short_overlay)); buf_consume(buf, overlay->cr_lf == '\r' ? sizeof(*overlay) : sizeof(*overlay) - 1);
return true; return true;
} }
static bool airspy_adsb_parse_mode_s_long(struct buf *buf, struct packet *packet, struct airspy_adsb_parser_state *state) { static bool airspy_adsb_parse_mode_s_long(struct buf *buf, struct packet *packet, struct airspy_adsb_parser_state *state) {
struct airspy_adsb_mode_s_long_overlay *long_overlay = (struct airspy_adsb_mode_s_long_overlay *) buf_at(buf, 0); struct airspy_adsb_mode_s_long_overlay *overlay = (struct airspy_adsb_mode_s_long_overlay *) buf_at(buf, 0);
if (buf->length < sizeof(*long_overlay) || if (((buf->length < sizeof(*overlay) - 1 || overlay->cr_lf != '\n') &&
long_overlay->asterisk != '*' || (buf->length < sizeof(*overlay) || overlay->cr_lf != '\r' || overlay->lf != '\n')) ||
long_overlay->semicolon != ';' || overlay->asterisk != '*' ||
long_overlay->cr != '\r' || overlay->semicolon != ';') {
long_overlay->lf != '\n') {
return false; return false;
} }
if (!airspy_adsb_parse_common(&long_overlay->common, packet, state)) { if (!airspy_adsb_parse_common(&overlay->common, packet, state)) {
return false; return false;
} }
packet->type = PACKET_TYPE_MODE_S_LONG; packet->type = PACKET_TYPE_MODE_S_LONG;
if (!hex_to_bin(packet->payload, long_overlay->payload, sizeof(long_overlay->payload) / 2)) { if (!hex_to_bin(packet->payload, overlay->payload, sizeof(overlay->payload) / 2)) {
return false; return false;
} }
buf_consume(buf, sizeof(*long_overlay)); buf_consume(buf, overlay->cr_lf == '\r' ? sizeof(*overlay) : sizeof(*overlay) - 1);
return true; return true;
} }
@@ -116,7 +114,7 @@ static void airspy_adsb_serialize_mode_s_short(struct packet *packet, struct buf
struct airspy_adsb_mode_s_short_overlay *overlay = (struct airspy_adsb_mode_s_short_overlay *) buf_at(buf, 0); struct airspy_adsb_mode_s_short_overlay *overlay = (struct airspy_adsb_mode_s_short_overlay *) buf_at(buf, 0);
overlay->asterisk = '*'; overlay->asterisk = '*';
overlay->semicolon = ';'; overlay->semicolon = ';';
overlay->cr = '\r'; overlay->cr_lf = '\r';
overlay->lf = '\n'; overlay->lf = '\n';
hex_from_bin_upper(overlay->payload, packet->payload, sizeof(overlay->payload) / 2); hex_from_bin_upper(overlay->payload, packet->payload, sizeof(overlay->payload) / 2);
@@ -129,7 +127,7 @@ static void airspy_adsb_serialize_mode_s_long(struct packet *packet, struct buf
struct airspy_adsb_mode_s_long_overlay *overlay = (struct airspy_adsb_mode_s_long_overlay *) buf_at(buf, 0); struct airspy_adsb_mode_s_long_overlay *overlay = (struct airspy_adsb_mode_s_long_overlay *) buf_at(buf, 0);
overlay->asterisk = '*'; overlay->asterisk = '*';
overlay->semicolon = ';'; overlay->semicolon = ';';
overlay->cr = '\r'; overlay->cr_lf = '\r';
overlay->lf = '\n'; overlay->lf = '\n';
hex_from_bin_upper(overlay->payload, packet->payload, sizeof(overlay->payload) / 2); hex_from_bin_upper(overlay->payload, packet->payload, sizeof(overlay->payload) / 2);

14
adsbus/raw.c
View File

@@ -27,11 +27,10 @@ struct __attribute__((packed)) raw_mode_s_long_overlay {
static bool raw_parse_mode_s_short(struct buf *buf, struct packet *packet) { static bool raw_parse_mode_s_short(struct buf *buf, struct packet *packet) {
struct raw_mode_s_short_overlay *overlay = (struct raw_mode_s_short_overlay *) buf_at(buf, 0); struct raw_mode_s_short_overlay *overlay = (struct raw_mode_s_short_overlay *) buf_at(buf, 0);
if (buf->length < sizeof(*overlay) || if (((buf->length < sizeof(*overlay) - 1 || overlay->cr_lf != '\n') &&
(buf->length < sizeof(*overlay) || overlay->cr_lf != '\r' || overlay->lf != '\n')) ||
overlay->asterisk != '*' || overlay->asterisk != '*' ||
overlay->semicolon != ';' || overlay->semicolon != ';') {
((overlay->cr_lf != '\n') &&
(overlay->cr_lf != '\r' || overlay->lf != '\n'))) {
return false; return false;
} }
if (!hex_to_bin(packet->payload, overlay->payload, sizeof(overlay->payload) / 2)) { if (!hex_to_bin(packet->payload, overlay->payload, sizeof(overlay->payload) / 2)) {
@@ -44,11 +43,10 @@ static bool raw_parse_mode_s_short(struct buf *buf, struct packet *packet) {
static bool raw_parse_mode_s_long(struct buf *buf, struct packet *packet) { static bool raw_parse_mode_s_long(struct buf *buf, struct packet *packet) {
struct raw_mode_s_long_overlay *overlay = (struct raw_mode_s_long_overlay *) buf_at(buf, 0); struct raw_mode_s_long_overlay *overlay = (struct raw_mode_s_long_overlay *) buf_at(buf, 0);
if (buf->length < sizeof(*overlay) || if (((buf->length < sizeof(*overlay) - 1 || overlay->cr_lf != '\n') &&
(buf->length < sizeof(*overlay) || overlay->cr_lf != '\r' || overlay->lf != '\n')) ||
overlay->asterisk != '*' || overlay->asterisk != '*' ||
overlay->semicolon != ';' || overlay->semicolon != ';') {
((overlay->cr_lf != '\n') &&
(overlay->cr_lf != '\r' || overlay->lf != '\n'))) {
return false; return false;
} }
if (!hex_to_bin(packet->payload, overlay->payload, sizeof(overlay->payload) / 2)) { if (!hex_to_bin(packet->payload, overlay->payload, sizeof(overlay->payload) / 2)) {