Update ND_PRINT() as a variadic macro

[tcpdump] / print-stp.c

diff --git a/print-stp.c b/print-stp.c
index fb3ad248bcd64d508050f3a40adad3bd2a82bf9d..78cf1f4a1c31227b4d13954d30ffef9caaa16d6a 100644 (file)
--- a/print-stp.c
+++ b/print-stp.c
@@ -108,13 +108,13 @@ stp_print_config_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
 
     ND_TCHECK(stp_bpdu->flags);
     bpdu_flags = EXTRACT_U_1(stp_bpdu->flags);
-    ND_PRINT((ndo, ", Flags [%s]",
-           bittok2str(stp_bpdu_flag_values, "none", bpdu_flags)));
+    ND_PRINT(", Flags [%s]",
+           bittok2str(stp_bpdu_flag_values, "none", bpdu_flags));
 
     ND_TCHECK(stp_bpdu->port_id);
-    ND_PRINT((ndo, ", bridge-id %s.%04x, length %u",
+    ND_PRINT(", bridge-id %s.%04x, length %u",
            stp_print_bridge_id((const u_char *)&stp_bpdu->bridge_id),
-           EXTRACT_BE_U_2(stp_bpdu->port_id), length));
+           EXTRACT_BE_U_2(stp_bpdu->port_id), length);
 
     /* in non-verbose mode just print the bridge-id */
     if (!ndo->ndo_vflag) {
@@ -122,22 +122,22 @@ stp_print_config_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
     }
 
     ND_TCHECK(stp_bpdu->forward_delay);
-    ND_PRINT((ndo, "\n\tmessage-age %.2fs, max-age %.2fs"
+    ND_PRINT("\n\tmessage-age %.2fs, max-age %.2fs"
            ", hello-time %.2fs, forwarding-delay %.2fs",
            (float) EXTRACT_BE_U_2(stp_bpdu->message_age) / STP_TIME_BASE,
            (float) EXTRACT_BE_U_2(stp_bpdu->max_age) / STP_TIME_BASE,
            (float) EXTRACT_BE_U_2(stp_bpdu->hello_time) / STP_TIME_BASE,
-           (float) EXTRACT_BE_U_2(stp_bpdu->forward_delay) / STP_TIME_BASE));
+           (float) EXTRACT_BE_U_2(stp_bpdu->forward_delay) / STP_TIME_BASE);
 
-    ND_PRINT((ndo, "\n\troot-id %s, root-pathcost %u",
+    ND_PRINT("\n\troot-id %s, root-pathcost %u",
            stp_print_bridge_id((const u_char *)&stp_bpdu->root_id),
-           EXTRACT_BE_U_4(stp_bpdu->root_path_cost)));
+           EXTRACT_BE_U_4(stp_bpdu->root_path_cost));
 
     /* Port role is only valid for 802.1w */
     if (EXTRACT_U_1(stp_bpdu->protocol_version) == STP_PROTO_RAPID) {
-        ND_PRINT((ndo, ", port-role %s",
+        ND_PRINT(", port-role %s",
                tok2str(rstp_obj_port_role_values, "Unknown",
-                       RSTP_EXTRACT_PORT_ROLE(bpdu_flags))));
+                       RSTP_EXTRACT_PORT_ROLE(bpdu_flags)));
     }
     return 1;
 
@@ -254,8 +254,8 @@ stp_print_mstp_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
     ptr = (const u_char *)stp_bpdu;
     ND_TCHECK(stp_bpdu->flags);
     bpdu_flags = EXTRACT_U_1(stp_bpdu->flags);
