diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2010-09-30 09:53:51 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2010-09-30 09:53:51 +0000 |
| commit | 46749e843c88de2a2f5746a8565bb3fae789623d (patch) | |
| tree | 1fcd477ee39ef9d6f7968c9f726214fb0378aee7 /epan/reassemble.c | |
| parent | 65e0721f71fe8c3acc97cc3199b83d50e9fba79d (diff) | |
| download | wireshark-46749e843c88de2a2f5746a8565bb3fae789623d.tar.gz wireshark-46749e843c88de2a2f5746a8565bb3fae789623d.tar.bz2 wireshark-46749e843c88de2a2f5746a8565bb3fae789623d.zip | |
Use the name from hf_fragment instead of hf_fragments when we only have
one fragment to reassemble.
svn path=/trunk/; revision=34285
Diffstat (limited to 'epan/reassemble.c')
| -rw-r--r-- | epan/reassemble.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/epan/reassemble.c b/epan/reassemble.c index 6345be1769..a82622f175 100644 --- a/epan/reassemble.c +++ b/epan/reassemble.c @@ -1969,9 +1969,15 @@ show_fragment(fragment_data *fd, const int offset, const fragment_items *fit, int hf; if (first_frag) { - proto_item_prepend_text(fi, "%u ", count); - proto_item_append_text(fi, " (%u byte%s): ", tvb_length(tvb), - plurality(tvb_length(tvb), "", "s")); + gchar *name; + if (count == 1) { + name = g_strdup(proto_registrar_get_name(*(fit->hf_fragment))); + } else { + name = g_strdup(proto_registrar_get_name(*(fit->hf_fragments))); + } + proto_item_set_text(fi, "%u %s (%u byte%s): ", count, name, tvb_length(tvb), + plurality(tvb_length(tvb), "", "s")); + g_free(name); } else { proto_item_append_text(fi, ", "); } |