diff options
| -rw-r--r-- | print-pgm.c | 5 | ||||
| -rw-r--r-- | print-tcp.c | 7 | ||||
| -rw-r--r-- | tests/heapoverflow-tcp_print.out | 2 | ||||
| -rw-r--r-- | tests/tcp-auth-heapoverflow.out | 2 | ||||
| -rw-r--r-- | tests/tcp_header_heapoverflow.out | 2 |
5 files changed, 10 insertions, 8 deletions
diff --git a/print-pgm.c b/print-pgm.c index 5b464a8d..2ca03db1 100644 --- a/print-pgm.c +++ b/print-pgm.c @@ -168,14 +168,15 @@ pgm_print(netdissect_options *ndo, ch = '\0'; if (!ND_TTEST_2(pgm->pgm_dport)) { if (ip6) { - ND_PRINT("%s > %s: [|pgm]", + ND_PRINT("%s > %s:", ip6addr_string(ndo, ip6->ip6_src), ip6addr_string(ndo, ip6->ip6_dst)); } else { - ND_PRINT("%s > %s: [|pgm]", + ND_PRINT("%s > %s:", ipaddr_string(ndo, ip->ip_src), ipaddr_string(ndo, ip->ip_dst)); } + nd_print_trunc(ndo); return; } diff --git a/print-tcp.c b/print-tcp.c index c504d63c..e963b40a 100644 --- a/print-tcp.c +++ b/print-tcp.c @@ -183,14 +183,15 @@ tcp_print(netdissect_options *ndo, ch = '\0'; if (!ND_TTEST_2(tp->th_dport)) { if (ip6) { - ND_PRINT("%s > %s: [|tcp]", + ND_PRINT("%s > %s:", ip6addr_string(ndo, ip6->ip6_src), ip6addr_string(ndo, ip6->ip6_dst)); } else { - ND_PRINT("%s > %s: [|tcp]", + ND_PRINT("%s > %s:", ipaddr_string(ndo, ip->ip_src), ipaddr_string(ndo, ip->ip_dst)); } + nd_print_trunc(ndo); return; } @@ -789,7 +790,7 @@ tcp_print(netdissect_options *ndo, ND_PRINT(">"); return; trunc: - ND_PRINT("[|tcp]"); + nd_print_trunc(ndo); if (ch != '\0') ND_PRINT(">"); } diff --git a/tests/heapoverflow-tcp_print.out b/tests/heapoverflow-tcp_print.out index 9d316747..d7d9ed2a 100644 --- a/tests/heapoverflow-tcp_print.out +++ b/tests/heapoverflow-tcp_print.out @@ -1,2 +1,2 @@ IP (tos 0x30, ttl 48, id 12336, offset 0, flags [DF], proto TCP (6), length 12336, bad cksum 3030 (->29a8)!) - 48.48.48.48.12336 > 48.48.48.48.12336: Flags [.U], seq 808464432:808476688, ack 808464432, win 12336, urg 12336, options [unknown-48 0x3030303030303030[|tcp] + 48.48.48.48.12336 > 48.48.48.48.12336: Flags [.U], seq 808464432:808476688, ack 808464432, win 12336, urg 12336, options [unknown-48 0x3030303030303030 [|tcp] diff --git a/tests/tcp-auth-heapoverflow.out b/tests/tcp-auth-heapoverflow.out index b7ff7f7a..6490f8be 100644 --- a/tests/tcp-auth-heapoverflow.out +++ b/tests/tcp-auth-heapoverflow.out @@ -1,2 +1,2 @@ IP (tos 0x30, ttl 48, id 12336, offset 0, flags [DF], proto TCP (6), length 12336, bad cksum 3030 (->29a8)!) - 48.48.48.48.12336 > 48.48.48.48.12336: Flags [.U], seq 808464432:808476696, ack 808464432, win 12336, urg 12336, options [tcp-ao keyid 48 rnextkeyid 48 mac 0x303030303030[|tcp] + 48.48.48.48.12336 > 48.48.48.48.12336: Flags [.U], seq 808464432:808476696, ack 808464432, win 12336, urg 12336, options [tcp-ao keyid 48 rnextkeyid 48 mac 0x303030303030 [|tcp] diff --git a/tests/tcp_header_heapoverflow.out b/tests/tcp_header_heapoverflow.out index 0f830aba..1ee2960f 100644 --- a/tests/tcp_header_heapoverflow.out +++ b/tests/tcp_header_heapoverflow.out @@ -1,2 +1,2 @@ IP (tos 0x30, ttl 48, id 12336, offset 0, flags [none], proto TCP (6), length 12336, bad cksum 3030 (->69a8)!) - 48.48.48.48.12336 > 48.48.48.48.12336: [|tcp] + 48.48.48.48.12336 > 48.48.48.48.12336: [|tcp] |