-    ND_PRINT((ndo, ", CIST Flags [%s], length %u",
-           bittok2str(stp_bpdu_flag_values, "none", bpdu_flags), length));
+    ND_PRINT(", CIST Flags [%s], length %u",
+           bittok2str(stp_bpdu_flag_values, "none", bpdu_flags), length);
 
     /*
      * in non-verbose mode just print the flags.
@@ -264,54 +264,54 @@ stp_print_mstp_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
         return 1;
     }
 
-    ND_PRINT((ndo, "\n\tport-role %s, ",
+    ND_PRINT("\n\tport-role %s, ",
            tok2str(rstp_obj_port_role_values, "Unknown",
-                   RSTP_EXTRACT_PORT_ROLE(bpdu_flags))));
+                   RSTP_EXTRACT_PORT_ROLE(bpdu_flags)));
 
     ND_TCHECK(stp_bpdu->root_path_cost);
-    ND_PRINT((ndo, "CIST root-id %s, CIST ext-pathcost %u",
+    ND_PRINT("CIST root-id %s, CIST ext-pathcost %u",
            stp_print_bridge_id((const u_char *)&stp_bpdu->root_id),
-           EXTRACT_BE_U_4(stp_bpdu->root_path_cost)));
+           EXTRACT_BE_U_4(stp_bpdu->root_path_cost));
 
     ND_TCHECK(stp_bpdu->bridge_id);
-    ND_PRINT((ndo, "\n\tCIST regional-root-id %s, ",
-           stp_print_bridge_id((const u_char *)&stp_bpdu->bridge_id)));
+    ND_PRINT("\n\tCIST regional-root-id %s, ",
+           stp_print_bridge_id((const u_char *)&stp_bpdu->bridge_id));
 
     ND_TCHECK(stp_bpdu->port_id);
-    ND_PRINT((ndo, "CIST port-id %04x,", EXTRACT_BE_U_2(stp_bpdu->port_id)));
+    ND_PRINT("CIST port-id %04x,", EXTRACT_BE_U_2(stp_bpdu->port_id));
 
     ND_TCHECK(stp_bpdu->forward_delay);
-    ND_PRINT((ndo, "\n\tmessage-age %.2fs, max-age %.2fs"
+    ND_PRINT("\n\tmessage-age %.2fs, max-age %.2fs"
            ", hello-time %.2fs, forwarding-delay %.2fs",
            (float) EXTRACT_BE_U_2(stp_bpdu->message_age) / STP_TIME_BASE,
            (float) EXTRACT_BE_U_2(stp_bpdu->max_age) / STP_TIME_BASE,
            (float) EXTRACT_BE_U_2(stp_bpdu->hello_time) / STP_TIME_BASE,
-           (float) EXTRACT_BE_U_2(stp_bpdu->forward_delay) / STP_TIME_BASE));
+           (float) EXTRACT_BE_U_2(stp_bpdu->forward_delay) / STP_TIME_BASE);
 
     ND_TCHECK_2(ptr + MST_BPDU_VER3_LEN_OFFSET);
-    ND_PRINT((ndo, "\n\tv3len %u, ", EXTRACT_BE_U_2(ptr + MST_BPDU_VER3_LEN_OFFSET)));
+    ND_PRINT("\n\tv3len %u, ", EXTRACT_BE_U_2(ptr + MST_BPDU_VER3_LEN_OFFSET));
     ND_TCHECK_4(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET + 12);
-    ND_PRINT((ndo, "MCID Name "));
+    ND_PRINT("MCID Name ");
     if (fn_printzp(ndo, ptr + MST_BPDU_CONFIG_NAME_OFFSET, 32, ndo->ndo_snapend))
        goto trunc;
-    ND_PRINT((ndo, ", rev %u,"
+    ND_PRINT(", rev %u,"
             "\n\t\tdigest %08x%08x%08x%08x, ",
                  EXTRACT_BE_U_2(ptr + MST_BPDU_CONFIG_NAME_OFFSET + 32),
                  EXTRACT_BE_U_4(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET),
                  EXTRACT_BE_U_4(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET + 4),
                  EXTRACT_BE_U_4(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET + 8),
-                 EXTRACT_BE_U_4(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET + 12)));
+                 EXTRACT_BE_U_4(ptr + MST_BPDU_CONFIG_DIGEST_OFFSET + 12));
 
     ND_TCHECK_4(ptr + MST_BPDU_CIST_INT_PATH_COST_OFFSET);
-    ND_PRINT((ndo, "CIST int-root-pathcost %u,",
-            EXTRACT_BE_U_4(ptr + MST_BPDU_CIST_INT_PATH_COST_OFFSET)));
+    ND_PRINT("CIST int-root-pathcost %u,",
+            EXTRACT_BE_U_4(ptr + MST_BPDU_CIST_INT_PATH_COST_OFFSET));
 
     ND_TCHECK_BRIDGE_ID(ptr + MST_BPDU_CIST_BRIDGE_ID_OFFSET);
-    ND_PRINT((ndo, "\n\tCIST bridge-id %s, ",
-           stp_print_bridge_id(ptr + MST_BPDU_CIST_BRIDGE_ID_OFFSET)));
+    ND_PRINT("\n\tCIST bridge-id %s, ",
+           stp_print_bridge_id(ptr + MST_BPDU_CIST_BRIDGE_ID_OFFSET));
 
     ND_TCHECK_1(ptr + MST_BPDU_CIST_REMAIN_HOPS_OFFSET);
-    ND_PRINT((ndo, "CIST remaining-hops %u", EXTRACT_U_1(ptr + MST_BPDU_CIST_REMAIN_HOPS_OFFSET)));
+    ND_PRINT("CIST remaining-hops %u", EXTRACT_U_1(ptr + MST_BPDU_CIST_REMAIN_HOPS_OFFSET));
 
     /* Dump all MSTI's */
     ND_TCHECK_2(ptr + MST_BPDU_VER3_LEN_OFFSET);
