diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | Makefile.nmake | 3 | ||||
| -rw-r--r-- | packet-igmp.c | 45 | ||||
| -rw-r--r-- | packet-msnip.c | 361 | ||||
| -rw-r--r-- | packet-msnip.h | 31 |
6 files changed, 433 insertions, 11 deletions
@@ -535,6 +535,7 @@ Ronnie Sahlberg <rsahlber@bigpond.net.au> { Support for filtering on absolute and relative time fields DVMRP support MRDISC support + MSNIP support } Borosa Tomislav <tomislav.borosa@SIEMENS.HR> { diff --git a/Makefile.am b/Makefile.am index f48349956a..0711bbc2d8 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,7 @@ # Makefile.am # Automake file for Ethereal # -# $Id: Makefile.am,v 1.339 2001/06/27 20:19:19 guy Exp $ +# $Id: Makefile.am,v 1.340 2001/06/29 18:55:49 guy Exp $ # # Ethereal - Network traffic analyzer # By Gerald Combs <gerald@ethereal.com> @@ -162,6 +162,7 @@ DISSECTOR_SRC = \ packet-mpeg1.c \ packet-mpls.c \ packet-mrdisc.c \ + packet-msnip.c \ packet-msproxy.c \ packet-mtp3.c \ packet-nbipx.c \ diff --git a/Makefile.nmake b/Makefile.nmake index 6e51fe249e..25f52f0e1f 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1,7 +1,7 @@ ## Makefile for building ethereal.exe with Microsoft C and nmake ## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake # -# $Id: Makefile.nmake,v 1.120 2001/06/27 20:19:19 guy Exp $ +# $Id: Makefile.nmake,v 1.121 2001/06/29 18:55:49 guy Exp $ include config.nmake include <win32.mak> @@ -116,6 +116,7 @@ DISSECTOR_SRC = \ packet-mpeg1.c \ packet-mpls.c \ packet-mrdisc.c \ + packet-msnip.c \ packet-msproxy.c \ packet-mtp3.c \ packet-nbipx.c \ diff --git a/packet-igmp.c b/packet-igmp.c index ccc44c4d11..562a399997 100644 --- a/packet-igmp.c +++ b/packet-igmp.c @@ -1,7 +1,7 @@ /* packet-igmp.c 2001 Ronnie Sahlberg <rsahlber@bigpond.net.au> * Routines for IGMP packet disassembly * - * $Id: packet-igmp.c,v 1.6 2001/06/27 20:19:19 guy Exp $ + * $Id: packet-igmp.c,v 1.7 2001/06/29 18:55:49 guy Exp $ * * Ethereal - Network traffic analyzer * By Gerald Combs <gerald@ethereal.com> @@ -30,7 +30,7 @@ draft-ietf-idmr-igmp-v3-07 Version 3 Size in bytes for each packet - type RFC988 RFC1054 RFC2236 RFC???? DVMRP MRDISC + type RFC988 RFC1054 RFC2236 RFC???? DVMRP MRDISC MSNIP v0 v1 v2 v3 v1/v3 0x01 20 0x02 20 @@ -46,9 +46,10 @@ 0x16 8 0x17 8 0x22 >=8 - 0x24 a - 0x25 a - 0x26 a + 0x23 >=8b + 0x24 >=8a 8b + 0x25 4a >=8b + 0x26 4a * Differs in second byte of protocol. Always 0 in V1 @@ -69,6 +70,13 @@ draft-ietf-idmr-igmp-mrdisc-06.txt TTL == 1 and IP.DST==224.0.0.2 for all packets + b MSNIP Protocol see packet-msnip.c + + MSNIP : Multicast Source Notification of Interest Protocol + draft-ietf-idmr-msnip-00.txt + 0x23, 0x24 are sent with ip.dst==224.0.0.22 + 0x25 is sent as unicast. + */ #ifdef HAVE_CONFIG_H @@ -88,6 +96,7 @@ #include "in_cksum.h" #include "packet-dvmrp.h" #include "packet-mrdisc.h" +#include "packet-msnip.h" static int proto_igmp = -1; static int hf_type = -1; @@ -118,7 +127,8 @@ static int ett_group_record = -1; static int ett_sqrv_bits = -1; static int ett_max_resp = -1; -#define MC_ALL_ROUTERS 0xe0000002 +#define MC_ALL_ROUTERS 0xe0000002 +#define MC_ALL_IGMPV3_ROUTERS 0xe0000016 #define IGMP_V0_CREATE_GROUP_REQUEST 0x01 @@ -138,6 +148,7 @@ static int ett_max_resp = -1; #define IGMP_V1_TRACEROUTE_RESPONSE 0x1e /* XXX */ #define IGMP_V1_TRACEROUTE_MESSAGE 0x1f /* XXX */ #define IGMP_V3_MEMBERSHIP_REPORT 0x22 +#define IGMP_TYPE_0x23 0x23 #define IGMP_TYPE_0x24 0x24 #define IGMP_TYPE_0x25 0x25 #define IGMP_TYPE_0x26 0x26 @@ -675,16 +686,32 @@ dissect_igmp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) case IGMP_V3_MEMBERSHIP_REPORT: offset = dissect_igmp_v3_response(tvb, pinfo, tree, type, offset); break; + case IGMP_TYPE_0x23: + dst = htonl(MC_ALL_IGMPV3_ROUTERS); + if (!memcmp(pinfo->dst.data, &dst, 4)) { + offset = dissect_msnip(tvb, pinfo, parent_tree, offset); + } + break; case IGMP_TYPE_0x24: dst = htonl(MC_ALL_ROUTERS); if (!memcmp(pinfo->dst.data, &dst, 4)) { offset = dissect_mrdisc(tvb, pinfo, parent_tree, offset); + } + dst = htonl(MC_ALL_IGMPV3_ROUTERS); + if (!memcmp(pinfo->dst.data, &dst, 4)) { + offset = dissect_msnip(tvb, pinfo, parent_tree, offset); } break; case IGMP_TYPE_0x25: - dst = htonl(MC_ALL_ROUTERS); - if (!memcmp(pinfo->dst.data, &dst, 4)) { - offset = dissect_mrdisc(tvb, pinfo, parent_tree, offset); + if ( (pinfo->iplen-pinfo->iphdrlen*4)>=8 ) { + /* if len of igmp packet>=8 we assume it is MSNIP */ + offset = dissect_msnip(tvb, pinfo, parent_tree, offset); + } else { + /* ok its not MSNIP, check if it might be MRDISC */ + dst = htonl(MC_ALL_ROUTERS); + if (!memcmp(pinfo->dst.data, &dst, 4)) { + offset = dissect_mrdisc(tvb, pinfo, parent_tree, offset); + } } break; case IGMP_TYPE_0x26: diff --git a/packet-msnip.c b/packet-msnip.c new file mode 100644 index 0000000000..95b9fb9126 --- /dev/null +++ b/packet-msnip.c @@ -0,0 +1,361 @@ +/* packet-msnip.c 2001 Ronnie Sahlberg <rsahlber@bigpond.net.au> + * Routines for IGMP/MSNIP packet disassembly + * + * $Id: packet-msnip.c,v 1.1 2001/06/29 18:55:49 guy Exp $ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs <gerald@ethereal.com> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ +/* + + + MSNIP + code + + 0x23 x + 0x24 x + 0x25 x + + MSNIP " Multicast Source Notification of Interest Protocol + Defined in draft-ietf-idmr-igmp-msnip-00.txt +*/ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif + +#include <stdio.h> +#include <string.h> +#include <glib.h> + +#include "packet.h" +#include "in_cksum.h" +#include "packet-msnip.h" + + +static int proto_msnip = -1; +static int hf_checksum = -1; +static int hf_checksum_bad = -1; +static int hf_type = -1; +static int hf_count = -1; +static int hf_holdtime = -1; +static int hf_groups = -1; +static int hf_maddr = -1; +static int hf_mask = -1; +static int hf_holdtime16 = -1; +static int hf_genid = -1; +static int hf_rec_type = -1; + +static int ett_msnip = -1; +static int ett_groups = -1; + + +#define MSNIP_GM 0x23 +#define MSNIP_IS 0x24 +#define MSNIP_RMR 0x25 +static const value_string msnip_types[] = { + {MSNIP_GM, "Multicast Group Map"}, + {MSNIP_IS, "Multicast Interest Solicitation"}, + {MSNIP_RMR, "Multicast Receiver Membership Report"}, + {0, NULL} +}; + +#define MSNIP_RECTYPE_TRANSMIT 1 +#define MSNIP_RECTYPE_HOLD 2 +static const value_string msnip_rec_types[] = { + {MSNIP_RECTYPE_TRANSMIT, "Request to start transmitting group"}, + {MSNIP_RECTYPE_HOLD, "Request to hold transmitting group"}, + {0, NULL} +}; + +static void +msnip_checksum(proto_tree *tree,tvbuff_t *tvb, int len) +{ + guint16 cksum,hdrcksum; + vec_t cksum_vec[1]; + + cksum_vec[0].ptr = tvb_get_ptr(tvb, 0, len); + cksum_vec[0].len = len; + + hdrcksum = tvb_get_ntohs(tvb, 2); + cksum = in_cksum(&cksum_vec[0],1); + + if (cksum==0) { + proto_tree_add_uint_format(tree, hf_checksum, tvb, 2, 2, hdrcksum, "Header checksum: 0x%04x (correct)", hdrcksum); + } else { + proto_tree_add_item_hidden(tree, hf_checksum_bad, tvb, 2, 2, TRUE); + proto_tree_add_uint_format(tree, hf_checksum, tvb, 2, 2, hdrcksum, "Header checksum: 0x%04x (incorrect, should be 0x%04x)", hdrcksum,in_cksum_shouldbe(hdrcksum,cksum)); + } + + return; +} + + +static int +dissect_msnip_rmr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset) +{ + guint8 count; + + /* group count */ + count = tvb_get_guint8(tvb, offset); + proto_tree_add_uint(parent_tree, hf_count, tvb, offset, 1, count); + offset += 1; + + /* checksum */ + msnip_checksum(parent_tree, tvb, tvb_length_remaining(tvb, 0)); + offset += 2; + + while (count--) { + proto_tree *tree; + proto_item *item; + guint8 rec_type; + guint32 maddr; + int old_offset = offset; + + item = proto_tree_add_item(parent_tree, hf_groups, + tvb, offset, 0, FALSE); + tree = proto_item_add_subtree(item, ett_groups); + + /* record type */ + rec_type = tvb_get_guint8(tvb, offset); + proto_tree_add_uint(tree, hf_rec_type, tvb, offset, 1, rec_type); + offset += 1; + + /* skip 3 unused bytes */ + offset += 3; + + /* multicast group */ + tvb_memcpy(tvb, (guint8 *)&maddr, offset, 4); + proto_tree_add_ipv4(tree, hf_maddr, tvb, offset, 4, + maddr); + offset += 4; + + if (item) { + proto_item_set_text(item,"Group: %s %s", + ip_to_str((guint8 *)&maddr), + val_to_str(rec_type, msnip_rec_types, + "Unknown Type:0x%02x")); + + proto_item_set_len(item, offset-old_offset); + } + } + + return offset; +} + +static int +dissect_msnip_is(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset) +{ + + /* skip reserved byte */ + offset += 1; + + /* checksum */ + msnip_checksum(parent_tree, tvb, tvb_length_remaining(tvb, 0)); + offset += 2; + + /* 16 bit holdtime */ + proto_tree_add_uint(parent_tree, hf_holdtime16, tvb, offset, 2, tvb_get_ntohs(tvb, offset)); + offset += 2; + + /* Generation ID */ + proto_tree_add_uint(parent_tree, hf_genid, tvb, offset, 2, tvb_get_ntohs(tvb, offset)); + offset += 2; + + return offset; +} + + +static int +dissect_msnip_gm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset) +{ + guint8 count; + + /* group count */ + count = tvb_get_guint8(tvb, offset); + proto_tree_add_uint(parent_tree, hf_count, tvb, offset, 1, count); + offset += 1; + + /* checksum */ + msnip_checksum(parent_tree, tvb, tvb_length_remaining(tvb, 0)); + offset += 2; + + /* holdtime */ + proto_tree_add_uint(parent_tree, hf_holdtime, tvb, offset, 4, count); + offset += 4; + + while (count--) { + proto_tree *tree; + proto_item *item; + guint32 maddr; + guint8 masklen; + int old_offset = offset; + + item = proto_tree_add_item(parent_tree, hf_groups, + tvb, offset, 0, FALSE); + tree = proto_item_add_subtree(item, ett_groups); + + /* multicast group */ + tvb_memcpy(tvb, (guint8 *)&maddr, offset, 4); + proto_tree_add_ipv4(tree, hf_maddr, tvb, offset, 4, + maddr); + offset += 4; + + /* mask length */ + masklen = tvb_get_guint8(tvb, offset); + proto_tree_add_uint(tree, hf_mask, tvb, + offset, 1, masklen); + offset += 1; + + /* skip 3 unused bytes */ + offset += 3; + + if (item) { + proto_item_set_text(item,"Group: %s/%d", + ip_to_str((guint8 *)&maddr), masklen); + + proto_item_set_len(item, offset-old_offset); + } + } + + return offset; +} + + +/* This function is only called from the IGMP dissector */ +int +dissect_msnip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, int offset) +{ + proto_tree *tree; + proto_item *item; + guint8 type; + + if (!proto_is_protocol_enabled(proto_msnip)) { + /* we are not enabled, skip entire packet to be nice + to the igmp layer. (so clicking on IGMP will display the data) + */ + return offset+tvb_length_remaining(tvb, offset); + } + + item = proto_tree_add_item(parent_tree, proto_msnip, tvb, offset, 0, FALSE); + tree = proto_item_add_subtree(item, ett_msnip); + + + if (check_col(pinfo->fd, COL_PROTOCOL)) { + col_set_str(pinfo->fd, COL_PROTOCOL, "MSNIP"); + } + if (check_col(pinfo->fd, COL_INFO)) { + col_clear(pinfo->fd, COL_INFO); + } + + + type = tvb_get_guint8(tvb, offset); + if (check_col(pinfo->fd, COL_INFO)) { + col_add_fstr(pinfo->fd, COL_INFO, + "%s",val_to_str(type, msnip_types, + "Unknown Type:0x%02x")); + } + + /* type of command */ + proto_tree_add_uint(tree, hf_type, tvb, offset, 1, type); + offset += 1; + + switch (type) { + case MSNIP_GM: + offset = dissect_msnip_gm(tvb, pinfo, tree, offset); + break; + case MSNIP_IS: + offset = dissect_msnip_is(tvb, pinfo, tree, offset); + break; + case MSNIP_RMR: + offset = dissect_msnip_rmr(tvb, pinfo, tree, offset); + break; + } + + if (item) { + proto_item_set_len(item, offset); + } + + return offset; +} + + +void +proto_register_msnip(void) +{ + static hf_register_info hf[] = { + { &hf_type, + { "Type", "msnip.type", FT_UINT8, BASE_HEX, + VALS(msnip_types), 0, "MSNIP Packet Type", HFILL }}, + + { &hf_checksum, + { "Checksum", "msnip.checksum", FT_UINT16, BASE_HEX, + NULL, 0, "MSNIP Checksum", HFILL }}, + + { &hf_checksum_bad, + { "Bad Checksum", "msnip.checksum_bad", FT_BOOLEAN, BASE_NONE, + NULL, 0, "Bad MSNIP Checksum", HFILL }}, + + { &hf_count, + { "Count", "msnip.count", FT_UINT8, BASE_DEC, + NULL, 0, "MSNIP Number of groups", HFILL }}, + + { &hf_holdtime, + { "Holdtime", "msnip.holdtime", FT_UINT32, BASE_DEC, + NULL, 0, "MSNIP Holdtime in seconds", HFILL }}, + + { &hf_groups, + { "Groups", "msnip.groups", FT_NONE, BASE_NONE, + NULL, 0, "MSNIP Groups", HFILL }}, + + { &hf_maddr, + { "Multicast group", "msnip.maddr", FT_IPv4, BASE_NONE, + NULL, 0, "MSNIP Multicast Group", HFILL }}, + + { &hf_mask, + { "Netmask", "msnip.netmask", FT_UINT8, BASE_DEC, + NULL, 0, "MSNIP Netmask", HFILL }}, + + { &hf_holdtime16, + { "Holdtime", "msnip.holdtime16", FT_UINT16, BASE_DEC, + NULL, 0, "MSNIP Holdtime in seconds", HFILL }}, + + { &hf_genid, + { "Generation ID", "msnip.genid", FT_UINT16, BASE_DEC, + NULL, 0, "MSNIP Generation ID", HFILL }}, + + { &hf_rec_type, + { "Record Type", "msnip.rec_type", FT_UINT8, BASE_DEC, + VALS(msnip_rec_types), 0, "MSNIP Record Type", HFILL }}, + + }; + static gint *ett[] = { + &ett_msnip, + &ett_groups, + }; + + proto_msnip = proto_register_protocol("MSNIP : Multicast Source Notification of Interest Protocol", + "MSNIP", "msnip"); + proto_register_field_array(proto_msnip, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); +} + diff --git a/packet-msnip.h b/packet-msnip.h new file mode 100644 index 0000000000..6bb5d56a1d --- /dev/null +++ b/packet-msnip.h @@ -0,0 +1,31 @@ +/* packet-msnip.h 2001 Ronnie Sahlberg <rsahlber@bigpond.net.au> + * Declarations of routines for IGMP/MSNIP packet disassembly + * + * $Id: packet-msnip.h,v 1.1 2001/06/29 18:55:50 guy Exp $ + * + * Ethereal - Network traffic analyzer + * By Gerald Combs <gerald@ethereal.com> + * Copyright 1998 Gerald Combs + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef __PACKET_MSNIP_H__ +#define __PACKET_MSNIP_H__ + +int dissect_msnip(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, int offset); + +#endif + |