Update ND_PRINT() as a variadic macro

[tcpdump] / print-gre.c

diff --git a/print-gre.c b/print-gre.c
index 672ed956bf5502bfeea26b876a505f2eba236f8b..06744cf6efde145a9a1071b6403043d52469bbf5 100644 (file)
--- a/print-gre.c
+++ b/print-gre.c
@@ -93,7 +93,7 @@ gre_print(netdissect_options *ndo, const u_char *bp, u_int length)
        if (len < 2)
                goto trunc;
        vers = EXTRACT_BE_U_2(bp) & GRE_VERS_MASK;
-        ND_PRINT((ndo, "GREv%u",vers));
+        ND_PRINT("GREv%u",vers);
 
         switch(vers) {
         case 0:
@@ -103,13 +103,13 @@ gre_print(netdissect_options *ndo, const u_char *bp, u_int length)
             gre_print_1(ndo, bp, len);
             break;
        default:
-            ND_PRINT((ndo, " ERROR: unknown-version"));
+            ND_PRINT(" ERROR: unknown-version");
             break;
         }
         return;
 
 trunc:
-       ND_PRINT((ndo, "%s", tstr));
+       ND_PRINT("%s", tstr);
        return;
 }
 
@@ -122,8 +122,8 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
        /* 16 bits ND_TCHECKed in gre_print() */
        flags = EXTRACT_BE_U_2(bp);
         if (ndo->ndo_vflag)
-            ND_PRINT((ndo, ", Flags [%s]",
-                   bittok2str(gre_flag_values,"none",flags)));
+            ND_PRINT(", Flags [%s]",
+                   bittok2str(gre_flag_values,"none",flags));
 
        len -= 2;
        bp += 2;
@@ -140,14 +140,14 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
                if (len < 2)
                        goto trunc;
                if (ndo->ndo_vflag)
-                       ND_PRINT((ndo, ", sum 0x%x", EXTRACT_BE_U_2(bp)));
+                       ND_PRINT(", sum 0x%x", EXTRACT_BE_U_2(bp));
                bp += 2;
                len -= 2;
 
                ND_TCHECK_2(bp);
                if (len < 2)
                        goto trunc;
-               ND_PRINT((ndo, ", off 0x%x", EXTRACT_BE_U_2(bp)));
+               ND_PRINT(", off 0x%x", EXTRACT_BE_U_2(bp));
                bp += 2;
                len -= 2;
        }
@@ -156,7 +156,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
                ND_TCHECK_4(bp);
                if (len < 4)
                        goto trunc;
-               ND_PRINT((ndo, ", key=0x%x", EXTRACT_BE_U_4(bp)));
+               ND_PRINT(", key=0x%x", EXTRACT_BE_U_4(bp));
                bp += 4;
                len -= 4;
        }
@@ -165,7 +165,7 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
                ND_TCHECK_4(bp);
                if (len < 4)
                        goto trunc;
-               ND_PRINT((ndo, ", seq %u", EXTRACT_BE_U_4(bp)));
+               ND_PRINT(", seq %u", EXTRACT_BE_U_4(bp));
                bp += 4;
                len -= 4;
        }
@@ -199,16 +199,16 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
        }
 
         if (ndo->ndo_eflag)
-            ND_PRINT((ndo, ", proto %s (0x%04x)",
+            ND_PRINT(", proto %s (0x%04x)",
                    tok2str(ethertype_values,"unknown",prot),
-                   prot));
+                   prot);
 
-        ND_PRINT((ndo, ", length %u",length));
+        ND_PRINT(", length %u",length);
 
         if (ndo->ndo_vflag < 1)
-            ND_PRINT((ndo, ": ")); /* put in a colon as protocol demarc */
+            ND_PRINT(": "); /* put in a colon as protocol demarc */
         else
-            ND_PRINT((ndo, "\n\t")); /* if verbose go multiline */
+            ND_PRINT("\n\t"); /* if verbose go multiline */
 
        switch (prot) {
        case ETHERTYPE_IP:
@@ -233,12 +233,12 @@ gre_print_0(netdissect_options *ndo, const u_char *bp, u_int length)
                ether_print(ndo, bp, len, ndo->ndo_snapend - bp, NULL, NULL);
                break;
        default:
-               ND_PRINT((ndo, "gre-proto-0x%x", prot));
+               ND_PRINT("gre-proto-0x%x", prot);
        }
        return;
 
 trunc:
-       ND_PRINT((ndo, "%s", tstr));
+       ND_PRINT("%s", tstr);
 }
 
 static void
@@ -253,8 +253,8 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
        bp += 2;
 
        if (ndo->ndo_vflag)
-            ND_PRINT((ndo, ", Flags [%s]",
-                   bittok2str(gre_flag_values,"none",flags)));
+            ND_PRINT(", Flags [%s]",
+                   bittok2str(gre_flag_values,"none",flags));
 
        ND_TCHECK_2(bp);
        if (len < 2)
@@ -271,7 +271,7 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
                if (len < 4)
                        goto trunc;
                k = EXTRACT_BE_U_4(bp);
-               ND_PRINT((ndo, ", call %d", k & 0xffff));
+               ND_PRINT(", call %d", k & 0xffff);
                len -= 4;
                bp += 4;
        }
@@ -280,7 +280,7 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
                ND_TCHECK_4(bp);
                if (len < 4)
                        goto trunc;
