X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/59864b113d8f2310a38d916e11a27c6f7e979ad9..d7d269e8c67b6e8262db27bb92ae524aa3c3f439:/print-cip.c diff --git a/print-cip.c b/print-cip.c index 23f61788..2ea50bc0 100644 --- a/print-cip.c +++ b/print-cip.c @@ -26,9 +26,9 @@ #include -#include +#include -#include "interface.h" +#include "netdissect.h" #include "addrtoname.h" #define RFC1483LLC_LEN 8 @@ -61,6 +61,7 @@ cip_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char { u_int caplen = h->caplen; u_int length = h->len; + int llc_hdrlen; if (memcmp(rfcllc, p, sizeof(rfcllc))==0 && caplen < RFC1483LLC_LEN) { ND_PRINT((ndo, "[|cip]")); @@ -74,18 +75,22 @@ cip_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char /* * LLC header is present. Try to print it & higher layers. */ - if (llc_print(ndo, p, length, caplen, NULL, NULL) == 0) { + 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) 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); + return (llc_hdrlen); }