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, 50 insertions, 48 deletions

diff --git a/epan/dissectors/packet-dcerpc-conv.c b/epan/dissectors/packet-dcerpc-conv.c
index 72b23be301..af20c74c6c 100644
--- a/epan/dissectors/packet-dcerpc-conv.c
+++ b/epan/dissectors/packet-dcerpc-conv.c
@@ -28,10 +28,6 @@
 #endif
 
 
-#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-
 #include <glib.h>
 #include <epan/packet.h>
 #include "packet-dcerpc.h"
@@ -58,23 +54,24 @@ static guint16  ver_conv = 3;
 
 static int
 conv_dissect_who_are_you_rqst (tvbuff_t *tvb, int offset,
-	                         packet_info *pinfo, proto_tree *tree,
-	                         guint8 *drep)
+			       packet_info *pinfo, proto_tree *tree,
+			       guint8 *drep)
 {
 	/*
 	 *         [in]    uuid_t          *actuid,
 	 *         [in]    unsigned32      boot_time,
 	 */
-       e_uuid_t actuid;
+	e_uuid_t actuid;
 
-       offset = dissect_ndr_uuid_t (tvb, offset, pinfo, tree, drep, hf_conv_who_are_you_rqst_actuid, &actuid);
-       offset = dissect_ndr_time_t (tvb, offset, pinfo, tree, drep, hf_conv_who_are_you_rqst_boot_time, NULL);
+	offset = dissect_ndr_uuid_t (tvb, offset, pinfo, tree, drep, hf_conv_who_are_you_rqst_actuid, &actuid);
+	offset = dissect_ndr_time_t (tvb, offset, pinfo, tree, drep, hf_conv_who_are_you_rqst_boot_time, NULL);
 
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-         col_add_fstr(pinfo->cinfo, COL_INFO,
-             "conv_who_are_you request actuid: %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-              actuid.Data1, actuid.Data2, actuid.Data3, actuid.Data4[0], actuid.Data4[1],
-              actuid.Data4[2], actuid.Data4[3], actuid.Data4[4], actuid.Data4[5], actuid.Data4[6], actuid.Data4[7]);
+	if (check_col(pinfo->cinfo, COL_INFO)) {
+		col_add_fstr(pinfo->cinfo, COL_INFO,
+			     "conv_who_are_you request actuid: %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+			     actuid.Data1, actuid.Data2, actuid.Data3,
+			     actuid.Data4[0], actuid.Data4[1], actuid.Data4[2], actuid.Data4[3],
+			     actuid.Data4[4], actuid.Data4[5], actuid.Data4[6], actuid.Data4[7]);
         }
 
 	return offset;
@@ -82,33 +79,33 @@ conv_dissect_who_are_you_rqst (tvbuff_t *tvb, int offset,
 
 static int
 conv_dissect_who_are_you_resp (tvbuff_t *tvb, int offset,
-	                         packet_info *pinfo, proto_tree *tree,
-	                         guint8 *drep)
+			       packet_info *pinfo, proto_tree *tree,
+			       guint8 *drep)
 {
 	/*
 	 *         [out]   unsigned32      *seq,
 	 *         [out]   unsigned32      *st
 	 */
-       guint32 seq, st;
+	guint32 seq, st;
 
-       offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_conv_who_are_you_resp_seq, &seq);
-       offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_conv_rc, &st);
+	offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_conv_who_are_you_resp_seq, &seq);
+	offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_conv_rc, &st);
 
 
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-         col_add_fstr(pinfo->cinfo, COL_INFO, "conv_who_are_you response seq:%u st:%s",
-               seq, val_to_str_ext(st, &dce_error_vals_ext, "%u"));
-       }
+	if (check_col(pinfo->cinfo, COL_INFO)) {
+		col_add_fstr(pinfo->cinfo, COL_INFO, "conv_who_are_you response seq:%u st:%s",
+			     seq, val_to_str_ext(st, &dce_error_vals_ext, "%u"));
+	}
 
