diff options
| author | sfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-09-26 19:24:47 +0000 |
|---|---|---|
| committer | sfisher <sfisher@f5534014-38df-0310-8fa8-9805f1628bb7> | 2011-09-26 19:24:47 +0000 |
| commit | aa5ada5fa604ca55599c483f1501916e2d142597 (patch) | |
| tree | 440364068e18af89f6af1857704649e92deeca9c /epan/dissectors/packet-igmp.c | |
| parent | 5a893d48e9af93274257e49eea07bb621cd58632 (diff) | |
From Thomas Morin via bug #6395: Improve display for IGMP
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@39156 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-igmp.c')
| -rw-r--r-- | epan/dissectors/packet-igmp.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/epan/dissectors/packet-igmp.c b/epan/dissectors/packet-igmp.c index 10efe311f3..cabe3bd98b 100644 --- a/epan/dissectors/packet-igmp.c +++ b/epan/dissectors/packet-igmp.c @@ -315,9 +315,10 @@ static const value_string mtrace_fwd_code_vals[] = { #define PRINT_IGMP_VERSION(version) \ do { \ proto_item *ti; \ + col_add_fstr(pinfo->cinfo, COL_PROTOCOL, "IGMPv%d",version); \ if (check_col(pinfo->cinfo, COL_INFO)) { \ col_add_fstr(pinfo->cinfo, COL_INFO, \ - "V%d %s",version,val_to_str(type, commands, \ + "%s",val_to_str(type, commands, \ "Unknown Type:0x%02x")); \ } \ /* version of IGMP protocol */ \ @@ -695,8 +696,10 @@ dissect_igmp_v2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int type, i } else { if (type == IGMP_V2_LEAVE_GROUP) { col_append_fstr(pinfo->cinfo, COL_INFO, " %s", ip_to_str((guint8*)&maddr) ); - } else { - col_append_fstr(pinfo->cinfo, COL_INFO, " / Join group %s", ip_to_str((guint8*)&maddr) ); + } else if (type == IGMP_V1_HOST_MEMBERSHIP_QUERY) { + col_append_fstr(pinfo->cinfo, COL_INFO, ", specific for group %s", ip_to_str((guint8*)&maddr) ); + } else { /* IGMP_V2_MEMBERSHIP_REPORT is the only case left */ + col_append_fstr(pinfo->cinfo, COL_INFO, " group %s", ip_to_str((guint8*)&maddr) ); } } } |