ICMPv6: Add the IPv6-Only flag

[tcpdump] / print-fr.c

diff --git a/print-fr.c b/print-fr.c
index 9d39f0b280d045912cbf85003a407f23188aae8f..8565dae5ff273b7feaf789b3e081e7b69c68ded6 100644 (file)
--- a/print-fr.c
+++ b/print-fr.c
@@ -227,8 +227,8 @@ fr_if_print(netdissect_options *ndo,
             return (0);
         else
             return length;
             return (0);
         else
             return length;

- trunc:
-        ND_PRINT("[|fr]");
+trunc:
+        nd_print_trunc(ndo);

         return caplen;
 }
 
         return caplen;
 }
 


@@ -365,8 +365,8 @@ fr_print(netdissect_options *ndo,
 
        return hdr_len;
 
 
        return hdr_len;
 

- trunc:
-        ND_PRINT("[|fr]");
+trunc:
+        nd_print_trunc(ndo);

         return 0;
 
 }
         return 0;
 
 }


@@ -385,8 +385,8 @@ mfr_if_print(netdissect_options *ndo,
             return (0);
         else
             return length;
             return (0);
         else
             return length;

- trunc:
-        ND_PRINT("[|mfr]");
+trunc:
+        nd_print_trunc(ndo);

         return caplen;
 }
 
         return caplen;
 }
 


@@ -502,7 +502,7 @@ mfr_print(netdissect_options *ndo,
             case MFR_CTRL_IE_LINK_ID:
                 for (idx = 0; idx < ie_len && idx < MFR_ID_STRING_MAXLEN; idx++) {
                     if (EXTRACT_U_1(tptr + idx) != 0) /* don't print null termination */
             case MFR_CTRL_IE_LINK_ID:
                 for (idx = 0; idx < ie_len && idx < MFR_ID_STRING_MAXLEN; idx++) {
                     if (EXTRACT_U_1(tptr + idx) != 0) /* don't print null termination */

-                        safeputchar(ndo, EXTRACT_U_1(tptr + idx));
+                        fn_print_char(ndo, EXTRACT_U_1(tptr + idx));

                     else
                         break;
                 }
                     else
                         break;
                 }


@@ -574,8 +574,8 @@ mfr_print(netdissect_options *ndo,
 
     return hdr_len;
 
 
     return hdr_len;
 

- trunc:
-    ND_PRINT("[|mfr]");
+trunc:
+    nd_print_trunc(ndo);

     return length;
 }
 
     return length;
 }
 


@@ -626,7 +626,7 @@ frf15_print(netdissect_options *ndo,
     return;
 
 trunc:
     return;
 
 trunc:

-    ND_PRINT("[|frf.15]");
+    nd_print_trunc(ndo);

 }
 
 /*
 }
 
 /*


@@ -802,7 +802,7 @@ q933_print(netdissect_options *ndo,
        u_int non_locking_shift;
        u_int unshift_codeset;
 
        u_int non_locking_shift;
        u_int unshift_codeset;
 

-       ndo->ndo_protocol = "q933";
+       ndo->ndo_protocol = "q.933";

        ND_PRINT("%s", ndo->ndo_eflag ? "" : "Q.933");
 
        if (length == 0 || !ND_TTEST_1(p)) {
        ND_PRINT("%s", ndo->ndo_eflag ? "" : "Q.933");
 
        if (length == 0 || !ND_TTEST_1(p)) {


@@ -1064,7 +1064,7 @@ q933_print(netdissect_options *ndo,
        return;
 
 trunc:
        return;
 
 trunc:

-       ND_PRINT("[|q.933]");
+       nd_print_trunc(ndo);

 }
 
 static int
 }
 
 static int