Fix spaces

[tcpdump] / print-atm.c

diff --git a/print-atm.c b/print-atm.c
index bb7eaf3b7d9152108b182e910d83cbddff4dd04c..06ecc0178a6ec628884f1366de4c7f5bea97a0cf 100644 (file)
--- a/print-atm.c
+++ b/print-atm.c
@@ -22,10 +22,10 @@
 /* \summary: Asynchronous Transfer Mode (ATM) printer */
 
 #ifdef HAVE_CONFIG_H
 /* \summary: Asynchronous Transfer Mode (ATM) printer */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"

 
 #include "netdissect.h"
 #include "extract.h"
 
 #include "netdissect.h"
 #include "extract.h"


@@ -123,7 +123,6 @@
 
 /* end of the original atmuni31.h */
 
 
 /* end of the original atmuni31.h */
 

-static const char tstr[] = "[|atm]";

 
 #define OAM_CRC10_MASK 0x3ff
 #define OAM_PAYLOAD_LEN 48
 
 #define OAM_CRC10_MASK 0x3ff
 #define OAM_PAYLOAD_LEN 48


@@ -253,15 +252,16 @@ atm_if_print(netdissect_options *ndo,
        uint32_t llchdr;
        u_int hdrlen = 0;
 
        uint32_t llchdr;
        u_int hdrlen = 0;
 

+       ndo->ndo_protocol = "atm_if";

        if (caplen < 1 || length < 1) {
        if (caplen < 1 || length < 1) {

-               ND_PRINT((ndo, "%s", tstr));
+               nd_print_trunc(ndo);

                return (caplen);
        }
 
         /* Cisco Style NLPID ? */
                return (caplen);
        }
 
         /* Cisco Style NLPID ? */

-        if (*p == LLC_UI) {
+        if (EXTRACT_U_1(p) == LLC_UI) {

             if (ndo->ndo_eflag)
             if (ndo->ndo_eflag)

-                ND_PRINT((ndo, "CNLPID "));
+                ND_PRINT("CNLPID ");

             isoclns_print(ndo, p + 1, length - 1);
             return hdrlen;
         }
             isoclns_print(ndo, p + 1, length - 1);
             return hdrlen;
         }


@@ -271,7 +271,7 @@ atm_if_print(netdissect_options *ndo,
         * control field.
         */
        if (caplen < 3 || length < 3) {
         * control field.
         */
        if (caplen < 3 || length < 3) {

-               ND_PRINT((ndo, "%s", tstr));
+               nd_print_trunc(ndo);

                return (caplen);
        }
 
                return (caplen);
        }
 


@@ -282,7 +282,7 @@ atm_if_print(netdissect_options *ndo,
         * packet nor an RFC 2684 routed NLPID-formatted PDU nor
         * an 802.2-but-no-SNAP IP packet.
         */
         * packet nor an RFC 2684 routed NLPID-formatted PDU nor
         * an 802.2-but-no-SNAP IP packet.
         */

-       llchdr = EXTRACT_BE_24BITS(p);
+       llchdr = EXTRACT_BE_U_3(p);

        if (llchdr != LLC_UI_HDR(LLCSAP_SNAP) &&
            llchdr != LLC_UI_HDR(LLCSAP_ISONS) &&
            llchdr != LLC_UI_HDR(LLCSAP_IP)) {
        if (llchdr != LLC_UI_HDR(LLCSAP_SNAP) &&
            llchdr != LLC_UI_HDR(LLCSAP_ISONS) &&
            llchdr != LLC_UI_HDR(LLCSAP_IP)) {


@@ -303,15 +303,15 @@ atm_if_print(netdissect_options *ndo,
                 * new DLT_IEEE802_6 value if we added it?
                 */
                if (caplen < 20 || length < 20) {
                 * new DLT_IEEE802_6 value if we added it?
                 */
                if (caplen < 20 || length < 20) {

-                       ND_PRINT((ndo, "%s", tstr));
+                       nd_print_trunc(ndo);

                        return (caplen);
                }
                if (ndo->ndo_eflag)
                        return (caplen);
                }
                if (ndo->ndo_eflag)

-                       ND_PRINT((ndo, "%08x%08x %08x%08x ",
-                              EXTRACT_BE_32BITS(p),
-                              EXTRACT_BE_32BITS(p + 4),
-                              EXTRACT_BE_32BITS(p + 8),
-                              EXTRACT_BE_32BITS(p + 12)));
+                       ND_PRINT("%08x%08x %08x%08x ",
+                              EXTRACT_BE_U_4(p),
+                              EXTRACT_BE_U_4(p + 4),
+                              EXTRACT_BE_U_4(p + 8),
+                              EXTRACT_BE_U_4(p + 12));

                p += 20;
                length -= 20;
                caplen -= 20;
                p += 20;
                length -= 20;
                caplen -= 20;


@@ -349,16 +349,16 @@ sig_print(netdissect_options *ndo,
 {
        uint32_t call_ref;
 
 {
        uint32_t call_ref;
 

-       ND_TCHECK(p[PROTO_POS]);
-       if (p[PROTO_POS] == Q2931) {
+       ND_TCHECK_1(p + PROTO_POS);
+       if (EXTRACT_U_1(p + PROTO_POS) == Q2931) {

                /*
                 * protocol:Q.2931 for User to Network Interface
                 * (UNI 3.1) signalling
                 */
                /*
                 * protocol:Q.2931 for User to Network Interface
                 * (UNI 3.1) signalling
                 */

-               ND_PRINT((ndo, "Q.2931"));
-               ND_TCHECK(p[MSG_TYPE_POS]);
-               ND_PRINT((ndo, ":%s ",
-                   tok2str(msgtype2str, "msgtype#%d", p[MSG_TYPE_POS])));
+               ND_PRINT("Q.2931");
+               ND_TCHECK_1(p + MSG_TYPE_POS);
+               ND_PRINT(":%s ",
+                   tok2str(msgtype2str, "msgtype#%u", EXTRACT_U_1(p + MSG_TYPE_POS)));

 
                /*
                 * The call reference comes before the message type,
 
                /*
                 * The call reference comes before the message type,


@@ -366,16 +366,16 @@ sig_print(netdissect_options *ndo,
                 * do from the caplen test above, we also know we have
                 * the call reference.
                 */
                 * do from the caplen test above, we also know we have
                 * the call reference.
                 */

-               call_ref = EXTRACT_BE_24BITS(p + CALL_REF_POS);
-               ND_PRINT((ndo, "CALL_REF:0x%06x", call_ref));
+               call_ref = EXTRACT_BE_U_3(p + CALL_REF_POS);
+               ND_PRINT("CALL_REF:0x%06x", call_ref);

        } else {
                /* SSCOP with some unknown protocol atop it */
        } else {
                /* SSCOP with some unknown protocol atop it */

-               ND_PRINT((ndo, "SSCOP, proto %d ", p[PROTO_POS]));
+               ND_PRINT("SSCOP, proto %u ", EXTRACT_U_1(p + PROTO_POS));

        }
        return;
 
 trunc:
        }
        return;
 
 trunc:

-       ND_PRINT((ndo, " %s", tstr));
+       nd_print_trunc(ndo);

 }
 
 /*
 }
 
 /*


@@ -386,8 +386,9 @@ atm_print(netdissect_options *ndo,
           u_int vpi, u_int vci, u_int traftype, const u_char *p, u_int length,
           u_int caplen)
 {
           u_int vpi, u_int vci, u_int traftype, const u_char *p, u_int length,
           u_int caplen)
 {

+       ndo->ndo_protocol = "atm";

        if (ndo->ndo_eflag)
        if (ndo->ndo_eflag)

-               ND_PRINT((ndo, "VPI:%u VCI:%u ", vpi, vci));
+               ND_PRINT("VPI:%u VCI:%u ", vpi, vci);

 
        if (vpi == 0) {
                switch (vci) {
 
        if (vpi == 0) {
                switch (vci) {


@@ -397,7 +398,7 @@ atm_print(netdissect_options *ndo,
                        return;
 
                case VCI_BCC:
                        return;
 
                case VCI_BCC:

-                       ND_PRINT((ndo, "broadcast sig: "));
+                       ND_PRINT("broadcast sig: ");

                        return;
 
                case VCI_OAMF4SC: /* fall through */
                        return;
 
                case VCI_OAMF4SC: /* fall through */


@@ -406,11 +407,11 @@ atm_print(netdissect_options *ndo,
                        return;
 
                case VCI_METAC:
                        return;
 
                case VCI_METAC:

-                       ND_PRINT((ndo, "meta: "));
+                       ND_PRINT("meta: ");

                        return;
 
                case VCI_ILMIC:
                        return;
 
                case VCI_ILMIC:

-                       ND_PRINT((ndo, "ilmi: "));
+                       ND_PRINT("ilmi: ");

                        snmp_print(ndo, p, length);
                        return;
                }
                        snmp_print(ndo, p, length);
                        return;
                }


@@ -433,22 +434,22 @@ atm_print(netdissect_options *ndo,
 }
 
 struct oam_fm_loopback_t {
 }
 
 struct oam_fm_loopback_t {

-    uint8_t loopback_indicator;
-    uint8_t correlation_tag[4];
-    uint8_t loopback_id[12];
-    uint8_t source_id[12];
-    uint8_t unused[16];
+    nd_uint8_t  loopback_indicator;
+    nd_uint32_t correlation_tag;
+    nd_byte     loopback_id[12];
+    nd_byte     source_id[12];
+    nd_byte     unused[16];

 };
 
 struct oam_fm_ais_rdi_t {
 };
 
 struct oam_fm_ais_rdi_t {

-    uint8_t failure_type;
-    uint8_t failure_location[16];
-    uint8_t unused[28];
+    nd_uint8_t  failure_type;
+    nd_byte     failure_location[16];
+    nd_byte     unused[28];

 };
 
 void
 };
 
 void

-oam_print (netdissect_options *ndo,
-           const u_char *p, u_int length, u_int hec)
+oam_print(netdissect_options *ndo,
+          const u_char *p, u_int length, u_int hec)

 {
     uint32_t cell_header;
     uint16_t vpi, vci, cksum, cksum_shouldbe, idx;
 {
     uint32_t cell_header;
     uint16_t vpi, vci, cksum, cksum_shouldbe, idx;


@@ -459,59 +460,59 @@ oam_print (netdissect_options *ndo,
         const struct oam_fm_ais_rdi_t *oam_fm_ais_rdi;
     } oam_ptr;
 
         const struct oam_fm_ais_rdi_t *oam_fm_ais_rdi;
     } oam_ptr;
 

-
-    ND_TCHECK(*(p+ATM_HDR_LEN_NOHEC+hec));
-    cell_header = EXTRACT_BE_32BITS(p + hec);
-    cell_type = ((*(p+ATM_HDR_LEN_NOHEC+hec))>>4) & 0x0f;
-    func_type = EXTRACT_8BITS((p + ATM_HDR_LEN_NOHEC + hec)) & 0x0f;
+    ndo->ndo_protocol = "oam";
+    ND_TCHECK_1(p + ATM_HDR_LEN_NOHEC + hec);
+    cell_header = EXTRACT_BE_U_4(p + hec);
+    cell_type = (EXTRACT_U_1((p + ATM_HDR_LEN_NOHEC + hec)) >> 4) & 0x0f;
+    func_type = EXTRACT_U_1((p + ATM_HDR_LEN_NOHEC + hec)) & 0x0f;

 
     vpi = (cell_header>>20)&0xff;
     vci = (cell_header>>4)&0xffff;
     payload = (cell_header>>1)&0x7;
     clp = cell_header&0x1;
 
 
     vpi = (cell_header>>20)&0xff;
     vci = (cell_header>>4)&0xffff;
     payload = (cell_header>>1)&0x7;
     clp = cell_header&0x1;
 

-    ND_PRINT((ndo, "%s, vpi %u, vci %u, payload [ %s ], clp %u, length %u",
+    ND_PRINT("%s, vpi %u, vci %u, payload [ %s ], clp %u, length %u",

            tok2str(oam_f_values, "OAM F5", vci),
            vpi, vci,
            tok2str(atm_pty_values, "Unknown", payload),
            tok2str(oam_f_values, "OAM F5", vci),
            vpi, vci,
            tok2str(atm_pty_values, "Unknown", payload),

-           clp, length));
+           clp, length);

 
     if (!ndo->ndo_vflag) {
         return;
     }
 
 
     if (!ndo->ndo_vflag) {
         return;
     }
 

-    ND_PRINT((ndo, "\n\tcell-type %s (%u)",
+    ND_PRINT("\n\tcell-type %s (%u)",

            tok2str(oam_celltype_values, "unknown", cell_type),
            tok2str(oam_celltype_values, "unknown", cell_type),

-           cell_type));
+           cell_type);

 
     if (oam_functype_values[cell_type] == NULL)
 
     if (oam_functype_values[cell_type] == NULL)

-        ND_PRINT((ndo, ", func-type unknown (%u)", func_type));
+        ND_PRINT(", func-type unknown (%u)", func_type);

     else
     else

-        ND_PRINT((ndo, ", func-type %s (%u)",
+        ND_PRINT(", func-type %s (%u)",

                tok2str(oam_functype_values[cell_type],"none",func_type),
                tok2str(oam_functype_values[cell_type],"none",func_type),

-               func_type));
+               func_type);

 
     p += ATM_HDR_LEN_NOHEC + hec;
 
     switch (cell_type << 4 | func_type) {
     case (OAM_CELLTYPE_FM << 4 | OAM_FM_FUNCTYPE_LOOPBACK):
         oam_ptr.oam_fm_loopback = (const struct oam_fm_loopback_t *)(p + OAM_CELLTYPE_FUNCTYPE_LEN);
 
     p += ATM_HDR_LEN_NOHEC + hec;
 
     switch (cell_type << 4 | func_type) {
     case (OAM_CELLTYPE_FM << 4 | OAM_FM_FUNCTYPE_LOOPBACK):
         oam_ptr.oam_fm_loopback = (const struct oam_fm_loopback_t *)(p + OAM_CELLTYPE_FUNCTYPE_LEN);

-        ND_TCHECK(*oam_ptr.oam_fm_loopback);
-        ND_PRINT((ndo, "\n\tLoopback-Indicator %s, Correlation-Tag 0x%08x",
+        ND_TCHECK_SIZE(oam_ptr.oam_fm_loopback);
+        ND_PRINT("\n\tLoopback-Indicator %s, Correlation-Tag 0x%08x",

                tok2str(oam_fm_loopback_indicator_values,
                        "Unknown",
                tok2str(oam_fm_loopback_indicator_values,
                        "Unknown",

-                       oam_ptr.oam_fm_loopback->loopback_indicator & OAM_FM_LOOPBACK_INDICATOR_MASK),
-               EXTRACT_BE_32BITS(&oam_ptr.oam_fm_loopback->correlation_tag)));
-        ND_PRINT((ndo, "\n\tLocation-ID "));
+                       EXTRACT_U_1(oam_ptr.oam_fm_loopback->loopback_indicator) & OAM_FM_LOOPBACK_INDICATOR_MASK),
+               EXTRACT_BE_U_4(oam_ptr.oam_fm_loopback->correlation_tag));
+        ND_PRINT("\n\tLocation-ID ");

         for (idx = 0; idx < sizeof(oam_ptr.oam_fm_loopback->loopback_id); idx++) {
             if (idx % 2) {
         for (idx = 0; idx < sizeof(oam_ptr.oam_fm_loopback->loopback_id); idx++) {
             if (idx % 2) {

-                ND_PRINT((ndo, "%04x ", EXTRACT_BE_16BITS(&oam_ptr.oam_fm_loopback->loopback_id[idx])));
+                ND_PRINT("%04x ", EXTRACT_BE_U_2(&oam_ptr.oam_fm_loopback->loopback_id[idx]));

             }
         }
             }
         }

-        ND_PRINT((ndo, "\n\tSource-ID   "));
+        ND_PRINT("\n\tSource-ID   ");

         for (idx = 0; idx < sizeof(oam_ptr.oam_fm_loopback->source_id); idx++) {
             if (idx % 2) {
         for (idx = 0; idx < sizeof(oam_ptr.oam_fm_loopback->source_id); idx++) {
             if (idx % 2) {

-                ND_PRINT((ndo, "%04x ", EXTRACT_BE_16BITS(&oam_ptr.oam_fm_loopback->source_id[idx])));
+                ND_PRINT("%04x ", EXTRACT_BE_U_2(&oam_ptr.oam_fm_loopback->source_id[idx]));

             }
         }
         break;
             }
         }
         break;


@@ -519,12 +520,12 @@ oam_print (netdissect_options *ndo,
     case (OAM_CELLTYPE_FM << 4 | OAM_FM_FUNCTYPE_AIS):
     case (OAM_CELLTYPE_FM << 4 | OAM_FM_FUNCTYPE_RDI):
         oam_ptr.oam_fm_ais_rdi = (const struct oam_fm_ais_rdi_t *)(p + OAM_CELLTYPE_FUNCTYPE_LEN);
     case (OAM_CELLTYPE_FM << 4 | OAM_FM_FUNCTYPE_AIS):
     case (OAM_CELLTYPE_FM << 4 | OAM_FM_FUNCTYPE_RDI):
         oam_ptr.oam_fm_ais_rdi = (const struct oam_fm_ais_rdi_t *)(p + OAM_CELLTYPE_FUNCTYPE_LEN);

-        ND_TCHECK(*oam_ptr.oam_fm_ais_rdi);
-        ND_PRINT((ndo, "\n\tFailure-type 0x%02x", oam_ptr.oam_fm_ais_rdi->failure_type));
-        ND_PRINT((ndo, "\n\tLocation-ID "));
+        ND_TCHECK_SIZE(oam_ptr.oam_fm_ais_rdi);
+        ND_PRINT("\n\tFailure-type 0x%02x", EXTRACT_U_1(oam_ptr.oam_fm_ais_rdi->failure_type));
+        ND_PRINT("\n\tLocation-ID ");

         for (idx = 0; idx < sizeof(oam_ptr.oam_fm_ais_rdi->failure_location); idx++) {
             if (idx % 2) {
         for (idx = 0; idx < sizeof(oam_ptr.oam_fm_ais_rdi->failure_location); idx++) {
             if (idx % 2) {

-                ND_PRINT((ndo, "%04x ", EXTRACT_BE_16BITS(&oam_ptr.oam_fm_ais_rdi->failure_location[idx])));
+                ND_PRINT("%04x ", EXTRACT_BE_U_2(&oam_ptr.oam_fm_ais_rdi->failure_location[idx]));

             }
         }
         break;
             }
         }
         break;


@@ -538,18 +539,18 @@ oam_print (netdissect_options *ndo,
     }
 
     /* crc10 checksum verification */
     }
 
     /* crc10 checksum verification */

-    ND_TCHECK2(*(p + OAM_CELLTYPE_FUNCTYPE_LEN + OAM_FUNCTION_SPECIFIC_LEN), 2);
-    cksum = EXTRACT_BE_16BITS(p + OAM_CELLTYPE_FUNCTYPE_LEN + OAM_FUNCTION_SPECIFIC_LEN)
+    ND_TCHECK_2(p + OAM_CELLTYPE_FUNCTYPE_LEN + OAM_FUNCTION_SPECIFIC_LEN);
+    cksum = EXTRACT_BE_U_2(p + OAM_CELLTYPE_FUNCTYPE_LEN + OAM_FUNCTION_SPECIFIC_LEN)

         & OAM_CRC10_MASK;
     cksum_shouldbe = verify_crc10_cksum(0, p, OAM_PAYLOAD_LEN);
 
         & OAM_CRC10_MASK;
     cksum_shouldbe = verify_crc10_cksum(0, p, OAM_PAYLOAD_LEN);
 

-    ND_PRINT((ndo, "\n\tcksum 0x%03x (%scorrect)",
+    ND_PRINT("\n\tcksum 0x%03x (%scorrect)",

            cksum,
            cksum,

-           cksum_shouldbe == 0 ? "" : "in"));
+           cksum_shouldbe == 0 ? "" : "in");

 
     return;
 
 trunc:
 
     return;
 
 trunc:

-    ND_PRINT((ndo, "[|oam]"));
+    nd_print_trunc(ndo);

     return;
 }
     return;
 }