@@ -325,18 +325,18 @@ stp_print_mstp_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
             msti = EXTRACT_BE_U_2(ptr + offset + MST_BPDU_MSTI_ROOT_PRIO_OFFSET);
             msti = msti & 0x0FFF;
 
-            ND_PRINT((ndo, "\n\tMSTI %u, Flags [%s], port-role %s",
+            ND_PRINT("\n\tMSTI %u, Flags [%s], port-role %s",
                    msti, bittok2str(stp_bpdu_flag_values, "none", EXTRACT_U_1(ptr + offset)),
                    tok2str(rstp_obj_port_role_values, "Unknown",
-                           RSTP_EXTRACT_PORT_ROLE(EXTRACT_U_1(ptr + offset)))));
-            ND_PRINT((ndo, "\n\t\tMSTI regional-root-id %s, pathcost %u",
+                           RSTP_EXTRACT_PORT_ROLE(EXTRACT_U_1(ptr + offset))));
+            ND_PRINT("\n\t\tMSTI regional-root-id %s, pathcost %u",
                    stp_print_bridge_id(ptr + offset +
                                        MST_BPDU_MSTI_ROOT_PRIO_OFFSET),
-                   EXTRACT_BE_U_4(ptr + offset + MST_BPDU_MSTI_ROOT_PATH_COST_OFFSET)));
-            ND_PRINT((ndo, "\n\t\tMSTI bridge-prio %u, port-prio %u, hops %u",
+                   EXTRACT_BE_U_4(ptr + offset + MST_BPDU_MSTI_ROOT_PATH_COST_OFFSET));
+            ND_PRINT("\n\t\tMSTI bridge-prio %u, port-prio %u, hops %u",
                    EXTRACT_U_1(ptr + offset + MST_BPDU_MSTI_BRIDGE_PRIO_OFFSET) >> 4,
                    EXTRACT_U_1(ptr + offset + MST_BPDU_MSTI_PORT_PRIO_OFFSET) >> 4,
-                   EXTRACT_U_1(ptr + offset + MST_BPDU_MSTI_REMAIN_HOPS_OFFSET)));
+                   EXTRACT_U_1(ptr + offset + MST_BPDU_MSTI_REMAIN_HOPS_OFFSET));
 
             len -= MST_BPDU_MSTI_LENGTH;
             offset += MST_BPDU_MSTI_LENGTH;
@@ -364,19 +364,19 @@ stp_print_spb_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
     ptr = (const u_char *)stp_bpdu;
     ND_TCHECK_4(ptr + offset + SPB_BPDU_AGREEMENT_DIGEST_OFFSET + 16);
 
-    ND_PRINT((ndo, "\n\tv4len %u, ", EXTRACT_BE_U_2(ptr + offset)));
-    ND_PRINT((ndo, "AUXMCID Name "));
+    ND_PRINT("\n\tv4len %u, ", EXTRACT_BE_U_2(ptr + offset));
+    ND_PRINT("AUXMCID Name ");
     if (fn_printzp(ndo, ptr + offset + SPB_BPDU_CONFIG_NAME_OFFSET, 32,
                   ndo->ndo_snapend))
        goto trunc;
