ua1zbe
/
aprsc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

APRS object parsing: Timestamp may end with one of z, h or / 

... and Lynn's ISS objects have HHMMSSh timestamps. Accept as valid.
This commit is contained in:
Heikki Hannikainen 2014-02-18 08:26:29 +02:00
parent 0998247967
commit 2fda70d34b
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/parse_aprs.c
View File

@ -885,9 +885,10 @@ static int parse_aprs_object(struct pbuf_t *pb, const char *body, const char *bo
return 0; return 0;
} }
/* check that the timestamp ends with a z */ /* check that the timestamp ends with one of the valid timestamp type IDs */
if (body[16] != 'z' && body[16] != 'Z') { char tz_end = body[16];
// fprintf(stderr, "\tinvalid object timestamp z character\n"); if (tz_end != 'z' && tz_end != 'Z' && tz_end != 'h' && tz_end != '/') {
DEBUG_LOG("\tinvalid object timestamp z character");
return 0; return 0;
} }
@ -911,7 +912,7 @@ static int parse_aprs_object(struct pbuf_t *pb, const char *body, const char *bo
pb->srcname = body; pb->srcname = body;
pb->srcname_len = namelen+1; pb->srcname_len = namelen+1;
// fprintf(stderr, "\tobject name: '%.*s'\n", pb->srcname_len, pb->srcname); DEBUG_LOG("object name: '%.*s'", pb->srcname_len, pb->srcname);
/* Forward the location parsing onwards */ /* Forward the location parsing onwards */
if (valid_sym_table_compressed(body[17])) if (valid_sym_table_compressed(body[17]))
@ -920,7 +921,7 @@ static int parse_aprs_object(struct pbuf_t *pb, const char *body, const char *bo
if (body[17] >= '0' && body[17] <= '9') if (body[17] >= '0' && body[17] <= '9')
return parse_aprs_uncompressed(pb, body + 17, body_end); return parse_aprs_uncompressed(pb, body + 17, body_end);
DEBUG_LOG("\tno valid position in object"); DEBUG_LOG("no valid position in object");
return 0; return 0;
} }