remove redundant ND_TCHECK, let GET_ routines handle checks

[tcpdump] / print-cip.c

diff --git a/print-cip.c b/print-cip.c
index f8b48ec2a92a206eef9f1419e42ce4c1c56ddbdf..8838dc99c9227a50eb6ea9eb05a84d897de41238 100644 (file)
--- a/print-cip.c
+++ b/print-cip.c
@@ -20,20 +20,19 @@
  *
  */
 
-#define NETDISSECT_REWORKED
+/* \summary: Linux Classical IP over ATM printer */
+
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include <string.h>
 
-#include <tcpdump-stdinc.h>
+#include "netdissect-stdinc.h"
 
-#include "interface.h"
+#include "netdissect.h"
 #include "addrtoname.h"
 
-#define RFC1483LLC_LEN 8
-
 static const unsigned char rfcllc[] = {
        0xaa,   /* DSAP: non-ISO */
        0xaa,   /* SSAP: non-ISO */
@@ -42,13 +41,13 @@ static const unsigned char rfcllc[] = {
        0x00,
        0x00 };
 
-static inline void
-cip_print(netdissect_options *ndo, int length)
+static void
+cip_print(netdissect_options *ndo, u_int length)
 {
        /*
         * There is no MAC-layer header, so just print the length.
         */
-       ND_PRINT((ndo, "%d: ", length));
+       ND_PRINT("%u: ", length);
 }
 
 /*
@@ -57,51 +56,46 @@ cip_print(netdissect_options *ndo, int length)
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
+void
 cip_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
        u_int caplen = h->caplen;
        u_int length = h->len;
-       u_short extracted_ethertype;
+       size_t cmplen;
+       int llc_hdrlen;
 
-       if (memcmp(rfcllc, p, sizeof(rfcllc))==0 && caplen < RFC1483LLC_LEN) {
-               ND_PRINT((ndo, "[|cip]"));
-               return (0);
-       }
+       ndo->ndo_protocol = "cip";
+       cmplen = sizeof(rfcllc);
+       if (cmplen > caplen)
+               cmplen = caplen;
+       if (cmplen > length)
+               cmplen = length;
 
        if (ndo->ndo_eflag)
                cip_print(ndo, length);
 
-       if (memcmp(rfcllc, p, sizeof(rfcllc)) == 0) {
+       if (cmplen == 0) {
+               nd_print_trunc(ndo);
+               return;
+       }
+       if (memcmp(rfcllc, p, cmplen) == 0) {
                /*
                 * LLC header is present.  Try to print it & higher layers.
                 */
-               if (llc_print(ndo, p, length, caplen, NULL, NULL,
-                   &extracted_ethertype) == 0) {
-                       /* ether_type not known, print raw packet */
-                       if (!ndo->ndo_eflag)
-                               cip_print(ndo, length);
-                       if (extracted_ethertype) {
-                               ND_PRINT((ndo, "(LLC %s) ",
-                              etherproto_string(htons(extracted_ethertype))));
-                       }
+               llc_hdrlen = llc_print(ndo, p, length, caplen, NULL, NULL);
+               if (llc_hdrlen < 0) {
+                       /* packet type not known, print raw packet */
                        if (!ndo->ndo_suppress_default_print)
-                               ndo->ndo_default_print(ndo, p, caplen);
+                               ND_DEFAULTPRINT(p, caplen);
+                       llc_hdrlen = -llc_hdrlen;
                }
        } else {
                /*
                 * LLC header is absent; treat it as just IP.
                 */
+               llc_hdrlen = 0;
                ip_print(ndo, p, length);
        }
 
-       return (0);
+       ndo->ndo_ll_hdr_len += llc_hdrlen;
 }
-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */