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

Add mode AC handling, and clean up the parsers and serializers to avoid duplication.

Browse Source
This commit is contained in:
Ian Gulliver
2016-02-27 21:50:15 -08:00
parent b7e32d1b48
commit 92334724f0
10 changed files with 176 additions and 296 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
adsbus/proto.c
View File

@@ -55,6 +55,14 @@ static void proto_serialize_packet(struct packet *packet, AdsbPacket *out, size_
out->payload.len = len;
}
static void proto_serialize_mode_ac(struct packet *packet, struct buf *buf) {
AdsbPacket packet_out = ADSB_PACKET__INIT;
proto_serialize_packet(packet, &packet_out, 2);
Adsb msg = ADSB__INIT;
msg.mode_ac = &packet_out;
proto_wrap_to_buf(&msg, buf);
}
static void proto_serialize_mode_s_short(struct packet *packet, struct buf *buf) {
AdsbPacket packet_out = ADSB_PACKET__INIT;
proto_serialize_packet(packet, &packet_out, 7);
@@ -216,6 +224,12 @@ bool proto_parse(struct buf *buf, struct packet *packet, void *state_in) {
return false;
}
packet->type = PACKET_TYPE_NONE;
} else if (msg->mode_ac) {
if (!proto_parse_packet(msg->mode_ac, packet, state, 2)) {
adsb__free_unpacked(msg, NULL);
return false;
}
packet->type = PACKET_TYPE_MODE_AC;
} else if (msg->mode_s_short) {
if (!proto_parse_packet(msg->mode_s_short, packet, state, 7)) {
adsb__free_unpacked(msg, NULL);
@@ -244,6 +258,11 @@ void proto_serialize(struct packet *packet, struct buf *buf) {
case PACKET_TYPE_NONE:
break;
case PACKET_TYPE_MODE_AC:
proto_serialize_mode_ac(packet, buf);
break;
case PACKET_TYPE_MODE_S_SHORT:
proto_serialize_mode_s_short(packet, buf);
break;