EAP: Add verbose output for the test case eapon1.pcap

[tcpdump] / print-smb.c

diff --git a/print-smb.c b/print-smb.c
index 402bb71f0c7cd5051d6c0b9103c5e0abb8d2378e..77d9f8144bc0739bd3fc6ca2c11a6fd5382e2e26 100644 (file)
--- a/print-smb.c
+++ b/print-smb.c
@@ -952,7 +952,7 @@ nbt_tcp_print(netdissect_options *ndo,
        goto trunc;
     if (ndo->ndo_snapend < data)
        goto trunc;
-    caplen = ndo->ndo_snapend - data;
+    caplen = ND_BYTES_AVAILABLE_AFTER(data);
     if (caplen < 4)
        goto trunc;
     maxbuf = data + caplen;
@@ -1237,7 +1237,7 @@ nbt_udp137_print(netdissect_options *ndo,
                } else {
                    if (p >= maxbuf)
                        goto out;
-                   smb_data_print(ndo, p, min(rdlen, length - (p - data)));
+                   smb_data_print(ndo, p, min(rdlen, length - ND_BYTES_BETWEEN(p, data)));
                    p += rdlen;
                }
            }
@@ -1269,7 +1269,7 @@ smb_tcp_print(netdissect_options *ndo,
        goto trunc;
     if (ndo->ndo_snapend < data)
        goto trunc;
-    caplen = ndo->ndo_snapend - data;
+    caplen = ND_BYTES_AVAILABLE_AFTER(data);
     if (caplen < 4)
        goto trunc;
     maxbuf = data + caplen;