-/* packet-isis-core.c
+/* packet-isis.c
* Routines for ISO/OSI network and transport protocol packet disassembly, core
* bits.
*
- * $Id: packet-isis.c,v 1.8 2000/04/17 01:36:31 guy Exp $
+ * $Id: packet-isis.c,v 1.34 2002/08/29 18:52:51 guy Exp $
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
- * By Gerald Combs <gerald@zing.org>
+ * 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
-#ifdef HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-
#include <stdio.h>
#include <string.h>
#include <glib.h>
-#include "packet.h"
+#include <epan/packet.h>
#include "nlpid.h"
#include "packet-osi.h"
#include "packet-isis.h"
* that we make sure we don't go off the end of the bleedin packet here!
*
* Input
- * unt offset : Current offset into packet data.
- * int len : length of to dump.
+ * tvbuff_t * : tvbuffer for packet data
* proto_tree * : tree of display data. May be NULL.
- * frame_data * fd : frame data
+ * int : current offset into packet data
* char * : format text
+ * subsequent args : arguments to format
*
* Output:
* void (may modify proto tree)
*/
void
-isis_dissect_unknown(int offset,guint length,proto_tree *tree,frame_data *fd,
- char *fmat, ...){
+isis_dissect_unknown(tvbuff_t *tvb, proto_tree *tree, int offset,
+ char *fmat, ...)
+{
va_list ap;
- if ( !IS_DATA_IN_FRAME(offset) ) {
- /*
- * big oops They were off the end of the packet already.
- * Just ignore this one.
- */
- return;
- }
- if ( !BYTES_ARE_IN_FRAME(offset, length) ) {
- /*
- * length will take us past eop. Truncate length.
- */
- length = END_OF_FRAME;
- }
-
va_start(ap, fmat);
- proto_tree_add_text(tree, offset, length, fmat, ap);
+ proto_tree_add_text_valist(tree, tvb, offset, -1, fmat, ap);
va_end(ap);
}
+
/*
* Name: dissect_isis()
- *
+ *
* Description:
* Main entry area for isis de-mangling. This will build the
* main isis tree data and call the sub-protocols as needed.
*
* Input:
- * u_char * : packet data
- * int : offset into packet where we are (packet_data[offset]== start
- * of what we care about)
- * frame_data * : frame data (whole packet with extra info)
+ * tvbuff_t * : tvbuffer for packet data
+ * packet_info * : info for current packet
* proto_tree * : tree of display data. May be NULL.
*
* Output:
* void, but we will add to the proto_tree if it is not NULL.
*/
static void
-dissect_isis(const u_char *pd, int offset, frame_data *fd,
- proto_tree *tree) {
- isis_hdr_t *ihdr;
+dissect_isis(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
proto_item *ti;
proto_tree *isis_tree = NULL;
+ int offset = 0;
+ guint8 isis_version;
+ guint8 isis_header_length;
+ guint8 isis_type_reserved;
+ guint8 isis_type;
+ guint8 isis_system_id_len;
- if (check_col(fd, COL_PROTOCOL))
- col_add_str(fd, COL_PROTOCOL, "ISIS");
+ if (check_col(pinfo->cinfo, COL_PROTOCOL))
+ col_set_str(pinfo->cinfo, COL_PROTOCOL, "ISIS");
+ if (check_col(pinfo->cinfo, COL_INFO))
+ col_clear(pinfo->cinfo, COL_INFO);
- if (!BYTES_ARE_IN_FRAME(offset, sizeof(*ihdr))) {
- isis_dissect_unknown(offset, sizeof(*ihdr), tree, fd,
- "not enough capture data for header (%d vs %d)",
- sizeof(*ihdr), END_OF_FRAME);
+ isis_version = tvb_get_guint8(tvb, 2);
+ if (isis_version != ISIS_REQUIRED_VERSION){
+ if (check_col(pinfo->cinfo, COL_INFO)) {
+ col_add_fstr(pinfo->cinfo, COL_INFO,
+ "Unknown ISIS version (%u vs %u)",
+ isis_version, ISIS_REQUIRED_VERSION );
+ }
+ isis_dissect_unknown(tvb, tree, 0,
+ "Unknown ISIS version (%d vs %d)",
+ isis_version, ISIS_REQUIRED_VERSION);
return;
}
- ihdr = (isis_hdr_t *) &pd[offset];
+ isis_header_length = tvb_get_guint8(tvb, 1);
+ if (tree) {
+ ti = proto_tree_add_item(tree, proto_isis, tvb, 0, -1, FALSE);
+ isis_tree = proto_item_add_subtree(ti, ett_isis);
+ }
- if (ihdr->isis_version != ISIS_REQUIRED_VERSION){
- isis_dissect_unknown(offset, END_OF_FRAME, tree, fd,
- "Unknown ISIS version (%d vs %d)",
- ihdr->isis_version, ISIS_REQUIRED_VERSION );
- return;
+ if (tree) {
+ proto_tree_add_item(isis_tree, hf_isis_irpd, tvb, offset, 1,
+ FALSE );
}
-
-
+ offset += 1;
+
if (tree) {
- ti = proto_tree_add_item(tree, proto_isis, offset,
- END_OF_FRAME, NULL );
- isis_tree = proto_item_add_subtree(ti, ett_isis);
- proto_tree_add_item(isis_tree, hf_isis_irpd, offset, 1,
- ihdr->isis_irpd );
- proto_tree_add_item(isis_tree, hf_isis_header_length,
- offset + 1, 1, ihdr->isis_header_length );
- proto_tree_add_item(isis_tree, hf_isis_version,
- offset + 2, 1, ihdr->isis_version );
- proto_tree_add_item(isis_tree, hf_isis_system_id_length,
- offset + 3, 1, ihdr->isis_system_id_len );
- proto_tree_add_uint_format(isis_tree, hf_isis_type,
- offset + 4, 1, ihdr->isis_type,
- "Type : %s (R:%s%s%s)",
- val_to_str(ihdr->isis_type & ISIS_TYPE_MASK, isis_vals,
- "Unknown (0x%x)"),
- (ihdr->isis_type & ISIS_R8_MASK) ? "1" : "0",
- (ihdr->isis_type & ISIS_R7_MASK) ? "1" : "0",
- (ihdr->isis_type & ISIS_R6_MASK) ? "1" : "0");
- proto_tree_add_item(isis_tree, hf_isis_version2,
- offset + 5, 1, ihdr->isis_version2 );
- proto_tree_add_item(isis_tree, hf_isis_reserved,
- offset + 6, 1, ihdr->isis_reserved );
- proto_tree_add_item(isis_tree, hf_isis_max_area_adr,
- offset + 7, 1, ihdr->isis_max_area_adr );
+ proto_tree_add_uint(isis_tree, hf_isis_header_length, tvb,
+ offset, 1, isis_header_length );
}
+ offset += 1;
+ if (tree) {
+ proto_tree_add_uint(isis_tree, hf_isis_version, tvb,
+ offset, 1, isis_version );
+ }
+ offset += 1;
- /*
- * Let us make sure we use the same names for all our decodes
- * here. First, dump the name into info column, and THEN
- * dispatch the sub-type.
- */
- if (check_col(fd, COL_INFO)) {
- col_add_str(fd, COL_INFO, val_to_str (
- ihdr->isis_type&ISIS_TYPE_MASK, isis_vals,
- "Unknown (0x%x)" ) );
+ isis_system_id_len = tvb_get_guint8(tvb, 3);
+ if (tree) {
+ proto_tree_add_uint(isis_tree, hf_isis_system_id_length, tvb,
+ offset, 1, isis_system_id_len );
+ }
+ offset += 1;
+
+ isis_type_reserved = tvb_get_guint8(tvb, 4);
+ isis_type = isis_type_reserved & ISIS_TYPE_MASK;
+ if (check_col(pinfo->cinfo, COL_INFO)) {
+ col_add_str(pinfo->cinfo, COL_INFO,
+ val_to_str ( isis_type, isis_vals, "Unknown (0x%x)" ) );
+ }
+ if (tree) {
+ proto_tree_add_uint_format(isis_tree, hf_isis_type, tvb,
+ offset, 1, isis_type,
+ "PDU Type : %s (R:%s%s%s)",
+ val_to_str(isis_type, isis_vals, "Unknown (0x%x)"),
+ (isis_type_reserved & ISIS_R8_MASK) ? "1" : "0",
+ (isis_type_reserved & ISIS_R7_MASK) ? "1" : "0",
+ (isis_type_reserved & ISIS_R6_MASK) ? "1" : "0");
+ }
+ offset += 1;
+
+ if (tree) {
+ proto_tree_add_item(isis_tree, hf_isis_version2, tvb, 5, 1,
+ FALSE );
+ }
+ offset += 1;
+
+ if (tree) {
+ proto_tree_add_item(isis_tree, hf_isis_reserved, tvb, 6, 1,
+ FALSE );
+ }
+ offset += 1;
+
+ if (tree) {
+ proto_tree_add_item(isis_tree, hf_isis_max_area_adr, tvb, 7, 1,
+ FALSE );
}
+ offset += 1;
/*
- * Advance offset (we are past the header).
+ * Interpret the system ID length.
*/
- offset += sizeof(*ihdr);
- switch (ihdr->isis_type) {
+ if (isis_system_id_len == 0)
+ isis_system_id_len = 6; /* zero means 6-octet ID field length */
+ else if (isis_system_id_len == 255) {
+ isis_system_id_len = 0; /* 255 means null ID field */
+ /* XXX - what about the LAN ID? */
+ }
+ /* XXX - otherwise, must be in the range 1 through 8 */
+
+ switch (isis_type) {
case ISIS_TYPE_L1_HELLO:
- isis_dissect_isis_hello(ISIS_TYPE_L1_HELLO,
- ihdr->isis_header_length, pd, offset, fd, isis_tree);
- break;
case ISIS_TYPE_L2_HELLO:
- isis_dissect_isis_hello(ISIS_TYPE_L2_HELLO,
- ihdr->isis_header_length, pd, offset, fd, isis_tree);
- break;
case ISIS_TYPE_PTP_HELLO:
- isis_dissect_isis_hello(ISIS_TYPE_PTP_HELLO,
- ihdr->isis_header_length, pd, offset, fd, isis_tree);
+ isis_dissect_isis_hello(tvb, pinfo, isis_tree, offset,
+ isis_type, isis_header_length, isis_system_id_len);
break;
case ISIS_TYPE_L1_LSP:
- isis_dissect_isis_lsp(ISIS_TYPE_L1_LSP, ihdr->isis_header_length,
- pd, offset, fd, isis_tree);
- break;
case ISIS_TYPE_L2_LSP:
- isis_dissect_isis_lsp(ISIS_TYPE_L2_LSP, ihdr->isis_header_length,
- pd, offset, fd, isis_tree);
+ isis_dissect_isis_lsp(tvb, pinfo, isis_tree, offset,
+ isis_type, isis_header_length, isis_system_id_len);
break;
case ISIS_TYPE_L1_CSNP:
- isis_dissect_isis_csnp(ISIS_TYPE_L1_CSNP,
- ihdr->isis_header_length, pd, offset, fd, isis_tree);
- break;
case ISIS_TYPE_L2_CSNP:
- isis_dissect_isis_csnp(ISIS_TYPE_L2_CSNP,
- ihdr->isis_header_length, pd, offset, fd, isis_tree);
+ isis_dissect_isis_csnp(tvb, pinfo, isis_tree, offset,
+ isis_type, isis_header_length, isis_system_id_len);
break;
case ISIS_TYPE_L1_PSNP:
- isis_dissect_isis_psnp(ISIS_TYPE_L1_PSNP,
- ihdr->isis_header_length, pd, offset, fd, isis_tree);
- break;
case ISIS_TYPE_L2_PSNP:
- isis_dissect_isis_psnp(ISIS_TYPE_L2_PSNP,
- ihdr->isis_header_length, pd, offset, fd, isis_tree);
+ isis_dissect_isis_psnp(tvb, pinfo, isis_tree, offset,
+ isis_type, isis_header_length, isis_system_id_len);
break;
default:
- isis_dissect_unknown(offset, END_OF_FRAME, tree, fd,
- "unknown ISIS packet type" );
+ isis_dissect_unknown(tvb, tree, offset,
+ "Unknown ISIS packet type");
}
} /* dissect_isis */
* NOTE: this procedure to autolinked by the makefile process that
* builds register.c
*
- * Input:
+ * Input:
* void
*
* Output:
* void
*/
-void
+void
proto_register_isis(void) {
static hf_register_info hf[] = {
{ &hf_isis_irpd,
- { "Intra Domain Routing Protocol Discriminator", "isis.irpd",
- FT_UINT8, BASE_HEX, VALS(nlpid_vals), 0x0, "" }},
+ { "Intra Domain Routing Protocol Discriminator", "isis.irpd",
+ FT_UINT8, BASE_HEX, VALS(nlpid_vals), 0x0, "", HFILL }},
{ &hf_isis_header_length,
- { "PDU Header Length ", "isis.len", FT_UINT8, BASE_DEC, NULL, 0x0, "" }},
+ { "PDU Header Length ", "isis.len", FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
{ &hf_isis_version,
- { "Version (==1) ", "isis.version", FT_UINT8,
- BASE_DEC, NULL, 0x0, "" }},
+ { "Version (==1) ", "isis.version", FT_UINT8,
+ BASE_DEC, NULL, 0x0, "", HFILL }},
{ &hf_isis_system_id_length,
- { "System ID Length ", "isis.sysid_len",
- FT_UINT8, BASE_DEC, NULL, 0x0, "" }},
+ { "System ID Length ", "isis.sysid_len",
+ FT_UINT8, BASE_DEC, NULL, 0x0, "", HFILL }},
- { &hf_isis_type,
- { "PDU Type :", "isis.type", FT_UINT8, BASE_DEC,
- VALS(isis_vals), 0xff, "" }},
+ { &hf_isis_type,
+ { "PDU Type ", "isis.type", FT_UINT8, BASE_DEC,
+ VALS(isis_vals), 0xff, "", HFILL }},
- { &hf_isis_version2,
- { "Version2 (==1) ", "isis.version2", FT_UINT8, BASE_DEC, NULL,
- 0x0, "" }},
+ { &hf_isis_version2,
+ { "Version2 (==1) ", "isis.version2", FT_UINT8, BASE_DEC, NULL,
+ 0x0, "", HFILL }},
{ &hf_isis_reserved,
- { "Reserved (==0) ", "isis.reserved", FT_UINT8, BASE_DEC, NULL,
- 0x0, "" }},
+ { "Reserved (==0) ", "isis.reserved", FT_UINT8, BASE_DEC, NULL,
+ 0x0, "", HFILL }},
{ &hf_isis_max_area_adr,
- { "Max.AREAs: (0==3) ", "isis.max_area_adr", FT_UINT8, BASE_DEC, NULL,
- 0x0, "" }},
+ { "Max.AREAs: (0==3) ", "isis.max_area_adr", FT_UINT8, BASE_DEC, NULL,
+ 0x0, "", HFILL }},
};
/*
* Note, we pull in the unknown CLV handler here, since it
* is used by all ISIS packet types.
- */
+ */
static gint *ett[] = {
&ett_isis,
};
- proto_isis = proto_register_protocol(PROTO_STRING_ISIS, "isis");
+ proto_isis = proto_register_protocol(PROTO_STRING_ISIS, "ISIS", "isis");
proto_register_field_array(proto_isis, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
+
+ /*
+ * Call registration routines for other source files in the ISIS
+ * dissector.
+ */
+ isis_register_hello(proto_isis);
+ isis_register_lsp(proto_isis);
+ isis_register_csnp(proto_isis);
+ isis_register_psnp(proto_isis);
}
void
proto_reg_handoff_isis(void)
{
- dissector_add("osinl", NLPID_ISO10589_ISIS, dissect_isis);
+ dissector_handle_t isis_handle;
+
+ isis_handle = create_dissector_handle(dissect_isis, proto_isis);
+ dissector_add("osinl", NLPID_ISO10589_ISIS, isis_handle);
}