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
86 @@ -237,12 +313,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 @@ -373,10 +453,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 @@ -578,8 +578,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 @@ -1214,6 +1216,7 @@ init_addrtoname(netdissect_options *ndo,
130 init_ipxsaparray(ndo);
133 +#ifndef TCPDUMP_MINI
135 dnaddr_string(netdissect_options *ndo, u_short dnaddr)
137 @@ -1233,6 +1236,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 @@ -342,6 +342,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 @@ -368,6 +369,7 @@ ethertype_print(netdissect_options *ndo,
250 isoclns_print(ndo, p + 1, length - 1);
254 case ETHERTYPE_PPPOED:
255 case ETHERTYPE_PPPOES:
256 @@ -380,9 +382,11 @@ ethertype_print(netdissect_options *ndo,
257 eap_print(ndo, p, length);
260 +#ifndef TCPDUMP_MINI
262 rrcp_print(ndo, p, length, src, dst);
268 @@ -391,6 +395,7 @@ ethertype_print(netdissect_options *ndo,
272 +#ifndef TCPDUMP_MINI
274 mpcp_print(ndo, p, length);
276 @@ -403,6 +408,7 @@ ethertype_print(netdissect_options *ndo,
277 case ETHERTYPE_CFM_OLD:
278 cfm_print(ndo, p, length);
283 lldp_print(ndo, p, length);
284 @@ -412,6 +418,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 @@ -441,6 +448,7 @@ ethertype_print(netdissect_options *ndo,
293 case ETHERTYPE_MEDSA:
294 medsa_print(ndo, p, length, caplen, src, dst);
302 @@ -216,6 +216,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 @@ -231,6 +232,7 @@ gre_print_0(netdissect_options *ndo, con
312 ether_print(ndo, bp, len, ndo->ndo_snapend - bp, NULL, NULL);
316 ND_PRINT((ndo, "gre-proto-0x%x", prot));
320 @@ -306,6 +306,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 @@ -317,6 +318,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 @@ -305,6 +305,7 @@ ip6_print(netdissect_options *ndo, const
342 +#ifndef TCPDUMP_MINI
343 case IPPROTO_FRAGMENT:
344 advance = frag6_print(ndo, cp, (const u_char *)ip6);
345 if (advance < 0 || ndo->ndo_snapend <= cp + advance)
346 @@ -328,6 +329,7 @@ ip6_print(netdissect_options *ndo, const
351 case IPPROTO_ROUTING:
353 advance = rt6_print(ndo, cp, (const u_char *)ip6);
354 @@ -335,12 +337,14 @@ ip6_print(netdissect_options *ndo, const
358 +#ifndef TCPDUMP_MINI
360 sctp_print(ndo, cp, (const u_char *)ip6, len);
363 dccp_print(ndo, cp, (const u_char *)ip6, len);
367 tcp_print(ndo, cp, len, (const u_char *)ip6, fragmented);
369 @@ -350,6 +354,7 @@ ip6_print(netdissect_options *ndo, const
371 icmp6_print(ndo, cp, len, (const u_char *)ip6, fragmented);
373 +#ifndef TCPDUMP_MINI
375 advance = ah_print(ndo, cp);
377 @@ -382,6 +387,7 @@ ip6_print(netdissect_options *ndo, const
379 pim_print(ndo, cp, len, (const u_char *)ip6);
384 ospf6_print(ndo, cp, len);
385 @@ -395,9 +401,11 @@ ip6_print(netdissect_options *ndo, const
386 ip_print(ndo, cp, len);
389 +#ifndef TCPDUMP_MINI
391 pgm_print(ndo, cp, len, (const u_char *)ip6);
396 gre_print(ndo, cp, len);
399 @@ -344,6 +344,7 @@ ip_print_demux(netdissect_options *ndo,
403 +#ifndef TCPDUMP_MINI
405 if (!ND_TTEST(*ipds->cp)) {
406 ND_PRINT((ndo, "[|AH]"));
407 @@ -382,7 +383,9 @@ again:
413 +#ifndef TCPDUMP_MINI
415 sctp_print(ndo, ipds->cp, (const u_char *)ipds->ip, ipds->len);
417 @@ -390,6 +393,7 @@ again:
419 dccp_print(ndo, ipds->cp, (const u_char *)ipds->ip, ipds->len);
424 /* pass on the MF bit plus the offset to detect fragments */
425 @@ -409,6 +413,7 @@ again:
426 ipds->off & (IP_MF|IP_OFFMASK));
429 +#ifndef TCPDUMP_MINI
432 * XXX - the current IANA protocol number assignments
433 @@ -429,14 +434,17 @@ again:
435 eigrp_print(ndo, ipds->cp, ipds->len);
440 ND_PRINT((ndo, " nd %d", ipds->len));
443 +#ifndef TCPDUMP_MINI
445 egp_print(ndo, ipds->cp, ipds->len);
450 ospf_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip);
451 @@ -469,6 +477,7 @@ again:
452 gre_print(ndo, ipds->cp, ipds->len);
455 +#ifndef TCPDUMP_MINI
457 mobile_print(ndo, ipds->cp, ipds->len);
459 @@ -497,6 +506,7 @@ again:
461 pgm_print(ndo, ipds->cp, ipds->len, (const u_char *)ipds->ip);
466 if (ndo->ndo_nflag==0 && (p_name = netdb_protoname(ipds->nh)) != NULL)
469 @@ -206,6 +206,7 @@ llc_print(netdissect_options *ndo, const
470 hdrlen = 4; /* DSAP, SSAP, 2-byte control field */
473 +#ifndef TCPDUMP_MINI
474 if (ssap_field == LLCSAP_GLOBAL && dsap_field == LLCSAP_GLOBAL) {
476 * This is an Ethernet_802.3 IPX frame; it has an
477 @@ -228,6 +229,7 @@ llc_print(netdissect_options *ndo, const
478 ipx_print(ndo, p, length);
479 return (0); /* no LLC header */
483 dsap = dsap_field & ~LLC_IG;
484 ssap = ssap_field & ~LLC_GSAP;
485 @@ -291,6 +293,7 @@ llc_print(netdissect_options *ndo, const
489 +#ifndef TCPDUMP_MINI
490 if (ssap == LLCSAP_IPX && dsap == LLCSAP_IPX &&
493 @@ -304,6 +307,7 @@ llc_print(netdissect_options *ndo, const
494 ipx_print(ndo, p, length);
500 if (ssap == LLCSAP_NETBEUI && dsap == LLCSAP_NETBEUI
501 @@ -322,12 +326,13 @@ llc_print(netdissect_options *ndo, const
505 +#ifndef TCPDUMP_MINI
506 if (ssap == LLCSAP_ISONS && dsap == LLCSAP_ISONS
507 && control == LLC_UI) {
508 isoclns_print(ndo, p, length);
513 if (!ndo->ndo_eflag) {
515 if (src == NULL || dst == NULL)
516 @@ -480,6 +485,7 @@ snap_print(netdissect_options *ndo, cons
520 +#ifndef TCPDUMP_MINI
522 cdp_print(ndo, p, length, caplen);
524 @@ -492,6 +498,7 @@ snap_print(netdissect_options *ndo, cons
526 vtp_print(ndo, p, length);
530 case PID_CISCO_VLANBRIDGE:
531 stp_print(ndo, p, length);
532 @@ -504,6 +511,7 @@ snap_print(netdissect_options *ndo, cons
536 +#ifndef TCPDUMP_MINI
537 case PID_RFC2684_ETH_FCS:
538 case PID_RFC2684_ETH_NOFCS:
540 @@ -565,6 +573,7 @@ snap_print(netdissect_options *ndo, cons
542 fddi_print(ndo, p, length, caplen);
546 case PID_RFC2684_BPDU:
547 stp_print(ndo, p, length);
550 @@ -116,6 +116,7 @@ null_if_print(netdissect_options *ndo, c
551 ip6_print(ndo, p, length);
554 +#ifndef TCPDUMP_MINI
556 isoclns_print(ndo, p, length);
558 @@ -127,6 +128,7 @@ null_if_print(netdissect_options *ndo, c
560 ipx_print(ndo, p, length);
565 /* unknown AF_ value */
568 @@ -1367,6 +1367,7 @@ trunc:
572 +#ifndef TCPDUMP_MINI
574 ppp_hdlc(netdissect_options *ndo,
575 const u_char *p, int length)
576 @@ -1445,6 +1446,7 @@ trunc:
578 ND_PRINT((ndo, "[|ppp]"));
584 @@ -1452,10 +1454,12 @@ static void
585 handle_ppp(netdissect_options *ndo,
586 u_int proto, const u_char *p, int length)
588 +#ifndef TCPDUMP_MINI
589 if ((proto & 0xff00) == 0x7e00) { /* is this an escape code ? */
590 ppp_hdlc(ndo, p - 1, length);
596 case PPP_LCP: /* fall through */
597 @@ -1488,6 +1492,7 @@ handle_ppp(netdissect_options *ndo,
599 ip6_print(ndo, p, length);
601 +#ifndef TCPDUMP_MINI
602 case ETHERTYPE_IPX: /*XXX*/
604 ipx_print(ndo, p, length);
605 @@ -1499,6 +1504,7 @@ handle_ppp(netdissect_options *ndo,
607 mpls_print(ndo, p, length);
611 ND_PRINT((ndo, "compressed PPP data"));
613 @@ -1639,6 +1645,7 @@ ppp_if_print(netdissect_options *ndo,
617 +#ifndef TCPDUMP_MINI
619 * PPP I/F printer to use if we know that RFC 1662-style PPP in HDLC-like
620 * framing, or Cisco PPP with HDLC framing as per section 4.3.1 of RFC 1547,
621 @@ -1866,6 +1873,7 @@ printx:
622 #endif /* __bsdi__ */
631 @@ -238,12 +238,14 @@ recurse:
633 switch (ether_type) {
635 +#ifndef TCPDUMP_MINI
636 case LINUX_SLL_P_802_3:
638 * Ethernet_802.3 IPX frame.
640 ipx_print(ndo, p, length);
644 case LINUX_SLL_P_802_2:
648 @@ -589,12 +589,14 @@ tcp_print(netdissect_options *ndo,
649 ND_PRINT((ndo, " %u", utoval));
652 +#ifndef TCPDUMP_MINI
656 if (!mptcp_print(ndo, cp-2, len, flags))
661 case TCPOPT_FASTOPEN:
663 @@ -670,6 +672,7 @@ tcp_print(netdissect_options *ndo,
667 +#ifndef TCPDUMP_MINI
668 if (ndo->ndo_packettype) {
669 switch (ndo->ndo_packettype) {
671 @@ -681,28 +684,36 @@ tcp_print(netdissect_options *ndo,
677 if (IS_SRC_OR_DST_PORT(TELNET_PORT)) {
678 telnet_print(ndo, bp, length);
679 } else if (IS_SRC_OR_DST_PORT(SMTP_PORT)) {
680 ND_PRINT((ndo, ": "));
681 smtp_print(ndo, bp, length);
682 - } else if (IS_SRC_OR_DST_PORT(BGP_PORT))
684 +#ifndef TCPDUMP_MINI
685 + else if (IS_SRC_OR_DST_PORT(BGP_PORT))
686 bgp_print(ndo, bp, length);
688 else if (IS_SRC_OR_DST_PORT(PPTP_PORT))
690 +#ifndef TCPDUMP_MINI
691 else if (IS_SRC_OR_DST_PORT(REDIS_PORT))
692 resp_print(ndo, bp, length);
695 else if (IS_SRC_OR_DST_PORT(NETBIOS_SSN_PORT))
696 nbt_tcp_print(ndo, bp, length);
697 else if (IS_SRC_OR_DST_PORT(SMB_PORT))
698 smb_tcp_print(ndo, bp, length);
700 +#ifndef TCPDUMP_MINI
701 else if (IS_SRC_OR_DST_PORT(BEEP_PORT))
702 beep_print(ndo, bp, length);
703 else if (IS_SRC_OR_DST_PORT(OPENFLOW_PORT_OLD) || IS_SRC_OR_DST_PORT(OPENFLOW_PORT_IANA))
704 openflow_print(ndo, bp, length);
706 else if (IS_SRC_OR_DST_PORT(FTP_PORT)) {
707 ND_PRINT((ndo, ": "));
708 ftp_print(ndo, bp, length);
709 @@ -719,6 +730,7 @@ tcp_print(netdissect_options *ndo,
710 * XXX packet could be unaligned, it can go strange
712 ns_print(ndo, bp + 2, length - 2, 0);
713 +#ifndef TCPDUMP_MINI
714 } else if (IS_SRC_OR_DST_PORT(MSDP_PORT)) {
715 msdp_print(ndo, bp, length);
716 } else if (IS_SRC_OR_DST_PORT(RPKI_RTR_PORT)) {
717 @@ -726,6 +738,7 @@ tcp_print(netdissect_options *ndo,
719 else if (length > 0 && (IS_SRC_OR_DST_PORT(LDP_PORT))) {
720 ldp_print(ndo, bp, length);
723 else if ((IS_SRC_OR_DST_PORT(NFS_PORT)) &&
724 length >= 4 && ND_TTEST2(*bp, 4)) {
727 @@ -430,10 +430,12 @@ udp_print(netdissect_options *ndo, regis
728 vat_print(ndo, (const void *)(up + 1), up);
731 +#ifndef TCPDUMP_MINI
733 udpipaddr_print(ndo, ip, sport, dport);
734 wb_print(ndo, (const void *)(up + 1), length);
739 rp = (const struct sunrpc_msg *)(up + 1);
740 @@ -462,10 +464,12 @@ udp_print(netdissect_options *ndo, regis
741 snmp_print(ndo, (const u_char *)(up + 1), length);
744 +#ifndef TCPDUMP_MINI
746 udpipaddr_print(ndo, ip, sport, dport);
752 udpipaddr_print(ndo, ip, sport, dport);
753 @@ -483,6 +487,7 @@ udp_print(netdissect_options *ndo, regis
754 radius_print(ndo, cp, length);
757 +#ifndef TCPDUMP_MINI
759 udpipaddr_print(ndo, ip, sport, dport);
760 vxlan_print(ndo, (const u_char *)(up + 1), length);
761 @@ -497,6 +502,7 @@ udp_print(netdissect_options *ndo, regis
762 udpipaddr_print(ndo, ip, sport, dport);
763 lmp_print(ndo, cp, length);
769 @@ -574,31 +580,40 @@ udp_print(netdissect_options *ndo, regis
770 ns_print(ndo, (const u_char *)(up + 1), length, 0);
771 else if (IS_SRC_OR_DST_PORT(MULTICASTDNS_PORT))
772 ns_print(ndo, (const u_char *)(up + 1), length, 1);
773 +#ifndef TCPDUMP_MINI
774 else if (IS_SRC_OR_DST_PORT(TIMED_PORT))
775 timed_print(ndo, (const u_char *)(up + 1));
777 else if (IS_SRC_OR_DST_PORT(TFTP_PORT))
778 tftp_print(ndo, (const u_char *)(up + 1), length);
779 else if (IS_SRC_OR_DST_PORT(BOOTPC_PORT) || IS_SRC_OR_DST_PORT(BOOTPS_PORT))
780 bootp_print(ndo, (const u_char *)(up + 1), length);
781 +#ifndef TCPDUMP_MINI
782 else if (IS_SRC_OR_DST_PORT(RIP_PORT))
783 rip_print(ndo, (const u_char *)(up + 1), length);
785 else if (IS_SRC_OR_DST_PORT(AODV_PORT))
786 aodv_print(ndo, (const u_char *)(up + 1), length,
788 +#ifndef TCPDUMP_MINI
789 else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT))
790 isakmp_print(ndo, (const u_char *)(up + 1), length, bp2);
792 else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT_NATT))
793 isakmp_rfc3948_print(ndo, (const u_char *)(up + 1), length, bp2);
795 else if (IS_SRC_OR_DST_PORT(ISAKMP_PORT_USER1) || IS_SRC_OR_DST_PORT(ISAKMP_PORT_USER2))
796 isakmp_print(ndo, (const u_char *)(up + 1), length, bp2);
799 else if (IS_SRC_OR_DST_PORT(SNMP_PORT) || IS_SRC_OR_DST_PORT(SNMPTRAP_PORT))
800 snmp_print(ndo, (const u_char *)(up + 1), length);
801 else if (IS_SRC_OR_DST_PORT(NTP_PORT))
802 ntp_print(ndo, (const u_char *)(up + 1), length);
803 +#ifndef TCPDUMP_MINI
804 else if (IS_SRC_OR_DST_PORT(KERBEROS_PORT) || IS_SRC_OR_DST_PORT(KERBEROS_SEC_PORT))
805 krb_print(ndo, (const void *)(up + 1));
807 else if (IS_SRC_OR_DST_PORT(L2TP_PORT))
808 l2tp_print(ndo, (const u_char *)(up + 1), length);
810 @@ -609,6 +624,7 @@ udp_print(netdissect_options *ndo, regis
812 else if (dport == VAT_PORT)
813 vat_print(ndo, (const void *)(up + 1), up);
814 +#ifndef TCPDUMP_MINI
815 else if (IS_SRC_OR_DST_PORT(ZEPHYR_SRV_PORT) || IS_SRC_OR_DST_PORT(ZEPHYR_CLT_PORT))
816 zephyr_print(ndo, (const void *)(up + 1), length);
818 @@ -621,8 +637,11 @@ udp_print(netdissect_options *ndo, regis
819 (const u_char *) ip);
820 else if (IS_SRC_OR_DST_PORT(RIPNG_PORT))
821 ripng_print(ndo, (const u_char *)(up + 1), length);
824 else if (IS_SRC_OR_DST_PORT(DHCP6_SERV_PORT) || IS_SRC_OR_DST_PORT(DHCP6_CLI_PORT))
825 dhcp6_print(ndo, (const u_char *)(up + 1), length);
826 +#ifndef TCPDUMP_MINI
827 else if (IS_SRC_OR_DST_PORT(AHCP_PORT))
828 ahcp_print(ndo, (const u_char *)(up + 1), length);
829 else if (IS_SRC_OR_DST_PORT(BABEL_PORT) || IS_SRC_OR_DST_PORT(BABEL_PORT_OLD))
830 @@ -636,6 +655,7 @@ udp_print(netdissect_options *ndo, regis
831 wb_print(ndo, (const void *)(up + 1), length);
832 else if (IS_SRC_OR_DST_PORT(CISCO_AUTORP_PORT))
833 cisco_autorp_print(ndo, (const void *)(up + 1), length);
835 else if (IS_SRC_OR_DST_PORT(RADIUS_PORT) ||
836 IS_SRC_OR_DST_PORT(RADIUS_NEW_PORT) ||
837 IS_SRC_OR_DST_PORT(RADIUS_ACCOUNTING_PORT) ||
838 @@ -643,15 +663,18 @@ udp_print(netdissect_options *ndo, regis
839 IS_SRC_OR_DST_PORT(RADIUS_CISCO_COA_PORT) ||
840 IS_SRC_OR_DST_PORT(RADIUS_COA_PORT) )
841 radius_print(ndo, (const u_char *)(up+1), length);
842 +#ifndef TCPDUMP_MINI
843 else if (dport == HSRP_PORT)
844 hsrp_print(ndo, (const u_char *)(up + 1), length);
845 else if (IS_SRC_OR_DST_PORT(LWRES_PORT))
846 lwres_print(ndo, (const u_char *)(up + 1), length);
847 else if (IS_SRC_OR_DST_PORT(LDP_PORT))
848 ldp_print(ndo, (const u_char *)(up + 1), length);
850 else if (IS_SRC_OR_DST_PORT(OLSR_PORT))
851 olsr_print(ndo, (const u_char *)(up + 1), length,
852 (IP_V(ip) == 6) ? 1 : 0);
853 +#ifndef TCPDUMP_MINI
854 else if (IS_SRC_OR_DST_PORT(MPLS_LSP_PING_PORT))
855 lspping_print(ndo, (const u_char *)(up + 1), length);
856 else if (dport == BFD_CONTROL_PORT ||
857 @@ -669,10 +692,12 @@ udp_print(netdissect_options *ndo, regis
858 lwapp_control_print(ndo, (const u_char *)(up + 1), length, 0);
859 else if (IS_SRC_OR_DST_PORT(LWAPP_DATA_PORT))
860 lwapp_data_print(ndo, (const u_char *)(up + 1), length);
862 else if (IS_SRC_OR_DST_PORT(SIP_PORT))
863 sip_print(ndo, (const u_char *)(up + 1), length);
864 else if (IS_SRC_OR_DST_PORT(SYSLOG_PORT))
865 syslog_print(ndo, (const u_char *)(up + 1), length);
866 +#ifndef TCPDUMP_MINI
867 else if (IS_SRC_OR_DST_PORT(OTV_PORT))
868 otv_print(ndo, (const u_char *)(up + 1), length);
869 else if (IS_SRC_OR_DST_PORT(VXLAN_PORT))
870 @@ -689,7 +714,9 @@ udp_print(netdissect_options *ndo, regis
872 ND_PRINT((ndo, "kip "));
873 llap_print(ndo, cp, length);
879 ND_PRINT((ndo, "UDP, bad length %u > %u",