/* packet-isis-hello.c
* Routines for decoding isis hello packets and their CLVs
*
- * $Id: packet-isis-hello.c,v 1.1 1999/12/15 04:34:17 guy Exp $
+ * $Id: packet-isis-hello.c,v 1.11 2001/01/03 06:55:29 guy Exp $
* Stuart Stanley <stuarts@mxmail.net>
*
* Ethereal - Network traffic analyzer
#include <string.h>
#include <glib.h>
#include "packet.h"
+#include "packet-osi.h"
#include "packet-isis.h"
#include "packet-isis-clv.h"
#include "packet-isis-hello.h"
/* hello packets */
-static int proto_isis_hello = -1;
-static int hf_isis_hello_circuit_reserved = -1;
-static int hf_isis_hello_source_id = -1;
-static int hf_isis_hello_holding_timer = -1;
-static int hf_isis_hello_pdu_length = -1;
-static int hf_isis_hello_priority_reserved = -1;
-static int hf_isis_hello_lan_id = -1;
-static int hf_isis_hello_local_circuit_id = -1;
-static int hf_isis_hello_clv_ipv4_int_addr = -1;
-
-static gint ett_isis_hello = -1;
-static gint ett_isis_hello_clv_area_addr = -1;
-static gint ett_isis_hello_clv_is_neighbors = -1;
-static gint ett_isis_hello_clv_padding = -1;
-static gint ett_isis_hello_clv_unknown = -1;
-static gint ett_isis_hello_clv_nlpid = -1;
-static gint ett_isis_hello_clv_auth = -1;
+static int proto_isis_hello = -1;
+static int hf_isis_hello_circuit_reserved = -1;
+static int hf_isis_hello_source_id = -1;
+static int hf_isis_hello_holding_timer = -1;
+static int hf_isis_hello_pdu_length = -1;
+static int hf_isis_hello_priority_reserved = -1;
+static int hf_isis_hello_lan_id = -1;
+static int hf_isis_hello_local_circuit_id = -1;
+static int hf_isis_hello_clv_ipv4_int_addr = -1;
+
+static gint ett_isis_hello = -1;
+static gint ett_isis_hello_clv_area_addr = -1;
+static gint ett_isis_hello_clv_is_neighbors = -1;
+static gint ett_isis_hello_clv_padding = -1;
+static gint ett_isis_hello_clv_unknown = -1;
+static gint ett_isis_hello_clv_nlpid = -1;
+static gint ett_isis_hello_clv_auth = -1;
static gint ett_isis_hello_clv_ipv4_int_addr = -1;
static const value_string isis_hello_circuit_type_vals[] = {
* Predclare dissectors for use in clv dissection.
*/
static void dissect_hello_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_hello_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_hello_padding_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_hello_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_hello_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_hello_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_hello_opts[] = {
{
* 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_hello_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 );
}
* 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_hello_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) {
isis_dissect_ip_int_clv(pd, offset, length, fd, tree,
hf_isis_hello_clv_ipv4_int_addr );
}
* 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_hello_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 Link 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_hello_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
* gint : tree id to use for proto tree.
*/
void
dissect_hello_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 ) {
while ( length > 0 ) {
if (length<6) {
isis_dissect_unknown(offset, length, tree, fd,
* format string.
*/
if ( tree ) {
- proto_tree_add_text ( tree, offset, 6,
- "IS Neighbor: %02x%02x.%02x%02x.%02x%02x",
- pd[offset], pd[offset+1], pd[offset+2],
- pd[offset+3], pd[offset+3], pd[offset+4] );
+ proto_tree_add_text ( tree, NullTVB, offset, 6,
+ "IS Neighbor: %s", print_system_id( pd + offset, 6 ) );
}
offset += 6;
length -= 6;
* 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_hello_padding_clv(const u_char *pd, int offset, guint length,
- frame_data *fd, proto_tree *tree) {
+ int id_length, frame_data *fd, proto_tree *tree) {
/* nothing to do here! */
}
*
* Description:
* This procedure rips apart the various types of ISIS hellos. L1H and
- * L2H's are identicle for the most part, while the PTP hello has
+ * L2H's are identical for the most part, while the PTP hello has
* a shorter header.
*
* Input:
- * int : hello type, alla packet-isis.h ISIS_TYPE_* values
+ * int : hello 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 : our offset into packet data.
* frame_data * : frame data
* void, will modify proto_tree if not NULL.
*/
void
-isis_dissect_isis_hello(int hello_type, int header_length,
+isis_dissect_isis_hello(int hello_type, int header_length, int id_length,
const u_char *pd, int offset, frame_data *fd, proto_tree *tree){
- isis_hello_t *ihp;
proto_item *ti;
proto_tree *hello_tree = NULL;
int len;
int hlen;
+ guint16 pdu_length;
+
+ OLD_CHECK_DISPLAY_AS_DATA(proto_isis_hello, pd, offset, fd, tree);
if (hello_type == ISIS_TYPE_PTP_HELLO) {
- hlen = sizeof(*ihp) - 6; /* make length correct */
+ hlen = 1+id_length+2+2+1;
} else {
- hlen = sizeof(*ihp);
+ hlen = 1+id_length+2+2+1+id_length+1;
}
- if (fd->cap_len < (offset + hlen)) {
+ 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;
}
- ihp = (isis_hello_t *) &pd[offset];
-
if (tree) {
- ti = proto_tree_add_item(tree, proto_isis_hello,
- offset, fd->cap_len - offset, NULL);
+ ti = proto_tree_add_item(tree, proto_isis_hello, NullTVB,
+ offset, END_OF_FRAME, FALSE);
hello_tree = proto_item_add_subtree(ti, ett_isis_hello);
- proto_tree_add_item_format(hello_tree,
+ proto_tree_add_uint_format(hello_tree,
hf_isis_hello_circuit_reserved,
- offset, 1, ihp->isis_hello_circuit_reserved,
- "Circuit type: %s, reserved(0x%02x == 0)",
- val_to_str(ihp->isis_hello_circuit,
+ NullTVB, offset, 1, pd[offset],
+ "Circuit type : %s, reserved(0x%02x == 0)",
+ val_to_str(pd[offset]&ISIS_HELLO_CTYPE_MASK,
isis_hello_circuit_type_vals,
"Unknown (0x%x)"),
- ihp->isis_hello_creserved
+ pd[offset]&ISIS_HELLO_CT_RESERVED_MASK
);
+ }
+ offset += 1;
+
+ if (tree) {
+ proto_tree_add_bytes_format(hello_tree, hf_isis_hello_source_id, NullTVB,
+ offset, id_length, &pd[offset],
+ "SystemID{ Sender of PDU } : %s",
+ print_system_id( pd + offset, id_length ) );
+ }
+ offset += id_length;
- proto_tree_add_item_format(hello_tree, hf_isis_hello_lan_id,
- offset + 1, 6, ihp->isis_hello_source_id,
- "Lan ID: %02x%02x.%02x%02x.%02x%02x",
- ihp->isis_hello_lan_id[0],
- ihp->isis_hello_lan_id[1],
- ihp->isis_hello_lan_id[2],
- ihp->isis_hello_lan_id[3],
- ihp->isis_hello_lan_id[4],
- ihp->isis_hello_lan_id[5]);
- proto_tree_add_item(hello_tree, hf_isis_hello_holding_timer,
- offset + 7, 2,pntohs(&ihp->isis_hello_holding_timer[0]));
- proto_tree_add_item(hello_tree, hf_isis_hello_pdu_length,
- offset + 9, 2,pntohs(&ihp->isis_hello_pdu_length[0]));
- proto_tree_add_item_format(hello_tree,
- hf_isis_hello_priority_reserved,
- offset + 11, 1, ihp->isis_hello_priority_reserved,
- "Priority: %d, reserved(0x%02x == 0)",
- ihp->isis_hello_priority,
- ihp->isis_hello_preserved );
- if (hello_type == ISIS_TYPE_PTP_HELLO) {
- proto_tree_add_item_format(hello_tree,
- hf_isis_hello_local_circuit_id,
- offset + 12, 1, ihp->isis_hello_lan_id[0] );
- } else {
- proto_tree_add_item_format(hello_tree,
- hf_isis_hello_lan_id, offset + 12, 7,
- ihp->isis_hello_lan_id,
- "Lan ID: %02x%02x.%02x%02x.%02x%02x-%02d",
- ihp->isis_hello_lan_id[0],
- ihp->isis_hello_lan_id[1],
- ihp->isis_hello_lan_id[2],
- ihp->isis_hello_lan_id[3],
- ihp->isis_hello_lan_id[4],
- ihp->isis_hello_lan_id[5],
- ihp->isis_hello_lan_id[6]);
+ if (tree) {
+ proto_tree_add_uint(hello_tree, hf_isis_hello_holding_timer, NullTVB,
+ offset, 2, pntohs(&pd[offset]));
+ }
+ offset += 2;
+
+ pdu_length = pntohs(&pd[offset]);
+ if (tree) {
+ proto_tree_add_uint(hello_tree, hf_isis_hello_pdu_length, NullTVB,
+ offset, 2, pdu_length);
+ }
+ offset += 2;
+
+ if (tree) {
+ proto_tree_add_uint_format(hello_tree, hf_isis_hello_priority_reserved, NullTVB,
+ offset, 1, pd[offset],
+ "Priority : %d, reserved(0x%02x == 0)",
+ pd[offset]&ISIS_HELLO_PRIORITY_MASK,
+ pd[offset]&ISIS_HELLO_P_RESERVED_MASK );
+ }
+ offset += 1;
+
+ if (hello_type == ISIS_TYPE_PTP_HELLO) {
+ if (tree) {
+ proto_tree_add_uint(hello_tree, hf_isis_hello_local_circuit_id, NullTVB,
+ offset, 1, pd[offset] );
}
+ offset += 1;
+ } else {
+ if (tree) {
+ proto_tree_add_bytes_format(hello_tree, hf_isis_hello_lan_id, NullTVB,
+ offset, id_length + 1, &pd[offset],
+ "SystemID{ Designated IS } : %s",
+ print_system_id( pd + offset, id_length + 1 ) );
+ }
+ offset += id_length + 1;
}
- offset += hlen;
- len = pntohs(&ihp->isis_hello_pdu_length[0]);
+ len = pdu_length;
len -= header_length;
if (len < 0) {
isis_dissect_unknown(offset, header_length, tree, fd,
* our list of valid ones!
*/
if (hello_type == ISIS_TYPE_L1_HELLO){
- isis_dissect_clvs ( clv_l1_hello_opts, len, pd, offset, fd,
- hello_tree, ett_isis_hello_clv_unknown );
+ isis_dissect_clvs ( clv_l1_hello_opts, len, id_length, pd,
+ offset, fd, hello_tree, ett_isis_hello_clv_unknown );
} else if (hello_type == ISIS_TYPE_L2_HELLO) {
- isis_dissect_clvs ( clv_l2_hello_opts, len, pd, offset, fd,
- hello_tree, ett_isis_hello_clv_unknown );
+ isis_dissect_clvs ( clv_l2_hello_opts, len, id_length, pd,
+ offset, fd, hello_tree, ett_isis_hello_clv_unknown );
} else {
- isis_dissect_clvs ( clv_ptp_hello_opts, len, pd, offset, fd,
- hello_tree, ett_isis_hello_clv_unknown );
+ isis_dissect_clvs ( clv_ptp_hello_opts, len, id_length, pd,
+ offset, fd, hello_tree, ett_isis_hello_clv_unknown );
}
}
proto_register_isis_hello(void) {
static hf_register_info hf[] = {
{ &hf_isis_hello_circuit_reserved,
- { "Circuit type", "", FT_UINT8, BASE_HEX, NULL,
- 0x0, "" }},
+ { "Circuit type ", "isis_hello.circuite_type",
+ FT_UINT8, BASE_HEX, NULL, 0x0, "" }},
{ &hf_isis_hello_source_id,
- { "Source ID", "isis_hello.source_id", FT_ETHER,
- BASE_HEX, NULL, 0x0, "" }},
+ { "SystemID{ Sender of PDU } ", "isis_hello.source_id",
+ FT_BYTES, BASE_HEX, NULL, 0x0, "" }},
{ &hf_isis_hello_holding_timer,
- { "Holding timer", "isis_hello.holding_timer",
- FT_UINT16, BASE_DEC, NULL, 0x0, "" }},
+ { "Holding timer ", "isis_hello.holding_timer",
+ FT_UINT16, BASE_DEC, NULL, 0x0, "" }},
{ &hf_isis_hello_pdu_length,
- { "PDU length", "isis_hello.pdu_length", FT_UINT16,
- BASE_DEC, NULL, 0x0, "" }},
+ { "PDU length ", "isis_hello.pdu_length",
+ FT_UINT16, BASE_DEC, NULL, 0x0, "" }},
{ &hf_isis_hello_priority_reserved,
- { "Priority", "",FT_UINT8, BASE_DEC, NULL,
- ISIS_HELLO_P_RESERVED_MASK, "" }},
+ { "Priority ", "isis_hello.priority",
+ FT_UINT8, BASE_DEC, NULL, ISIS_HELLO_P_RESERVED_MASK, "" }},
{ &hf_isis_hello_lan_id,
- { "LAN ID", "", FT_STRING, BASE_DEC, NULL, 0x0, "" }},
+ { "SystemID{ Designated IS } ", "isis_hello.lan_id",
+ FT_BYTES, BASE_DEC, NULL, 0x0, "" }},
{ &hf_isis_hello_local_circuit_id,
- { "Local circuit ID", "isis_hello.local_circuit_id", FT_UINT8,
- BASE_DEC, NULL, 0x0, "" }},
+ { "Local circuit ID ", "isis_hello.local_circuit_id",
+ FT_UINT8, BASE_DEC, NULL, 0x0, "" }},
{ &hf_isis_hello_clv_ipv4_int_addr,
- { "IPv4 interface address", "", FT_IPv4,
- BASE_NONE, NULL, 0x0, "" }},
+ { "IPv4 interface address ", "isis_hello.clv_ipv4_int_addr",
+ FT_IPv4, BASE_NONE, NULL, 0x0, "" }},
};
static gint *ett[] = {
&ett_isis_hello_clv_ipv4_int_addr,
};
- proto_isis_hello = proto_register_protocol("ISIS hello", "ISIS-hello");
+ proto_isis_hello = proto_register_protocol("ISIS HELLO",
+ "ISIS HELLO", "isis_hello");
proto_register_field_array(proto_isis_hello, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
}
-
git.samba.org / obnox / wireshark / wip.git / blobdiff