|
|
|
@ -102,7 +102,7 @@
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
tp = lookup_bytestring(ndo, ep, len);
|
|
|
|
|
if (tp->bs_name)
|
|
|
|
|
if (tp->bs_name)
|
|
|
|
|
@@ -1214,6 +1216,7 @@ init_addrtoname(netdissect_options *ndo,
|
|
|
|
|
init_ipxsaparray(ndo);
|
|
|
|
|
}
|
|
|
|
@ -111,7 +111,7 @@
|
|
|
|
|
const char *
|
|
|
|
|
dnaddr_string(netdissect_options *ndo, u_short dnaddr)
|
|
|
|
|
{
|
|
|
|
|
@@ -1233,6 +1236,7 @@ dnaddr_string(netdissect_options *ndo, u
|
|
|
|
|
@@ -1230,6 +1233,7 @@ dnaddr_string(netdissect_options *ndo, u
|
|
|
|
|
|
|
|
|
|
return(tp->name);
|
|
|
|
|
}
|
|
|
|
@ -224,7 +224,7 @@
|
|
|
|
|
return (1);
|
|
|
|
|
@@ -368,6 +369,7 @@ ethertype_print(netdissect_options *ndo,
|
|
|
|
|
}
|
|
|
|
|
isoclns_print(ndo, p + 1, length - 1);
|
|
|
|
|
isoclns_print(ndo, p + 1, length - 1);
|
|
|
|
|
return(1);
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
@ -321,15 +321,15 @@
|
|
|
|
|
advance = frag6_print(ndo, cp, (const u_char *)ip6);
|
|
|
|
|
if (advance < 0 || ndo->ndo_snapend <= cp + advance)
|
|
|
|
|
@@ -328,6 +329,7 @@ ip6_print(netdissect_options *ndo, const
|
|
|
|
|
return;
|
|
|
|
|
return;
|
|
|
|
|
nh = *cp;
|
|
|
|
|
return;
|
|
|
|
|
+#endif
|
|
|
|
|
case IPPROTO_ROUTING:
|
|
|
|
|
ND_TCHECK(*cp);
|
|
|
|
|
ND_TCHECK(*cp);
|
|
|
|
|
advance = rt6_print(ndo, cp, (const u_char *)ip6);
|
|
|
|
|
@@ -335,12 +337,14 @@ ip6_print(netdissect_options *ndo, const
|
|
|
|
|
return;
|
|
|
|
|
return;
|
|
|
|
|
nh = *cp;
|
|
|
|
|
break;
|
|
|
|
|
+#ifndef TCPDUMP_MINI
|
|
|
|
@ -350,7 +350,7 @@
|
|
|
|
|
+#ifndef TCPDUMP_MINI
|
|
|
|
|
case IPPROTO_AH:
|
|
|
|
|
advance = ah_print(ndo, cp);
|
|
|
|
|
if (advance < 0)
|
|
|
|
|
if (advance < 0)
|
|
|
|
|
@@ -382,6 +387,7 @@ ip6_print(netdissect_options *ndo, const
|
|
|
|
|
case IPPROTO_PIM:
|
|
|
|
|
pim_print(ndo, cp, len, (const u_char *)ip6);
|
|
|
|
@ -440,7 +440,7 @@
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
default:
|
|
|
|
|
if (ndo->ndo_nflag==0 && (p_name = netdb_protoname(ipds->nh)) != NULL)
|
|
|
|
|
if (ndo->ndo_nflag==0 && (p_name = netdb_protoname(ipds->nh)) != NULL)
|
|
|
|
|
--- a/print-llc.c
|
|
|
|
|
+++ b/print-llc.c
|
|
|
|
|
@@ -206,6 +206,7 @@ llc_print(netdissect_options *ndo, const
|
|
|
|
@ -482,14 +482,14 @@
|
|
|
|
|
+#ifndef TCPDUMP_MINI
|
|
|
|
|
if (ssap == LLCSAP_ISONS && dsap == LLCSAP_ISONS
|
|
|
|
|
&& control == LLC_UI) {
|
|
|
|
|
isoclns_print(ndo, p, length);
|
|
|
|
|
isoclns_print(ndo, p, length);
|
|
|
|
|
return (hdrlen);
|
|
|
|
|
}
|
|
|
|
|
-
|
|
|
|
|
+#endif
|
|
|
|
|
if (!ndo->ndo_eflag) {
|
|
|
|
|
if (ssap == dsap) {
|
|
|
|
|
if (src == NULL || dst == NULL)
|
|
|
|
|
if (src == NULL || dst == NULL)
|
|
|
|
|
@@ -480,6 +485,7 @@ snap_print(netdissect_options *ndo, cons
|
|
|
|
|
|
|
|
|
|
case OUI_CISCO:
|
|
|
|
@ -530,7 +530,7 @@
|
|
|
|
|
|
|
|
|
|
+#ifndef TCPDUMP_MINI
|
|
|
|
|
case BSD_AFNUM_ISO:
|
|
|
|
|
isoclns_print(ndo, p, length);
|
|
|
|
|
isoclns_print(ndo, p, length);
|
|
|
|
|
break;
|
|
|
|
|
@@ -127,6 +128,7 @@ null_if_print(netdissect_options *ndo, c
|
|
|
|
|
case BSD_AFNUM_IPX:
|
|
|
|
@ -605,7 +605,7 @@
|
|
|
|
|
/*
|
|
|
|
|
--- a/print-sll.c
|
|
|
|
|
+++ b/print-sll.c
|
|
|
|
|
@@ -238,12 +238,14 @@ recurse:
|
|
|
|
|
@@ -249,12 +249,14 @@ recurse:
|
|
|
|
|
*/
|
|
|
|
|
switch (ether_type) {
|
|
|
|
|
|
|
|
|
@ -683,7 +683,7 @@
|
|
|
|
|
else if (IS_SRC_OR_DST_PORT(FTP_PORT)) {
|
|
|
|
|
ND_PRINT((ndo, ": "));
|
|
|
|
|
ftp_print(ndo, bp, length);
|
|
|
|
|
@@ -719,6 +730,7 @@ tcp_print(netdissect_options *ndo,
|
|
|
|
|
@@ -725,6 +736,7 @@ tcp_print(netdissect_options *ndo,
|
|
|
|
|
* XXX packet could be unaligned, it can go strange
|
|
|
|
|
*/
|
|
|
|
|
ns_print(ndo, bp + 2, length - 2, 0);
|
|
|
|
@ -691,7 +691,7 @@
|
|
|
|
|
} else if (IS_SRC_OR_DST_PORT(MSDP_PORT)) {
|
|
|
|
|
msdp_print(ndo, bp, length);
|
|
|
|
|
} else if (IS_SRC_OR_DST_PORT(RPKI_RTR_PORT)) {
|
|
|
|
|
@@ -726,6 +738,7 @@ tcp_print(netdissect_options *ndo,
|
|
|
|
|
@@ -732,6 +744,7 @@ tcp_print(netdissect_options *ndo,
|
|
|
|
|
}
|
|
|
|
|
else if (length > 0 && (IS_SRC_OR_DST_PORT(LDP_PORT))) {
|
|
|
|
|
ldp_print(ndo, bp, length);
|
|
|
|
|