From: Guy Harris Date: Mon, 24 Nov 2014 01:42:21 +0000 (-0800) Subject: Merge git://github.com/the-tcpdump-group/tcpdump X-Git-Tag: tcpdump-4.7.2~1^2~83 X-Git-Url: https://git.tcpdump.org/tcpdump/commitdiff_plain/90db58ec397c4fd682621cc55f93f81e21fab9ae Merge git://github.com/the-tcpdump-group/tcpdump --- 90db58ec397c4fd682621cc55f93f81e21fab9ae diff --cc CHANGES index 84fac257,69e798d9..9eea2ed0 --- a/CHANGES +++ b/CHANGES @@@ -1,15 -1,8 +1,19 @@@ + Thursday Nov. 20, 2014 guy@alum.mit.edu + Summary for 5.0.0 tcpdump release ++ DCCP: update Packet Types with RFC4340/IANA names ++ +Friday Nov. 12, 2014 guy@alum.mit.edu + Summary for 4.7.0 tcpdump release + changes to hex printing of CDP packets Fix PPI printing Radius: update Packet Type Codes and Attribute Types with RFC/IANA names - DCCP: update Packet Types with RFC4340/IANA names + Add a routine to print "text protocols", and add FTP/HTTP/SMTP/RTSP support. + improvements to telnet printer, even if not -v + omit length for bcp, print-tcp uses it + formatting fixes for a bunch of protocols + new bounds checks for a number of protocols + split netflow 1,6, and 6 dissector up. + added geneve dissector Tuesday Sep. 2, 2014 mcr@sandelman.ca Summary for 4.6.2 tcpdump release