diff options
| author | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-07-23 19:38:52 +0000 |
|---|---|---|
| committer | jmayer <jmayer@f5534014-38df-0310-8fa8-9805f1628bb7> | 2003-07-23 19:38:52 +0000 |
| commit | e03492e01c237ffc1ff01cecf0ccb749abeb3b7d (patch) | |
| tree | eb127d72a2e1e35696cfcac18efd19455908e666 /packet-igmp.c | |
| parent | d70e9bec3b311977eccd13662e5770164ce674c2 (diff) | |
Fix a bug reported by Dave Nicoson:
Igmp v1 membership reports should not be misdetected as v2 reports
(don't confuse the query with the report).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@8074 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'packet-igmp.c')
| -rw-r--r-- | packet-igmp.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/packet-igmp.c b/packet-igmp.c index 756ab46661..19f384736a 100644 --- a/packet-igmp.c +++ b/packet-igmp.c @@ -1,7 +1,7 @@ /* packet-igmp.c 2001 Ronnie Sahlberg <See AUTHORS for email> * Routines for IGMP packet disassembly * - * $Id: packet-igmp.c,v 1.22 2003/03/04 06:47:09 guy Exp $ + * $Id: packet-igmp.c,v 1.23 2003/07/23 19:38:52 jmayer Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -294,7 +294,7 @@ static const value_string mtrace_fwd_code_vals[] = { }; #define PRINT_IGMP_VERSION(version) \ - if (check_col(pinfo->cinfo, COL_INFO)) { \ + if (check_col(pinfo->cinfo, COL_INFO)) { \ col_add_fstr(pinfo->cinfo, COL_INFO, \ "V%d %s",version,val_to_str(type, commands, \ "Unknown Type:0x%02x")); \ @@ -817,13 +817,8 @@ dissect_igmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) } break; - case IGMP_V1_HOST_MEMBERSHIP_REPORT: /* 0x12 v1/v2 */ - /* v1 and v2 differs in second byte of header */ - if (tvb_get_guint8(tvb, offset)) { - offset = dissect_igmp_v2(tvb, pinfo, tree, type, offset); - } else { - offset = dissect_igmp_v1(tvb, pinfo, tree, type, offset); - } + case IGMP_V1_HOST_MEMBERSHIP_REPORT: /* 0x12 v1 only */ + offset = dissect_igmp_v1(tvb, pinfo, tree, type, offset); break; case IGMP_DVMRP: |