-    ND_PRINT((ndo, ", Rev %u,\n\t\tdigest %08x%08x%08x%08x",
+    ND_PRINT(", Rev %u,\n\t\tdigest %08x%08x%08x%08x",
             EXTRACT_BE_U_2(ptr + offset + SPB_BPDU_CONFIG_REV_OFFSET),
             EXTRACT_BE_U_4(ptr + offset + SPB_BPDU_CONFIG_DIGEST_OFFSET),
             EXTRACT_BE_U_4(ptr + offset + SPB_BPDU_CONFIG_DIGEST_OFFSET + 4),
             EXTRACT_BE_U_4(ptr + offset + SPB_BPDU_CONFIG_DIGEST_OFFSET + 8),
-            EXTRACT_BE_U_4(ptr + offset + SPB_BPDU_CONFIG_DIGEST_OFFSET + 12)));
+            EXTRACT_BE_U_4(ptr + offset + SPB_BPDU_CONFIG_DIGEST_OFFSET + 12));
 
-    ND_PRINT((ndo, "\n\tAgreement num %u, Discarded Agreement num %u, Agreement valid-"
+    ND_PRINT("\n\tAgreement num %u, Discarded Agreement num %u, Agreement valid-"
             "flag %u,\n\tRestricted role-flag: %u, Format id %u cap %u, "
             "Convention id %u cap %u,\n\tEdge count %u, "
             "Agreement digest %08x%08x%08x%08x%08x\n",
@@ -393,7 +393,7 @@ stp_print_spb_bpdu(netdissect_options *ndo, const struct stp_bpdu_ *stp_bpdu,
             EXTRACT_BE_U_4(ptr + offset + SPB_BPDU_AGREEMENT_DIGEST_OFFSET + 4),
             EXTRACT_BE_U_4(ptr + offset + SPB_BPDU_AGREEMENT_DIGEST_OFFSET + 8),
             EXTRACT_BE_U_4(ptr + offset + SPB_BPDU_AGREEMENT_DIGEST_OFFSET + 12),
-            EXTRACT_BE_U_4(ptr + offset + SPB_BPDU_AGREEMENT_DIGEST_OFFSET + 16)));
+            EXTRACT_BE_U_4(ptr + offset + SPB_BPDU_AGREEMENT_DIGEST_OFFSET + 16));
     return 1;
 
 trunc:
@@ -420,14 +420,14 @@ stp_print(netdissect_options *ndo, const u_char *p, u_int length)
 
     ND_TCHECK(stp_bpdu->protocol_id);
     if (EXTRACT_BE_U_2(stp_bpdu->protocol_id)) {
-        ND_PRINT((ndo, "unknown STP version, length %u", length));
+        ND_PRINT("unknown STP version, length %u", length);
         return;
     }
 
     ND_TCHECK(stp_bpdu->protocol_version);
     protocol_version = EXTRACT_U_1(stp_bpdu->protocol_version);
-    ND_PRINT((ndo, "STP %s", tok2str(stp_proto_values, "Unknown STP protocol (0x%02x)",
-                         protocol_version)));
+    ND_PRINT("STP %s", tok2str(stp_proto_values, "Unknown STP protocol (0x%02x)",
+                         protocol_version));
 
     switch (protocol_version) {
     case STP_PROTO_REGULAR:
@@ -441,8 +441,8 @@ stp_print(netdissect_options *ndo, const u_char *p, u_int length)
 
     ND_TCHECK(stp_bpdu->bpdu_type);
     bpdu_type = EXTRACT_U_1(stp_bpdu->bpdu_type);
-    ND_PRINT((ndo, ", %s", tok2str(stp_bpdu_type_values, "Unknown BPDU Type (0x%02x)",
-                           bpdu_type)));
+    ND_PRINT(", %s", tok2str(stp_bpdu_type_values, "Unknown BPDU Type (0x%02x)",
+                           bpdu_type));
 
     switch (bpdu_type) {
     case STP_BPDU_TYPE_CONFIG:
@@ -508,7 +508,7 @@ stp_print(netdissect_options *ndo, const u_char *p, u_int length)
 
     return;
 trunc:
-    ND_PRINT((ndo, "[|stp %u]", length));
+    ND_PRINT("[|stp %u]", length);
 }
 
 /*