sq dissect_verification_trailer

diff --git a/epan/dissectors/packet-dcerpc.c b/epan/dissectors/packet-dcerpc.c
index d4fa183fa2d9dee3437394b3c353cc52449b6f9e..873c74e4a0e00db278b47f18394222d2ab97fe68 100644 (file)
--- a/epan/dissectors/packet-dcerpc.c
+++ b/epan/dissectors/packet-dcerpc.c
@@ -2945,7 +2945,8 @@ dissect_sec_vt_header(proto_tree *tree, tvbuff_t *tvb, int offset)
 }
 
 static int
-dissect_verification_trailer(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, proto_tree *parent_tree)
+dissect_verification_trailer(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+                             proto_tree *parent_tree, int *signature_offset)
 {
        static const guint8 TRAILER_SIGNATUR[] = {0x8a, 0xe3, 0x13, 0x71, 0x02, 0xf4, 0x36, 0x71};
        typedef enum {
@@ -2962,6 +2963,9 @@ dissect_verification_trailer(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
 
        const guint8 *start, *pos;
        int remaining = tvb_length_remaining(tvb, offset);
+
+        *signature_offset = -1;
+
        if (remaining < (int)sizeof(TRAILER_SIGNATUR)) {
                return offset;
        }
@@ -2982,6 +2986,8 @@ dissect_verification_trailer(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
                remaining -= len;
        }
 
+        *signature_offset = offset;
+
        proto_tree_add_text(tree, tvb, offset, sizeof(TRAILER_SIGNATUR),
                            "rpc_sec_verification_trailer");
        offset += sizeof(TRAILER_SIGNATUR);
@@ -3234,13 +3240,26 @@ dcerpc_try_handoff(packet_info *pinfo, proto_tree *tree,
                  */
                 TRY {
                     int remaining;
+                    int trailer_offset = -1;
+
+                    proto_tree_add_text(dcerpc_tree, stub_tvb, 0, -1,
+                                        "Complete Stub Data");
 
                     offset = sub_dissect(stub_tvb, 0, pinfo, sub_tree,
                                           info, drep);
-                    proto_item_set_end(sub_item, tvb, offset);
 
                     offset = dissect_verification_trailer(stub_tvb, offset,
-                                                         pinfo, dcerpc_tree);
+                                                          pinfo, dcerpc_tree,
+                                                          &trailer_offset);
+
+                    if (trailer_offset != -1 && sub_item) {
+                        remaining = tvb_length_remaining(stub_tvb, trailer_offset);
+                        proto_item_set_len(sub_item, length - remaining);
+
+                        proto_tree_add_text(dcerpc_tree, stub_tvb,
+                                            0, length - remaining,
+                                            "Stub Data");
+                    }
 
                     /* If we have a subdissector and it didn't dissect all
                        data in the tvb, make a note of it. */