diff options
| -rw-r--r-- | epan/dissectors/packet-isis-clv.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-isis-hello.c | 2 | ||||
| -rw-r--r-- | epan/dissectors/packet-isis-lsp.c | 11 |
3 files changed, 5 insertions, 10 deletions
diff --git a/epan/dissectors/packet-isis-clv.c b/epan/dissectors/packet-isis-clv.c index c919357d86..c7aee559f9 100644 --- a/epan/dissectors/packet-isis-clv.c +++ b/epan/dissectors/packet-isis-clv.c @@ -429,7 +429,7 @@ isis_dissect_nlpid_clv(tvbuff_t *tvb, proto_tree *tree, int hf_nlpid, int offset if ( !tree ) return; /* nothing to do! */ if (length <= 0) { - proto_tree_add_bytes_format_value(tree, hf_nlpid, tvb, offset, length, NULL, "--none--"); + proto_tree_add_item(tree, hf_nlpid, tvb, offset, length, ENC_NA); } else { first = TRUE; ti = proto_tree_add_bytes_format(tree, hf_nlpid, tvb, offset, length, NULL, "NLPID(s): "); diff --git a/epan/dissectors/packet-isis-hello.c b/epan/dissectors/packet-isis-hello.c index 740908376e..2a8fef35a3 100644 --- a/epan/dissectors/packet-isis-hello.c +++ b/epan/dissectors/packet-isis-hello.c @@ -1416,7 +1416,7 @@ proto_register_isis_hello(void) { &hf_isis_hello_area_address, { "Area address", "isis.hello.area_address", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_isis_hello_instance_identifier, { "Instance Identifier", "isis.hello.iid", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, { &hf_isis_hello_supported_itid, { "Supported ITID", "isis.hello.supported_itid", FT_UINT16, BASE_DEC, NULL, 0x0, NULL, HFILL }}, - { &hf_isis_hello_clv_nlpid, { "NLPID", "isis.hello.clv_nlpid", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, + { &hf_isis_hello_clv_nlpid, { "NLPID", "isis.hello.clv_nlpid", FT_BYTES, BASE_NONE|BASE_ALLOW_ZERO, NULL, 0x0, NULL, HFILL }}, { &hf_isis_hello_clv_ip_authentication, { "NLPID", "isis.hello.clv_ip_authentication", FT_STRING, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_isis_hello_authentication, { "Authentication", "isis.hello.clv_authentication", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }}, { &hf_isis_hello_mtid, { "Topology ID", "isis.hello.mtid", FT_UINT16, BASE_DEC|BASE_RANGE_STRING, RVALS(mtid_strings), 0xfff, NULL, HFILL }}, diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c index c2b7260ac0..8f7198127c 100644 --- a/epan/dissectors/packet-isis-lsp.c +++ b/epan/dissectors/packet-isis-lsp.c @@ -1724,7 +1724,6 @@ dissect_isis_lsp_clv_mt_cap_spb_instance(tvbuff_t *tvb, packet_info *pinfo, else { proto_tree *subtree, *ti; int subofs = offset; - const guint8 *cist_root_identifier = tvb_get_ptr (tvb, subofs + CIST_ROOT_ID_OFFSET, CIST_ROOT_ID_LEN); guint8 num_trees = tvb_get_guint8(tvb, subofs + NUM_TREES_OFFSET); /*************************/ @@ -1732,11 +1731,7 @@ dissect_isis_lsp_clv_mt_cap_spb_instance(tvbuff_t *tvb, packet_info *pinfo, "SPB Instance: Type: 0x%02x, Length: %d", subtype, sublen); /*************************/ - proto_tree_add_bytes_format_value( subtree, hf_isis_lsp_mt_cap_spb_instance_cist_root_identifier, tvb, subofs + CIST_ROOT_ID_OFFSET, CIST_ROOT_ID_LEN, - cist_root_identifier, "%08x-%08x-%08x-%08x-%08x-%08x-%08x-%08x", - cist_root_identifier[0], cist_root_identifier[1], cist_root_identifier[2], - cist_root_identifier[3], cist_root_identifier[4], cist_root_identifier[5], - cist_root_identifier[6], cist_root_identifier[7]); + proto_tree_add_item(subtree, hf_isis_lsp_mt_cap_spb_instance_cist_root_identifier, tvb, subofs + CIST_ROOT_ID_OFFSET, CIST_ROOT_ID_LEN, ENC_NA); proto_tree_add_item(subtree, hf_isis_lsp_mt_cap_spb_instance_cist_external_root_path_cost, tvb, subofs + CIST_EXT_ROOT_PATH_COST_OFFSET, CIST_EXT_ROOT_PATH_COST_LEN, ENC_BIG_ENDIAN); proto_tree_add_item(subtree, hf_isis_lsp_mt_cap_spb_instance_bridge_priority, tvb, subofs + BRIDGE_PRI_OFFSET, BRIDGE_PRI_LEN, ENC_BIG_ENDIAN); @@ -4406,7 +4401,7 @@ proto_register_isis_lsp(void) }, { &hf_isis_lsp_mt_cap_spb_instance_cist_root_identifier, { "CIST Root Identifier", "isis.lsp.mt_cap_spb_instance.cist_root_identifier", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, SEP_DASH, NULL, 0x0, NULL, HFILL } }, { &hf_isis_lsp_mt_cap_spb_instance_cist_external_root_path_cost, @@ -4816,7 +4811,7 @@ proto_register_isis_lsp(void) }, { &hf_isis_lsp_clv_nlpid, { "NLPID", "isis.lsp.clv_nlpid", - FT_BYTES, BASE_NONE, NULL, 0x0, + FT_BYTES, BASE_NONE|BASE_ALLOW_ZERO, NULL, 0x0, NULL, HFILL } }, { &hf_isis_lsp_ip_authentication, |