-               ND_PRINT((ndo, ", seq %u", EXTRACT_BE_U_4(bp)));
+               ND_PRINT(", seq %u", EXTRACT_BE_U_4(bp));
                bp += 4;
                len -= 4;
        }
@@ -289,41 +289,41 @@ gre_print_1(netdissect_options *ndo, const u_char *bp, u_int length)
                ND_TCHECK_4(bp);
                if (len < 4)
                        goto trunc;
-               ND_PRINT((ndo, ", ack %u", EXTRACT_BE_U_4(bp)));
+               ND_PRINT(", ack %u", EXTRACT_BE_U_4(bp));
                bp += 4;
                len -= 4;
        }
 
        if ((flags & GRE_SP) == 0)
-               ND_PRINT((ndo, ", no-payload"));
+               ND_PRINT(", no-payload");
 
         if (ndo->ndo_eflag)
-            ND_PRINT((ndo, ", proto %s (0x%04x)",
+            ND_PRINT(", proto %s (0x%04x)",
                    tok2str(ethertype_values,"unknown",prot),
-                   prot));
+                   prot);
 
-        ND_PRINT((ndo, ", length %u",length));
+        ND_PRINT(", length %u",length);
 
         if ((flags & GRE_SP) == 0)
             return;
 
         if (ndo->ndo_vflag < 1)
-            ND_PRINT((ndo, ": ")); /* put in a colon as protocol demarc */
+            ND_PRINT(": "); /* put in a colon as protocol demarc */
         else
-            ND_PRINT((ndo, "\n\t")); /* if verbose go multiline */
+            ND_PRINT("\n\t"); /* if verbose go multiline */
 
        switch (prot) {
        case ETHERTYPE_PPP:
                ppp_print(ndo, bp, len);
                break;
        default:
-               ND_PRINT((ndo, "gre-proto-0x%x", prot));
+               ND_PRINT("gre-proto-0x%x", prot);
                break;
        }
        return;
 
 trunc:
-       ND_PRINT((ndo, "%s", tstr));
+       ND_PRINT("%s", tstr);
 }
 
 static int
@@ -334,17 +334,17 @@ gre_sre_print(netdissect_options *ndo, uint16_t af, uint8_t sreoff,
 
        switch (af) {
        case GRESRE_IP:
-               ND_PRINT((ndo, ", (rtaf=ip"));
+               ND_PRINT(", (rtaf=ip");
                ret = gre_sre_ip_print(ndo, sreoff, srelen, bp, len);
-               ND_PRINT((ndo, ")"));
+               ND_PRINT(")");
                break;
        case GRESRE_ASN:
-               ND_PRINT((ndo, ", (rtaf=asn"));
+               ND_PRINT(", (rtaf=asn");
                ret = gre_sre_asn_print(ndo, sreoff, srelen, bp, len);
-               ND_PRINT((ndo, ")"));
+               ND_PRINT(")");
                break;
        default:
-               ND_PRINT((ndo, ", (rtaf=0x%x)", af));
+               ND_PRINT(", (rtaf=0x%x)", af);
                ret = 1;
        }
        return (ret);
@@ -358,15 +358,15 @@ gre_sre_ip_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,
        char buf[INET_ADDRSTRLEN];
 
        if (sreoff & 3) {
-               ND_PRINT((ndo, ", badoffset=%u", sreoff));
+               ND_PRINT(", badoffset=%u", sreoff);
                return (1);
        }
        if (srelen & 3) {
-               ND_PRINT((ndo, ", badlength=%u", srelen));
+               ND_PRINT(", badlength=%u", srelen);
                return (1);
        }
        if (sreoff >= srelen) {
-               ND_PRINT((ndo, ", badoff/len=%u/%u", sreoff, srelen));
+               ND_PRINT(", badoff/len=%u/%u", sreoff, srelen);
                return (1);
        }
 
@@ -377,8 +377,8 @@ gre_sre_ip_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,
                        return (0);
 
                addrtostr(bp, buf, sizeof(buf));
-               ND_PRINT((ndo, " %s%s",
-                   ((bp - up) == sreoff) ? "*" : "", buf));
+               ND_PRINT(" %s%s",
+                   ((bp - up) == sreoff) ? "*" : "", buf);
 
                bp += 4;
                len -= 4;
@@ -394,15 +394,15 @@ gre_sre_asn_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,
        const u_char *up = bp;
 
        if (sreoff & 1) {
-               ND_PRINT((ndo, ", badoffset=%u", sreoff));
+               ND_PRINT(", badoffset=%u", sreoff);
                return (1);
        }
        if (srelen & 1) {
-               ND_PRINT((ndo, ", badlength=%u", srelen));
+               ND_PRINT(", badlength=%u", srelen);
                return (1);
        }
        if (sreoff >= srelen) {
-               ND_PRINT((ndo, ", badoff/len=%u/%u", sreoff, srelen));
+               ND_PRINT(", badoff/len=%u/%u", sreoff, srelen);
                return (1);
        }
 
@@ -412,9 +412,9 @@ gre_sre_asn_print(netdissect_options *ndo, uint8_t sreoff, uint8_t srelen,
                if (len < 2)
                        return (0);
 
-               ND_PRINT((ndo, " %s%x",
+               ND_PRINT(" %s%x",
                    ((bp - up) == sreoff) ? "*" : "",
-                   EXTRACT_BE_U_2(bp)));
+                   EXTRACT_BE_U_2(bp));
 
                bp += 2;
                len -= 2;