PierMesh
/
direwolf
mirror of https://github.com/wb2osz/direwolf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

decode_aprs can now process KISS or AX.25 frames as sequences of hexadecimal numbers.

This commit is contained in:
WB2OSZ 2017-05-26 19:49:44 -04:00
parent be7ee8211e
commit 1a0217ec19
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ax25_pad.c
View File

@ -724,6 +724,7 @@ packet_t ax25_dup (packet_t copy_from)
* out_heard - True if "*" found. * out_heard - True if "*" found.
* *
* Returns: True (1) if OK, false (0) if any error. * Returns: True (1) if OK, false (0) if any error.
* When 0, out_addr, out_ssid, and out_heard are unpredictable.
* *
* *
*------------------------------------------------------------------------------*/ *------------------------------------------------------------------------------*/
@ -760,7 +761,7 @@ int ax25_parse_addr (int position, char *in_addr, int strict, char *out_addr, in
maxlen = strict ? 6 : (AX25_MAX_ADDR_LEN-1); maxlen = strict ? 6 : (AX25_MAX_ADDR_LEN-1);
p = in_addr; p = in_addr;
i = 0; i = 0;
for (p = in_addr; *p != '\0' && *p != '-'; p++) { for (p = in_addr; *p != '\0' && *p != '-' && *p != '*'; p++) {
if (i >= maxlen) { if (i >= maxlen) {
text_color_set(DW_COLOR_ERROR); text_color_set(DW_COLOR_ERROR);
dw_printf ("%sAddress is too long. \"%s\" has more than %d characters.\n", position_name[position], in_addr, maxlen); dw_printf ("%sAddress is too long. \"%s\" has more than %d characters.\n", position_name[position], in_addr, maxlen);

2
decode_aprs.c
View File

@ -4838,7 +4838,7 @@ int main (int argc, char *argv[])
ax25_format_addrs (pp, addrs); ax25_format_addrs (pp, addrs);
text_color_set(DW_COLOR_DECODED); text_color_set(DW_COLOR_DECODED);
dw_printf ("%s:", addrs); dw_printf ("%s", addrs);
info_len = ax25_get_info (pp, &pinfo); info_len = ax25_get_info (pp, &pinfo);
ax25_safe_print ((char *)pinfo, info_len, 1); // Display non-ASCII to hexadecimal. ax25_safe_print ((char *)pinfo, info_len, 1); // Display non-ASCII to hexadecimal.