frag6: Refactor duplicate code

Update a test output accordingly.

(cherry picked from commit 37745f6daa8d8a23d74d045e8141a04309453dd0)

diff --git a/print-frag6.c b/print-frag6.c
index 0ac2fd7f4430d8bd966a6410ce33b8b3c380b653..a58ba90f7ccfd83a0e43febad806801613227240 100644 (file)
--- a/print-frag6.c
+++ b/print-frag6.c
@@ -42,18 +42,13 @@ frag6_print(netdissect_options *ndo, const u_char *bp, const u_char *bp2)
        dp = (const struct ip6_frag *)bp;
        ip6 = (const struct ip6_hdr *)bp2;
 
-       if (ndo->ndo_vflag) {
-               ND_PRINT("frag (0x%08x:%u|%zu)",
-                        GET_BE_U_4(dp->ip6f_ident),
-                        GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK,
-                        sizeof(struct ip6_hdr) + GET_BE_U_2(ip6->ip6_plen) -
-                               (bp - bp2) - sizeof(struct ip6_frag));
-       } else {
-               ND_PRINT("frag (%u|%zu)",
-                        GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK,
-                        sizeof(struct ip6_hdr) + GET_BE_U_2(ip6->ip6_plen) -
-                                (bp - bp2) - sizeof(struct ip6_frag));
-       }
+       ND_PRINT("frag (");
+       if (ndo->ndo_vflag)
+               ND_PRINT("0x%08x:", GET_BE_U_4(dp->ip6f_ident));
+       ND_PRINT("%u|%zu)",
+                GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK,
+                sizeof(struct ip6_hdr) + GET_BE_U_2(ip6->ip6_plen) -
+                       (bp - bp2) - sizeof(struct ip6_frag));
 
        /* it is meaningless to decode non-first fragment */
        if ((GET_BE_U_2(dp->ip6f_offlg) & IP6F_OFF_MASK) != 0)

diff --git a/tests/ip6_frag_asan.out b/tests/ip6_frag_asan.out
index 19e8de6c24f1f703db61844b608b14a54d8246fe..1ff43fc2e96e6aa4f58f3da1c2da01946d0d9b2b 100644 (file)
--- a/tests/ip6_frag_asan.out
+++ b/tests/ip6_frag_asan.out
@@ -1 +1 @@
-    1  2038-01-01 00:00:00.000000 IP6 (class 0x51, flowlabel 0xb2100, hlim 16, next-header Fragment (44) payload length: 27136) 452:22:19:0:41a:e4ff:10ff:484d > 2243:80:1400:100:19:ffff:ffff:fffb:  [|frag6]
+    1  2038-01-01 00:00:00.000000 IP6 (class 0x51, flowlabel 0xb2100, hlim 16, next-header Fragment (44) payload length: 27136) 452:22:19:0:41a:e4ff:10ff:484d > 2243:80:1400:100:19:ffff:ffff:fffb: frag ( [|frag6]