diff options
| author | Jaap Keuter <jaap.keuter@xs4all.nl> | 2007-06-20 17:17:25 +0000 |
|---|---|---|
| committer | Jaap Keuter <jaap.keuter@xs4all.nl> | 2007-06-20 17:17:25 +0000 |
| commit | d613ff0e2c4f2a36be94786fbe9cc857ddb2b794 (patch) | |
| tree | c535dec7e5cb6a13707ecf867b44762941118fd2 /epan | |
| parent | 6949e0d231cf16166ad268286edf8bdfac0d3225 (diff) | |
| download | wireshark-d613ff0e2c4f2a36be94786fbe9cc857ddb2b794.tar.gz | |
From Lukasz M.:
Sometimes edonkey packets comes joined, and wireshark display only last
one on column Info. Now everyone is displayed.
svn path=/trunk/; revision=22143
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-edonkey.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/epan/dissectors/packet-edonkey.c b/epan/dissectors/packet-edonkey.c index 42a9b0b5c3..d8ec83c4cb 100644 --- a/epan/dissectors/packet-edonkey.c +++ b/epan/dissectors/packet-edonkey.c @@ -1759,9 +1759,6 @@ static void dissect_edonkey_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tre if (check_col(pinfo->cinfo, COL_PROTOCOL)) col_set_str(pinfo->cinfo, COL_PROTOCOL, "eDonkey"); - if (check_col(pinfo->cinfo, COL_INFO)) - col_clear(pinfo->cinfo, COL_INFO); - if (tree) { ti = proto_tree_add_item(tree, proto_edonkey, tvb, 0, -1, FALSE); edonkey_tree = proto_item_add_subtree(ti, ett_edonkey); @@ -1808,7 +1805,7 @@ static void dissect_edonkey_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tre } if (check_col(pinfo->cinfo, COL_INFO)) { - col_append_fstr(pinfo->cinfo, COL_INFO, "%s TCP", protocol_name); + col_append_sep_fstr(pinfo->cinfo, COL_INFO, ", ", "%s TCP", protocol_name); } msg_type = tvb_get_guint8(tvb, offset); @@ -1868,6 +1865,9 @@ static void dissect_edonkey_tcp_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tre static void dissect_edonkey_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) { + if (check_col(pinfo->cinfo, COL_INFO)) + col_clear(pinfo->cinfo, COL_INFO); + tcp_dissect_pdus(tvb, pinfo, tree, edonkey_desegment, EDONKEY_TCP_HEADER_LENGTH, get_edonkey_tcp_pdu_len, dissect_edonkey_tcp_pdu); |