3 @@ -70,6 +70,82 @@ DEPENDENCY_CFLAG = @DEPENDENCY_CFLAG@
5 $(CC) $(FULL_CFLAGS) -c $(srcdir)/$*.c
16 + ascii_strcasecmp.c \
83 CSRC = setsignal.c tcpdump.c util.c
86 @@ -236,12 +312,16 @@ LIBNETDISSECT_SRC=\
97 LIBNETDISSECT_OBJ=$(LIBNETDISSECT_SRC:.c=.o) ${LOCALSRC:.c=.o} ${LIBOBJS}
98 LIBNETDISSECT=libnetdissect.a
102 SRC = $(CSRC) $(GENSRC) $(LOCALSRC) $(LIBNETDISSECT_SRC)
103 @@ -367,10 +447,12 @@ $(PROG): $(OBJ) @V_PCAPDEP@
105 $(CC) $(FULL_CFLAGS) $(LDFLAGS) -o $@ $(OBJ) $(LIBS)
108 $(LIBNETDISSECT): $(LIBNETDISSECT_OBJ)
110 $(AR) cr $@ $(LIBNETDISSECT_OBJ)
114 datalinks.o: $(srcdir)/missing/datalinks.c
115 $(CC) $(FULL_CFLAGS) -o $@ -c $(srcdir)/missing/datalinks.c
118 @@ -564,8 +564,10 @@ linkaddr_string(netdissect_options *ndo,
119 if (type == LINKADDR_ETHER && len == ETHER_ADDR_LEN)
120 return (etheraddr_string(ndo, ep));
122 +#ifndef TCPDUMP_MINI
123 if (type == LINKADDR_FRELAY)
124 return (q922_string(ndo, ep, len));
127 tp = lookup_bytestring(ndo, ep, len);
129 @@ -1200,6 +1202,7 @@ init_addrtoname(netdissect_options *ndo,
130 init_ipxsaparray(ndo);
133 +#ifndef TCPDUMP_MINI
135 dnaddr_string(netdissect_options *ndo, u_short dnaddr)
137 @@ -1219,6 +1222,7 @@ dnaddr_string(netdissect_options *ndo, u
143 /* Return a zero'ed hnamemem struct and cuts down on calloc() overhead */
147 @@ -48,6 +48,7 @@ static const struct printer printers[] =
149 { ipnet_if_print, DLT_IPNET },
151 +#ifndef TCPDUMP_MINI
152 #ifdef DLT_IEEE802_15_4
153 { ieee802_15_4_if_print, DLT_IEEE802_15_4 },
155 @@ -57,12 +58,14 @@ static const struct printer printers[] =
157 { ppi_if_print, DLT_PPI },
160 #ifdef DLT_NETANALYZER
161 { netanalyzer_if_print, DLT_NETANALYZER },
163 #ifdef DLT_NETANALYZER_TRANSPARENT
164 { netanalyzer_transparent_if_print, DLT_NETANALYZER_TRANSPARENT },
166 +#ifndef TCPDUMP_MINI
167 #if defined(DLT_NFLOG) && defined(HAVE_PCAP_NFLOG_H)
168 { nflog_if_print, DLT_NFLOG},
170 @@ -75,10 +78,12 @@ static const struct printer printers[] =
171 #ifdef DLT_IP_OVER_FC
172 { ipfc_if_print, DLT_IP_OVER_FC },
175 { null_if_print, DLT_NULL },
177 { null_if_print, DLT_LOOP },
179 +#ifndef TCPDUMP_MINI
180 #ifdef DLT_APPLE_IP_OVER_IEEE1394
181 { ap1394_if_print, DLT_APPLE_IP_OVER_IEEE1394 },
183 @@ -92,7 +97,9 @@ static const struct printer printers[] =
184 #ifdef DLT_ARCNET_LINUX
185 { arcnet_linux_if_print, DLT_ARCNET_LINUX },
188 { raw_if_print, DLT_RAW },
189 +#ifndef TCPDUMP_MINI
191 { raw_if_print, DLT_IPV4 },
193 @@ -116,17 +123,21 @@ static const struct printer printers[] =
195 { chdlc_if_print, DLT_HDLC },
199 { pppoe_if_print, DLT_PPP_ETHER },
201 +#ifndef TCPDUMP_MINI
202 #if defined(DLT_PFLOG) && defined(HAVE_NET_IF_PFLOG_H)
203 { pflog_if_print, DLT_PFLOG },
205 { token_if_print, DLT_IEEE802 },
206 { fddi_if_print, DLT_FDDI },
209 { sll_if_print, DLT_LINUX_SLL },
211 +#ifndef TCPDUMP_MINI
213 { fr_if_print, DLT_FR },
215 @@ -198,6 +209,7 @@ static const struct printer printers[] =
217 { pktap_if_print, DLT_PKTAP },
220 #ifdef DLT_IEEE802_11_RADIO
221 { ieee802_11_radio_if_print, DLT_IEEE802_11_RADIO },
223 @@ -214,12 +226,14 @@ static const struct printer printers[] =
224 #ifdef DLT_PPP_WITHDIRECTION
225 { ppp_if_print, DLT_PPP_WITHDIRECTION },
227 +#ifndef TCPDUMP_MINI
229 { ppp_bsdos_if_print, DLT_PPP_BSDOS },
231 #ifdef DLT_PPP_SERIAL
232 { ppp_hdlc_if_print, DLT_PPP_SERIAL },
240 @@ -332,6 +332,7 @@ ethertype_print(netdissect_options *ndo,
241 arp_print(ndo, p, length, caplen);
244 +#ifndef TCPDUMP_MINI
246 decnet_print(ndo, p, length, caplen);
248 @@ -354,6 +355,7 @@ ethertype_print(netdissect_options *ndo,
250 isoclns_print(ndo, p + 1, length - 1, length - 1);
254 case ETHERTYPE_PPPOED:
255 case ETHERTYPE_PPPOES:
256 @@ -366,9 +368,11 @@ ethertype_print(netdissect_options *ndo,
257 eap_print(ndo, p, length);
260 +#ifndef TCPDUMP_MINI
262 rrcp_print(ndo, p - 14 , length + 14);
268 @@ -377,6 +381,7 @@ ethertype_print(netdissect_options *ndo,
272 +#ifndef TCPDUMP_MINI
274 mpcp_print(ndo, p, length);
276 @@ -389,6 +394,7 @@ ethertype_print(netdissect_options *ndo,
277 case ETHERTYPE_CFM_OLD:
278 cfm_print(ndo, p, length);
283 lldp_print(ndo, p, length);
284 @@ -398,6 +404,7 @@ ethertype_print(netdissect_options *ndo,
285 loopback_print(ndo, p, length);
288 +#ifndef TCPDUMP_MINI
290 case ETHERTYPE_MPLS_MULTI:
291 mpls_print(ndo, p, length);
292 @@ -427,6 +434,7 @@ ethertype_print(netdissect_options *ndo,
293 case ETHERTYPE_MEDSA:
294 medsa_print(ndo, p, length, caplen);
302 @@ -203,6 +203,7 @@ gre_print_0(netdissect_options *ndo, con
304 ip6_print(ndo, bp, len);
306 +#ifndef TCPDUMP_MINI
308 mpls_print(ndo, bp, len);
310 @@ -218,6 +219,7 @@ gre_print_0(netdissect_options *ndo, con
312 ether_print(ndo, bp, len, len, NULL, NULL);
316 ND_PRINT((ndo, "gre-proto-0x%x", prot));
320 @@ -304,6 +304,7 @@ igmp_print(netdissect_options *ndo,
321 ND_TCHECK2(bp[4], 4);
322 ND_PRINT((ndo, "igmp leave %s", ipaddr_string(ndo, &bp[4])));
324 +#ifndef TCPDUMP_MINI
326 ND_PRINT((ndo, "igmp dvmrp"));
328 @@ -315,6 +316,7 @@ igmp_print(netdissect_options *ndo,
329 ND_PRINT((ndo, "igmp pimv1"));
330 pimv1_print(ndo, bp, len);
334 print_mresp(ndo, bp, len);
338 @@ -297,6 +297,7 @@ ip6_print(netdissect_options *ndo, const
339 advance = dstopt_print(ndo, cp);
342 +#ifndef TCPDUMP_MINI
343 case IPPROTO_FRAGMENT:
344 advance = frag6_print(ndo, cp, (const u_char *)ip6);
345 if (ndo->ndo_snapend <= cp + advance)
346 @@ -318,16 +319,19 @@ ip6_print(netdissect_options *ndo, const
347 advance = mobility_print(ndo, cp, (const u_char *)ip6);
351 case IPPROTO_ROUTING:
352 advance = rt6_print(ndo, cp, (const u_char *)ip6);
355 +#ifndef TCPDUMP_MINI
357 sctp_print(ndo, cp, (const u_char *)ip6, len);
360 dccp_print(ndo, cp, (const u_char *)ip6, len);
364 tcp_print(ndo, cp, len, (const u_char *)ip6, fragmented);
366 @@ -337,6 +341,7 @@ ip6_print(netdissect_options *ndo, const
368 icmp6_print(ndo, cp, len, (const u_char *)ip6, fragmented);
370 +#ifndef TCPDUMP_MINI
372 advance = ah_print(ndo, cp);
374 @@ -360,6 +365,7 @@ ip6_print(netdissect_options *ndo, const
376 pim_print(ndo, cp, len, (const u_char *)ip6);
381 ospf6_print(ndo, cp, len);
382 @@ -373,9 +379,11 @@ ip6_print(netdissect_options *ndo, const
383 ip_print(ndo, cp, len);
386 +#ifndef TCPDUMP_MINI
388 pgm_print(ndo, cp, len, (const u_char *)ip6);
393 gre_print(ndo, cp, len);
396 @@ -327,6 +327,7 @@ ip_print_demux(netdissect_options *ndo,
400 +#ifndef TCPDUMP_MINI
402 ipds->nh = *ipds->cp;
403 ipds->advance = ah_print(ndo, ipds->cp);
404 @@ -361,7 +362,9 @@ again:
405 ipds->nh = enh & 0xff;
410 +#ifndef TCPDUMP_MINI
412 sctp_print(ndo, ipds->cp, (const u_char *)ipds->ip, ipds->len);
414 @@ -369,6 +372,7 @@ again:
416 dccp_print(ndo, ipds->cp, (const u_char *)ipds->ip, ipds->len);
421 /* pass on the MF bit plus the offset to detect fragments */
422 @@ -388,6 +392,7 @@ again:
423 ipds->off & (IP_MF|IP_OFFMASK));
426 +#ifndef TCPDUMP_MINI
429 * XXX - the current IANA protocol number assignments
430 @@ -408,14 +413,17 @@ again:
432 eigrp_print(ndo, ipds->cp, ipds->len);
437 ND_PRINT((ndo, " nd %d", ipds->len));
440 +#ifndef TCPDUMP_MINI
442 egp_print(ndo, ipds->cp, ipds->len);
447 ospf_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip);
448 @@ -448,6 +456,7 @@ again:
449 gre_print(ndo, ipds->cp, ipds->len);
452 +#ifndef TCPDUMP_MINI
454 mobile_print(ndo, ipds->cp, ipds->len);
456 @@ -476,6 +485,7 @@ again:
458 pgm_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip);
463 if (ndo->ndo_nflag==0 && (proto = getprotobynumber(ipds->nh)) != NULL)
466 @@ -204,6 +204,7 @@ llc_print(netdissect_options *ndo, const
467 hdrlen = 4; /* DSAP, SSAP, 2-byte control field */
470 +#ifndef TCPDUMP_MINI
471 if (ssap_field == LLCSAP_GLOBAL && dsap_field == LLCSAP_GLOBAL) {
473 * This is an Ethernet_802.3 IPX frame; it has an
474 @@ -226,6 +227,7 @@ llc_print(netdissect_options *ndo, const
475 ipx_print(ndo, p, length);
476 return (0); /* no LLC header */
480 dsap = dsap_field & ~LLC_IG;
481 ssap = ssap_field & ~LLC_GSAP;
482 @@ -289,6 +291,7 @@ llc_print(netdissect_options *ndo, const
486 +#ifndef TCPDUMP_MINI
487 if (ssap == LLCSAP_IPX && dsap == LLCSAP_IPX &&
490 @@ -302,6 +305,7 @@ llc_print(netdissect_options *ndo, const
491 ipx_print(ndo, p, length);
497 if (ssap == LLCSAP_NETBEUI && dsap == LLCSAP_NETBEUI
498 @@ -320,11 +324,13 @@ llc_print(netdissect_options *ndo, const
502 +#ifndef TCPDUMP_MINI
503 if (ssap == LLCSAP_ISONS && dsap == LLCSAP_ISONS
504 && control == LLC_UI) {
505 isoclns_print(ndo, p, length, caplen);
510 if (!ndo->ndo_eflag) {
512 @@ -458,6 +464,7 @@ snap_print(netdissect_options *ndo, cons
516 +#ifndef TCPDUMP_MINI
518 cdp_print(ndo, p, length, caplen);
520 @@ -470,6 +477,7 @@ snap_print(netdissect_options *ndo, cons
522 vtp_print(ndo, p, length);
526 case PID_CISCO_VLANBRIDGE:
527 stp_print(ndo, p, length);
528 @@ -482,6 +490,7 @@ snap_print(netdissect_options *ndo, cons
532 +#ifndef TCPDUMP_MINI
533 case PID_RFC2684_ETH_FCS:
534 case PID_RFC2684_ETH_NOFCS:
536 @@ -543,6 +552,7 @@ snap_print(netdissect_options *ndo, cons
538 fddi_print(ndo, p, length, caplen);
542 case PID_RFC2684_BPDU:
543 stp_print(ndo, p, length);
546 @@ -114,6 +114,7 @@ null_if_print(netdissect_options *ndo, c
547 ip6_print(ndo, p, length);
550 +#ifndef TCPDUMP_MINI
552 isoclns_print(ndo, p, length, caplen);
554 @@ -125,6 +126,7 @@ null_if_print(netdissect_options *ndo, c
556 ipx_print(ndo, p, length);
561 /* unknown AF_ value */
564 @@ -1346,6 +1346,7 @@ trunc:
568 +#ifndef TCPDUMP_MINI
570 ppp_hdlc(netdissect_options *ndo,
571 const u_char *p, int length)
572 @@ -1424,6 +1425,7 @@ trunc:
574 ND_PRINT((ndo, "[|ppp]"));
580 @@ -1431,10 +1433,12 @@ static void
581 handle_ppp(netdissect_options *ndo,
582 u_int proto, const u_char *p, int length)
584 +#ifndef TCPDUMP_MINI
585 if ((proto & 0xff00) == 0x7e00) { /* is this an escape code ? */
586 ppp_hdlc(ndo, p - 1, length);
592 case PPP_LCP: /* fall through */
593 @@ -1467,6 +1471,7 @@ handle_ppp(netdissect_options *ndo,
595 ip6_print(ndo, p, length);
597 +#ifndef TCPDUMP_MINI
598 case ETHERTYPE_IPX: /*XXX*/
600 ipx_print(ndo, p, length);
601 @@ -1478,6 +1483,7 @@ handle_ppp(netdissect_options *ndo,
603 mpls_print(ndo, p, length);
607 ND_PRINT((ndo, "compressed PPP data"));
609 @@ -1618,6 +1624,7 @@ ppp_if_print(netdissect_options *ndo,
613 +#ifndef TCPDUMP_MINI
615 * PPP I/F printer to use if we know that RFC 1662-style PPP in HDLC-like
616 * framing, or Cisco PPP with HDLC framing as per section 4.3.1 of RFC 1547,
617 @@ -1840,6 +1847,7 @@ printx:
618 #endif /* __bsdi__ */
627 @@ -236,12 +236,14 @@ recurse:
629 switch (ether_type) {
631 +#ifndef TCPDUMP_MINI
632 case LINUX_SLL_P_802_3:
634 * Ethernet_802.3 IPX frame.
636 ipx_print(ndo, p, length);
640 case LINUX_SLL_P_802_2:
644 @@ -565,12 +565,14 @@ tcp_print(netdissect_options *ndo,
645 ND_PRINT((ndo, " %u", utoval));
648 +#ifndef TCPDUMP_MINI
652 if (!mptcp_print(ndo, cp-2, len, flags))
657 case TCPOPT_FASTOPEN:
659 @@ -645,6 +647,7 @@ tcp_print(netdissect_options *ndo,
663 +#ifndef TCPDUMP_MINI
664 if (ndo->ndo_packettype) {
665 switch (ndo->ndo_packettype) {
667 @@ -656,28 +659,36 @@ tcp_print(netdissect_options *ndo,
673 if (IS_SRC_OR_DST_PORT(TELNET_PORT)) {
674 telnet_print(ndo, bp, length);
675 } else if (IS_SRC_OR_DST_PORT(SMTP_PORT)) {
676 ND_PRINT((ndo, ": "));
677 smtp_print(ndo, bp, length);
678 - } else if (IS_SRC_OR_DST_PORT(BGP_PORT))
680 +#ifndef TCPDUMP_MINI
681 + else if (IS_SRC_OR_DST_PORT(BGP_PORT))
682 bgp_print(ndo, bp, length);
684 else if (IS_SRC_OR_DST_PORT(PPTP_PORT))
686 +#ifndef TCPDUMP_MINI
687 else if (IS_SRC_OR_DST_PORT(REDIS_PORT))
688 resp_print(ndo, bp, length);
691 else if (IS_SRC_OR_DST_PORT(NETBIOS_SSN_PORT))
692 nbt_tcp_print(ndo, bp, length);
693 else if (IS_SRC_OR_DST_PORT(SMB_PORT))
694 smb_tcp_print(ndo, bp, length);
696 +#ifndef TCPDUMP_MINI
697 else if (IS_SRC_OR_DST_PORT(BEEP_PORT))
698 beep_print(ndo, bp, length);
699 else if (IS_SRC_OR_DST_PORT(OPENFLOW_PORT_OLD) || IS_SRC_OR_DST_PORT(OPENFLOW_PORT_IANA))
700 openflow_print(ndo, bp, length);
702 else if (IS_SRC_OR_DST_PORT(FTP_PORT)) {
703 ND_PRINT((ndo, ": "));
704 ftp_print(ndo, bp, length);
705 @@ -694,6 +705,7 @@ tcp_print(netdissect_options *ndo,
706 * XXX packet could be unaligned, it can go strange
708 ns_print(ndo, bp + 2, length - 2, 0);
709 +#ifndef TCPDUMP_MINI
710 } else if (IS_SRC_OR_DST_PORT(MSDP_PORT)) {
711 msdp_print(ndo, bp, length);
712 } else if (IS_SRC_OR_DST_PORT(RPKI_RTR_PORT)) {
713 @@ -701,6 +713,7 @@ tcp_print(netdissect_options *ndo,
715 else if (length > 0 && (IS_SRC_OR_DST_PORT(LDP_PORT))) {
716 ldp_print(ndo, bp, length);
719 else if ((IS_SRC_OR_DST_PORT(NFS_PORT)) &&
720 length >= 4 && ND_TTEST2(*bp, 4)) {
723 @@ -397,10 +397,12 @@ udp_print(netdissect_options *ndo, regis
724 vat_print(ndo, (const void *)(up + 1), up);
727 +#ifndef TCPDUMP_MINI
729 udpipaddr_print(ndo, ip, sport, dport);
730 wb_print(ndo, (const void *)(up + 1), length);
735 rp = (const struct sunrpc_msg *)(up + 1);
736 @@ -429,10 +431,12 @@ udp_print(netdissect_options *ndo, regis
737 snmp_print(ndo, (const u_char *)(up + 1), length);
740 +#ifndef TCPDUMP_MINI
742 udpipaddr_print(ndo, ip, sport, dport);
748 udpipaddr_print(ndo, ip, sport, dport);
749 @@ -450,6 +454,7 @@ udp_print(netdissect_options *ndo, regis
750 radius_print(ndo, cp, length);
753 +#ifndef TCPDUMP_MINI
755 udpipaddr_print(ndo, ip, sport, dport);
756 vxlan_print(ndo, (const u_char *)(up + 1), length);
757 @@ -464,6 +469,7 @@ udp_print(netdissect_options *ndo, regis
758 udpipaddr_print(ndo, ip, sport, dport);
759 lmp_print(ndo, cp, length);
765 @@ -541,31 +547,40 @@ udp_print(netdissect_options *ndo, regis
766 ns_print(ndo, (const u_char *)(up + 1), length, 0);
767 else if (IS_SRC_OR_DST_PORT(MULTICASTDNS_PORT))
768 ns_print(ndo, (const u_char *)(up + 1), length, 1);
769 +#ifndef TCPDUMP_MINI
770 else if (IS_SRC_OR_DST_PORT(TIMED_PORT))
771 timed_print(ndo, (const u_char *)(up + 1));
773 else if (IS_SRC_OR_DST_PORT(TFTP_PORT))
774 tftp_print(ndo, (const u_char *)(up + 1), length);
775 else if (IS_SRC_OR_DST_PORT(BOOTPC_PORT) || IS_SRC_OR_DST_PORT(BOOTPS_PORT))
776 bootp_print(ndo, (const u_char *)(up + 1), length);
777 +#ifndef TCPDUMP_MINI
778 else if (IS_SRC_OR_DST_PORT(RIP_PORT))
779 rip_print(ndo, (const u_char *)(up + 1), length);
781 else if (IS_SRC_OR_DST_PORT(AODV_PORT))
782 aodv_print(ndo, (const u_char *)(up + 1), length,
784 +#ifndef TCPDUMP_MINI
785 else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT))
786 isakmp_print(ndo, (const u_char *)(up + 1), length, bp2);
788 else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT_NATT))
789 isakmp_rfc3948_print(ndo, (const u_char *)(up + 1), length, bp2);
791 else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT_USER1) || IS_SRC_OR_DST_PORT(ISAKMP_PORT_USER2))
792 isakmp_print(ndo, (const u_char *)(up + 1), length, bp2);
795 else if (IS_SRC_OR_DST_PORT(SNMP_PORT) || IS_SRC_OR_DST_PORT(SNMPTRAP_PORT))
796 snmp_print(ndo, (const u_char *)(up + 1), length);
797 else if (IS_SRC_OR_DST_PORT(NTP_PORT))
798 ntp_print(ndo, (const u_char *)(up + 1), length);
799 +#ifndef TCPDUMP_MINI
800 else if (IS_SRC_OR_DST_PORT(KERBEROS_PORT) || IS_SRC_OR_DST_PORT(KERBEROS_SEC_PORT))
801 krb_print(ndo, (const void *)(up + 1));
803 else if (IS_SRC_OR_DST_PORT(L2TP_PORT))
804 l2tp_print(ndo, (const u_char *)(up + 1), length);
806 @@ -576,6 +591,7 @@ udp_print(netdissect_options *ndo, regis
808 else if (dport == VAT_PORT)
809 vat_print(ndo, (const void *)(up + 1), up);
810 +#ifndef TCPDUMP_MINI
811 else if (IS_SRC_OR_DST_PORT(ZEPHYR_SRV_PORT) || IS_SRC_OR_DST_PORT(ZEPHYR_CLT_PORT))
812 zephyr_print(ndo, (const void *)(up + 1), length);
814 @@ -588,8 +604,11 @@ udp_print(netdissect_options *ndo, regis
815 (const u_char *) ip);
816 else if (IS_SRC_OR_DST_PORT(RIPNG_PORT))
817 ripng_print(ndo, (const u_char *)(up + 1), length);
820 else if (IS_SRC_OR_DST_PORT(DHCP6_SERV_PORT) || IS_SRC_OR_DST_PORT(DHCP6_CLI_PORT))
821 dhcp6_print(ndo, (const u_char *)(up + 1), length);
822 +#ifndef TCPDUMP_MINI
823 else if (IS_SRC_OR_DST_PORT(AHCP_PORT))
824 ahcp_print(ndo, (const u_char *)(up + 1), length);
825 else if (IS_SRC_OR_DST_PORT(BABEL_PORT) || IS_SRC_OR_DST_PORT(BABEL_PORT_OLD))
826 @@ -603,6 +622,7 @@ udp_print(netdissect_options *ndo, regis
827 wb_print(ndo, (const void *)(up + 1), length);
828 else if (IS_SRC_OR_DST_PORT(CISCO_AUTORP_PORT))
829 cisco_autorp_print(ndo, (const void *)(up + 1), length);
831 else if (IS_SRC_OR_DST_PORT(RADIUS_PORT) ||
832 IS_SRC_OR_DST_PORT(RADIUS_NEW_PORT) ||
833 IS_SRC_OR_DST_PORT(RADIUS_ACCOUNTING_PORT) ||
834 @@ -610,15 +630,18 @@ udp_print(netdissect_options *ndo, regis
835 IS_SRC_OR_DST_PORT(RADIUS_CISCO_COA_PORT) ||
836 IS_SRC_OR_DST_PORT(RADIUS_COA_PORT) )
837 radius_print(ndo, (const u_char *)(up+1), length);
838 +#ifndef TCPDUMP_MINI
839 else if (dport == HSRP_PORT)
840 hsrp_print(ndo, (const u_char *)(up + 1), length);
841 else if (IS_SRC_OR_DST_PORT(LWRES_PORT))
842 lwres_print(ndo, (const u_char *)(up + 1), length);
843 else if (IS_SRC_OR_DST_PORT(LDP_PORT))
844 ldp_print(ndo, (const u_char *)(up + 1), length);
846 else if (IS_SRC_OR_DST_PORT(OLSR_PORT))
847 olsr_print(ndo, (const u_char *)(up + 1), length,
848 (IP_V(ip) == 6) ? 1 : 0);
849 +#ifndef TCPDUMP_MINI
850 else if (IS_SRC_OR_DST_PORT(MPLS_LSP_PING_PORT))
851 lspping_print(ndo, (const u_char *)(up + 1), length);
852 else if (dport == BFD_CONTROL_PORT ||
853 @@ -636,10 +659,12 @@ udp_print(netdissect_options *ndo, regis
854 lwapp_control_print(ndo, (const u_char *)(up + 1), length, 0);
855 else if (IS_SRC_OR_DST_PORT(LWAPP_DATA_PORT))
856 lwapp_data_print(ndo, (const u_char *)(up + 1), length);
858 else if (IS_SRC_OR_DST_PORT(SIP_PORT))
859 sip_print(ndo, (const u_char *)(up + 1), length);
860 else if (IS_SRC_OR_DST_PORT(SYSLOG_PORT))
861 syslog_print(ndo, (const u_char *)(up + 1), length);
862 +#ifndef TCPDUMP_MINI
863 else if (IS_SRC_OR_DST_PORT(OTV_PORT))
864 otv_print(ndo, (const u_char *)(up + 1), length);
865 else if (IS_SRC_OR_DST_PORT(VXLAN_PORT))
866 @@ -656,7 +681,9 @@ udp_print(netdissect_options *ndo, regis
868 ND_PRINT((ndo, "kip "));
869 llap_print(ndo, cp, length);
875 ND_PRINT((ndo, "UDP, bad length %u > %u",