xan/patty
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Slight refactor of src/decode.c

Browse source
This commit is contained in:
XANTRONIX 2020-05-23 11:05:32 -04:00 • committed by XANTRONIX Industrial
parent 627bc70e0f
commit a423467037
1 changed files with 43 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/decode.c
View file

@ -103,6 +103,37 @@ static int address_fprint(FILE *stream, const patty_ax25_frame *frame) {
return 0; return 0;
} }
static int frame_fprint(FILE *stream,
const patty_ax25_frame *frame,
void *data,
size_t len) {
if (address_fprint(stream, frame) < 0) {
goto error_io;
}
if (frame->type == PATTY_AX25_FRAME_INFO) {
if (fprintf(stream, " poll %d ns %d nr %d",
PATTY_AX25_CONTROL_POLL(frame->control),
PATTY_AX25_CONTROL_SEQ_SEND(frame->control),
PATTY_AX25_CONTROL_SEQ_RECV(frame->control)) < 0) {
goto error_io;
}
}
if (fprintf(stream, " proto %02x %ld bytes\n", frame->proto, len) < 0) {
goto error_io;
}
if (hexdump_fprint(stream, data, len) < 0) {
goto error_io;
}
return 0;
error_io:
return -1;
}
int main(int argc, char **argv) { int main(int argc, char **argv) {
patty_kiss_tnc *tnc; patty_kiss_tnc *tnc;
ssize_t len; ssize_t len;
@ -116,7 +147,7 @@ int main(int argc, char **argv) {
if ((tnc = patty_kiss_tnc_open(argv[1], 330)) == NULL) { if ((tnc = patty_kiss_tnc_open(argv[1], 330)) == NULL) {
perror("Unable to open TNC"); perror("Unable to open TNC");
exit(127); goto error_kiss_tnc_open;
} }
while ((len = patty_kiss_tnc_recv(tnc, &data, &port)) > 0) { while ((len = patty_kiss_tnc_recv(tnc, &data, &port)) > 0) {
@ -125,24 +156,24 @@ int main(int argc, char **argv) {
if (patty_ax25_frame_decode(&frame, data, len) < 0) { if (patty_ax25_frame_decode(&frame, data, len) < 0) {
perror("Unable to decode frame"); perror("Unable to decode frame");
exit(127); goto error_ax25_frame_decode;
} }
address_fprint(stderr, &frame); if (frame_fprint(stderr, &frame, data, len) < 0) {
perror("Unable to print frame");
if (frame.type == PATTY_AX25_FRAME_INFO) { goto error_frame_fprint;
fprintf(stderr, " poll %d", PATTY_AX25_CONTROL_POLL(frame.control));
fprintf(stderr, " ns %d", PATTY_AX25_CONTROL_SEQ_SEND(frame.control));
fprintf(stderr, " nr %d", PATTY_AX25_CONTROL_SEQ_RECV(frame.control));
} }
fprintf(stderr, " proto %02x", frame.proto);
fprintf(stderr, " %ld bytes\n", len);
hexdump_fprint(stderr, data, len);
} }
patty_kiss_tnc_close(tnc); patty_kiss_tnc_close(tnc);
return 0; return 0;
error_frame_fprint:
error_ax25_frame_decode:
patty_kiss_tnc_close(tnc);
error_kiss_tnc_open:
return 127;
} }