diff options
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-tcp.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-tpkt.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-tcp.c b/epan/dissectors/packet-tcp.c index ba13eb7f76..b44f085b30 100644 --- 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 ca02451316..70218b3fd3 100644 --- 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); |