ISIS(lsp): Remove not longer supported sub-TLV (from TLV 149)

Next patch will add new supported TLV

Bug: 15015
Change-Id: I5092d19b99fc6b9b5c870cafec2990dd67012ab1
Reviewed-on: https://code.wireshark.org/review/29206
Reviewed-by: Anders Broman <a.broman58@gmail.com>

1 files changed, 0 insertions, 147 deletions

diff --git a/epan/dissectors/packet-isis-lsp.c b/epan/dissectors/packet-isis-lsp.c
index 254a5278bb..18546371e9 100644
--- a/epan/dissectors/packet-isis-lsp.c
+++ b/epan/dissectors/packet-isis-lsp.c
@@ -100,15 +100,6 @@
 
 /* sub-TLV's under SID/Label binding TLV */
 #define ISIS_LSP_SL_SUB_SID_LAB     1
-#define ISIS_LSP_SL_SUB_ERO_MET     2
-#define ISIS_LSP_SL_SUB_IPV4_ERO    3
-#define ISIS_LSP_SL_SUB_IPV6_ERO    4
-#define ISIS_LSP_SL_SUB_UN_IF       5
-#define ISIS_LSP_SL_SUB_IPV4_B_ERO  6
-#define ISIS_LSP_SL_SUB_IPV6_B_ERO  7
-#define ISIS_LSP_SL_SUB_B_UN_IF     8
-
-#define ISIS_TLV_SL_SUB_TLV_L_BIT   0x80 /* ERO sub-tlv L flag */
 
 /* Segment Routing Sub-TLV */
 #define ISIS_SR_SID_LABEL           1
@@ -209,18 +200,6 @@ static int hf_isis_lsp_sl_sub_tlv_type = -1;
 static int hf_isis_lsp_sl_sub_tlv_length = -1;
 static int hf_isis_lsp_sl_sub_tlv_label_20 = -1;
 static int hf_isis_lsp_sl_sub_tlv_label_32 = -1;
-static int hf_isis_lsp_sl_sub_tlv_metric = -1;
-static int hf_isis_lsp_sl_sub_tlv_ero_flag = -1;
-static int hf_isis_lsp_sl_sub_tlv_ero_ipv4 = -1;
-static int hf_isis_lsp_sl_sub_tlv_ero_ipv6 = -1;
-static int hf_isis_lsp_sl_sub_tlv_router_id32 = -1;
-static int hf_isis_lsp_sl_sub_tlv_router_id128 = -1;
-static int hf_isis_lsp_sl_sub_tlv_inter_id = -1;
-static int hf_isis_lsp_sl_sub_tlv_backup_ero_ipv4 = -1;
-static int hf_isis_lsp_sl_sub_tlv_backup_ero_ipv6 = -1;
-static int hf_isis_lsp_sl_sub_tlv_backup_router_id32 = -1;
-static int hf_isis_lsp_sl_sub_tlv_backup_router_id128 = -1;
-static int hf_isis_lsp_sl_sub_tlv_backup_inter_id = -1;
 /* Generated from convert_proto_tree_add_text.pl */
 static int hf_isis_lsp_grp_macaddr_length = -1;
 static int hf_isis_lsp_grp_ipv4addr_length = -1;
