OpenFlow: Have a function for each message type.

[tcpdump] / print-arcnet.c

diff --git a/print-arcnet.c b/print-arcnet.c
index e5e9bbfef7039ebf04cf50051d6dceb899066120..0acd6ad61ac8d5711633fc68d5d14f4e0ee7c9f3 100644 (file)
--- a/print-arcnet.c
+++ b/print-arcnet.c
@@ -115,7 +115,7 @@ static const struct tok arctypemap[] = {
        { ARCTYPE_IPX,          "ipx" },
        { ARCTYPE_INET6,        "ipv6" },
        { ARCTYPE_DIAGNOSE,     "diag" },
        { ARCTYPE_IPX,          "ipx" },
        { ARCTYPE_INET6,        "ipv6" },
        { ARCTYPE_DIAGNOSE,     "diag" },

-       { 0, 0 }
+       { 0, NULL }

 };
 
 static void
 };
 
 static void


@@ -130,18 +130,18 @@ arcnet_print(netdissect_options *ndo, const u_char *bp, u_int length, int phds,
 
        if (ndo->ndo_qflag) {
                ND_PRINT("%02x %02x %u: ",
 
        if (ndo->ndo_qflag) {
                ND_PRINT("%02x %02x %u: ",

-                            EXTRACT_U_1(ap->arc_shost),
-                            EXTRACT_U_1(ap->arc_dhost),
+                            GET_U_1(ap->arc_shost),
+                            GET_U_1(ap->arc_dhost),

                             length);
                return;
        }
 
                             length);
                return;
        }
 

-       arctypename = tok2str(arctypemap, "%02x", EXTRACT_U_1(ap->arc_type));
+       arctypename = tok2str(arctypemap, "%02x", GET_U_1(ap->arc_type));

 
        if (!phds) {
                ND_PRINT("%02x %02x %s %u: ",
 
        if (!phds) {
                ND_PRINT("%02x %02x %s %u: ",

-                            EXTRACT_U_1(ap->arc_shost),
-                            EXTRACT_U_1(ap->arc_dhost),
+                            GET_U_1(ap->arc_shost),
+                            GET_U_1(ap->arc_dhost),

                             arctypename,
                             length);
                return;
                             arctypename,
                             length);
                return;


@@ -149,8 +149,8 @@ arcnet_print(netdissect_options *ndo, const u_char *bp, u_int length, int phds,
 
        if (flag == 0) {
                ND_PRINT("%02x %02x %s seqid %04x %u: ",
 
        if (flag == 0) {
                ND_PRINT("%02x %02x %s seqid %04x %u: ",

-                       EXTRACT_U_1(ap->arc_shost),
-                       EXTRACT_U_1(ap->arc_dhost),
+                       GET_U_1(ap->arc_shost),
+                       GET_U_1(ap->arc_dhost),

                        arctypename, seqid,
                        length);
                return;
                        arctypename, seqid,
                        length);
                return;


@@ -159,15 +159,15 @@ arcnet_print(netdissect_options *ndo, const u_char *bp, u_int length, int phds,
        if (flag & 1)
                ND_PRINT("%02x %02x %s seqid %04x "
                        "(first of %u fragments) %u: ",
        if (flag & 1)
                ND_PRINT("%02x %02x %s seqid %04x "
                        "(first of %u fragments) %u: ",

-                       EXTRACT_U_1(ap->arc_shost),
-                       EXTRACT_U_1(ap->arc_dhost),
+                       GET_U_1(ap->arc_shost),
+                       GET_U_1(ap->arc_dhost),

                        arctypename, seqid,
                        (flag + 3) / 2, length);
        else
                ND_PRINT("%02x %02x %s seqid %04x "
                        "(fragment %u) %u: ",
                        arctypename, seqid,
                        (flag + 3) / 2, length);
        else
                ND_PRINT("%02x %02x %s seqid %04x "
                        "(fragment %u) %u: ",

-                       EXTRACT_U_1(ap->arc_shost),
-                       EXTRACT_U_1(ap->arc_dhost),
+                       GET_U_1(ap->arc_shost),
+                       GET_U_1(ap->arc_dhost),

                        arctypename, seqid,
                        flag/2 + 1, length);
 }
                        arctypename, seqid,
                        flag/2 + 1, length);
 }


@@ -178,7 +178,7 @@ arcnet_print(netdissect_options *ndo, const u_char *bp, u_int length, int phds,
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */

-u_int
+void

 arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
        u_int caplen = h->caplen;
 arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
        u_int caplen = h->caplen;


@@ -190,14 +190,15 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
        u_int seqid = 0;
        u_char arc_type;
 
        u_int seqid = 0;
        u_char arc_type;
 

-       ndo->ndo_protocol = "arcnet_if";
+       ndo->ndo_protocol = "arcnet";

        if (caplen < ARC_HDRLEN) {
                nd_print_trunc(ndo);
        if (caplen < ARC_HDRLEN) {
                nd_print_trunc(ndo);

-               return (caplen);
+               ndo->ndo_ll_hdr_len += caplen;
+               return;

        }
 
        ap = (const struct arc_header *)p;
        }
 
        ap = (const struct arc_header *)p;

-       arc_type = EXTRACT_U_1(ap->arc_type);
+       arc_type = GET_U_1(ap->arc_type);

 
        switch (arc_type) {
        default:
 
        switch (arc_type) {
        default:


@@ -216,22 +217,24 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
                        arcnet_print(ndo, p, length, 0, 0, 0);
                        ND_PRINT(" phds");
                        nd_print_trunc(ndo);
                        arcnet_print(ndo, p, length, 0, 0, 0);
                        ND_PRINT(" phds");
                        nd_print_trunc(ndo);

-                       return (caplen);
+                       ndo->ndo_ll_hdr_len += caplen;
+                       return;

                }
 
                }
 

-               flag = EXTRACT_U_1(ap->arc_flag);
+               flag = GET_U_1(ap->arc_flag);

                if (flag == 0xff) {
                        if (caplen < ARC_HDRNEWLEN_EXC) {
                                arcnet_print(ndo, p, length, 0, 0, 0);
                                ND_PRINT(" phds extended");
                                nd_print_trunc(ndo);
                if (flag == 0xff) {
                        if (caplen < ARC_HDRNEWLEN_EXC) {
                                arcnet_print(ndo, p, length, 0, 0, 0);
                                ND_PRINT(" phds extended");
                                nd_print_trunc(ndo);

-                               return (caplen);
+                               ndo->ndo_ll_hdr_len += caplen;
+                               return;

                        }
                        }

-                       flag = EXTRACT_U_1(ap->arc_flag2);
-                       seqid = EXTRACT_BE_U_2(ap->arc_seqid2);
+                       flag = GET_U_1(ap->arc_flag2);
+                       seqid = GET_BE_U_2(ap->arc_seqid2);

                        archdrlen = ARC_HDRNEWLEN_EXC;
                } else {
                        archdrlen = ARC_HDRNEWLEN_EXC;
                } else {

-                       seqid = EXTRACT_BE_U_2(ap->arc_seqid);
+                       seqid = GET_BE_U_2(ap->arc_seqid);

                        archdrlen = ARC_HDRNEWLEN;
                }
        }
                        archdrlen = ARC_HDRNEWLEN;
                }
        }


@@ -251,13 +254,14 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
                /*
                 * This is a middle fragment.
                 */
                /*
                 * This is a middle fragment.
                 */

-               return (archdrlen);
+               ndo->ndo_ll_hdr_len += archdrlen;
+               return;

        }
 
        if (!arcnet_encap_print(ndo, arc_type, p, length, caplen))
                ND_DEFAULTPRINT(p, caplen);
 
        }
 
        if (!arcnet_encap_print(ndo, arc_type, p, length, caplen))
                ND_DEFAULTPRINT(p, caplen);
 

-       return (archdrlen);
+       ndo->ndo_ll_hdr_len += archdrlen;

 }
 
 /*
 }
 
 /*


@@ -270,7 +274,7 @@ arcnet_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_ch
  * reassembled packets rather than raw frames, and headers have an
  * extra "offset" field between the src/dest and packet type.
  */
  * reassembled packets rather than raw frames, and headers have an
  * extra "offset" field between the src/dest and packet type.
  */

-u_int
+void

 arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
        u_int caplen = h->caplen;
 arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
        u_int caplen = h->caplen;


@@ -280,21 +284,23 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons
        int archdrlen = 0;
        u_char arc_type;
 
        int archdrlen = 0;
        u_char arc_type;
 

-       ndo->ndo_protocol = "arcnet_linux_if";
+       ndo->ndo_protocol = "arcnet_linux";

        if (caplen < ARC_LINUX_HDRLEN) {
                nd_print_trunc(ndo);
        if (caplen < ARC_LINUX_HDRLEN) {
                nd_print_trunc(ndo);

-               return (caplen);
+               ndo->ndo_ll_hdr_len += caplen;
+               return;

        }
 
        ap = (const struct arc_linux_header *)p;
        }
 
        ap = (const struct arc_linux_header *)p;

-       arc_type = EXTRACT_U_1(ap->arc_type);
+       arc_type = GET_U_1(ap->arc_type);

 
        switch (arc_type) {
        default:
                archdrlen = ARC_LINUX_HDRNEWLEN;
                if (caplen < ARC_LINUX_HDRNEWLEN) {
                        nd_print_trunc(ndo);
 
        switch (arc_type) {
        default:
                archdrlen = ARC_LINUX_HDRNEWLEN;
                if (caplen < ARC_LINUX_HDRNEWLEN) {
                        nd_print_trunc(ndo);

-                       return (caplen);
+                       ndo->ndo_ll_hdr_len += caplen;
+                       return;

                }
                break;
        case ARCTYPE_IP_OLD:
                }
                break;
        case ARCTYPE_IP_OLD:


@@ -317,7 +323,7 @@ arcnet_linux_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, cons
        if (!arcnet_encap_print(ndo, arc_type, p, length, caplen))
                ND_DEFAULTPRINT(p, caplen);
 
        if (!arcnet_encap_print(ndo, arc_type, p, length, caplen))
                ND_DEFAULTPRINT(p, caplen);
 

-       return (archdrlen);
+       ndo->ndo_ll_hdr_len += archdrlen;

 }
 
 /*
 }
 
 /*