CHANGES: Add a change backported to 4.99

[tcpdump] / print-ipoib.c

diff --git a/print-ipoib.c b/print-ipoib.c
index 5ebefd6cae2a87feee34aafe681cd7541fb43a6f..87ae97c8f51553847b9c228154d497647a7f39e4 100644 (file)
--- a/print-ipoib.c
+++ b/print-ipoib.c
@@ -25,14 +25,10 @@
 
 /* \summary: IP-over-InfiniBand (IPoIB) printer */
 
-#ifdef HAVE_CONFIG_H
 #include <config.h>
-#endif
 
 #include "netdissect-stdinc.h"
 
-#include <stdio.h>
-
 #include "netdissect.h"
 #include "extract.h"
 #include "addrtoname.h"
@@ -74,8 +70,15 @@ 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;
        }
 
@@ -87,6 +90,7 @@ ipoib_print(netdissect_options *ndo, const u_char *p, u_int length, u_int caplen
        }
        orig_length = length;
 
+       ndo->ndo_ll_hdr_len += IPOIB_HDRLEN;
        length -= IPOIB_HDRLEN;
        caplen -= IPOIB_HDRLEN;
        ether_type = GET_BE_U_2(p + 40);
@@ -111,11 +115,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);
 }