-       return offset;
+	return offset;
 }
 
 
 
 static int
 conv_dissect_who_are_you2_rqst (tvbuff_t *tvb, int offset,
-	                         packet_info *pinfo, proto_tree *tree,
-	                         guint8 *drep)
+				packet_info *pinfo, proto_tree *tree,
+				guint8 *drep)
 {
 	/*
 	 *         [in]    uuid_t          *actuid,
@@ -120,18 +117,19 @@ conv_dissect_who_are_you2_rqst (tvbuff_t *tvb, int offset,
         offset = dissect_ndr_time_t (tvb, offset, pinfo, tree, drep, hf_conv_who_are_you2_rqst_boot_time, NULL);
 
         if (check_col(pinfo->cinfo, COL_INFO)) {
-           col_add_fstr(pinfo->cinfo, COL_INFO,
-                "conv_who_are_you2 request actuid: %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-                 actuid.Data1, actuid.Data2, actuid.Data3, actuid.Data4[0], actuid.Data4[1],
-                 actuid.Data4[2], actuid.Data4[3], actuid.Data4[4], actuid.Data4[5], actuid.Data4[6], actuid.Data4[7]);
+		col_add_fstr(pinfo->cinfo, COL_INFO,
+			     "conv_who_are_you2 request actuid: %08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+			     actuid.Data1, actuid.Data2, actuid.Data3,
+			     actuid.Data4[0], actuid.Data4[1], actuid.Data4[2], actuid.Data4[3],
+			     actuid.Data4[4], actuid.Data4[5], actuid.Data4[6], actuid.Data4[7]);
         }
 
 	return offset;
 }
 static int
 conv_dissect_who_are_you2_resp (tvbuff_t *tvb, int offset,
-	                         packet_info *pinfo, proto_tree *tree,
-	                         guint8 *drep)
+				packet_info *pinfo, proto_tree *tree,
+				guint8 *drep)
 {
 	/*
 	 *         [out]   unsigned32      *seq,
@@ -139,19 +137,20 @@ conv_dissect_who_are_you2_resp (tvbuff_t *tvb, int offset,
 	 *
 	 *         [out]   unsigned32      *st
 	 */
-       guint32 seq, st;
-       e_uuid_t cas_uuid;
-
-       offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_conv_who_are_you2_resp_seq, &seq);
-       offset = dissect_ndr_uuid_t (tvb, offset, pinfo, tree, drep, hf_conv_who_are_you2_resp_casuuid, &cas_uuid);
-       offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_conv_rc, &st);
-
-       if (check_col(pinfo->cinfo, COL_INFO)) {
-         col_add_fstr(pinfo->cinfo, COL_INFO,
-               "conv_who_are_you2 response seq:%u st:%s cas:%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
-                seq, val_to_str_ext(st, &dce_error_vals_ext, "%u"),
-                cas_uuid.Data1, cas_uuid.Data2, cas_uuid.Data3, cas_uuid.Data4[0], cas_uuid.Data4[1],
-                cas_uuid.Data4[2], cas_uuid.Data4[3], cas_uuid.Data4[4], cas_uuid.Data4[5], cas_uuid.Data4[6], cas_uuid.Data4[7]);
+	guint32 seq, st;
+	e_uuid_t cas_uuid;
+
+	offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_conv_who_are_you2_resp_seq, &seq);
+	offset = dissect_ndr_uuid_t (tvb, offset, pinfo, tree, drep, hf_conv_who_are_you2_resp_casuuid, &cas_uuid);
+	offset = dissect_ndr_uint32 (tvb, offset, pinfo, tree, drep, hf_conv_rc, &st);
+
+	if (check_col(pinfo->cinfo, COL_INFO)) {
+		col_add_fstr(pinfo->cinfo, COL_INFO,
+			     "conv_who_are_you2 response seq:%u st:%s cas:%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x",
+			     seq, val_to_str_ext(st, &dce_error_vals_ext, "%u"),
+			     cas_uuid.Data1, cas_uuid.Data2, cas_uuid.Data3,
+			     cas_uuid.Data4[0], cas_uuid.Data4[1], cas_uuid.Data4[2], cas_uuid.Data4[3],
+			     cas_uuid.Data4[4], cas_uuid.Data4[5], cas_uuid.Data4[6], cas_uuid.Data4[7]);
         }
 
 	return offset;
@@ -163,9 +162,12 @@ static dcerpc_sub_dissector conv_dissectors[] = {
           conv_dissect_who_are_you_rqst, conv_dissect_who_are_you_resp },
     { 1, "who_are_you2",
           conv_dissect_who_are_you2_rqst, conv_dissect_who_are_you2_resp },
-    { 2, "are_you_there", NULL, NULL },
-    { 3, "who_are_you_auth", NULL, NULL },
-    { 4, "who_are_you_auth_more", NULL, NULL },
+    { 2, "are_you_there",
+          NULL, NULL },
+    { 3, "who_are_you_auth",
+          NULL, NULL },
+    { 4, "who_are_you_auth_more",
+          NULL, NULL },
     { 0, NULL, NULL, NULL }
 };