@@ -474,13 +453,6 @@ static const value_string isis_lsp_istype_vals[] = {
 
 static const value_string isis_lsp_sl_sub_tlv_vals[] = {
     { ISIS_LSP_SL_SUB_SID_LAB,    "SID/Label sub tlv"},
-    { ISIS_LSP_SL_SUB_ERO_MET,    "ERO Metric sub tlv"},
-    { ISIS_LSP_SL_SUB_IPV4_ERO,   "IPv4 ERO sub tlv"},
-    { ISIS_LSP_SL_SUB_IPV6_ERO,   "IPv6 ERO sub tlv"},
-    { ISIS_LSP_SL_SUB_UN_IF,      "Unumbered If sub tlv"},
-    { ISIS_LSP_SL_SUB_IPV4_B_ERO, "IPv4 backup sub tlv"},
-    { ISIS_LSP_SL_SUB_IPV6_B_ERO, "IPv6 backup sub tlv"},
-    { ISIS_LSP_SL_SUB_B_UN_IF,    "Backup Unumbered If"},
     { 0, NULL } };
 
 static const int * adj_sid_flags[] = {
@@ -2057,65 +2029,6 @@ dissect_isis_lsp_clv_sid_label_binding(tvbuff_t *tvb, packet_info* pinfo, proto_
                         break;
                 }
                 break;
-            case ISIS_LSP_SL_SUB_ERO_MET :
-                proto_tree_add_item(subtree, hf_isis_lsp_sl_sub_tlv_metric, tvb, i+2+tlv_offset, 4, ENC_BIG_ENDIAN);
-                break;
-            case ISIS_LSP_SL_SUB_IPV4_ERO :
-                proto_tree_add_item(subtree, hf_isis_lsp_sl_sub_tlv_ero_flag, tvb, i+2+tlv_offset, 1, ENC_BIG_ENDIAN);
-                proto_tree_add_item(subtree, hf_isis_lsp_sl_sub_tlv_ero_ipv4, tvb, i+3+tlv_offset, 4, ENC_NA);
-                break;
-            case ISIS_LSP_SL_SUB_IPV6_ERO :
-                proto_tree_add_item(subtree, hf_isis_lsp_sl_sub_tlv_ero_flag, tvb, i+2+tlv_offset, 1, ENC_BIG_ENDIAN);
-                proto_tree_add_item(subtree, hf_isis_lsp_sl_sub_tlv_ero_ipv6, tvb, i+3+tlv_offset, 16, ENC_NA);
-                break;
-            case ISIS_LSP_SL_SUB_UN_IF :
-                switch (clv_len) {
-                    case 8 :
-                        proto_tree_add_item(subtree, hf_isis_lsp_sl_sub_tlv_router_id32,
-                                            tvb, i+2+tlv_offset, 4, ENC_NA);
-                        proto_tree_add_item(subtree, hf_isis_lsp_sl_sub_tlv_inter_id,
-                                            tvb, i+6+tlv_offset, 4, ENC_BIG_ENDIAN);
-                        break;
-                    case 20 :
-                        proto_tree_add_item(subtree, hf_isis_lsp_sl_sub_tlv_router_id128,
-                                            tvb, i+2+tlv_offset, 16, ENC_NA);
-                        proto_tree_add_item(subtree, hf_isis_lsp_sl_sub_tlv_inter_id,
-                                            tvb, i+2+16+tlv_offset, 4, ENC_BIG_ENDIAN);
-                        break;
-                    default :
-                        proto_tree_add_expert_format(tree, pinfo, &ei_isis_lsp_malformed_subtlv, tvb, i+2+tlv_offset, -1,
-                                                "Router ID badly formatted");
-                        break;
-                }
-                break;
-            case ISIS_LSP_SL_SUB_IPV4_B_ERO :
-                proto_tree_add_item(subtree, hf_isis_lsp_sl_sub_tlv_ero_flag, tvb, i+2+tlv_offset, 1, ENC_BIG_ENDIAN);
-                proto_tree_add_item(subtree, hf_isis_lsp_sl_sub_tlv_backup_ero_ipv4, tvb, i+3+tlv_offset, 4, ENC_NA);
-                break;
-            case ISIS_LSP_SL_SUB_IPV6_B_ERO :
-                proto_tree_add_item(subtree, hf_isis_lsp_sl_sub_tlv_ero_flag, tvb, i+2+tlv_offset, 1, ENC_BIG_ENDIAN);
-                proto_tree_add_item(subtree, hf_isis_lsp_sl_sub_tlv_backup_ero_ipv6, tvb, i+3+tlv_offset, 16, ENC_NA);
-                break;
-            case ISIS_LSP_SL_SUB_B_UN_IF :
-                switch (clv_len) {
-                    case 8 :
-                        proto_tree_add_item(subtree, hf_isis_lsp_sl_sub_tlv_backup_router_id32,
-                                            tvb, i+2+tlv_offset, 4, ENC_NA);
-                        proto_tree_add_item(subtree, hf_isis_lsp_sl_sub_tlv_backup_inter_id,
-                                            tvb, i+6+tlv_offset, 4, ENC_BIG_ENDIAN);
-                        break;
-                    case 20 :
-                        proto_tree_add_item(subtree, hf_isis_lsp_sl_sub_tlv_backup_router_id128,
-                                            tvb, i+2+tlv_offset, 16, ENC_NA);
-                        proto_tree_add_item(subtree, hf_isis_lsp_sl_sub_tlv_backup_inter_id,
-                                            tvb, i+2+16+tlv_offset, 4, ENC_BIG_ENDIAN);
-                        break;
-                    default :
-                        proto_tree_add_expert_format(tree, pinfo, &ei_isis_lsp_malformed_subtlv, tvb, i+2+tlv_offset, -1,
-                                                "backup Router ID badly formatted");
-                        break;
-                 }
-                break;
             default:
                 proto_tree_add_expert_format(tree, pinfo, &ei_isis_lsp_malformed_subtlv, tvb, i+2+tlv_offset, -1,
                                             "Sub TLV badly formatted, type unknown %d", clv_code);
@@ -3989,66 +3902,6 @@ proto_register_isis_lsp(void)
               FT_UINT32, BASE_DEC, NULL, 0x0,
               NULL, HFILL}
         },
