Skip to content

Commit 1a0217e

Browse files
committed
decode_aprs can now process KISS or AX.25 frames as sequences of hexadecimal numbers.
1 parent be7ee82 commit 1a0217e

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

ax25_pad.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -724,6 +724,7 @@ packet_t ax25_dup (packet_t copy_from)
724724
* out_heard - True if "*" found.
725725
*
726726
* Returns: True (1) if OK, false (0) if any error.
727+
* When 0, out_addr, out_ssid, and out_heard are unpredictable.
727728
*
728729
*
729730
*------------------------------------------------------------------------------*/
@@ -760,7 +761,7 @@ int ax25_parse_addr (int position, char *in_addr, int strict, char *out_addr, in
760761
maxlen = strict ? 6 : (AX25_MAX_ADDR_LEN-1);
761762
p = in_addr;
762763
i = 0;
763-
for (p = in_addr; *p != '\0' && *p != '-'; p++) {
764+
for (p = in_addr; *p != '\0' && *p != '-' && *p != '*'; p++) {
764765
if (i >= maxlen) {
765766
text_color_set(DW_COLOR_ERROR);
766767
dw_printf ("%sAddress is too long. \"%s\" has more than %d characters.\n", position_name[position], in_addr, maxlen);

decode_aprs.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -4838,7 +4838,7 @@ int main (int argc, char *argv[])
48384838

48394839
ax25_format_addrs (pp, addrs);
48404840
text_color_set(DW_COLOR_DECODED);
4841-
dw_printf ("%s:", addrs);
4841+
dw_printf ("%s", addrs);
48424842

48434843
info_len = ax25_get_info (pp, &pinfo);
48444844
ax25_safe_print ((char *)pinfo, info_len, 1); // Display non-ASCII to hexadecimal.

0 commit comments

Comments
 (0)