X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/8e0c4a48bab394d6b3756ac6e9b5aac78876e27d..refs/pull/1034/head:/print-ipoib.c

diff --git a/print-ipoib.c b/print-ipoib.c
index 63d61b3a..3d431235 100644
--- 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.
  *
@@ -26,13 +26,10 @@
 /* \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"
@@ -75,19 +72,27 @@ 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) {
+	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("IPOIB");
+		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);
@@ -112,11 +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);
 }