Makefile.in: don't remove configure and config.h.in in make distclean.

[tcpdump] / print-ipoib.c

diff --git a/print-ipoib.c b/print-ipoib.c
index c835db9897ae3edaa7a4dabc7b7d6b990681abbd..3d43123505a1151c1f430fe2b7396fc20d1f53ac 100644 (file)
--- a/print-ipoib.c
+++ b/print-ipoib.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 
+ * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996,
  *     1997, 2000, 2011, 2012
  *     The Regents of the University of California.  All rights reserved.
  *
@@ -23,14 +23,13 @@
  * Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
  */
 
+/* \summary: IP-over-InfiniBand (IPoIB) printer */
+
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
-#include <netdissect-stdinc.h>
-
-#include <stdio.h>
-#include <pcap.h>
+#include "netdissect-stdinc.h"
 
 #include "netdissect.h"
 #include "extract.h"
@@ -46,17 +45,17 @@ ipoib_hdr_print(netdissect_options *ndo, const u_char *bp, u_int length)
 {
        uint16_t ether_type;
 
-       ether_type = GET_BE_U_2(&bp[40]);
+       ether_type = GET_BE_U_2(bp + 40);
        if (!ndo->ndo_qflag) {
-               (void)printf(", ethertype %s (0x%04x)",
+               ND_PRINT(", ethertype %s (0x%04x)",
                             tok2str(ethertype_values,"Unknown", ether_type),
                             ether_type);
        } else {
-               (void)printf(", ethertype %s",
+               ND_PRINT(", ethertype %s",
                             tok2str(ethertype_values,"Unknown", ether_type));
        }
 
-       (void)printf(", length %u: ", length);
+       ND_PRINT(", length %u: ", length);
 }
 
 /*
@@ -73,21 +72,30 @@ ipoib_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
        u_int orig_length;
        u_short ether_type;
 
-       if (caplen < IPOIB_HDRLEN || length < IPOIB_HDRLEN) {
-               printf("[|ipoib]");
+       if (caplen < IPOIB_HDRLEN) {
+               nd_print_trunc(ndo);
+               ndo->ndo_ll_hdr_len += caplen;
+               return;
+       }
+
+       if (length < IPOIB_HDRLEN) {
+               nd_print_trunc(ndo);
+               ndo->ndo_ll_hdr_len += length;
                return;
        }
 
        if (ndo->ndo_eflag) {
+               nd_print_protocol_caps(ndo);
                if (print_encap_header != NULL)
                        (*print_encap_header)(encap_header_arg);
                ipoib_hdr_print(ndo, p, length);
        }
        orig_length = length;
 
+       ndo->ndo_ll_hdr_len += IPOIB_HDRLEN;
        length -= IPOIB_HDRLEN;
        caplen -= IPOIB_HDRLEN;
-       ether_type = GET_BE_U_2(&p[40]);
+       ether_type = GET_BE_U_2(p + 40);
        p += IPOIB_HDRLEN;
 
        if (ethertype_print(ndo, ether_type, p, length, caplen, NULL, NULL) == 0) {
@@ -109,17 +117,9 @@ ipoib_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
  * 'h->len' is the length of the packet off the wire, and 'h->caplen'
  * is the number of bytes actually captured.
  */
-u_int
+void
 ipoib_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
+       ndo->ndo_protocol = "ipoib";
        ipoib_print(ndo, p, h->len, h->caplen, NULL, NULL);
-
-       return (IPOIB_HDRLEN);
 }
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */