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

issue 530 - Put * after all used addresses.

This commit is contained in:
wb2osz 2024-09-13 16:13:21 +01:00
parent 312d558923
commit 48f524d5fc
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/server.c
View File

@ -976,6 +976,9 @@ void server_send_monitored (int chan, packet_t pp, int own_xmit)
// Format addresses in AGWPR monitoring format such as: // Format addresses in AGWPR monitoring format such as:
// 1:Fm ZL4FOX-8 To Q7P2U2 Via WIDE3-3 // 1:Fm ZL4FOX-8 To Q7P2U2 Via WIDE3-3
// Issue 530 pointed out that in this situation it is customary to put * after each used address,
// not just the last used as in the TNC-2 monitoring format.
static void mon_addrs (int chan, packet_t pp, char *result, int result_size) static void mon_addrs (int chan, packet_t pp, char *result, int result_size)
{ {
char src[AX25_MAX_ADDR_LEN]; char src[AX25_MAX_ADDR_LEN];
@ -986,16 +989,20 @@ static void mon_addrs (int chan, packet_t pp, char *result, int result_size)
int num_digi = ax25_get_num_repeaters(pp); int num_digi = ax25_get_num_repeaters(pp);
if (num_digi > 0) { if (num_digi > 0) {
char via[AX25_MAX_REPEATERS*(AX25_MAX_ADDR_LEN+1)]; // complete via path
strlcpy (via, "", sizeof(via));
char via[AX25_MAX_REPEATERS*(AX25_MAX_ADDR_LEN+1)]; for (int j = 0; j < num_digi; j++) {
char stemp[AX25_MAX_ADDR_LEN+1]; char digiaddr[AX25_MAX_ADDR_LEN];
int j;
ax25_get_addr_with_ssid (pp, AX25_REPEATER_1, via); if (j != 0) {
for (j = 1; j < num_digi; j++) { strlcat (via, ",", sizeof(via)); // comma if not first address
ax25_get_addr_with_ssid (pp, AX25_REPEATER_1 + j, stemp); }
strlcat (via, ",", sizeof(via)); ax25_get_addr_with_ssid (pp, AX25_REPEATER_1 + j, digiaddr);
strlcat (via, stemp, sizeof(via)); strlcat (via, digiaddr, sizeof(via));
if (ax25_get_h(pp, AX25_REPEATER_1 + j)) {
strlcat (via, "*", sizeof(via));
}
} }
snprintf (result, result_size, " %d:Fm %s To %s Via %s ", snprintf (result, result_size, " %d:Fm %s To %s Via %s ",
chan+1, src, dst, via); chan+1, src, dst, via);