/* packet-isis-lsp.c
* Routines for decoding isis lsp packets and their CLVs
*
- * $Id: packet-isis-lsp.c,v 1.2 2000/01/15 00:22:32 gram Exp $
+ * $Id: packet-isis-lsp.c,v 1.15 2001/06/07 19:13:35 guy Exp $
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
#endif
#include "packet.h"
+#include "packet-osi.h"
+#include "packet-ipv6.h"
#include "packet-isis.h"
#include "packet-isis-clv.h"
#include "packet-isis-lsp.h"
static int hf_isis_lsp_sequence_number = -1;
static int hf_isis_lsp_checksum = -1;
static int hf_isis_lsp_clv_ipv4_int_addr = -1;
+static int hf_isis_lsp_clv_ipv6_int_addr = -1;
+static int hf_isis_lsp_clv_te_router_id = -1;
static gint ett_isis_lsp = -1;
static gint ett_isis_lsp_clv_area_addr = -1;
static gint ett_isis_lsp_clv_is_neighbors = -1;
+static gint ett_isis_lsp_clv_ext_is_reachability = -1; /* CLV 22 */
+ static gint ett_isis_lsp_part_of_clv_ext_is_reachability = -1;
+ static gint ett_isis_lsp_subclv_admin_group = -1;
+ static gint ett_isis_lsp_subclv_unrsv_bw = -1;
static gint ett_isis_lsp_clv_unknown = -1;
static gint ett_isis_lsp_clv_partition_dis = -1;
static gint ett_isis_lsp_clv_prefix_neighbors = -1;
static gint ett_isis_lsp_clv_nlpid = -1;
+static gint ett_isis_lsp_clv_hostname = -1;
+static gint ett_isis_lsp_clv_te_router_id = -1;
static gint ett_isis_lsp_clv_auth = -1;
static gint ett_isis_lsp_clv_ipv4_int_addr = -1;
+static gint ett_isis_lsp_clv_ipv6_int_addr = -1; /* CLV 232 */
static gint ett_isis_lsp_clv_ip_reachability = -1;
+static gint ett_isis_lsp_clv_ext_ip_reachability = -1; /* CLV 135 */
+ static gint ett_isis_lsp_part_of_clv_ext_ip_reachability = -1;
+static gint ett_isis_lsp_clv_ipv6_reachability = -1; /* CLV 236 */
+ static gint ett_isis_lsp_part_of_clv_ipv6_reachability = -1;
static const char *isis_lsp_attached_bits[] = {
"error", "expense", "delay", "default" };
* Predclare dissectors for use in clv dissection.
*/
static void dissect_lsp_area_address_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree);
+ guint length, int id_length, frame_data *fd, proto_tree *tree);
static void dissect_lsp_l1_is_neighbors_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree);
+ guint length, int id_length, frame_data *fd, proto_tree *tree);
static void dissect_lsp_l1_es_neighbors_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree);
+ guint length, int id_length, frame_data *fd, proto_tree *tree);
static void dissect_lsp_l2_is_neighbors_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree);
+ guint length, int id_length, frame_data *fd, proto_tree *tree);
+static void dissect_lsp_ext_is_reachability_clv(const u_char *pd, int offset,
+ guint length, int id_length, frame_data *fd, proto_tree *tree);
static void dissect_lsp_partition_dis_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree);
+ guint length, int id_length, frame_data *fd, proto_tree *tree);
static void dissect_lsp_prefix_neighbors_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree);
+ guint length, int id_length, frame_data *fd, proto_tree *tree);
static void dissect_lsp_ip_reachability_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree);
+ guint length, int id_length, frame_data *fd, proto_tree *tree);
+static void dissect_lsp_ext_ip_reachability_clv(const u_char *pd, int offset,
+ guint length, int id_length, frame_data *fd, proto_tree *tree);
+static void dissect_lsp_ipv6_reachability_clv(const u_char *pd, int offset,
+ guint length, int id_length, frame_data *fd, proto_tree *tree);
static void dissect_lsp_nlpid_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree);
+ guint length, int id_length, frame_data *fd, proto_tree *tree);
+static void dissect_lsp_hostname_clv(const u_char *pd, int offset,
+ guint length, int id_length, frame_data *fd, proto_tree *tree);
+static void dissect_lsp_te_router_id_clv(const u_char *pd, int offset,
+ guint length, int id_length, frame_data *fd, proto_tree *tree);
static void dissect_lsp_ip_int_addr_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree);
+ guint length, int id_length, frame_data *fd, proto_tree *tree);
+static void dissect_lsp_ipv6_int_addr_clv(const u_char *pd, int offset,
+ guint length, int id_length, frame_data *fd, proto_tree *tree);
static void dissect_lsp_l1_auth_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree);
+ guint length, int id_length, frame_data *fd, proto_tree *tree);
static void dissect_lsp_l2_auth_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree);
+ guint length, int id_length, frame_data *fd, proto_tree *tree);
static const isis_clv_handle_t clv_l1_lsp_opts[] = {
{
&ett_isis_lsp_clv_is_neighbors,
dissect_lsp_l1_es_neighbors_clv
},
+ {
+ ISIS_CLV_L1_LSP_EXT_IS_REACHABLE,
+ "Extended IS reachability",
+ &ett_isis_lsp_clv_ext_is_reachability,
+ dissect_lsp_ext_is_reachability_clv
+ },
{
ISIS_CLV_L1_LSP_IP_INT_REACHABLE,
"IP Internal reachability",
&ett_isis_lsp_clv_ip_reachability,
dissect_lsp_ip_reachability_clv
},
+ {
+ ISIS_CLV_L1_LSP_EXT_IP_REACHABLE,
+ "Extended IP Reachability",
+ &ett_isis_lsp_clv_ext_ip_reachability,
+ dissect_lsp_ext_ip_reachability_clv
+ },
+ {
+ ISIS_CLV_L1_LSP_IPv6_REACHABLE,
+ "IPv6 reachability",
+ &ett_isis_lsp_clv_ipv6_reachability,
+ dissect_lsp_ipv6_reachability_clv
+ },
{
ISIS_CLV_L1_LSP_NLPID,
- "NLPID",
+ "Protocols supported",
&ett_isis_lsp_clv_nlpid,
dissect_lsp_nlpid_clv
},
+ {
+ ISIS_CLV_L1_LSP_HOSTNAME,
+ "Hostname",
+ &ett_isis_lsp_clv_hostname,
+ dissect_lsp_hostname_clv
+ },
+ {
+ ISIS_CLV_L1_LSP_TE_ROUTER_ID,
+ "Traffic Engineering Router ID",
+ &ett_isis_lsp_clv_te_router_id,
+ dissect_lsp_te_router_id_clv
+ },
{
ISIS_CLV_L1_LSP_IP_INTERFACE_ADDR,
"IP Interface address(es)",
&ett_isis_lsp_clv_ipv4_int_addr,
dissect_lsp_ip_int_addr_clv
},
+ {
+ ISIS_CLV_L1_LSP_IPv6_INTERFACE_ADDR,
+ "IPv6 Interface address(es)",
+ &ett_isis_lsp_clv_ipv6_int_addr,
+ dissect_lsp_ipv6_int_addr_clv
+ },
{
ISIS_CLV_L1_LSP_AUTHENTICATION_NS,
"Authentication(non-spec)",
&ett_isis_lsp_clv_is_neighbors,
dissect_lsp_l2_is_neighbors_clv
},
+ {
+ ISIS_CLV_L2_LSP_EXT_IS_REACHABLE,
+ "Extended IS reachability",
+ &ett_isis_lsp_clv_ext_is_reachability,
+ dissect_lsp_ext_is_reachability_clv
+ },
{
ISIS_CLV_L2_LSP_PARTITION_DIS,
"Parition Designated Level 2 IS",
},
{
ISIS_CLV_L2_LSP_NLPID,
- "NLPID",
+ "Protocols supported",
&ett_isis_lsp_clv_nlpid,
dissect_lsp_nlpid_clv
},
+ {
+ ISIS_CLV_L2_LSP_HOSTNAME,
+ "Hostname",
+ &ett_isis_lsp_clv_hostname,
+ dissect_lsp_hostname_clv
+ },
+ {
+ ISIS_CLV_L2_LSP_TE_ROUTER_ID,
+ "Traffic Engineering Router ID",
+ &ett_isis_lsp_clv_te_router_id,
+ dissect_lsp_te_router_id_clv
+ },
{
ISIS_CLV_L2_LSP_IP_EXT_REACHABLE,
"IP external reachability",
&ett_isis_lsp_clv_ip_reachability,
dissect_lsp_ip_reachability_clv
},
+ {
+ ISIS_CLV_L2_LSP_EXT_IP_REACHABLE,
+ "Extended IP Reachability",
+ &ett_isis_lsp_clv_ext_ip_reachability,
+ dissect_lsp_ext_ip_reachability_clv
+ },
+ {
+ ISIS_CLV_L2_LSP_IPv6_REACHABLE,
+ "IPv6 reachability",
+ &ett_isis_lsp_clv_ipv6_reachability,
+ dissect_lsp_ipv6_reachability_clv
+ },
{
ISIS_CLV_L2_LSP_IP_INTERFACE_ADDR,
"IP Interface address(es)",
&ett_isis_lsp_clv_ipv4_int_addr,
dissect_lsp_ip_int_addr_clv
},
+ {
+ ISIS_CLV_L2_LSP_IPv6_INTERFACE_ADDR,
+ "IPv6 Interface address(es)",
+ &ett_isis_lsp_clv_ipv6_int_addr,
+ dissect_lsp_ipv6_int_addr_clv
+ },
{
ISIS_CLV_L2_LSP_AUTHENTICATION_NS,
"Authentication(non spec)",
if ( !tree ) return;
s = ISIS_LSP_CLV_METRIC_SUPPORTED(value);
- proto_tree_add_text ( tree, offset, 1,
+ proto_tree_add_text ( tree, NullTVB, offset, 1,
"%s Metric: %s%s %s%d:%d", pstr,
s ? "Not supported" : "Supported",
(s && force_supported) ? "(but is required to be)":"",
/*
- * Name: dissect_lsp_ip_reachabillityclv()
+ * Name: dissect_lsp_ip_reachabillity_clv()
*
* Description:
* Decode an IP reachability CLV. This can be either internal or
* u_char * : packet data
* int : current offset into packet data
* guint : length of this clv
+ * int : length of IDs in packet.
* frame_data * : frame data
* proto_tree * : proto tree to build on (may be null)
*
*/
static void
dissect_lsp_ip_reachability_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree) {
+ guint length, int id_length, frame_data *fd, proto_tree *tree) {
proto_item *ti;
proto_tree *ntree = NULL;
guint32 src, mask;
if ( tree ) {
memcpy(&src, &pd[offset+4], 4);
memcpy(&mask, &pd[offset+8], 4);
- ti = proto_tree_add_text ( tree, offset, 12,
- "IP prefix: %s (%s) : %s",
- get_hostname(src), ip_to_str((guint8*)&src),
+ ti = proto_tree_add_text ( tree, NullTVB, offset, 12,
+ "IPv4 prefix: %s : %s",
+ ip_to_str((guint8*)&src),
ip_to_str((guint8*)&mask) );
ntree = proto_item_add_subtree(ti,
ett_isis_lsp_clv_ip_reachability);
- dissect_metric ( ntree, offset, pd[offset], "Default",
- TRUE );
- dissect_metric ( ntree, offset + 1, pd[offset+1],
- "Delay", FALSE );
- dissect_metric ( ntree, offset + 2, pd[offset+2],
- "Expense",FALSE );
- dissect_metric ( ntree, offset + 3, pd[offset+3],
- "Error", FALSE );
+
+ proto_tree_add_text (ntree, NullTVB, offset, 1,
+ "Default Metric: %d, %s, Distribution: %s",
+ ISIS_LSP_CLV_METRIC_VALUE(pd[offset]),
+ ISIS_LSP_CLV_METRIC_IE(pd[offset]) ? "External" : "Internal",
+ ISIS_LSP_CLV_METRIC_UPDOWN(pd[offset]) ? "down" : "up");
+
+
+ if (ISIS_LSP_CLV_METRIC_SUPPORTED(pd[offset+1])) {
+ proto_tree_add_text (ntree, NullTVB, offset+1, 1, "Delay Metric: Not supported");
+ } else {
+ proto_tree_add_text (ntree, NullTVB, offset+1, 1, "Delay Metric: %d, %s",
+ ISIS_LSP_CLV_METRIC_VALUE(pd[offset+1]),
+ ISIS_LSP_CLV_METRIC_IE(pd[offset+1]) ? "External" : "Internal");
+ }
+
+ if (ISIS_LSP_CLV_METRIC_SUPPORTED(pd[offset+2])) {
+ proto_tree_add_text (ntree, NullTVB, offset+2, 1, "Expense Metric: Not supported");
+ } else {
+ proto_tree_add_text (ntree, NullTVB, offset+2, 1, "Exense Metric: %d, %s",
+ ISIS_LSP_CLV_METRIC_VALUE(pd[offset+2]),
+ ISIS_LSP_CLV_METRIC_IE(pd[offset+2]) ? "External" : "Internal");
+ }
+
+ if (ISIS_LSP_CLV_METRIC_SUPPORTED(pd[offset+3])) {
+ proto_tree_add_text (ntree, NullTVB, offset+3, 1, "Error Metric: Not supported");
+ } else {
+ proto_tree_add_text (ntree, NullTVB, offset+3, 1, "Error Metric: %d, %s",
+ ISIS_LSP_CLV_METRIC_VALUE(pd[offset+3]),
+ ISIS_LSP_CLV_METRIC_IE(pd[offset+3]) ? "External" : "Internal");
+ }
}
offset += 12;
length -= 12;
}
}
+
+/*
+ * Name: dissect_lsp_ext_ip_reachability_clv()
+ *
+ * Description: Decode an Extended IP Reachability CLV - code 135.
+ *
+ * The extended IP reachability TLV is an extended version
+ * of the IP reachability TLVs (codes 128 and 130). It encodes
+ * the metric as a 32-bit unsigned interger and allows to add
+ * sub-CLV(s).
+ *
+ * Input:
+ * u_char * : packet data
+ * int : current offset into packet data
+ * guint : length of this clv
+ * int : length of IDs in packet.
+ * frame_data * : frame data
+ * proto_tree * : proto tree to build on (may be null)
+ *
+ * Output:
+ * void, will modify proto_tree if not null.
+ */
+static void
+dissect_lsp_ext_ip_reachability_clv(const u_char *pd, int offset,
+ guint length, int id_length, frame_data *fd, proto_tree *tree) {
+ proto_item *pi = NULL;
+ proto_tree *subtree = NULL;
+ guint8 ctrl_info;
+ guint8 bit_length, byte_length;
+ guint8 prefix [4];
+ guint8 len;
+
+ if (!tree) return;
+
+ while (length > 0) {
+ memset (prefix, 0, 4);
+ ctrl_info = pd[offset+4];
+ bit_length = ctrl_info & 0x3f;
+ byte_length = (bit_length + 7) / 8;
+ memcpy (prefix, &pd[offset+5], byte_length);
+ pi = proto_tree_add_text (tree, NullTVB, offset, 0,
+ "IPv4 prefix: %s /%d",
+ ip_to_str (prefix),
+ bit_length );
+ subtree = proto_item_add_subtree (pi,
+ ett_isis_lsp_part_of_clv_ext_ip_reachability);
+
+ proto_tree_add_text (subtree, NullTVB, offset, 4,
+ "Metric: %d", pntohl (&pd[offset]) );
+
+ proto_tree_add_text (subtree, NullTVB, offset+4, 1,
+ "Distribution: %s",
+ ((ctrl_info & 0x80) == 0) ? "up" : "down" );
+
+ proto_tree_add_text (subtree, NullTVB, offset+4, 1,
+ "Sub_CLV(s): %s",
+ ((ctrl_info & 0x40) == 0) ? "no" : "yes" );
+
+ len = 5 + byte_length;
+ if ((ctrl_info & 0x40) != 0)
+ len += 1 + pd[offset+len] ;
+ proto_item_set_len (pi, len);
+ offset += len;
+ length -= len;
+ }
+}
+
+/*
+ * Name: dissect_lsp_ipv6_reachability_clv()
+ *
+ * Description: Decode an IPv6 reachability CLV - code 236.
+ *
+ * Input:
+ * u_char * : packet data
+ * int : current offset into packet data
+ * guint : length of this clv
+ * int : length of IDs in packet.
+ * frame_data * : frame data
+ * proto_tree * : proto tree to build on (may be null)
+ *
+ * Output:
+ * void, will modify proto_tree if not null.
+ */
+static void
+dissect_lsp_ipv6_reachability_clv(const u_char *pd, int offset,
+ guint length, int id_length, frame_data *fd, proto_tree *tree) {
+ proto_item *ti;
+ proto_tree *ntree = NULL;
+ guint8 bit_length, byte_length;
+ struct e_in6_addr prefix;
+ guint8 ctrl_info;
+ guint32 metric;
+ guint8 len;
+
+ if (!tree) return;
+
+ memset (prefix.s6_addr, 0, 16);
+
+ while (length > 0) {
+ bit_length = pd[offset+5];
+ byte_length = (bit_length + 7) / 8;
+ memcpy (prefix.s6_addr, &pd[offset+6], byte_length);
+ ti = proto_tree_add_text (tree, NullTVB, offset, 0,
+ "IP prefix: %s /%d",
+ ip6_to_str (&prefix),
+ bit_length );
+ ntree = proto_item_add_subtree (ti, ett_isis_lsp_part_of_clv_ipv6_reachability);
+
+ metric = pntohl (&pd[offset]);
+ proto_tree_add_text (ntree, NullTVB, offset, 4,
+ "Metric: %d", metric);
+
+ ctrl_info = pd[offset+4];
+ proto_tree_add_text (ntree, NullTVB, offset+4, 1,
+ "Distribution: %s, %s",
+ ((ctrl_info & 0x80) == 0) ? "up" : "down",
+ ((ctrl_info & 0x40) == 0) ? "internal" : "external" );
+
+ proto_tree_add_text (ntree, NullTVB, offset+4, 1,
+ "Reserved bits: 0x%x",
+ (ctrl_info & 0x1f) );
+ proto_tree_add_text (ntree, NullTVB, offset+4, 1,
+ "Sub_CLV(s): %s",
+ ((ctrl_info & 0x20) == 0) ? "no" : "yes" );
+
+ len = 6 + byte_length;
+ if ((ctrl_info & 0x20) != 0)
+ len += 1 + pd[offset+len] ;
+ proto_item_set_len (ti, len);
+ offset += len;
+ length -= len;
+ }
+}
+
/*
* Name: dissect_lsp_nlpid_clv()
*
* u_char * : packet data
* int : current offset into packet data
* guint : length of this clv
+ * int : length of IDs in packet.
* frame_data * : frame data
* proto_tree * : proto tree to build on (may be null)
*
*/
static void
dissect_lsp_nlpid_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree) {
+ guint length, int id_length, frame_data *fd, proto_tree *tree) {
isis_dissect_nlpid_clv(pd, offset, length, fd, tree );
}
+/*
+ * Name: dissect_lsp_hostname_clv()
+ *
+ * Description:
+ * Decode for a lsp packets hostname clv. Calls into the
+ * clv common one.
+ *
+ * Input:
+ * u_char * : packet data
+ * int : current offset into packet data
+ * guint : length of this clv
+ * int : length of IDs in packet.
+ * frame_data * : frame data
+ * proto_tree * : proto tree to build on (may be null)
+ *
+ * Output:
+ * void, will modify proto_tree if not null.
+ */
+static void
+dissect_lsp_hostname_clv(const u_char *pd, int offset,
+ guint length, int id_length, frame_data *fd, proto_tree *tree) {
+ isis_dissect_hostname_clv(pd, offset, length, fd, tree );
+}
+
+
+/*
+ * Name: dissect_lsp_te_router_id_clv()
+ *
+ * Description:
+ * Decode for a lsp packets Traffic Engineering ID clv. Calls into the
+ * clv common one.
+ *
+ * Input:
+ * u_char * : packet data
+ * int : current offset into packet data
+ * guint : length of this clv
+ * int : length of IDs in packet.
+ * frame_data * : frame data
+ * proto_tree * : proto tree to build on (may be null)
+ *
+ * Output:
+ * void, will modify proto_tree if not null.
+ */
+static void
+dissect_lsp_te_router_id_clv(const u_char *pd, int offset,
+ guint length, int id_length, frame_data *fd, proto_tree *tree) {
+ isis_dissect_te_router_id_clv(pd, offset, length, fd, tree,
+ hf_isis_lsp_clv_te_router_id );
+}
+
+
+
+
/*
* Name: dissect_lsp_ip_int_addr_clv()
*
* u_char * : packet data
* int : current offset into packet data
* guint : length of this clv
+ * int : length of IDs in packet.
* frame_data * : frame data
* proto_tree * : proto tree to build on (may be null)
*
* void, will modify proto_tree if not null.
*/
static void
-dissect_lsp_ip_int_addr_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree) {
+dissect_lsp_ip_int_addr_clv(const u_char *pd, int offset,
+ guint length, int id_length, frame_data *fd, proto_tree *tree) {
isis_dissect_ip_int_clv(pd, offset, length, fd, tree,
hf_isis_lsp_clv_ipv4_int_addr );
}
+/*
+ * Name: dissect_lsp_ipv6_int_addr_clv()
+ *
+ * Description: Decode an IPv6 interface addr CLV - code 232.
+ *
+ * Calls into the clv common one.
+ *
+ * Input:
+ * u_char * : packet data
+ * int : current offset into packet data
+ * guint : length of this clv
+ * int : length of IDs in packet.
+ * frame_data * : frame data
+ * proto_tree * : proto tree to build on (may be null)
+ *
+ * Output:
+ * void, will modify proto_tree if not null.
+ */
+static void
+dissect_lsp_ipv6_int_addr_clv(const u_char *pd, int offset,
+ guint length, int id_length, frame_data *fd, proto_tree *tree) {
+ isis_dissect_ipv6_int_clv(pd, offset, length, fd, tree,
+ hf_isis_lsp_clv_ipv6_int_addr );
+}
+
/*
* Name: dissect_lsp_L1_auth_clv()
*
* u_char * : packet data
* int : current offset into packet data
* guint : length of this clv
+ * int : length of IDs in packet.
* frame_data * : frame data
* proto_tree * : proto tree to build on (may be null)
*
*/
static void
dissect_lsp_l1_auth_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree) {
+ guint length, int id_length, frame_data *fd, proto_tree *tree) {
isis_dissect_authentication_clv(pd, offset, length, fd, tree,
"Per area authentication" );
}
* u_char * : packet data
* int : current offset into packet data
* guint : length of this clv
+ * int : length of IDs in packet.
* frame_data * : frame data
* proto_tree * : proto tree to build on (may be null)
*
*/
static void
dissect_lsp_l2_auth_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree) {
+ guint length, int id_length, frame_data *fd, proto_tree *tree) {
isis_dissect_authentication_clv(pd, offset, length, fd, tree,
"Per domain authentication" );
}
* u_char * : packet data
* int : offset into packet data where we are.
* guint : length of clv we are decoding
+ * int : length of IDs in packet.
* frame_data * : frame data (complete frame)
* proto_tree * : protocol display tree to fill out. May be NULL
*
*/
static void
dissect_lsp_area_address_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree) {
+ guint length, int id_length, frame_data *fd, proto_tree *tree) {
isis_dissect_area_address_clv(pd, offset, length, fd, tree );
}
* u_char * : packet data
* int : offset into packet data where we are.
* guint : length of clv we are decoding
+ * int : length of IDs in packet.
* frame_data * : frame data (complete frame)
* proto_tree * : protocol display tree to fill out. May be NULL
* int : set to decode first octet as virtual vs reserved == 0
*/
static void
dissect_lsp_eis_neighbors_clv_inner(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree,
+ guint length, int id_length, frame_data *fd, proto_tree *tree,
int show_virtual, int is_eis) {
proto_item *ti;
proto_tree *ntree = NULL;
int tlen;
- if (is_eis) {
- tlen = 10;
- } else {
- tlen = 11;
+ if (!is_eis) {
+ id_length++; /* IDs are one octet longer in IS neighbours */
if ( tree ) {
if ( show_virtual ) {
/* virtual path flag */
- proto_tree_add_text ( tree, offset, 1,
+ proto_tree_add_text ( tree, NullTVB, offset, 1,
&pd[offset] ? "IsNotVirtual" : "IsVirtual" );
} else {
- proto_tree_add_text ( tree, offset, 1,
+ proto_tree_add_text ( tree, NullTVB, offset, 1,
"Reserved value 0x%02x, must == 0",
pd[offset] );
}
}
offset++;
length--;
-
}
+ tlen = 4 + id_length;
while ( length > 0 ) {
if (length<tlen) {
*/
if ( tree ) {
if ( is_eis ) {
- ti = proto_tree_add_text ( tree, offset, 11,
- "ES Neighbor: %02x%02x.%02x%02x.%02x%02x",
- pd[offset+4], pd[offset+5],
- pd[offset+6], pd[offset+7],
- pd[offset+8], pd[offset+9] );
+ ti = proto_tree_add_text ( tree, NullTVB, offset, tlen,
+ "ES Neighbor: %s",
+ print_system_id( pd + offset + 4, id_length ) );
} else {
- ti = proto_tree_add_text ( tree, offset, 11,
- "IS Neighbor: %02x%02x.%02x%02x.%02x%02x-%02x",
- pd[offset+4], pd[offset+5],
- pd[offset+6], pd[offset+7],
- pd[offset+8], pd[offset+9],
- pd[offset+10] );
+ ti = proto_tree_add_text ( tree, NullTVB, offset, tlen,
+ "IS Neighbor: %s",
+ print_system_id( pd + offset + 4, id_length ) );
}
ntree = proto_item_add_subtree(ti,
ett_isis_lsp_clv_is_neighbors);
- dissect_metric ( ntree, offset, pd[offset], "Default",
- TRUE );
- dissect_metric ( ntree, offset + 1, pd[offset+1],
- "Delay", FALSE );
- dissect_metric ( ntree, offset + 2, pd[offset+2],
- "Expense",FALSE );
- dissect_metric ( ntree, offset + 3, pd[offset+3],
- "Error", FALSE );
+
+
+
+ proto_tree_add_text (ntree, NullTVB, offset, 1,
+ "Default Metric: %d, %s",
+ ISIS_LSP_CLV_METRIC_VALUE(pd[offset]),
+ ISIS_LSP_CLV_METRIC_IE(pd[offset]) ? "External" : "Internal");
+
+ if (ISIS_LSP_CLV_METRIC_SUPPORTED(pd[offset+1])) {
+ proto_tree_add_text (ntree, NullTVB, offset+1, 1, "Delay Metric: Not supported");
+ } else {
+ proto_tree_add_text (ntree, NullTVB, offset+1, 1, "Delay Metric: %d, %s",
+ ISIS_LSP_CLV_METRIC_VALUE(pd[offset+1]),
+ ISIS_LSP_CLV_METRIC_IE(pd[offset+1]) ? "External" : "Internal");
+ }
+
+
+ if (ISIS_LSP_CLV_METRIC_SUPPORTED(pd[offset+2])) {
+ proto_tree_add_text (ntree, NullTVB, offset+2, 1, "Expense Metric: Not supported");
+ } else {
+ proto_tree_add_text (ntree, NullTVB, offset+2, 1, "Expense Metric: %d, %s",
+ ISIS_LSP_CLV_METRIC_VALUE(pd[offset+2]),
+ ISIS_LSP_CLV_METRIC_IE(pd[offset+2]) ? "External" : "Internal");
+ }
+
+ if (ISIS_LSP_CLV_METRIC_SUPPORTED(pd[offset+3])) {
+ proto_tree_add_text (ntree, NullTVB, offset+3, 1, "Error Metric: Not supported");
+ } else {
+ proto_tree_add_text (ntree, NullTVB, offset+3, 1, "Error Metric: %d, %s",
+ ISIS_LSP_CLV_METRIC_VALUE(pd[offset+3]),
+ ISIS_LSP_CLV_METRIC_IE(pd[offset+3]) ? "External" : "Internal");
+ }
+
+
+/* this is redundant information
+ Proto_tree_add_text ( ntree, NullTVB, offset + 4, id_length,
+ "Neighbour ID: %s",
+ print_system_id( pd + offset + 4, id_length ) );
+*/
}
offset += tlen;
length -= tlen;
* u_char * : packet data
* int : offset into packet data where we are.
* guint : length of clv we are decoding
+ * int : length of IDs in packet.
* frame_data * : frame data (complete frame)
* proto_tree * : protocol display tree to fill out. May be NULL
*
*/
static void
dissect_lsp_l1_is_neighbors_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree) {
- dissect_lsp_eis_neighbors_clv_inner( pd, offset, length, fd, tree,TRUE,
- FALSE );
+ guint length, int id_length, frame_data *fd, proto_tree *tree) {
+ dissect_lsp_eis_neighbors_clv_inner( pd, offset, length, id_length,
+ fd, tree, TRUE, FALSE );
}
/*
* u_char * : packet data
* int : offset into packet data where we are.
* guint : length of clv we are decoding
+ * int : length of IDs in packet.
* frame_data * : frame data (complete frame)
* proto_tree * : protocol display tree to fill out. May be NULL
*
*/
static void
dissect_lsp_l1_es_neighbors_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree) {
- dissect_lsp_eis_neighbors_clv_inner( pd, offset, length, fd, tree,
- TRUE, TRUE);
+ guint length, int id_length, frame_data *fd, proto_tree *tree) {
+ dissect_lsp_eis_neighbors_clv_inner( pd, offset, length, id_length,
+ fd, tree, TRUE, TRUE);
}
/*
* u_char * : packet data
* int : offset into packet data where we are.
* guint : length of clv we are decoding
+ * int : length of IDs in packet.
* frame_data * : frame data (complete frame)
* proto_tree * : protocol display tree to fill out. May be NULL
*
*/
static void
dissect_lsp_l2_is_neighbors_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree) {
- dissect_lsp_eis_neighbors_clv_inner(pd,offset, length, fd, tree, FALSE,
- FALSE);
+ guint length, int id_length, frame_data *fd, proto_tree *tree) {
+ dissect_lsp_eis_neighbors_clv_inner(pd, offset, length, id_length,
+ fd, tree, FALSE, FALSE);
+}
+
+/*
+ * Name: dissect_subclv_admin_group ()
+ *
+ * Description: Called by function dissect_lsp_ext_is_reachability_clv().
+ *
+ * This function is called by dissect_lsp_ext_is_reachability_clv()
+ * for dissect the administrive group sub-CLV (code 3).
+ *
+ * Input:
+ * u_char * : packet data
+ * int : offset into packet data where we are (beginning of the sub_clv value).
+ * proto_tree * : protocol display tree to fill out.
+ *
+ * Output:
+ * void
+ */
+static void
+dissect_subclv_admin_group (const u_char *pd, int offset, proto_tree *tree) {
+ proto_item *ti;
+ proto_tree *ntree;
+ guint32 clv_value;
+ guint32 mask;
+ int i;
+
+ ti = proto_tree_add_text (tree, NullTVB, offset-2, 6, "Administrative group(s):");
+ ntree = proto_item_add_subtree (ti, ett_isis_lsp_subclv_admin_group);
+
+ clv_value = pntohl (&pd[offset]);
+ mask = 1;
+ for (i = 0 ; i < 32 ; i++) {
+ if ( (clv_value & mask) != 0 ) {
+ proto_tree_add_text (ntree, NullTVB, offset, 4, "group %d", i);
+ }
+ mask <<= 1;
+ }
+}
+
+/*
+ * Name: dissect_subclv_max_bw ()
+ *
+ * Description: Called by function dissect_lsp_ext_is_reachability_clv().
+ *
+ * This function is called by dissect_lsp_ext_is_reachability_clv()
+ * for dissect the maximum link bandwidth sub-CLV (code 9).
+ *
+ * Input:
+ * u_char * : packet data
+ * int : offset into packet data where we are (beginning of the sub_clv value).
+ * proto_tree * : protocol display tree to fill out.
+ *
+ * Output:
+ * void
+ */
+static void
+dissect_subclv_max_bw (const u_char *pd, int offset, proto_tree *tree) {
+ guint32 ui;
+ gfloat bw;
+
+ ui = pntohl (&pd[offset]);
+ memcpy (&bw, &ui, 4);
+ proto_tree_add_text (tree, NullTVB, offset-2, 6,
+ "Maximum link bandwidth : %.2f Mbps", bw*8/1000000 );
+}
+
+/*
+ * Name: dissect_subclv_rsv_bw ()
+ *
+ * Description: Called by function dissect_lsp_ext_is_reachability_clv().
+ *
+ * This function is called by dissect_lsp_ext_is_reachability_clv()
+ * for dissect the reservable link bandwidth sub-CLV (code 10).
+ *
+ * Input:
+ * u_char * : packet data
+ * int : offset into packet data where we are (beginning of the sub_clv value).
+ * proto_tree * : protocol display tree to fill out.
+ *
+ * Output:
+ * void
+ */
+static void
+dissect_subclv_rsv_bw (const u_char *pd, int offset, proto_tree *tree) {
+ guint32 ui;
+ gfloat bw;
+
+ ui = pntohl (&pd[offset]);
+ memcpy (&bw, &ui, 4);
+ proto_tree_add_text (tree, NullTVB, offset-2, 6,
+ "Reservable link bandwidth: %.2f Mbps", bw*8/1000000 );
+}
+
+/*
+ * Name: dissect_subclv_unrsv_bw ()
+ *
+ * Description: Called by function dissect_lsp_ext_is_reachability_clv().
+ *
+ * This function is called by dissect_lsp_ext_is_reachability_clv()
+ * for dissect the unreserved bandwidth sub-CLV (code 11).
+ *
+ * Input:
+ * u_char * : packet data
+ * int : offset into packet data where we are (beginning of the sub_clv value).
+ * proto_tree * : protocol display tree to fill out.
+ *
+ * Output:
+ * void
+ */
+static void
+dissect_subclv_unrsv_bw (const u_char *pd, int offset, proto_tree *tree) {
+ proto_item *ti;
+ proto_tree *ntree;
+ guint32 ui;
+ gfloat bw;
+ int i;
+
+ ti = proto_tree_add_text (tree, NullTVB, offset-2, 34, "Unreserved bandwidth:");
+ ntree = proto_item_add_subtree (ti, ett_isis_lsp_subclv_unrsv_bw);
+
+ for (i = 0 ; i < 8 ; i++) {
+ ui = pntohl (&pd[offset]);
+ memcpy (&bw, &ui, 4);
+ proto_tree_add_text (ntree, NullTVB, offset+4*i, 4,
+ "priority level %d: %.2f Mbps", i, bw*8/1000000 );
+ }
+}
+
+/*
+ * Name: dissect_lsp_ext_is_reachability_clv()
+ *
+ * Description: Decode a Extended IS Reachability CLV - code 22
+ *
+ * The extended IS reachability TLV is an extended version
+ * of the IS reachability TLV (code 2). It encodes the metric
+ * as a 24-bit unsigned interger and allows to add sub-CLV(s).
+ *
+ * Input:
+ * u_char * : packet data
+ * int : offset into packet data where we are.
+ * guint : length of clv we are decoding
+ * int : length of IDs in packet.
+ * frame_data * : frame data (complete frame)
+ * proto_tree * : protocol display tree to fill out. May be NULL
+ *
+ * Output:
+ * void, but we will add to proto tree if !NULL.
+ */
+static void
+dissect_lsp_ext_is_reachability_clv(const u_char *pd, int offset,
+ guint length, int id_length, frame_data *fd, proto_tree *tree) {
+ proto_item *ti;
+ proto_tree *ntree = NULL;
+ guint8 subclvs_len;
+ guint8 len, i;
+ guint8 clv_code, clv_len;
+
+ if (!tree) return;
+
+ while (length > 0) {
+ ti = proto_tree_add_text (tree, NullTVB, offset, 0,
+ "IS neighbor: %s",
+ print_system_id (&pd[offset], 7) );
+ ntree = proto_item_add_subtree (ti,
+ ett_isis_lsp_part_of_clv_ext_is_reachability );
+
+ proto_tree_add_text (ntree, NullTVB, offset+7, 3,
+ "Metric: %d", pntoh24 (&pd[offset+7]) );
+
+ subclvs_len = pd[offset+10];
+ if (subclvs_len == 0) {
+ proto_tree_add_text (ntree, NullTVB, offset+10, 1, "No sub-CLV");
+ }
+ else {
+ i = 0;
+ while (i < subclvs_len) {
+ clv_code = pd[offset+11+i];
+ clv_len = pd[offset+12+i];
+ switch (clv_code) {
+ case 3 :
+ dissect_subclv_admin_group (pd, offset+13+i, ntree);
+ break;
+ case 6 :
+ proto_tree_add_text (ntree, NullTVB, offset+11+i, 6,
+ "IPv4 interface address: %s", ip_to_str (&pd[offset+13+i]) );
+ break;
+ case 8 :
+ proto_tree_add_text (ntree, NullTVB, offset+11+i, 6,
+ "IPv4 neighbor address: %s", ip_to_str (&pd[offset+13+i]) );
+ break;
+ case 9 :
+ dissect_subclv_max_bw (pd, offset+13+i, ntree);
+ break;
+ case 10:
+ dissect_subclv_rsv_bw (pd, offset+13+i, ntree);
+ break;
+ case 11:
+ dissect_subclv_unrsv_bw (pd, offset+13+i, ntree);
+ break;
+ case 18:
+ proto_tree_add_text (ntree, NullTVB, offset+11+i, 5,
+ "Traffic engineering default metric: %d",
+ pntoh24 (&pd[offset+13+i]) );
+ break;
+ case 250:
+ case 251:
+ case 252:
+ case 253:
+ case 254:
+ proto_tree_add_text (ntree, NullTVB, offset+11+i, clv_len+2,
+ "Unknown Cisco specific extensions: code %d, length %d",
+ clv_code, clv_len );
+ break;
+ default :
+ proto_tree_add_text (ntree, NullTVB, offset+11+i, clv_len+2,
+ "Unknown sub-CLV: code %d, length %d", clv_code, clv_len );
+ break;
+ }
+ i += clv_len + 2;
+ }
+ }
+
+ len = 11 + subclvs_len;
+ proto_item_set_len (ti, len);
+ offset += len;
+ length -= len;
+ }
}
/*
*
* Description:
* This CLV is used to indicate which system is the designated
- * IS for partition repair. This means just putting out the 6 octet
- * IS.
+ * IS for partition repair. This means just putting out the
+ * "id_length"-octet IS.
*
* Input:
* u_char * : packet data
* int : offset into packet data where we are.
* guint : length of clv we are decoding
+ * int : length of IDs in packet.
* frame_data * : frame data (complete frame)
* proto_tree * : protocol display tree to fill out. May be NULL
*
*/
static void
dissect_lsp_partition_dis_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree) {
+ guint length, int id_length, frame_data *fd, proto_tree *tree) {
- if ( length < 6 ) {
+ if ( length < id_length ) {
isis_dissect_unknown(offset, length, tree, fd,
- "short lsp parition DIS(%d vs 6)", length );
+ "short lsp parition DIS(%d vs %d)", length,
+ id_length );
return;
}
/*
* Gotta build a sub-tree for all our pieces
*/
if ( tree ) {
- proto_tree_add_text ( tree, offset+4, 6,
- "Partition designated L2 IS: %02x%02x.%02x%02x.%02x%02x",
- pd[offset], pd[offset+1], pd[offset+2],
- pd[offset+3], pd[offset+4], pd[offset+5]);
+ proto_tree_add_text ( tree, NullTVB, offset, id_length,
+ "Partition designated L2 IS: %s",
+ print_system_id( pd + offset, id_length ) );
}
- length -= 6;
- offset += 6;
+ length -= id_length;
+ offset += id_length;
if ( length > 0 ){
isis_dissect_unknown(offset, length, tree, fd,
"Long lsp parition DIS, %d left over", length );
* u_char * : packet data
* int : offset into packet data where we are.
* guint : length of clv we are decoding
+ * int : length of IDs in packet.
* frame_data * : frame data (complete frame)
* proto_tree * : protocol display tree to fill out. May be NULL
*
*/
static void
dissect_lsp_prefix_neighbors_clv(const u_char *pd, int offset,
- guint length, frame_data *fd, proto_tree *tree) {
+ guint length, int id_length, frame_data *fd, proto_tree *tree) {
char *sbuf;
int mylen;
* Lets turn the area address into "standard" 0000.0000.etc
* format string.
*/
- sbuf = isis_address_to_string ( pd, offset + 1, mylen );
+ sbuf = print_area( pd + offset + 1, mylen );
/* and spit it out */
if ( tree ) {
- proto_tree_add_text ( tree, offset, mylen + 1,
+ proto_tree_add_text ( tree, NullTVB, offset, mylen + 1,
"Area address (%d): %s", mylen, sbuf );
}
offset += mylen + 1;
* Input:
* char * : title string
* proto_tree * : tree to display into. REQUIRED
+ * u_char * : packet data
* int : offset into packet data where we are.
- * isis_lsp_id_t * : id to display.
+ * int : length of IDs in packet.
*
* Output:
* void, but we will add to proto tree
*/
void
-isis_lsp_decode_lsp_id(char *tstr, proto_tree *tree, int offset,
- isis_lsp_id_t *id ) {
- proto_tree_add_text(tree, offset, 8,
- "%s: %02x%02x.%02x%02x.%02x%02x.%02x-%02x", tstr,
- id->source_id[0],
- id->source_id[1],
- id->source_id[2],
- id->source_id[3],
- id->source_id[4],
- id->source_id[5],
- id->psuodonode_id,
- id->lsp_number );
+isis_lsp_decode_lsp_id(char *tstr, proto_tree *tree, const u_char *pd,
+ int offset, int id_length ) {
+ proto_tree_add_text(tree, NullTVB, offset, id_length + 2,
+ "%s: %s.%02x-%02x", tstr,
+ print_system_id( pd + offset, id_length ),
+ pd[offset + id_length],
+ pd[offset + id_length + 1] );
}
/*
* de-mangler with the right list of valid CLVs.
*
* Input:
+ * int : LSP type, a la packet-isis.h ISIS_TYPE_* values
+ * int : header length of packet.
+ * int : length of IDs in packet.
* u_char * : packet data
- * int : offset into packet data where we are.
- * guint : length of clv we are decoding
- * frame_data * : frame data (complete frame)
- * proto_tree * : protocol display tree to fill out. May be NULL
+ * int offset : our offset into packet data.
+ * frame_data * : frame data
+ * proto_tree * : protocol display tree to add to. May be NULL.
*
* Output:
* void, but we will add to proto tree if !NULL.
*/
void
-isis_dissect_isis_lsp(int lsp_type, int header_length,
+isis_dissect_isis_lsp(int lsp_type, int header_length, int id_length,
const u_char *pd, int offset, frame_data *fd, proto_tree *tree){
- isis_lsp_t *ilp;
proto_item *ti;
proto_tree *lsp_tree = NULL;
int hlen;
+ guint16 pdu_length;
char sbuf[128];
int inx, q, some, value, len;
- hlen = sizeof(*ilp);
+ OLD_CHECK_DISPLAY_AS_DATA(proto_isis_lsp, pd, offset, fd, tree);
- if (fd->cap_len < (offset + hlen)) {
+ hlen = 2+2+id_length+2+4+2+1;
+
+ if (!BYTES_ARE_IN_FRAME(offset, hlen)) {
isis_dissect_unknown(offset, hlen, tree, fd,
"not enough capture data for header (%d vs %d)",
- hlen, offset - fd->cap_len);
+ hlen, END_OF_FRAME);
return;
}
- ilp = (isis_lsp_t *) &pd[offset];
-
if (tree) {
- ti = proto_tree_add_item(tree, proto_isis_lsp,
- offset, fd->cap_len - offset, NULL);
+ ti = proto_tree_add_item(tree, proto_isis_lsp, NullTVB,
+ offset, END_OF_FRAME, FALSE);
lsp_tree = proto_item_add_subtree(ti, ett_isis_lsp);
- proto_tree_add_item(lsp_tree, hf_isis_lsp_pdu_length,
- offset, 2, pntohs(&ilp->isis_lsp_pdu_length));
- proto_tree_add_item(lsp_tree, hf_isis_lsp_remaining_life,
- offset + 2, 2, pntohs(&ilp->isis_lsp_remaining_life));
- isis_lsp_decode_lsp_id("LSP ID", lsp_tree, offset + 4,
- &ilp->isis_lsp_id );
- proto_tree_add_item(lsp_tree, hf_isis_lsp_sequence_number,
- offset + 12, 4,
- pntohl(&ilp->isis_lsp_sequence_number));
+ }
+
+ pdu_length = pntohs(&pd[offset]);
+ if (tree) {
+ proto_tree_add_uint(lsp_tree, hf_isis_lsp_pdu_length, NullTVB,
+ offset, 2, pdu_length);
+ }
+ offset += 2;
+
+ if (tree) {
+ proto_tree_add_uint(lsp_tree, hf_isis_lsp_remaining_life, NullTVB,
+ offset, 2, pntohs(&pd[offset]));
+ }
+ offset += 2;
+
+ if (tree) {
+ isis_lsp_decode_lsp_id("LSP ID", lsp_tree, pd, offset,
+ id_length );
+ }
+ offset += id_length + 2;
+
+ if (tree) {
+ proto_tree_add_uint(lsp_tree, hf_isis_lsp_sequence_number, NullTVB,
+ offset, 4,
+ pntohl(&pd[offset]));
+ }
+ offset += 4;
+ if (tree) {
/* XXX -> we could validate the cksum here! */
- proto_tree_add_item(lsp_tree, hf_isis_lsp_checksum,
- offset + 16, 2, pntohs(&ilp->isis_lsp_checksum));
+ proto_tree_add_uint(lsp_tree, hf_isis_lsp_checksum, NullTVB,
+ offset, 2, pntohs(&pd[offset]));
+ }
+ offset += 2;
+ if (tree) {
/*
* We need to build our type block values.
*/
sbuf[0] = 0;
some = 0;
- value = ISIS_LSP_ATT(ilp->isis_lsp_type_block);
+ value = ISIS_LSP_ATT(pd[offset]);
inx = 0;
for ( q = (1<<ISIS_LSP_ATT_SHIFT); q > 0; q = q >> 1 ){
if (q & value) {
inx++;
}
if (!some) {
- strcat ( sbuf, "<none set!>" );
+ strcat ( sbuf, "default-only" );
}
- proto_tree_add_text(lsp_tree, offset + 18, 1,
+ proto_tree_add_text(lsp_tree, NullTVB, offset + 18, 1,
"Type block(0x%02x): P:%d, Supported metric(s): %s, OL:%d, istype:%s",
- ilp->isis_lsp_type_block,
- ISIS_LSP_PARTITION(ilp->isis_lsp_type_block) ? 1 : 0,
+ pd[offset],
+ ISIS_LSP_PARTITION(pd[offset]) ? 1 : 0,
sbuf,
- ISIS_LSP_HIPPITY(ilp->isis_lsp_type_block) ? 1 : 0,
- val_to_str(ISIS_LSP_IS_TYPE(ilp->isis_lsp_type_block),
+ ISIS_LSP_HIPPITY(pd[offset]) ? 1 : 0,
+ val_to_str(ISIS_LSP_IS_TYPE(pd[offset]),
isis_lsp_istype_vals, "Unknown (0x%x)")
);
-
}
+ offset += 1;
- offset += hlen;
- len = pntohs(&ilp->isis_lsp_pdu_length);
- len -= header_length;
+ len = pdu_length - header_length;
if (len < 0) {
isis_dissect_unknown(offset, header_length, tree, fd,
"packet header length %d went beyond packet",
* our list of valid ones!
*/
if (lsp_type == ISIS_TYPE_L1_LSP){
- isis_dissect_clvs ( clv_l1_lsp_opts, len, pd, offset, fd,
- lsp_tree, ett_isis_lsp_clv_unknown );
+ isis_dissect_clvs ( clv_l1_lsp_opts, len, id_length, pd,
+ offset, fd, lsp_tree, ett_isis_lsp_clv_unknown );
} else {
- isis_dissect_clvs ( clv_l2_lsp_opts, len, pd, offset, fd,
- lsp_tree, ett_isis_lsp_clv_unknown );
+ isis_dissect_clvs ( clv_l2_lsp_opts, len, id_length, pd,
+ offset, fd, lsp_tree, ett_isis_lsp_clv_unknown );
}
}
/*
BASE_HEX, NULL, 0x0, "" }},
{ &hf_isis_lsp_clv_ipv4_int_addr,
- { "IPv4 interface address: ", "", FT_IPv4,
+ { "IPv4 interface address", "isis_lsp.clv_ipv4_int_addr", FT_IPv4,
+ BASE_NONE, NULL, 0x0, "" }},
+
+ { &hf_isis_lsp_clv_ipv6_int_addr,
+ { "IPv6 interface address", "isis_lsp.clv_ipv6_int_addr", FT_IPv6,
+ BASE_NONE, NULL, 0x0, "" }},
+
+ { &hf_isis_lsp_clv_te_router_id,
+ { "Traffic Engineering Router ID", "isis_lsp.clv_te_router_id", FT_IPv4,
BASE_NONE, NULL, 0x0, "" }},
};
static gint *ett[] = {
&ett_isis_lsp,
&ett_isis_lsp_clv_area_addr,
&ett_isis_lsp_clv_is_neighbors,
+ &ett_isis_lsp_clv_ext_is_reachability, /* CLV 22 */
+ &ett_isis_lsp_part_of_clv_ext_is_reachability,
+ &ett_isis_lsp_subclv_admin_group,
+ &ett_isis_lsp_subclv_unrsv_bw,
&ett_isis_lsp_clv_unknown,
&ett_isis_lsp_clv_partition_dis,
&ett_isis_lsp_clv_prefix_neighbors,
&ett_isis_lsp_clv_auth,
&ett_isis_lsp_clv_nlpid,
+ &ett_isis_lsp_clv_hostname,
&ett_isis_lsp_clv_ipv4_int_addr,
+ &ett_isis_lsp_clv_ipv6_int_addr, /* CLV 232 */
+ &ett_isis_lsp_clv_te_router_id,
&ett_isis_lsp_clv_ip_reachability,
+ &ett_isis_lsp_clv_ext_ip_reachability, /* CLV 135 */
+ &ett_isis_lsp_part_of_clv_ext_ip_reachability,
+ &ett_isis_lsp_clv_ipv6_reachability, /* CLV 236 */
+ &ett_isis_lsp_part_of_clv_ipv6_reachability,
};
- proto_isis_lsp = proto_register_protocol("ISIS lsp", "ISIS-lsp");
+ proto_isis_lsp = proto_register_protocol(PROTO_STRING_LSP,
+ "ISIS LSP", "isis_lsp");
proto_register_field_array(proto_isis_lsp, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
+
+
git.samba.org / obnox / wireshark / wip.git / blobdiff