Skip to content

Commit dc9bc8d

Browse files
wb2oszwb2osz
committed
Fix ax25_set_addr: Assertion.
1 parent 6d836c1 commit dc9bc8d

File tree

2 files changed

+50
-46
lines changed

2 files changed

+50
-46
lines changed

‎ax25_pad.c

+34-33
Original file line numberDiff line numberDiff line change
@@ -483,9 +483,8 @@ packet_t ax25_from_text (char *monitor, int strict)
483483
return (NULL);
484484
}
485485

486-
ax25_set_addr (this_p, AX25_SOURCE, pa);
486+
ax25_set_addr (this_p, AX25_SOURCE, atemp);
487487
ax25_set_h (this_p, AX25_SOURCE); // c/r in this position
488-
489488
ax25_set_ssid (this_p, AX25_SOURCE, ssid_temp);
490489

491490
/*
@@ -507,9 +506,8 @@ packet_t ax25_from_text (char *monitor, int strict)
507506
return (NULL);
508507
}
509508

510-
ax25_set_addr (this_p, AX25_DESTINATION, pa);
509+
ax25_set_addr (this_p, AX25_DESTINATION, atemp);
511510
ax25_set_h (this_p, AX25_DESTINATION); // c/r in this position
512-
513511
ax25_set_ssid (this_p, AX25_DESTINATION, ssid_temp);
514512

515513
/*
@@ -522,17 +520,14 @@ packet_t ax25_from_text (char *monitor, int strict)
522520

523521
k = this_p->num_addr;
524522

525-
// JWL 10:38 this_p->num_addr++;
526-
527523
if ( ! ax25_parse_addr (k, pa, strict, atemp, &ssid_temp, &heard_temp)) {
528524
text_color_set(DW_COLOR_ERROR);
529525
dw_printf ("Failed to create packet from text. Bad digipeater address\n");
530526
ax25_delete (this_p);
531527
return (NULL);
532528
}
533529

534-
ax25_set_addr (this_p, k, pa);
535-
530+
ax25_set_addr (this_p, k, atemp);
536531
ax25_set_ssid (this_p, k, ssid_temp);
537532

538533
// Does it have an "*" at the end?
@@ -934,7 +929,6 @@ void ax25_set_addr (packet_t this_p, int n, char *ad)
934929
assert (this_p->magic1 == MAGIC);
935930
assert (this_p->magic2 == MAGIC);
936931
assert (n >= 0 && n < AX25_MAX_ADDRS);
937-
assert (strlen(ad) < AX25_MAX_ADDR_LEN);
938932

939933
//dw_printf ("ax25_set_addr (%d, %s) num_addr=%d\n", n, ad, this_p->num_addr);
940934

@@ -944,6 +938,11 @@ void ax25_set_addr (packet_t this_p, int n, char *ad)
944938
/*
945939
* Set existing address position.
946940
*/
941+
942+
// Why aren't we setting 'strict' here?
943+
// Messages from IGate have q-constructs.
944+
// We use this to parse it and later remove unwanted parts.
945+
947946
ax25_parse_addr (n, ad, 0, atemp, &ssid_temp, &heard_temp);
948947

949948
memset (this_p->frame_data + n*7, ' ' << 1, 6);
@@ -1011,7 +1010,6 @@ void ax25_insert_addr (packet_t this_p, int n, char *ad)
10111010
assert (this_p->magic1 == MAGIC);
10121011
assert (this_p->magic2 == MAGIC);
10131012
assert (n >= AX25_REPEATER_1 && n < AX25_MAX_ADDRS);
1014-
assert (strlen(ad) < AX25_MAX_ADDR_LEN);
10151013

10161014
//dw_printf ("ax25_insert_addr (%d, %s)\n", n, ad);
10171015

@@ -1770,11 +1768,12 @@ int ax25_pack (packet_t this_p, unsigned char result[AX25_MAX_PACKET_LEN])
17701768
*------------------------------------------------------------------*/
17711769

17721770
// TODO: need someway to ensure caller allocated enough space.
1773-
#define DESC_SIZ 16
1771+
#define DESC_SIZ 32
17741772

