Merge remote-tracking branch 'origin/stable/11' into devel-11

1 files changed, 6 insertions, 97 deletions

diff --git a/contrib/tcpdump/INSTALL.txt b/contrib/tcpdump/INSTALL.txt
index dcb52b8..f91d004 100644
--- a/contrib/tcpdump/INSTALL.txt
+++ b/contrib/tcpdump/INSTALL.txt
@@ -49,9 +49,10 @@ addrtoname.c	- address to hostname routines
 addrtoname.h	- address to hostname definitions
 ah.h		- IPSEC Authentication Header definitions
 appletalk.h	- AppleTalk definitions
+ascii_strcasecmp.c - locale-independent case-independent string comparison
+		routines
 atime.awk	- TCP ack awk script
 atm.h		- ATM traffic type definitions
-atmuni31.h	- ATM Q.2931 definitions
 bpf_dump.c	- BPF program printing routines, in case libpcap doesn't
 		  have them
 chdlc.h		- Cisco HDLC definitions
@@ -100,100 +101,8 @@ pcap_dump_ftell.c - pcap_dump_ftell() implementation, in case libpcap
 		doesn't have it
 pcap-missing.h	- declarations of functions possibly missing from libpcap
 ppp.h		- Point to Point Protocol definitions
-print-802_11.c	- IEEE 802.11 printer routines
-print-ap1394.c	- Apple IP-over-IEEE 1394 printer routines
-print-ah.c	- IPSEC Authentication Header printer routines
-print-aodv.c	- AODV printer routines
-print-arcnet.c	- ARCNET printer routines
-print-arp.c	- Address Resolution Protocol printer routines
-print-ascii.c	- ASCII packet dump routines
-print-atalk.c	- AppleTalk printer routines
-print-atm.c	- ATM printer routines
-print-beep.c	- BEEP printer routines
-print-bgp.c	- Border Gateway Protocol printer routines
-print-bootp.c	- BOOTP and IPv4 DHCP printer routines
-print-bt.c	- Bluetooth printer routines
-print-cdp.c	- Cisco Discovery Protocol printer routines
-print-chdlc.c	- Cisco HDLC printer routines
-print-cip.c	- Classical-IP over ATM routines
-print-cnfp.c	- Cisco NetFlow printer routines
-print-dccp.c	- DCCP printer routines
-print-decnet.c	- DECnet printer routines
-print-dhcp6.c	- IPv6 DHCP printer routines
-print-domain.c	- Domain Name System printer routines
-print-dvmrp.c	- Distance Vector Multicast Routing Protocol printer routines
-print-eap.c	- EAP printer routines
-print-enc.c	- OpenBSD IPsec encapsulation BPF layer printer routines
-print-egp.c	- External Gateway Protocol printer routines
-print-esp.c	- IPSEC Encapsulating Security Payload printer routines
-print-ether.c	- Ethernet printer routines
-print-fddi.c	- Fiber Distributed Data Interface printer routines
-print-fr.c	- Frame Relay printer routines
-print-frag6.c	- IPv6 fragmentation header printer routines
-print-gre.c	- Generic Routing Encapsulation printer routines
-print-hsrp.c	- Cisco Hot Standby Router Protocol printer routines
-print-icmp.c	- Internet Control Message Protocol printer routines
-print-icmp6.c	- IPv6 Internet Control Message Protocol printer routines
-print-igmp.c	- Internet Group Management Protocol printer routines
-print-igrp.c	- Interior Gateway Routing Protocol printer routines
-print-ip.c	- IP printer routines
-print-ip6.c	- IPv6 printer routines
-print-ip6opts.c	- IPv6 header option printer routines
-print-ipcomp.c	- IP Payload Compression Protocol printer routines
-print-ipx.c	- IPX printer routines
-print-isakmp.c	- Internet Security Association and Key Management Protocol
-print-isoclns.c	- ISO CLNS, ESIS, and ISIS printer routines
-print-krb.c	- Kerberos printer routines
-print-l2tp.c	- Layer Two Tunneling Protocol printer routines
-print-lane.c	- ATM LANE printer routines
-print-llc.c	- IEEE 802.2 LLC printer routines
-print-lspping.c	- LSPPING printer routines
-print-lwres.c	- Lightweight Resolver protocol printer routines
-print-mobile.c	- IPv4 mobility printer routines
-print-mobility.c - IPv6 mobility printer routines
-print-mpls.c	- Multi-Protocol Label Switching printer routines
-print-msdp.c	- Multicast Source Discovery Protocol printer routines
-print-nfs.c	- Network File System printer routines
-print-ntp.c	- Network Time Protocol printer routines
-print-null.c	- BSD loopback device printer routines
-print-ospf.c	- Open Shortest Path First printer routines
-print-ospf6.c	- IPv6 Open Shortest Path First printer routines
-print-pflog.c	- OpenBSD packet filter log file printer routines
-print-pgm.c	- Pragmatic General Multicast printer routines
-print-pim.c	- Protocol Independent Multicast printer routines
-print-ppp.c	- Point to Point Protocol printer routines
-print-pppoe.c	- PPP-over-Ethernet printer routines
-print-pptp.c	- Point-to-Point Tunnelling Protocol printer routines
-print-radius.c	- Radius protocol printer routines
-print-raw.c	- Raw IP printer routines
-print-rip.c	- Routing Information Protocol printer routines
-print-ripng.c	- IPv6 Routing Information Protocol printer routines
-print-rrcp.c	- Realtek Remote Control Protocol routines
-print-rsvp.c	- Resource reSerVation Protocol (RSVP) printer routines
-print-rt6.c	- IPv6 routing header printer routines
-print-rx.c	- AFS RX printer routines
-print-sctp.c	- Stream Control Transmission Protocol printer routines
-print-sip.c	- SIP printer routines
-print-sl.c	- Compressed Serial Line Internet Protocol printer routines
-print-sll.c	- Linux "cooked" capture printer routines
-print-slow.c	- IEEE "slow protocol" (802.3ad) printer routines
-print-smb.c	- SMB/CIFS printer routines
-print-snmp.c	- Simple Network Management Protocol printer routines
-print-stp.c	- IEEE 802.1d spanning tree protocol printer routines
-print-sunatm.c	- SunATM DLPI capture printer routines
-print-sunrpc.c	- Sun Remote Procedure Call printer routines
-print-symantec.c - Symantec Enterprise Firewall printer routines
-print-tcp.c	- TCP printer routines
-print-telnet.c	- Telnet option printer routines
-print-tftp.c	- Trivial File Transfer Protocol printer routines
-print-timed.c	- BSD time daemon protocol printer routines
-print-token.c	- Token Ring printer routines
-print-udp.c	- UDP printer routines
-print-usb.c	- USB printer routines
-print-vjc.c	- PPP Van Jacobson compression (RFC1144) printer routines
-print-vrrp.c	- Virtual Router Redundancy Protocol
-print-wb.c	- White Board printer routines
-print-zephyr.c	- Zephyr printer routines
+print.c		- Top-level routines for protocol printing
+print-*.c	- The netdissect printers
 rpc_auth.h	- definitions for ONC RPC authentication
 rpc_msg.h	- definitions for ONC RPC messages
 send-ack.awk	- unidirectional tcp send/ack awk script
@@ -203,11 +112,11 @@ slcompress.h	- SLIP/PPP Van Jacobson compression (RFC1144) definitions
 smb.h		- SMB/CIFS definitions
 smbutil.c	- SMB/CIFS utility routines
 stime.awk	- TCP send awk script
-strcasecmp.c	- missing routine
 tcp.h		- TCP definitions
 tcpdump.1	- manual entry
 tcpdump.c	- main program
+timeval-operations.h - timeval operations macros
 udp.h		- UDP definitions
-util.c		- utility routines
+util-print.c	- utility routines for protocol printers
 vfprintf.c	- emulation routine
 win32		- headers and routines for building on Win32 systems