-        { &hf_isis_lsp_sl_sub_tlv_metric,
-            { "Metric", "isis.lsp.sl_sub_tlv.metric",
-              FT_UINT32, BASE_DEC, NULL, 0x0,
-              NULL, HFILL}
-        },
-        { &hf_isis_lsp_sl_sub_tlv_ero_flag,
-            { "L bit", "isis.lsp.sl_sub_tlv.ero_flag_l",
-              FT_BOOLEAN, 8, TFS(&tfs_isis_tlv_sl_sub_tlv_f), ISIS_TLV_SL_SUB_TLV_L_BIT,
-              NULL, HFILL}
-        },
-        { &hf_isis_lsp_sl_sub_tlv_ero_ipv4,
-            { "ERO IPv4", "isis.lsp.sl_sub_tlv.ero_ipv4",
-              FT_IPv4, BASE_NONE, NULL, 0x0,
-              NULL, HFILL}
-        },
-        { &hf_isis_lsp_sl_sub_tlv_ero_ipv6,
-            { "ERO IPv6", "isis.lsp.sl_sub_tlv.ero_ipv6",
-              FT_IPv6, BASE_NONE, NULL, 0x0,
-              NULL, HFILL}
-        },
-        { &hf_isis_lsp_sl_sub_tlv_router_id32,
-          { "Router ID", "isis.lsp.sl_sub_tlv.router_id32",
-            FT_IPv4, BASE_NONE, NULL, 0x0,
-            NULL, HFILL}
-        },
-        { &hf_isis_lsp_sl_sub_tlv_router_id128,
-          { "Router ID", "isis.lsp.sl_sub_tlv.router_id128",
-            FT_IPv6, BASE_NONE, NULL, 0x0,
-            NULL, HFILL}
-        },
-        { &hf_isis_lsp_sl_sub_tlv_inter_id,
-          { "Interface ID", "isis.lsp.sl_sub_tlv.interface_id",
-            FT_UINT32, BASE_DEC, NULL, 0x0,
-            NULL, HFILL}
-        },
-        { &hf_isis_lsp_sl_sub_tlv_backup_ero_ipv4,
-            { "Backup ERO IPv4", "isis.lsp.sl_sub_tlv.backup_ero_ipv4",
-              FT_IPv4, BASE_NONE, NULL, 0x0,
-              NULL, HFILL}
-        },
-        { &hf_isis_lsp_sl_sub_tlv_backup_ero_ipv6,
-            { "Backup ERO IPv6", "isis.lsp.sl_sub_tlv.backup_ero_ipv6",
-              FT_IPv6, BASE_NONE, NULL, 0x0,
-              NULL, HFILL}
-        },
-        { &hf_isis_lsp_sl_sub_tlv_backup_router_id32,
-          { "Backup Router ID", "isis.lsp.sl_sub_tlv.backup_router_id32",
-            FT_IPv4, BASE_NONE, NULL, 0x0,
-            NULL, HFILL}
-        },
-        { &hf_isis_lsp_sl_sub_tlv_backup_router_id128,
-          { "Backup Router ID", "isis.lsp.sl_sub_tlv.backup_router_id128",
-            FT_IPv6, BASE_NONE, NULL, 0x0,
-            NULL, HFILL}
-        },
-        { &hf_isis_lsp_sl_sub_tlv_backup_inter_id,
-          { "Backup Interface ID", "isis.lsp.sl_sub_tlv.backup_interface_id",
-            FT_UINT32, BASE_DEC, NULL, 0x0,
-            NULL, HFILL}
-        },
         /* Generated from convert_proto_tree_add_text.pl */
         { &hf_isis_lsp_mt_id_reserved,
             { "Reserved", "isis.lsp.reserved",