17751773
ax25_frame_type_t ax25_frame_type (packet_t this_p, ax25_modulo_t modulo, char *desc, int *pf, int *nr, int *ns)
17761774
{
1777-
int c;
1775+
int c; // U frames are always one control byte.
1776+
int c2; // I & S frames can have second Control byte.
17781777

17791778
assert (this_p->magic1 == MAGIC);
17801779
assert (this_p->magic2 == MAGIC);
@@ -1789,13 +1788,16 @@ ax25_frame_type_t ax25_frame_type (packet_t this_p, ax25_modulo_t modulo, char *
17891788
strlcpy (desc, "Not AX.25", DESC_SIZ);
17901789
return (frame_not_AX25);
17911790
}
1791+
if (modulo == modulo_128) {
1792+
c2 = ax25_get_c2 (this_p);
1793+
}
1794+
17921795

17931796
if ((c & 1) == 0) {
17941797

1795-
// Information
1798+
// Information rrr p sss 0 or sssssss 0 rrrrrrr p
17961799

17971800
if (modulo == modulo_128) {
1798-
int c2 = ax25_get_c2 (this_p);
17991801
*ns = (c >> 1) & 0x7f;
18001802
*pf = c2 & 1;
18011803
*nr = (c2 >> 1) & 0x7f;
@@ -1805,15 +1807,14 @@ ax25_frame_type_t ax25_frame_type (packet_t this_p, ax25_modulo_t modulo, char *
18051807
*pf = (c >> 4) & 1;
18061808
*nr = (c >> 5) & 7;
18071809
}
1808-
strlcpy (desc, "I frame", DESC_SIZ);
1810+
snprintf (desc, DESC_SIZ, "I frame, n(s)= %d, n(r)=%d, p=%d", *ns, *nr, *pf);
18091811
return (frame_type_I);
18101812
}
18111813
else if ((c & 2) == 0) {
18121814

1813-
// Supervisory
1815+
// Supervisory rrr p/f ss 0 1 or 0000 ss 0 1 rrrrrrr p/f
18141816

18151817
if (modulo == modulo_128) {
1816-
int c2 = ax25_get_c2 (this_p);
18171818
*pf = c2 & 1;
18181819
*nr = (c2 >> 1) & 0x7f;
18191820
}
@@ -1823,35 +1824,35 @@ ax25_frame_type_t ax25_frame_type (packet_t this_p, ax25_modulo_t modulo, char *
18231824
}
18241825

18251826
switch ((c >> 2) & 3) {
1826-
case 0: strlcpy (desc, "S frame RR", DESC_SIZ); return (frame_type_RR); break;
1827-
case 1: strlcpy (desc, "S frame RNR", DESC_SIZ); return (frame_type_RNR); break;
1828-
case 2: strlcpy (desc, "S frame REJ", DESC_SIZ); return (frame_type_REJ); break;
1829-
case 3: strlcpy (desc, "S frame SREJ", DESC_SIZ); return (frame_type_SREJ); break;
1827+
case 0: snprintf (desc, DESC_SIZ, "S frame RR, n(r)=%d, p/f=%d", *nr, *pf); return (frame_type_S_RR); break;
1828+
case 1: snprintf (desc, DESC_SIZ, "S frame RNR, n(r)=%d, p/f=%d", *nr, *pf); return (frame_type_S_RNR); break;
1829+
case 2: snprintf (desc, DESC_SIZ, "S frame REJ, n(r)=%d, p/f=%d", *nr, *pf); return (frame_type_S_REJ); break;
1830+
case 3: snprintf (desc, DESC_SIZ, "S frame SREJ, n(r)=%d, p/f=%d", *nr, *pf); return (frame_type_S_SREJ); break;
18301831
}
18311832
}
18321833
else {
18331834

1834-
// Unnumbered
1835+
// Unnumbered mmm p/f mm 1 1
18351836

18361837
*pf = (c >> 4) & 1;
18371838

18381839
switch (c & 0xef) {
18391840

1840-
case 0x6f: strlcpy (desc, "U frame SABME", DESC_SIZ); return (frame_type_SABME); break;
1841-
case 0x2f: strlcpy (desc, "U frame SABM", DESC_SIZ); return (frame_type_SABM); break;
1842-
case 0x43: strlcpy (desc, "U frame DISC", DESC_SIZ); return (frame_type_DISC); break;
1843-
case 0x0f: strlcpy (desc, "U frame DM", DESC_SIZ); return (frame_type_DM); break;
1844-
case 0x63: strlcpy (desc, "U frame UA", DESC_SIZ); return (frame_type_UA); break;
1845-
case 0x87: strlcpy (desc, "U frame FRMR", DESC_SIZ); return (frame_type_FRMR); break;
1846-
case 0x03: strlcpy (desc, "U frame UI", DESC_SIZ); return (frame_type_UI); break;
1847-
case 0xaf: strlcpy (desc, "U frame XID", DESC_SIZ); return (frame_type_XID); break;
1848-
case 0xe3: strlcpy (desc, "U frame TEST", DESC_SIZ); return (frame_type_TEST); break;
1849-
default: strlcpy (desc, "U frame ???", DESC_SIZ); return (frame_type_U); break;
1841+
case 0x6f: snprintf (desc, DESC_SIZ, "U frame SABME, p=%d", *pf); return (frame_type_U_SABME); break;
1842+
case 0x2f: snprintf (desc, DESC_SIZ, "U frame SABM, p=%d", *pf); return (frame_type_U_SABM); break;
1843+
case 0x43: snprintf (desc, DESC_SIZ, "U frame DISC, p=%d", *pf); return (frame_type_U_DISC); break;
1844+
case 0x0f: snprintf (desc, DESC_SIZ, "U frame DM, f=%d", *pf); return (frame_type_U_DM); break;
1845+
case 0x63: snprintf (desc, DESC_SIZ, "U frame UA, f=%d", *pf); return (frame_type_U_UA); break;
1846+
case 0x87: snprintf (desc, DESC_SIZ, "U frame FRMR, f=%d", *pf); return (frame_type_U_FRMR); break;
1847+
case 0x03: snprintf (desc, DESC_SIZ, "U frame UI, pf=%d", *pf); return (frame_type_U_UI); break;
1848+
case 0xaf: snprintf (desc, DESC_SIZ, "U frame XID, pf=%d", *pf); return (frame_type_U_XID); break;
1849+
case 0xe3: snprintf (desc, DESC_SIZ, "U frame TEST, pf=%d", *pf); return (frame_type_U_TEST); break;
1850+
default: snprintf (desc, DESC_SIZ, "U frame ???"); return (frame_type_U); break;
18501851
}
18511852
}
18521853

18531854
// Should be unreachable but compiler doesn't realize that.
1854-
// Suppress "warning: control reaches end of non-void function"
1855+
// Here only to suppress "warning: control reaches end of non-void function"
18551856

18561857
return (frame_not_AX25);
18571858

‎ax25_pad.h

+16-13
Original file line numberDiff line numberDiff line change
@@ -236,20 +236,23 @@ typedef enum ax25_modulo_e { modulo_8 = 8, modulo_128 = 128 } ax25_modulo_t;
236236
typedef enum ax25_frame_type_e {
237237

238238
frame_type_I, // Information
239-
frame_type_RR, // Receive Ready - System Ready To Receive
240-
frame_type_RNR, // Receive Not Ready - TNC Buffer Full
241-
frame_type_REJ, // Reject Frame - Out of Sequence or Duplicate
242-
frame_type_SREJ, // Selective Reject - Request single frame repeat
243-
frame_type_SABME, // Set Async Balanced Mode, Extended
244-
frame_type_SABM, // Set Async Balanced Mode
245-
frame_type_DISC, // Disconnect
246-
frame_type_DM, // Disconnect Mode
247-
frame_type_UA, // Unnumbered Acknowledge
248-
frame_type_FRMR, // Frame Reject
249-
frame_type_UI, // Unnumbered Information
250-
frame_type_XID, // Exchange Identification
251-
frame_type_TEST, // Test
239+
240+
frame_type_S_RR, // Receive Ready - System Ready To Receive
241+
frame_type_S_RNR, // Receive Not Ready - TNC Buffer Full
242+
frame_type_S_REJ, // Reject Frame - Out of Sequence or Duplicate
243+
frame_type_S_SREJ, // Selective Reject - Request single frame repeat
244+
245+
frame_type_U_SABME, // Set Async Balanced Mode, Extended
246+
frame_type_U_SABM, // Set Async Balanced Mode
247+
frame_type_U_DISC, // Disconnect
248+
frame_type_U_DM, // Disconnect Mode
249+
frame_type_U_UA, // Unnumbered Acknowledge
250+
frame_type_U_FRMR, // Frame Reject
251+
frame_type_U_UI, // Unnumbered Information
252+
frame_type_U_XID, // Exchange Identification
253+
frame_type_U_TEST, // Test
252254
frame_type_U, // other Unnumbered, not used by AX.25.
255+
253256
frame_not_AX25 // Could not get control byte from frame.
254257

255258
} ax25_frame_type_t;

0 commit comments

Comments
 (0)