diff options
author | Guy Harris <guy@alum.mit.edu> | 2005-01-20 05:40:56 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2005-01-20 05:40:56 +0000 |
commit | 36e8efcbca4fdfdad9f24f7c3a8ae021d7b0823f (patch) | |
tree | 743eafaabf72d89242cd8d582b90aeeabafcdea3 /epan/dissectors | |
parent | b8e743ada92143d984441ef493767bf4a8a78238 (diff) |
From Hannes Gredler: support for Juniper's DLT_JUNIPER_ATM{1,2} values.
svn path=/trunk/; revision=13130
Diffstat (limited to 'epan/dissectors')
-rw-r--r-- | epan/dissectors/Makefile.common | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-ip.c | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-ipv6.c | 1 | ||||
-rw-r--r-- | epan/dissectors/packet-juniper.c | 422 | ||||
-rw-r--r-- | epan/dissectors/packet-osi.c | 28 | ||||
-rw-r--r-- | epan/dissectors/packet-ppp.c | 1 |
6 files changed, 443 insertions, 11 deletions
diff --git a/epan/dissectors/Makefile.common b/epan/dissectors/Makefile.common index 91f48a2b93..d48cf877f6 100644 --- a/epan/dissectors/Makefile.common +++ b/epan/dissectors/Makefile.common @@ -319,6 +319,7 @@ DISSECTOR_SRC = \ packet-isup.c \ packet-iua.c \ packet-jabber.c \ + packet-juniper.c \ packet-jxta.c \ packet-kadm5.c \ packet-kerberos.c \ diff --git a/epan/dissectors/packet-ip.c b/epan/dissectors/packet-ip.c index 6f72b879aa..d9dbd1848c 100644 --- a/epan/dissectors/packet-ip.c +++ b/epan/dissectors/packet-ip.c @@ -1762,6 +1762,7 @@ proto_reg_handoff_ip(void) dissector_add("ip.proto", IP_PROTO_IPIP, ip_handle); dissector_add("null.type", BSD_AF_INET, ip_handle); dissector_add("chdlctype", ETHERTYPE_IP, ip_handle); + dissector_add("osinl.excl", NLPID_IP, ip_handle); dissector_add("fr.ietf", NLPID_IP, ip_handle); dissector_add("x.25.spi", NLPID_IP, ip_handle); dissector_add("arcnet.protocol_id", ARCNET_PROTO_IP_1051, ip_handle); diff --git a/epan/dissectors/packet-ipv6.c b/epan/dissectors/packet-ipv6.c index 1b026a6f6b..dce5de93fb 100644 --- a/epan/dissectors/packet-ipv6.c +++ b/epan/dissectors/packet-ipv6.c @@ -953,6 +953,7 @@ proto_reg_handoff_ipv6(void) dissector_add("null.type", BSD_AF_INET6_DARWIN, ipv6_handle); dissector_add("chdlctype", ETHERTYPE_IPv6, ipv6_handle); dissector_add("fr.ietf", NLPID_IP6, ipv6_handle); + dissector_add("osinl.excl", NLPID_IP6, ipv6_handle); dissector_add("x.25.spi", NLPID_IP6, ipv6_handle); dissector_add("arcnet.protocol_id", ARCNET_PROTO_IPv6, ipv6_handle); diff --git a/epan/dissectors/packet-juniper.c b/epan/dissectors/packet-juniper.c new file mode 100644 index 0000000000..81e1c28dec --- /dev/null +++ b/epan/dissectors/packet-juniper.c @@ -0,0 +1,422 @@ +/* packet-juniper.c + * Routines for Juniper Networks, Inc. packet disassembly + * Copyright 2005 Hannes Gredler <hannes@juniper.net> + * + * $Id$ + * + * 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. + */ + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include <glib.h> +#include <epan/packet.h> +#include "etypes.h" +#include <epan/prefs.h> +#include <epan/addr_resolv.h> +#include "ppptypes.h" +#include "packet-ppp.h" +#include "packet-ip.h" + +#define JUNIPER_FLAG_PKT_OUT 0x00 /* Outgoing packet */ +#define JUNIPER_FLAG_PKT_IN 0x01 /* Incoming packet */ +#define JUNIPER_FLAG_NO_L2 0x02 /* L2 header stripped */ +#define JUNIPER_ATM2_PKT_TYPE_MASK 0x70 +#define JUNIPER_ATM2_GAP_COUNT_MASK 0x3F +#define JUNIPER_PCAP_MAGIC 0x4d4743 + +#define JUNIPER_ATM1 1 +#define JUNIPER_ATM2 2 + +#define JUNIPER_HDR_SNAP 0xaaaa03 +#define JUNIPER_HDR_NLPID 0xfefe03 +#define JUNIPER_HDR_CNLPID 0x03 + +static const value_string juniper_direction_vals[] = { + {JUNIPER_FLAG_PKT_OUT, "Out"}, + {JUNIPER_FLAG_PKT_IN, "In"}, + {0, NULL} +}; + +static const value_string juniper_l2hdr_presence_vals[] = { + { 0, "Present"}, + { 2, "none"}, + {0, NULL} +}; + +static int proto_juniper = -1; + +static int hf_juniper_magic = -1; +static int hf_juniper_direction = -1; +static int hf_juniper_l2hdr_presence = -1; +static int hf_juniper_atm1_cookie = -1; +static int hf_juniper_atm2_cookie = -1; + +static gint ett_juniper = -1; + +static dissector_handle_t ipv4_handle; +static dissector_handle_t ipv6_handle; +static dissector_handle_t llc_handle; +static dissector_handle_t eth_handle; +static dissector_handle_t ppp_handle; +static dissector_handle_t data_handle; + +static dissector_table_t osinl_subdissector_table; +static dissector_table_t osinl_excl_subdissector_table; + +static void dissect_juniper_atm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 atm_pictype); +u_int ppp_heuristic_guess(guint16); +u_int ip_heuristic_guess(guint8); + +/* wrapper for passing the PIC type to the generic ATM dissector */ +static void +dissect_juniper_atm1(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_juniper_atm(tvb,pinfo,tree, JUNIPER_ATM1); +} + +/* wrapper for passing the PIC type to the generic ATM dissector */ +static void +dissect_juniper_atm2(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) +{ + dissect_juniper_atm(tvb,pinfo,tree, JUNIPER_ATM2); +} + +/* generic ATM dissector */ +static void +dissect_juniper_atm(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, guint16 atm_pictype) +{ + proto_item *ti,*tisub; + proto_tree *subtree = NULL; + guint8 direction,l2hdr_presence,flags,ipvers,atm1_header_len,atm2_header_len; + guint32 magic_number, cookie1, proto; + guint64 cookie2; + guint offset; + + tvbuff_t *next_tvb; + + switch (atm_pictype) { + case JUNIPER_ATM1: + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper ATM1"); + break; + case JUNIPER_ATM2: + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper ATM2"); + break; + default: /* should not happen */ + if (check_col(pinfo->cinfo, COL_PROTOCOL)) + col_set_str(pinfo->cinfo, COL_PROTOCOL, "Juniper ATM unknown"); + return; + + } + + if (check_col(pinfo->cinfo, COL_INFO)) + col_clear(pinfo->cinfo, COL_INFO); + + offset = 0; + magic_number = tvb_get_ntoh24(tvb, 0); + flags = tvb_get_guint8(tvb, 3); + direction = flags & JUNIPER_FLAG_PKT_IN; + l2hdr_presence = flags & JUNIPER_FLAG_NO_L2; + + if ((flags & JUNIPER_FLAG_NO_L2) == JUNIPER_FLAG_NO_L2) { + atm1_header_len = 8; + atm2_header_len = 8; + } + else { + atm1_header_len = 8; + atm2_header_len = 12; + } + + switch (atm_pictype) { + case JUNIPER_ATM1: + ti = proto_tree_add_text (tree, tvb, 0, atm1_header_len, "Juniper ATM1 PIC"); + break; + case JUNIPER_ATM2: + ti = proto_tree_add_text (tree, tvb, 0, atm2_header_len, "Juniper ATM2 PIC"); + break; + default: /* should not happen */ + ti = proto_tree_add_text (tree, tvb, 0, 0 , "Juniper unknown ATM PIC"); + return; + } + + subtree = proto_item_add_subtree(ti, ett_juniper); + + tisub = proto_tree_add_text (subtree, tvb, 0, 3, + "Magic-Number: 0x%06x (%scorrect)", + magic_number, + (magic_number == JUNIPER_PCAP_MAGIC) ? "" : "in" ); + + if (magic_number != JUNIPER_PCAP_MAGIC) + return; + + tisub = proto_tree_add_uint_format (subtree, hf_juniper_direction, tvb, 3, 1, + direction, "Direction: %s", + val_to_str(direction,juniper_direction_vals,"Unknown")); + + tisub = proto_tree_add_uint_format (subtree, hf_juniper_l2hdr_presence, tvb, 3, 1, + l2hdr_presence, "L2-header: %s", + val_to_str(l2hdr_presence,juniper_l2hdr_presence_vals,"Unknown")); + + + switch (atm_pictype) { + case JUNIPER_ATM1: + offset += atm1_header_len; + break; + case JUNIPER_ATM2: + offset += atm2_header_len; + break; + default: /* should not happen */ + return; + } + + if ((flags & JUNIPER_FLAG_NO_L2) == JUNIPER_FLAG_NO_L2) { /* no link header present ? */ + next_tvb = tvb_new_subset(tvb, offset, -1, -1); + ipvers = ip_heuristic_guess(tvb_get_guint8(tvb, offset)); /* try IP */ + if ( ipvers != 0) { + ti = proto_tree_add_text (tree, tvb, offset, 1, + "Payload Type: Null encapsulation IPv%u", + ipvers); + subtree = proto_item_add_subtree(ti, ett_juniper); + switch (ipvers) { + case 6: + call_dissector(ipv6_handle, next_tvb, pinfo, subtree); + break; + case 4: + call_dissector(ipv4_handle, next_tvb, pinfo, subtree); + break; + } + } + return; + } + + cookie1 = tvb_get_ntohl(tvb,4); + cookie2 = tvb_get_ntoh64(tvb,4); + + switch (atm_pictype) { + case JUNIPER_ATM1: + tisub = proto_tree_add_uint(subtree, hf_juniper_atm1_cookie, tvb, 4, 4, cookie1); + break; + case JUNIPER_ATM2: + tisub = proto_tree_add_uint64(subtree, hf_juniper_atm2_cookie, tvb, 4, 8, cookie2); + break; + default: /* should not happen */ + return; + } + + next_tvb = tvb_new_subset(tvb, offset, -1, -1); + + /* FIXME OAM cells */ + + proto = tvb_get_ntoh24(tvb, offset); /* first try: 24-Bit guess */ + + if (proto == JUNIPER_HDR_NLPID) { /* NLPID encaps ? */ + ti = proto_tree_add_text (tree, tvb, offset, 3, "Payload Type: LLC/NLPID "); + subtree = proto_item_add_subtree(ti, ett_juniper); + call_dissector(llc_handle, next_tvb, pinfo, subtree); + return; + } + + if (proto == JUNIPER_HDR_SNAP) { /* SNAP encaps ? */ + ti = proto_tree_add_text (tree, tvb, offset, 3, "Payload Type: LLC/SNAP "); + subtree = proto_item_add_subtree(ti, ett_juniper); + call_dissector(llc_handle, next_tvb, pinfo, subtree); + return; + } + + if (direction != JUNIPER_FLAG_PKT_IN && /* ether-over-1483 encaps ? */ + (cookie1 & JUNIPER_ATM2_GAP_COUNT_MASK) && + atm_pictype != JUNIPER_ATM1) { + ti = proto_tree_add_text (tree, tvb, 4, 1, "Payload Type: Ethernet"); + subtree = proto_item_add_subtree(ti, ett_juniper); + call_dissector(eth_handle, next_tvb, pinfo, subtree); + return; + } + + proto = tvb_get_ntohs(tvb, offset); /* second try: 16-Bit guess */ + + if ( ppp_heuristic_guess(proto) != 0 && + atm_pictype != JUNIPER_ATM1) { /* VC-MUX PPPoA encaps ? - not supported on ATM1 PICs */ + ti = proto_tree_add_text (tree, tvb, offset, 2, "Payload Type: VC-MUX PPP"); + subtree = proto_item_add_subtree(ti, ett_juniper); + call_dissector(ppp_handle, next_tvb, pinfo, subtree); + return; + } + + proto = tvb_get_guint8(tvb, offset); /* third try: 8-Bit guess */ + + if ( proto == JUNIPER_HDR_CNLPID ) { /* Cisco style NLPID encaps ? */ + ti = proto_tree_add_text (tree, tvb, offset, 1, "Payload Type: Cisco NLPID"); + subtree = proto_item_add_subtree(ti, ett_juniper); + proto = tvb_get_guint8(tvb, offset+1); + if(dissector_try_port(osinl_subdissector_table, proto, next_tvb, pinfo, subtree)) + return; + next_tvb = tvb_new_subset(tvb, offset+2, -1, -1); + if(dissector_try_port(osinl_excl_subdissector_table, proto, next_tvb, pinfo, subtree)) + return; + } + + ipvers = ip_heuristic_guess(proto); + if ( ipvers != 0) { /* last resort: VC-MUX encaps ? */ + ti = proto_tree_add_text (tree, tvb, offset, 1, + "Payload Type: VC-MUX IPv%u", + ipvers); + subtree = proto_item_add_subtree(ti, ett_juniper); + switch (ipvers) { + case 6: + call_dissector(ipv6_handle, next_tvb, pinfo, subtree); + break; + case 4: + call_dissector(ipv4_handle, next_tvb, pinfo, subtree); + break; + } + return; + } + + /* could not figure what it is */ + ti = proto_tree_add_text (tree, tvb, offset, -1, "Payload Type: unknown"); + +} + +/* list of Juniper supported PPP proto IDs */ +u_int +ppp_heuristic_guess(const u_int16_t proto) { + + switch(proto) { + case PPP_IP : + case PPP_OSI : + case PPP_MPLS_UNI : + case PPP_MPLS_MULTI : + case PPP_IPCP : + case PPP_OSICP : + case PPP_MPLSCP : + case PPP_LCP : + case PPP_PAP : + case PPP_CHAP : + case PPP_MP : + case PPP_IPV6 : + case PPP_IPV6CP : + return 1; + break; + + default: + return 0; /* did not find a ppp header */ + break; + } +} + +/* + * return the IP version number based on the first byte of the IP header + * returns 0 if it does not match a valid first IPv4/IPv6 header byte + */ +u_int +ip_heuristic_guess(const u_int8_t ip_header_byte) { + + switch(ip_header_byte) { + case 0x45: + case 0x46: + case 0x47: + case 0x48: + case 0x49: + case 0x4a: + case 0x4b: + case 0x4c: + case 0x4d: + case 0x4e: + case 0x4f: + return 4; + break; + case 0x60: + case 0x61: + case 0x62: + case 0x63: + case 0x64: + case 0x65: + case 0x66: + case 0x67: + case 0x68: + case 0x69: + case 0x6a: + case 0x6b: + case 0x6c: + case 0x6d: + case 0x6e: + case 0x6f: + return 6; + break; + default: + return 0; /* did not find a ip header */ + } +} + +void +proto_register_juniper(void) +{ + static hf_register_info hf[] = { + { &hf_juniper_magic, + { "Magic Number", "juniper.magic-number", FT_UINT24, BASE_HEX, + NULL, 0x0, "", HFILL }}, + { &hf_juniper_direction, + { "Direction", "juniper.direction", FT_UINT8, BASE_HEX, + VALS(juniper_direction_vals), 0x0, "", HFILL }}, + { &hf_juniper_l2hdr_presence, + { "L2 header presence", "juniper.l2hdr", FT_UINT8, BASE_HEX, + VALS(juniper_l2hdr_presence_vals), 0x0, "", HFILL }}, + { &hf_juniper_atm2_cookie, + { "Cookie", "juniper.atm2.cookie", FT_UINT64, BASE_HEX, + NULL, 0x0, "", HFILL }}, + { &hf_juniper_atm1_cookie, + { "Cookie", "juniper.atm1.cookie", FT_UINT32, BASE_HEX, + NULL, 0x0, "", HFILL }}, + }; + + static gint *ett[] = { + &ett_juniper, + }; + + proto_juniper = proto_register_protocol("Juniper", "Juniper", "juniper"); + proto_register_field_array(proto_juniper, hf, array_length(hf)); + proto_register_subtree_array(ett, array_length(ett)); + +} + +void +proto_reg_handoff_juniper(void) +{ + dissector_handle_t juniper_atm1_handle; + dissector_handle_t juniper_atm2_handle; + + osinl_subdissector_table = find_dissector_table("osinl"); + osinl_excl_subdissector_table = find_dissector_table("osinl.excl"); + eth_handle = find_dissector("eth_withoutfcs"); + ppp_handle = find_dissector("ppp"); + llc_handle = find_dissector("llc"); + ipv4_handle = find_dissector("ip"); + ipv6_handle = find_dissector("ipv6"); + data_handle = find_dissector("data"); + + juniper_atm2_handle = create_dissector_handle(dissect_juniper_atm2, proto_juniper); + juniper_atm1_handle = create_dissector_handle(dissect_juniper_atm1, proto_juniper); + dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_ATM2, juniper_atm2_handle); + dissector_add("wtap_encap", WTAP_ENCAP_JUNIPER_ATM1, juniper_atm1_handle); +} + diff --git a/epan/dissectors/packet-osi.c b/epan/dissectors/packet-osi.c index 6afbc80adf..2223e42e01 100644 --- a/epan/dissectors/packet-osi.c +++ b/epan/dissectors/packet-osi.c @@ -224,6 +224,7 @@ const value_string nlpid_vals[] = { }; static dissector_table_t osinl_subdissector_table; +static dissector_table_t osinl_excl_subdissector_table; static dissector_handle_t data_handle, ppp_handle; static void dissect_osi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -235,10 +236,15 @@ static void dissect_osi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) nlpid = tvb_get_guint8(tvb, 0); - /* do lookup with the subdissector table */ + /* try lookup with the subdissector tables that includes the nlpid */ if (dissector_try_port(osinl_subdissector_table, nlpid, tvb, pinfo, tree)) return; + /* try lookup with the subdissector tables that excludes the nlpid */ + new_tvb = tvb_new_subset(tvb, 1, -1, -1); + if (dissector_try_port(osinl_excl_subdissector_table, nlpid, new_tvb, pinfo, tree)) + return; + switch (nlpid) { /* ESIS (X.25) is not currently decoded */ @@ -255,14 +261,6 @@ static void dissect_osi(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } call_dissector(data_handle,tvb, pinfo, tree); break; - case NLPID_PPP: - /* XXX - we should put the NLPID into the protocol tree. - We should also probably have a subdissector table for - those protocols whose PDUs *aren't* defined to begin - with an NLPID. */ - new_tvb = tvb_new_subset(tvb, 1, -1, -1); - call_dissector(ppp_handle, new_tvb, pinfo, tree); - break; default: if (check_col(pinfo->cinfo, COL_PROTOCOL)) { col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISO"); @@ -280,9 +278,17 @@ proto_register_osi(void) { /* There's no "OSI" protocol *per se*, but we do register a dissector table so various protocols running at the - network layer can register themselves. */ + network layer can register themselves. + all protocols that require inclusion of the NLPID + should register here */ osinl_subdissector_table = register_dissector_table("osinl", - "OSI NLPID", FT_UINT8, BASE_HEX); + "OSI incl NLPID", FT_UINT8, BASE_HEX); + + /* This dissector table is for those protocols whose PDUs + * aren't* defined to begin with an NLPID. + * (typically non OSI protocols like IP,IPv6,PPP */ + osinl_excl_subdissector_table = register_dissector_table("osinl.excl", + "OSI excl NLPID", FT_UINT8, BASE_HEX); } void diff --git a/epan/dissectors/packet-ppp.c b/epan/dissectors/packet-ppp.c index 08fdb6a9b0..66fb6c6129 100644 --- a/epan/dissectors/packet-ppp.c +++ b/epan/dissectors/packet-ppp.c @@ -3690,6 +3690,7 @@ proto_reg_handoff_ppp(void) ppp_hdlc_handle = find_dissector("ppp_hdlc"); dissector_add("wtap_encap", WTAP_ENCAP_PPP, ppp_hdlc_handle); dissector_add("wtap_encap", WTAP_ENCAP_PPP_WITH_PHDR, ppp_hdlc_handle); + dissector_add("osinl.excl", NLPID_PPP, ppp_handle); dissector_add("gre.proto", ETHERTYPE_PPP, ppp_hdlc_handle); } |