diff options
| author | Guy Harris <guy@alum.mit.edu> | 2001-11-07 20:26:38 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2001-11-07 20:26:38 +0000 |
| commit | d65661ea24649bc600e44cf9d49b881ea65621c2 (patch) | |
| tree | fb1372663c8536c400b78d26bea997db65a6de96 | |
| parent | a29623753d82629f0843e9326276693c8f823d7d (diff) | |
| download | wireshark-d65661ea24649bc600e44cf9d49b881ea65621c2.tar.gz wireshark-d65661ea24649bc600e44cf9d49b881ea65621c2.tar.bz2 wireshark-d65661ea24649bc600e44cf9d49b881ea65621c2.zip | |
MPLS support for handling either IPv4 or IPv6 as the payload protocol
type, from Hamish Moffatt.
svn path=/trunk/; revision=4175
| -rw-r--r-- | AUTHORS | 5 | ||||
| -rw-r--r-- | doc/ethereal.pod.template | 1 | ||||
| -rw-r--r-- | packet-mpls.c | 20 |
3 files changed, 20 insertions, 6 deletions
@@ -877,6 +877,11 @@ Pekka Nikander <pekka.nikander[AT]nomadiclab.com> { PPP/EAPOL EAP support } +Hamish Moffatt <hamish[AT]cloud.net.au> { + MPLS support for handling either IPv4 or IPv6 as the payload + protocol type +} + Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his permission to use his version of snprintf.c. diff --git a/doc/ethereal.pod.template b/doc/ethereal.pod.template index a009ca1410..fdddf6fe78 100644 --- a/doc/ethereal.pod.template +++ b/doc/ethereal.pod.template @@ -1213,6 +1213,7 @@ B<http://www.ethereal.com>. Tomas Kukosa <tomas.kukosa[AT]anfdata.cz> <a.stockmeier[AT]avm.de> Pekka Nikander <pekka.nikander[AT]nomadiclab.com> + Hamish Moffatt <hamish[AT]cloud.net.au> Alain Magloire <alainm[AT]rcsm.ece.mcgill.ca> was kind enough to give his permission to use his version of snprintf.c. diff --git a/packet-mpls.c b/packet-mpls.c index 7e1bd55a12..c49ddafca3 100644 --- a/packet-mpls.c +++ b/packet-mpls.c @@ -3,12 +3,11 @@ * * (c) Copyright Ashok Narayanan <ashokn@cisco.com> * - * $Id: packet-mpls.c,v 1.21 2001/06/18 02:17:49 guy Exp $ + * $Id: packet-mpls.c,v 1.22 2001/11/07 20:26:37 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 @@ -108,7 +107,8 @@ static hf_register_info mplsf_info[] = { "", HFILL }}, }; -static dissector_handle_t ip_handle; +static dissector_handle_t ipv4_handle; +static dissector_handle_t ipv6_handle; /* * Given a 4-byte MPLS label starting at offset "offset", in tvbuff "tvb", @@ -138,6 +138,7 @@ dissect_mpls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint8 exp; guint8 bos; guint8 ttl; + guint8 ipvers; proto_tree *mpls_tree; proto_item *ti; @@ -180,7 +181,13 @@ dissect_mpls(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (bos) break; } next_tvb = tvb_new_subset(tvb, offset, -1, -1); - call_dissector(ip_handle, next_tvb, pinfo, tree); + + ipvers = (tvb_get_guint8(tvb, offset) >> 4) & 0x0F; + if (ipvers == 6) { + call_dissector(ipv6_handle, next_tvb, pinfo, tree); + } else { + call_dissector(ipv4_handle, next_tvb, pinfo, tree); + } } void @@ -200,9 +207,10 @@ void proto_reg_handoff_mpls(void) { /* - * Get a handle for the IP dissector. + * Get a handle for the IPv4 and IPv6 dissectors. */ - ip_handle = find_dissector("ip"); + ipv4_handle = find_dissector("ip"); + ipv6_handle = find_dissector("ipv6"); dissector_add("ethertype", ETHERTYPE_MPLS, dissect_mpls, proto_mpls); dissector_add("ppp.protocol", PPP_MPLS_UNI, dissect_mpls, proto_mpls); |