- Make the reassemble TCP preference default TRUE.

- in dissect_tpkt_encap() only check the desegment flag passed in the function.

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

diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c
index ba13eb7f765f5fe15e5526d8320761894bc15cac..b44f085b300ae3f07300ed05674106be781e599c 100644 (file)
--- a/epan/dissectors/packet-tcp.c
+++ b/epan/dissectors/packet-tcp.c
@@ -1564,7 +1564,7 @@ tcp_fragment_init(void)
 
 /* functions to trace tcp segments */
 /* Enable desegmenting of TCP streams */
-static gboolean tcp_desegment = FALSE;
+static gboolean tcp_desegment = TRUE;
 
 static GHashTable *tcp_segment_table = NULL;
 static GMemChunk *tcp_segment_key_chunk = NULL;

diff --git a/epan/dissectors/packet-tpkt.c b/epan/dissectors/packet-tpkt.c
index ca02451316d0df28f04a4fc09eee3316ba3462bc..70218b3fd3912807acc38ab28492d8b04cd51ab3 100644 (file)
--- a/epan/dissectors/packet-tpkt.c
+++ b/epan/dissectors/packet-tpkt.c
@@ -133,7 +133,7 @@ dissect_tpkt_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
         * which case we'd have to zero the buffer out explicitly
         * anyway.
         */
-       if (tpkt_desegment && check_col(pinfo->cinfo, COL_INFO))
+       if (desegment && check_col(pinfo->cinfo, COL_INFO))
                col_add_str(pinfo->cinfo, COL_INFO, "");
 
        while (tvb_reported_length_remaining(tvb, offset) != 0) {
@@ -232,7 +232,7 @@ dissect_tpkt_encap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
                 * information without getting TPKT stuff in the middle;
                 * why the second?
                 */
-               if (!tpkt_desegment && !pinfo->fragmented
+               if (!desegment && !pinfo->fragmented
                    && check_col(pinfo->cinfo, COL_INFO)) {
                        col_add_fstr(pinfo->cinfo, COL_INFO,
                            "TPKT Data length = %u", data_len);