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

Factor out parsing of different packet types.

Browse Source
This commit is contained in:
Ian Gulliver
2016-02-16 03:33:43 +00:00
parent a1e0e2fe9f
commit 1d762390ac
1 changed files with 39 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
airspy_adsb.c
View File

@@ -44,20 +44,15 @@ void airspy_adsb_init() {
assert(sizeof(struct airspy_adsb_parser_state) <= PARSER_STATE_LEN); assert(sizeof(struct airspy_adsb_parser_state) <= PARSER_STATE_LEN);
} }
bool airspy_adsb_parse(struct backend *backend, struct packet *packet) { static bool airspy_adsb_parse_mode_s_short(struct buf *buf, struct packet *packet, struct airspy_adsb_parser_state *state) {
struct buf *buf = &backend->buf; struct airspy_adsb_mode_s_short_overlay *short_overlay = (struct airspy_adsb_mode_s_short_overlay *) buf_at(buf, 0);
struct airspy_adsb_parser_state *state = (struct airspy_adsb_parser_state *) backend->parser_state;
if (buf->length < 35 || if (buf->length < 35 ||
buf_chr(buf, 0) != '*') { short_overlay->asterisk != '*' ||
short_overlay->semicolon != ';' ||
short_overlay->cr != '\r' ||
short_overlay->lf != '\n') {
return false; return false;
} }
{
struct airspy_adsb_mode_s_short_overlay *short_overlay = (struct airspy_adsb_mode_s_short_overlay *) buf_at(buf, 0);
if (short_overlay->cr == '\r' &&
short_overlay->lf == '\n' &&
short_overlay->semicolon == ';') {
if (!airspy_adsb_parse_common(&short_overlay->common, packet, state)) { if (!airspy_adsb_parse_common(&short_overlay->common, packet, state)) {
return false; return false;
} }
@@ -66,14 +61,16 @@ bool airspy_adsb_parse(struct backend *backend, struct packet *packet) {
buf_consume(buf, sizeof(*short_overlay)); buf_consume(buf, sizeof(*short_overlay));
return true; return true;
} }
}
{ 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 *long_overlay = (struct airspy_adsb_mode_s_long_overlay *) buf_at(buf, 0);
if (buf->length >= 49 && if (buf->length < 49 ||
long_overlay->cr == '\r' && long_overlay->asterisk != '*' ||
long_overlay->lf == '\n' && long_overlay->semicolon != ';' ||
long_overlay->semicolon == ';') { long_overlay->cr != '\r' ||
long_overlay->lf != '\n') {
return false;
}
if (!airspy_adsb_parse_common(&long_overlay->common, packet, state)) { if (!airspy_adsb_parse_common(&long_overlay->common, packet, state)) {
return false; return false;
} }
@@ -82,9 +79,14 @@ bool airspy_adsb_parse(struct backend *backend, struct packet *packet) {
buf_consume(buf, sizeof(*long_overlay)); buf_consume(buf, sizeof(*long_overlay));
return true; return true;
} }
}
return false; bool airspy_adsb_parse(struct backend *backend, struct packet *packet) {
struct buf *buf = &backend->buf;
struct airspy_adsb_parser_state *state = (struct airspy_adsb_parser_state *) backend->parser_state;
return (
airspy_adsb_parse_mode_s_short(buf, packet, state) ||
airspy_adsb_parse_mode_s_long(buf, packet, state));
} }
static bool airspy_adsb_parse_common(struct airspy_adsb_common_overlay *overlay, struct packet *packet, struct airspy_adsb_parser_state *state) { static bool airspy_adsb_parse_common(struct airspy_adsb_common_overlay *overlay, struct packet *packet, struct airspy_adsb_parser_state *state) {