Use separate filters for the RTT found on a SACK and the RTT found on a

DATA chunk: having them in both places is helpful when looking at the
messages but having them separate is helpful when graphing the RTTs.


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@43406 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 74 insertions, 22 deletions

diff --git a/AUTHORS b/AUTHORS
index 3d1e977510..4cf40173e2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -2180,6 +2180,7 @@ metatech                <metatechbe [AT] gmail.com> {
  	Distributed Relational Database Architecture protocol support
  	Borland StarTeam protocol support
  	Adobe Real Time Messaging Protocol support
+ 	ActiveMQ OpenWire protocol support
 }
 
 Brian Wheeler           <Brian.Wheeler [AT] arrisi.com> {
@@ -2244,6 +2245,7 @@ Rich Coe                <Richard.Coe [AT] med.ge.com> {
 
 Dominic Béchaz          <bdo [AT] zhwin.ch> {
 	IEEE 1588 / PTP support
+	EPL v1 support
 }
 
 Richard van der Hoff	<richardv [AT] mxtelecom.com> {
@@ -2295,8 +2297,8 @@ Jeff Connelly		<shellreef+mp2p [AT] gmail.com> {
 	MANOLITO support
 }
 
-Irene Rüngler		<i.ruengeler [AT] fh-muenster.de {
-	SCTP analysis
+Irene Rüngeler		<i.ruengeler [AT] fh-muenster.de {
+	Graphical SCTP analysis
 	Support PPID and SCTP port based selection in Decode as
 }
 
@@ -2338,7 +2340,7 @@ Alejandro Vaquero	<alejandro.vaquero [AT] verso.com> {
 Francesco Fondelli	<francesco.fondelli [AT] gmail.com> {
 	ICE protocol support
 	DCCP protocol support
-	MPLS OAM support, Y.1711
+	ITU-T Y.1711 (OAM mechanism for MPLS networks) support
 	RSVP/OSPF Extensions for Support of Diffserv-aware MPLS-TE, RFC 4124
 	Linux Packet Generator support
 	rval_to_str() and alike
@@ -2360,6 +2362,8 @@ Francesco Fondelli	<francesco.fondelli [AT] gmail.com> {
 	RSVP IF_ID ERROR_STRING TLV support, RFC 4783
 	Support for Vendor Private objects, RFC 3936
 	Support for MPLS Packet Loss and Delay Measurement, RFC 6374
+	Support for DCCP Simultaneous-Open for NAT Traversal, RFC 5596
+	MPLS-TP Protection State Coordination (PSC) Protocol, RFC 6378
 }
 
 Artem Tamazov           <artem.tamazov [AT] tellabs.com> {
@@ -2567,7 +2571,7 @@ Kyle J. Harms		<kyle.j.harms [AT] boeing.com> {
 	CIGI dissection
 }
 
-Eric Wedel              <ewedel [AT] bluearc.com> {
+Eric Wedel		<ewedel [AT] bluearc.com> {
 	KPASSWD over TCP support
 }
 
@@ -2652,10 +2656,6 @@ Mark Lewis		<mlewis [AT] altera.com> {
 	2dParityFec dissector
 }
 
-Dominic Bechaz		<bdo [AT] zhwin.ch> {
-	EPL v1 support
-}
-
 David Buechi		<bhd [AT] zhwin.ch> {
 	EPL v1 support
 }
@@ -2794,7 +2794,7 @@ Jens Bräuer		<jensb [AT] cs.tu-berlin.de> {
 	Wifi Simple Config aka Wifi Protected Setup
 }
 
-Sake Blok               <sake [AT] euronet.nl> {
+Sake Blok		<sake [AT] euronet.nl> {
 	Cisco proprietary MST format support
 	"Copy as Filter" functionality
 	Split time_delta in time delta captured and time delta displayed
@@ -2974,6 +2974,7 @@ Alexis La Goutte	<alexis.lagoutte [AT] gmail.com> {
 	CAPWAP dissector
 	PAPI dissector
 	MONGO dissector
+	WebSocket dissector
 	Miscellaneous ISAKMP enhancements
 	Miscellaneous ICMPv6 enhancements
 	Miscellaneous 802.11 enhancements
@@ -3010,7 +3011,7 @@ Florian Forster		<octo [AT] verplant.org> {
 	CollectD dissector
 }
 
-Ivan Sy Jr.             <ivan_jr [AT] yahoo.com> {
+Ivan Sy Jr.		<ivan_jr [AT] yahoo.com> {
         Added DNS RRs: DLV, SSHFP, SPF, HIP, DHCID, NSEC3PARAM, APL, PX,
                        GPOS, NSAP, NSAP-PTR, AFSDB, RP, X25, ISDN, RT, RR
         Allow some network control block addresses with ttl != 1.
@@ -3136,8 +3137,9 @@ Michael Bernhard	<michael.bernhard [AT] bfh.ch> {
 	IEC 61850 dissector
 }
 
-Holger Freyther		<zecke [AT] selfish.org> {
+Holger Hans Peter Freyther	<zecke [AT] selfish.org> {
 	NexusWare C7 MTP over UDP dissector
+	DVB-H IPDC ESG
 }
 
 Jose Pico		<jose [AT] taddong.com> {
@@ -3333,12 +3335,12 @@ Glenn Matthews		<glenn.matthews [AT] cisco.com> {
 	XMCP dissector
 }
 
-Donnie Savage           <dsavage [AT] cisco.com> {
+Donnie Savage		<dsavage [AT] cisco.com> {
 	EIGRP TLV 2.0 and 3.0 support
 	SAF support
 }
 
-Spenser Sheng           <spenser.sheng [AT] ericsson.com> {
+Spenser Sheng		<spenser.sheng [AT] ericsson.com> {
 	LCS-AP support
 }
 
@@ -3358,7 +3360,7 @@ Iain Arnell		<iarnell [AT] epo.org> {
 	ajp13 enhancements
 }
 
-Mariusz Okrój 		<okrojmariusz [AT] gmail.com> {
+Mariusz Okrój		<okrojmariusz [AT] gmail.com> {
 	XMPP enhancements
 }
 
@@ -3370,11 +3372,11 @@ Kari Vatjus-Anttila	<kari.vatjus-anttila [AT] cie.fi> {
 	kNet (KristalliNet) dissector
 }
 
-Shobhank Sharma         <ssharma5 [AT] ncsu.edu> {
+Shobhank Sharma		<ssharma5 [AT] ncsu.edu> {
 	MPLS Enhancement - Generic Associated Channel, as per RFC 5586
 }
 
-Salil Kanitkar         <sskanitk [AT] ncsu.edu> {
+Salil Kanitkar		<sskanitk [AT] ncsu.edu> {
 	OSPF Router Informational Capabilities - Opaque RI TLV - RFC4970
 	OSPF Dynamic Hostname TLV in RI Opaque TLV - RFC5642
 }
@@ -3384,6 +3386,18 @@ Michael Sakaluk		<mdsakalu [AT] ncsu.edu> {
 	Load balancing for mesh softwires (RFC 5640)
 }
 
+Mayuresh Raut		<msraut [AT] ncsu.edu> {
+	LSP ping over MPLS tunnels (RFC 6424)
+}
+
+Sheetal Kshirsagar	<sdkshirs [AT] ncsu.edu> {
+	RPL SRH dissector enhancements (RFC 6554)
+}
+
+Andrew Williams		<anwilli5 [AT] ncsu.edu> {
+	IPv6 preference for RPL SRH strict compliance to RFC 6554
+}
+
 Per Liedberg		<per.liedberg [AT] ericsson.com> {
 	RoHC dissection improvments
 }
@@ -3393,12 +3407,48 @@ Gaurav Tungatkar	<gauravstt [AT] gmail.com> {
 	and Extension for Interface and Next-Hop
 }
 
-Holger Hans Peter Freyther <zecke [AT] selfish.org> {
-	DVB-H IPDC ESG
+Paul Erkkila		<pee [AT] erkkila.org> {
+	Hazelcast Dissector
 }
 
-Paul Erkkila <pee [AT] erkkila.org> {
-	Hazelcast Dissector
+Bill Schiller		<bill.schiller [AT] emerson.com> {
+	HART/IP dissector
+}
+
+Aditya Ambadkar		<arambadk [AT] ncsu.edu> {
+    Support for flow label sub-tlv according to RFC 6391
+}
+
+Diana Chris		<dvchris [AT] ncsu.edu> {
+    Support for flow label sub-tlv according to RFC 6391
+}
+
+Guy Martin		<gmsoft [AT] tuxicoman.be> {
+	DVB-DATA MultiProtocol Encapsulation dissector
+	DVB Event Information Table (EIT) dissector
+	DVB Network Information Table (NIT) dissector
+	DVB Service Description Table (SDT) dissector
+	DVB Time and Date Table (TDT) dissector
+	DVB Time Offset Table (TOT) dissector
+	DVB Bouquet Association Table (BAT) dissector
+	MPEG2 Conditional Access Table (CA) dissector
+	MPEG2 descriptors dissector
+	MPEG2 Program Associate Table (PAT) dissector
+	MPEG2 Program Map Table (PMT) dissector
+	MPEG2 Section dissector
+}
+
+Deepti Ragha		<dlragha [AT] ncsu.edu> {
+	Additions to ARP dissector to support opcodes as specified by IANA in
+http://www.iana.org/assignments/arp-parameters/arp-parameters.xml	
+}
+
+Niels de Vos		<ndevos [AT] redhat.com> {
+	Gluster dissectors
+}
+
+Clement MARRAST 	clement.marrast [AT] molex.com {
+	WSE Remote Ethernet protocol
 }
 
 and by:
@@ -3413,7 +3463,6 @@ Kaloian Stoilov         <kalkata [AT] yahoo.com>
 Steven Lass             <stevenlass [AT] mail.com>
 Gregory Stark           <gsstark [AT] mit.edu>
 Darren Steele           <steeley [AT] steeley.co.uk>
-	                <smhuang [AT] pcs.csie.nctu.edu.tw>
 Michael Kopp            <michael.kopp [AT] isarnet.de>
 Bernd Leibing           <bernd.leibing [AT] kiz.uni-ulm.de>
 Chris Heath             <chris [AT] heathens.co.nz>
@@ -3511,7 +3560,6 @@ Matt Thornton		<MATT_THORNTON [AT] appsig.com>
 Timo Metsala		<timo.metsala [AT] gmail.com>
 Tomer Shani		<thetour [AT] japan.com>
 Manu Pathak		<mapathak [AT] cisco.com>
-Kaul			<mykaul [AT] gmail.com>
 John Sullivan		<john [AT] kanargh.force9.co.uk>
 Martin André		<andre [AT] clarinet.u-strasbg.fr>
 Andrei Emeltchenko	<Andrei.Emeltchenko [AT] nokia.com>
@@ -3595,6 +3643,10 @@ Andras Veres-Szentkiralyi	<vsza [AT] vsza.hu>
 Jakob Hirsch 		<jh.wireshark-bugzilla [AT] plonk.de>
 Роман Донченко		<DXDragon [AT] yandex.ru>
 			<billyjeans [AT] gmail.com>
+Evan Huus		<eapache [AT] gmail.com>
+Tom Cook		<tcook [AT] ixiacom.com>
+Tom Alexander		<talexander [AT] ixiacom.com>
+Klaus Heckelmann	<klaus.heckelmann [AT] nashtech.com>
 
 Dan Lasley <dlasley[AT]promus.com> gave permission for his
 dumpit() hex-dump routine to be used.