]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-vtp.c
Fix spaces
[tcpdump] / print-vtp.c
index a6e44bc53622991298ecf0b805b3ce899186402b..2718d2ac57a1113a840dc8ce87292409936fc80d 100644 (file)
 /* \summary: Cisco VLAN Trunking Protocol (VTP) printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"
@@ -116,13 +116,14 @@ static const struct tok vtp_stp_type_values[] = {
 };
 
 void
-vtp_print (netdissect_options *ndo,
-           const u_char *pptr, u_int length)
+vtp_print(netdissect_options *ndo,
+          const u_char *pptr, u_int length)
 {
     u_int type, len, name_len, tlv_len, tlv_value, mgmtd_len;
     const u_char *tptr;
     const struct vtp_vlan_ *vtp_vlan;
 
+    ndo->ndo_protocol = "vtp";
     if (length < VTP_HEADER_LEN)
         goto trunc;
 
@@ -131,11 +132,11 @@ vtp_print (netdissect_options *ndo,
     ND_TCHECK_LEN(tptr, VTP_HEADER_LEN);
 
     type = EXTRACT_U_1(tptr + 1);
-    ND_PRINT((ndo, "VTPv%u, Message %s (0x%02x), length %u",
+    ND_PRINT("VTPv%u, Message %s (0x%02x), length %u",
           EXTRACT_U_1(tptr),
           tok2str(vtp_message_type_values,"Unknown message type", type),
           type,
-          length));
+          length);
 
     /* In non-verbose mode, just print version and message type */
     if (ndo->ndo_vflag < 1) {
@@ -143,16 +144,16 @@ vtp_print (netdissect_options *ndo,
     }
 
     /* verbose mode print all fields */
-    ND_PRINT((ndo, "\n\tDomain name: "));
+    ND_PRINT("\n\tDomain name: ");
     mgmtd_len = EXTRACT_U_1(tptr + 3);
     if (mgmtd_len < 1 ||  mgmtd_len > 32) {
-       ND_PRINT((ndo, " [invalid MgmtD Len %u]", mgmtd_len));
+       ND_PRINT(" [invalid MgmtD Len %u]", mgmtd_len);
        return;
     }
-    fn_printzp(ndo, tptr + 4, mgmtd_len, NULL);
-    ND_PRINT((ndo, ", %s: %u",
+    nd_printzp(ndo, tptr + 4, mgmtd_len, NULL);
+    ND_PRINT(", %s: %u",
           tok2str(vtp_header_values, "Unknown", type),
-          EXTRACT_U_1(tptr + 2)));
+          EXTRACT_U_1(tptr + 2));
 
     tptr += VTP_HEADER_LEN;
 
@@ -181,22 +182,22 @@ vtp_print (netdissect_options *ndo,
         */
 
        ND_TCHECK_8(tptr);
-       ND_PRINT((ndo, "\n\t  Config Rev %x, Updater %s",
+       ND_PRINT("\n\t  Config Rev %x, Updater %s",
               EXTRACT_BE_U_4(tptr),
-              ipaddr_string(ndo, tptr+4)));
+              ipaddr_string(ndo, tptr+4));
        tptr += 8;
        ND_TCHECK_LEN(tptr, VTP_UPDATE_TIMESTAMP_LEN);
-       ND_PRINT((ndo, ", Timestamp 0x%08x 0x%08x 0x%08x",
+       ND_PRINT(", Timestamp 0x%08x 0x%08x 0x%08x",
               EXTRACT_BE_U_4(tptr),
               EXTRACT_BE_U_4(tptr + 4),
-              EXTRACT_BE_U_4(tptr + 8)));
+              EXTRACT_BE_U_4(tptr + 8));
        tptr += VTP_UPDATE_TIMESTAMP_LEN;
        ND_TCHECK_LEN(tptr, VTP_MD5_DIGEST_LEN);
-       ND_PRINT((ndo, ", MD5 digest: %08x%08x%08x%08x",
+       ND_PRINT(", MD5 digest: %08x%08x%08x%08x",
               EXTRACT_BE_U_4(tptr),
               EXTRACT_BE_U_4(tptr + 4),
               EXTRACT_BE_U_4(tptr + 8),
-              EXTRACT_BE_U_4(tptr + 12)));
+              EXTRACT_BE_U_4(tptr + 12));
        tptr += VTP_MD5_DIGEST_LEN;
        break;
 
@@ -223,7 +224,7 @@ vtp_print (netdissect_options *ndo,
         */
 
        ND_TCHECK_4(tptr);
-       ND_PRINT((ndo, ", Config Rev %x", EXTRACT_BE_U_4(tptr)));
+       ND_PRINT(", Config Rev %x", EXTRACT_BE_U_4(tptr));
 
        /*
         *  VLAN INFORMATION
@@ -254,19 +255,19 @@ vtp_print (netdissect_options *ndo,
            if (len < VTP_VLAN_INFO_FIXED_PART_LEN)
                goto trunc;
            ND_TCHECK_SIZE(vtp_vlan);
-           ND_PRINT((ndo, "\n\tVLAN info status %s, type %s, VLAN-id %u, MTU %u, SAID 0x%08x, Name ",
+           ND_PRINT("\n\tVLAN info status %s, type %s, VLAN-id %u, MTU %u, SAID 0x%08x, Name ",
                   tok2str(vtp_vlan_status,"Unknown",EXTRACT_U_1(vtp_vlan->status)),
                   tok2str(vtp_vlan_type_values,"Unknown",EXTRACT_U_1(vtp_vlan->type)),
                   EXTRACT_BE_U_2(vtp_vlan->vlanid),
                   EXTRACT_BE_U_2(vtp_vlan->mtu),
-                  EXTRACT_BE_U_4(vtp_vlan->index)));
+                  EXTRACT_BE_U_4(vtp_vlan->index));
            len  -= VTP_VLAN_INFO_FIXED_PART_LEN;
            tptr += VTP_VLAN_INFO_FIXED_PART_LEN;
            name_len = EXTRACT_U_1(vtp_vlan->name_len);
            if (len < 4*((name_len + 3)/4))
                goto trunc;
            ND_TCHECK_LEN(tptr, name_len);
-           fn_printzp(ndo, tptr, name_len, NULL);
+           nd_printzp(ndo, tptr, name_len, NULL);
 
            /*
             * Vlan names are aligned to 32-bit boundaries.
@@ -291,12 +292,12 @@ vtp_print (netdissect_options *ndo,
                 type = EXTRACT_U_1(tptr);
                 tlv_len = EXTRACT_U_1(tptr + 1);
 
-                ND_PRINT((ndo, "\n\t\t%s (0x%04x) TLV",
+                ND_PRINT("\n\t\t%s (0x%04x) TLV",
                        tok2str(vtp_vlan_tlv_values, "Unknown", type),
-                       type));
+                       type);
 
                 if (len < tlv_len * 2 + 2) {
-                    ND_PRINT((ndo, " (TLV goes past the end of the packet)"));
+                    ND_PRINT(" (TLV goes past the end of the packet)");
                     return;
                 }
                 ND_TCHECK_LEN(tptr, tlv_len * 2 + 2);
@@ -306,38 +307,38 @@ vtp_print (netdissect_options *ndo,
                  * in units of 16-bit words.
                  */
                 if (tlv_len != 1) {
-                    ND_PRINT((ndo, " (invalid TLV length %u != 1)", tlv_len));
+                    ND_PRINT(" (invalid TLV length %u != 1)", tlv_len);
                     return;
                 } else {
                     tlv_value = EXTRACT_BE_U_2(tptr + 2);
 
                     switch (type) {
                     case VTP_VLAN_STE_HOP_COUNT:
-                        ND_PRINT((ndo, ", %u", tlv_value));
+                        ND_PRINT(", %u", tlv_value);
                         break;
 
                     case VTP_VLAN_PRUNING:
-                        ND_PRINT((ndo, ", %s (%u)",
+                        ND_PRINT(", %s (%u)",
                                tlv_value == 1 ? "Enabled" : "Disabled",
-                               tlv_value));
+                               tlv_value);
                         break;
 
                     case VTP_VLAN_STP_TYPE:
-                        ND_PRINT((ndo, ", %s (%u)",
+                        ND_PRINT(", %s (%u)",
                                tok2str(vtp_stp_type_values, "Unknown", tlv_value),
-                               tlv_value));
+                               tlv_value);
                         break;
 
                     case VTP_VLAN_BRIDGE_TYPE:
-                        ND_PRINT((ndo, ", %s (%u)",
+                        ND_PRINT(", %s (%u)",
                                tlv_value == 1 ? "SRB" : "SRT",
-                               tlv_value));
+                               tlv_value);
                         break;
 
                     case VTP_VLAN_BACKUP_CRF_MODE:
-                        ND_PRINT((ndo, ", %s (%u)",
+                        ND_PRINT(", %s (%u)",
                                tlv_value == 1 ? "Backup" : "Not backup",
-                               tlv_value));
+                               tlv_value);
                         break;
 
                         /*
@@ -378,7 +379,7 @@ vtp_print (netdissect_options *ndo,
         */
 
        ND_TCHECK_4(tptr);
-       ND_PRINT((ndo, "\n\tStart value: %u", EXTRACT_BE_U_4(tptr)));
+       ND_PRINT("\n\tStart value: %u", EXTRACT_BE_U_4(tptr));
        break;
 
     case VTP_JOIN_MESSAGE:
@@ -393,12 +394,5 @@ vtp_print (netdissect_options *ndo,
     return;
 
  trunc:
-    ND_PRINT((ndo, "[|vtp]"));
+    nd_print_trunc(ndo);
 }
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 4
- * End:
- */