diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-09-27 05:39:58 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-09-27 05:39:58 +0000 |
| commit | 0f2584c4d2da10bc952eb2bf24dd524360e17d10 (patch) | |
| tree | b7bd149a75f1e2519ae6deafbf88b1505472d80a /epan/dissectors/packet-tpkt.c | |
| parent | 13c7fec8f50318248f13df2a1a755ac48bc4c249 (diff) | |
- Make the reassemble TCP preference default TRUE.
- in dissect_tpkt_encap() only check the desegment flag passed in the function.
svn path=/trunk/; revision=16016
Diffstat (limited to 'epan/dissectors/packet-tpkt.c')
| -rw-r--r-- | epan/dissectors/packet-tpkt.c | 4 |
1 files changed, 2 insertions, 2 deletions
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); |