Merge pull request #5681 from opensourcerouting/manpage-rename

[mirror_frr.git] / ldpd / ldp_vty_cmds.c

diff --git a/ldpd/ldp_vty_cmds.c b/ldpd/ldp_vty_cmds.c
index be473063cdabc68d325c17fc3a6ead2122574db5..c24e1917ccf7b974cf859caf24d01b6930d8758b 100644 (file)
--- a/ldpd/ldp_vty_cmds.c
+++ b/ldpd/ldp_vty_cmds.c
@@ -25,9 +25,11 @@
 
 #include "ldpd/ldpd.h"
 #include "ldpd/ldp_vty.h"
 
 #include "ldpd/ldpd.h"
 #include "ldpd/ldp_vty.h"

+#ifndef VTYSH_EXTRACT_PL

 #include "ldpd/ldp_vty_cmds_clippy.c"
 #include "ldpd/ldp_vty_cmds_clippy.c"

+#endif

 
 

-DEFUN_NOSH(ldp_mpls_ldp,
+DEFPY_NOSH(ldp_mpls_ldp,

        ldp_mpls_ldp_cmd,
        "mpls ldp",
        "Global MPLS configuration subcommands\n"
        ldp_mpls_ldp_cmd,
        "mpls ldp",
        "Global MPLS configuration subcommands\n"


@@ -46,21 +48,15 @@ DEFPY  (no_ldp_mpls_ldp,
        return (ldp_vty_mpls_ldp(vty, "no"));
 }
 
        return (ldp_vty_mpls_ldp(vty, "no"));
 }
 

-DEFUN_NOSH(ldp_l2vpn,
+DEFPY_NOSH(ldp_l2vpn,

        ldp_l2vpn_cmd,
        ldp_l2vpn_cmd,

-       "l2vpn WORD type vpls",
+       "l2vpn WORD$l2vpn_name type vpls",

        "Configure l2vpn commands\n"
        "L2VPN name\n"
        "L2VPN type\n"
        "Virtual Private LAN Service\n")
 {
        "Configure l2vpn commands\n"
        "L2VPN name\n"
        "L2VPN type\n"
        "Virtual Private LAN Service\n")
 {

-       int              idx = 0;
-       const char      *name;
-
-       argv_find(argv, argc, "WORD", &idx);
-       name = argv[idx]->arg;
-
-       return (ldp_vty_l2vpn(vty, 0, name));
+       return (ldp_vty_l2vpn(vty, NULL, l2vpn_name));

 }
 
 DEFPY  (no_ldp_l2vpn,
 }
 
 DEFPY  (no_ldp_l2vpn,


@@ -75,20 +71,14 @@ DEFPY  (no_ldp_l2vpn,
        return (ldp_vty_l2vpn(vty, "no", l2vpn_name));
 }
 
        return (ldp_vty_l2vpn(vty, "no", l2vpn_name));
 }
 

-DEFUN_NOSH(ldp_address_family,
+DEFPY_NOSH(ldp_address_family,

        ldp_address_family_cmd,
        ldp_address_family_cmd,

-       "address-family <ipv4|ipv6>",
+       "address-family <ipv4|ipv6>$af",

        "Configure Address Family and its parameters\n"
        "IPv4\n"
        "IPv6\n")
 {
        "Configure Address Family and its parameters\n"
        "IPv4\n"
        "IPv6\n")
 {

-       int              idx = 0;
-       const char      *af;
-
-       argv_find(argv, argc, "address-family", &idx);
-       af = argv[idx + 1]->text;
-
-       return (ldp_vty_address_family(vty, 0, af));
+       return (ldp_vty_address_family(vty, NULL, af));

 }
 
 DEFPY  (no_ldp_address_family,
 }
 
 DEFPY  (no_ldp_address_family,


@@ -102,7 +92,7 @@ DEFPY  (no_ldp_address_family,
        return (ldp_vty_address_family(vty, "no", af));
 }
 
        return (ldp_vty_address_family(vty, "no", af));
 }
 

-DEFUN_NOSH(ldp_exit_address_family,
+DEFPY_NOSH(ldp_exit_address_family,

        ldp_exit_address_family_cmd,
        "exit-address-family",
        "Exit from Address Family configuration mode\n")
        ldp_exit_address_family_cmd,
        "exit-address-family",
        "Exit from Address Family configuration mode\n")


@@ -112,30 +102,52 @@ DEFUN_NOSH(ldp_exit_address_family,
        return CMD_SUCCESS;
 }
 
        return CMD_SUCCESS;
 }
 

-DEFPY  (ldp_discovery_holdtime,
-       ldp_discovery_holdtime_cmd,
-       "[no] discovery <hello|targeted-hello>$hello_type holdtime (1-65535)$holdtime",
+DEFPY  (ldp_discovery_link_holdtime,
+       ldp_discovery_link_holdtime_cmd,
+       "[no] discovery hello holdtime (1-65535)$holdtime",

        NO_STR
        "Configure discovery parameters\n"
        "LDP Link Hellos\n"
        NO_STR
        "Configure discovery parameters\n"
        "LDP Link Hellos\n"

+       "Hello holdtime\n"
+       "Time (seconds) - 65535 implies infinite\n")
+{
+       return (ldp_vty_disc_holdtime(vty, no, HELLO_LINK, holdtime));
+}
+
+DEFPY  (ldp_discovery_targeted_holdtime,
+       ldp_discovery_targeted_holdtime_cmd,
+       "[no] discovery targeted-hello holdtime (1-65535)$holdtime",
+       NO_STR
+       "Configure discovery parameters\n"

        "LDP Targeted Hellos\n"
        "Hello holdtime\n"
        "Time (seconds) - 65535 implies infinite\n")
 {
        "LDP Targeted Hellos\n"
        "Hello holdtime\n"
        "Time (seconds) - 65535 implies infinite\n")
 {

-       return (ldp_vty_disc_holdtime(vty, no, hello_type, holdtime));
+       return (ldp_vty_disc_holdtime(vty, no, HELLO_TARGETED, holdtime));

 }
 
 }
 

-DEFPY  (ldp_discovery_interval,
-       ldp_discovery_interval_cmd,
-       "[no] discovery <hello|targeted-hello>$hello_type interval (1-65535)$interval",
+DEFPY  (ldp_discovery_link_interval,
+       ldp_discovery_link_interval_cmd,
+       "[no] discovery hello interval (1-65535)$interval",

        NO_STR
        "Configure discovery parameters\n"
        "LDP Link Hellos\n"
        NO_STR
        "Configure discovery parameters\n"
        "LDP Link Hellos\n"

+       "Hello interval\n"
+       "Time (seconds)\n")
+{
+       return (ldp_vty_disc_interval(vty, no, HELLO_LINK, interval));
+}
+
+DEFPY  (ldp_discovery_targeted_interval,
+       ldp_discovery_targeted_interval_cmd,
+       "[no] discovery targeted-hello interval (1-65535)$interval",
+       NO_STR
+       "Configure discovery parameters\n"

        "LDP Targeted Hellos\n"
        "Hello interval\n"
        "Time (seconds)\n")
 {
        "LDP Targeted Hellos\n"
        "Hello interval\n"
        "Time (seconds)\n")
 {

-       return (ldp_vty_disc_interval(vty, no, hello_type, interval));
+       return (ldp_vty_disc_interval(vty, no, HELLO_TARGETED, interval));

 }
 
 DEFPY  (ldp_dual_stack_transport_connection_prefer_ipv4,
 }
 
 DEFPY  (ldp_dual_stack_transport_connection_prefer_ipv4,


@@ -144,7 +156,7 @@ DEFPY  (ldp_dual_stack_transport_connection_prefer_ipv4,
        NO_STR
        "Configure dual stack parameters\n"
        "Configure TCP transport parameters\n"
        NO_STR
        "Configure dual stack parameters\n"
        "Configure TCP transport parameters\n"

-       "Configure prefered address family for TCP transport connection with neighbor\n"
+       "Configure preferred address family for TCP transport connection with neighbor\n"

        "IPv4\n")
 {
        return (ldp_vty_trans_pref_ipv4(vty, no));
        "IPv4\n")
 {
        return (ldp_vty_trans_pref_ipv4(vty, no));


@@ -337,19 +349,13 @@ DEFPY  (ldp_session_holdtime,
        return (ldp_vty_af_session_holdtime(vty, no, holdtime));
 }
 
        return (ldp_vty_af_session_holdtime(vty, no, holdtime));
 }
 

-DEFUN_NOSH(ldp_interface,
+DEFPY_NOSH(ldp_interface,

        ldp_interface_cmd,
        ldp_interface_cmd,

-       "interface IFNAME",
+       "interface IFNAME$ifname",

        "Enable LDP on an interface and enter interface submode\n"
        "Interface's name\n")
 {
        "Enable LDP on an interface and enter interface submode\n"
        "Interface's name\n")
 {

-       int              idx = 0;
-       const char      *ifname;
-
-       argv_find(argv, argc, "IFNAME", &idx);
-       ifname = argv[idx]->arg;
-
-       return (ldp_vty_interface(vty, 0, ifname));
+       return (ldp_vty_interface(vty, NULL, ifname));

 }
 
 DEFPY  (no_ldp_interface,
 }
 
 DEFPY  (no_ldp_interface,


@@ -415,20 +421,14 @@ DEFPY  (ldp_member_interface,
        return (ldp_vty_l2vpn_interface(vty, no, ifname));
 }
 
        return (ldp_vty_l2vpn_interface(vty, no, ifname));
 }
 

-DEFUN_NOSH(ldp_member_pseudowire,
+DEFPY_NOSH(ldp_member_pseudowire,

        ldp_member_pseudowire_cmd,
        ldp_member_pseudowire_cmd,

-       "member pseudowire IFNAME",
+       "member pseudowire IFNAME$ifname",

        "L2VPN member configuration\n"
        "Pseudowire interface\n"
        "Interface's name\n")
 {
        "L2VPN member configuration\n"
        "Pseudowire interface\n"
        "Interface's name\n")
 {

-       int              idx = 0;
-       const char      *ifname;
-
-       argv_find(argv, argc, "IFNAME", &idx);
-       ifname = argv[idx]->arg;
-
-       return (ldp_vty_l2vpn_pseudowire(vty, 0, ifname));
+       return (ldp_vty_l2vpn_pseudowire(vty, NULL, ifname));

 }
 
 DEFPY  (no_ldp_member_pseudowire,
 }
 
 DEFPY  (no_ldp_member_pseudowire,


@@ -538,13 +538,14 @@ DEFPY  (ldp_debug_mpls_ldp_discovery_hello,
 
 DEFPY  (ldp_debug_mpls_ldp_type,
        ldp_debug_mpls_ldp_type_cmd,
 
 DEFPY  (ldp_debug_mpls_ldp_type,
        ldp_debug_mpls_ldp_type_cmd,

-       "[no] debug mpls ldp <errors|event|zebra>$type",
+       "[no] debug mpls ldp <errors|event|labels|zebra>$type",

        NO_STR
        "Debugging functions\n"
        "MPLS information\n"
        "Label Distribution Protocol\n"
        "Errors\n"
        "LDP event information\n"
        NO_STR
        "Debugging functions\n"
        "MPLS information\n"
        "Label Distribution Protocol\n"
        "Errors\n"
        "LDP event information\n"

+       "LDP label allocation information\n"

        "LDP zebra information\n")
 {
        return (ldp_vty_debug(vty, no, type, NULL, NULL));
        "LDP zebra information\n")
 {
        return (ldp_vty_debug(vty, no, type, NULL, NULL));


@@ -580,17 +581,38 @@ DEFPY  (ldp_debug_mpls_ldp_messages_sent,
 
 DEFPY  (ldp_show_mpls_ldp_binding,
        ldp_show_mpls_ldp_binding_cmd,
 
 DEFPY  (ldp_show_mpls_ldp_binding,
        ldp_show_mpls_ldp_binding_cmd,

-       "show mpls ldp [<ipv4|ipv6>]$af binding [detail]$detail [json]$json",
+       "show mpls ldp [<ipv4|ipv6>]$af binding\
+         [<A.B.C.D/M|X:X::X:X/M>$prefix [longer-prefixes$longer_prefixes]]\
+         [{\
+           neighbor A.B.C.D$nbr\
+           |local-label (0-1048575)$local_label\
+           |remote-label (0-1048575)$remote_label\
+         }]\
+        [detail]$detail [json]$json",

        "Show running system information\n"
        "MPLS information\n"
        "Label Distribution Protocol\n"
        "IPv4 Address Family\n"
        "IPv6 Address Family\n"
        "Label Information Base (LIB) information\n"
        "Show running system information\n"
        "MPLS information\n"
        "Label Distribution Protocol\n"
        "IPv4 Address Family\n"
        "IPv6 Address Family\n"
        "Label Information Base (LIB) information\n"

+       "Destination prefix (IPv4)\n"
+       "Destination prefix (IPv6)\n"
+       "Include longer matches\n"
+       "Display labels from LDP neighbor\n"
+       "Neighbor LSR-ID\n"
+       "Match locally assigned label values\n"
+       "Locally assigned label value\n"
+       "Match remotely assigned label values\n"
+       "Remotely assigned label value\n"

        "Show detailed information\n"
        JSON_STR)
 {
        "Show detailed information\n"
        JSON_STR)
 {

-       return (ldp_vty_show_binding(vty, af, detail, json));
+       if (!local_label_str)
+               local_label = NO_LABEL;
+       if (!remote_label_str)
+               remote_label = NO_LABEL;
+       return (ldp_vty_show_binding(vty, af, prefix_str, !!longer_prefixes,
+           nbr_str, local_label, remote_label, detail, json));

 }
 
 DEFPY  (ldp_show_mpls_ldp_discovery,
 }
 
 DEFPY  (ldp_show_mpls_ldp_discovery,


@@ -636,55 +658,84 @@ DEFPY  (ldp_show_mpls_ldp_capabilities,
 
 DEFPY  (ldp_show_mpls_ldp_neighbor,
        ldp_show_mpls_ldp_neighbor_cmd,
 
 DEFPY  (ldp_show_mpls_ldp_neighbor,
        ldp_show_mpls_ldp_neighbor_cmd,

-       "show mpls ldp neighbor [detail]$detail [json]$json",
+       "show mpls ldp neighbor [A.B.C.D]$lsr_id [detail]$detail [json]$json",

        "Show running system information\n"
        "MPLS information\n"
        "Label Distribution Protocol\n"
        "Neighbor information\n"
        "Show running system information\n"
        "MPLS information\n"
        "Label Distribution Protocol\n"
        "Neighbor information\n"

+       "Neighbor LSR-ID\n"

        "Show detailed information\n"
        JSON_STR)
 {
        "Show detailed information\n"
        JSON_STR)
 {

-       return (ldp_vty_show_neighbor(vty, 0, detail, json));
+       return (ldp_vty_show_neighbor(vty, lsr_id_str, 0, detail, json));

 }
 
 DEFPY  (ldp_show_mpls_ldp_neighbor_capabilities,
        ldp_show_mpls_ldp_neighbor_capabilities_cmd,
 }
 
 DEFPY  (ldp_show_mpls_ldp_neighbor_capabilities,
        ldp_show_mpls_ldp_neighbor_capabilities_cmd,

-       "show mpls ldp neighbor capabilities [json]$json",
+       "show mpls ldp neighbor [A.B.C.D]$lsr_id capabilities [json]$json",

        "Show running system information\n"
        "MPLS information\n"
        "Label Distribution Protocol\n"
        "Neighbor information\n"
        "Show running system information\n"
        "MPLS information\n"
        "Label Distribution Protocol\n"
        "Neighbor information\n"

+       "Neighbor LSR-ID\n"

        "Display neighbor capability information\n"
        JSON_STR)
 {
        "Display neighbor capability information\n"
        JSON_STR)
 {

-       return (ldp_vty_show_neighbor(vty, 1, NULL, json));
+       return (ldp_vty_show_neighbor(vty, lsr_id_str, 1, NULL, json));

 }
 
 DEFPY  (ldp_show_l2vpn_atom_binding,
        ldp_show_l2vpn_atom_binding_cmd,
 }
 
 DEFPY  (ldp_show_l2vpn_atom_binding,
        ldp_show_l2vpn_atom_binding_cmd,

-       "show l2vpn atom binding [json]$json",
+       "show l2vpn atom binding\
+         [{\
+           A.B.C.D$peer\
+           |local-label (16-1048575)$local_label\
+           |remote-label (16-1048575)$remote_label\
+         }]\
+        [json]$json",

        "Show running system information\n"
        "Show information about Layer2 VPN\n"
        "Show Any Transport over MPLS information\n"
        "Show AToM label binding information\n"
        "Show running system information\n"
        "Show information about Layer2 VPN\n"
        "Show Any Transport over MPLS information\n"
        "Show AToM label binding information\n"

+       "Destination address of the VC\n"
+       "Match locally assigned label values\n"
+       "Locally assigned label value\n"
+       "Match remotely assigned label values\n"
+       "Remotely assigned label value\n"

        JSON_STR)
 {
        JSON_STR)
 {

-       return (ldp_vty_show_atom_binding(vty, json));
+       if (!local_label_str)
+               local_label = NO_LABEL;
+       if (!remote_label_str)
+               remote_label = NO_LABEL;
+       return (ldp_vty_show_atom_binding(vty, peer_str, local_label,
+           remote_label, json));

 }
 
 DEFPY  (ldp_show_l2vpn_atom_vc,
        ldp_show_l2vpn_atom_vc_cmd,
 }
 
 DEFPY  (ldp_show_l2vpn_atom_vc,
        ldp_show_l2vpn_atom_vc_cmd,

-       "show l2vpn atom vc [json]$json",
+       "show l2vpn atom vc\
+         [{\
+           A.B.C.D$peer\
+           |interface IFNAME$ifname\
+           |vc-id (1-4294967295)$vcid\
+         }]\
+        [json]$json",

        "Show running system information\n"
        "Show information about Layer2 VPN\n"
        "Show Any Transport over MPLS information\n"
        "Show AToM virtual circuit information\n"
        "Show running system information\n"
        "Show information about Layer2 VPN\n"
        "Show Any Transport over MPLS information\n"
        "Show AToM virtual circuit information\n"

+       "Destination address of the VC\n"
+       "Local interface of the pseudowire\n"
+       "Interface's name\n"
+       "VC ID\n"
+       "VC ID\n"

        JSON_STR)
 {
        JSON_STR)
 {

-       return (ldp_vty_show_atom_vc(vty, json));
+       return (ldp_vty_show_atom_vc(vty, peer_str, ifname, vcid_str, json));

 }
 
 }
 

-DEFUN_NOSH (ldp_show_debugging_mpls_ldp,
+DEFPY_NOSH (ldp_show_debugging_mpls_ldp,

            ldp_show_debugging_mpls_ldp_cmd,
            "show debugging [mpls ldp]",
            "Show running system information\n"
            ldp_show_debugging_mpls_ldp_cmd,
            "show debugging [mpls ldp]",
            "Show running system information\n"


@@ -746,8 +797,10 @@ ldp_vty_init (void)
 
        install_element(LDP_NODE, &ldp_address_family_cmd);
        install_element(LDP_NODE, &no_ldp_address_family_cmd);
 
        install_element(LDP_NODE, &ldp_address_family_cmd);
        install_element(LDP_NODE, &no_ldp_address_family_cmd);

-       install_element(LDP_NODE, &ldp_discovery_holdtime_cmd);
-       install_element(LDP_NODE, &ldp_discovery_interval_cmd);
+       install_element(LDP_NODE, &ldp_discovery_link_holdtime_cmd);
+       install_element(LDP_NODE, &ldp_discovery_targeted_holdtime_cmd);
+       install_element(LDP_NODE, &ldp_discovery_link_interval_cmd);
+       install_element(LDP_NODE, &ldp_discovery_targeted_interval_cmd);

        install_element(LDP_NODE, &ldp_dual_stack_transport_connection_prefer_ipv4_cmd);
        install_element(LDP_NODE, &ldp_dual_stack_cisco_interop_cmd);
        install_element(LDP_NODE, &ldp_neighbor_password_cmd);
        install_element(LDP_NODE, &ldp_dual_stack_transport_connection_prefer_ipv4_cmd);
        install_element(LDP_NODE, &ldp_dual_stack_cisco_interop_cmd);
        install_element(LDP_NODE, &ldp_neighbor_password_cmd);


@@ -755,8 +808,10 @@ ldp_vty_init (void)
        install_element(LDP_NODE, &ldp_neighbor_ttl_security_cmd);
        install_element(LDP_NODE, &ldp_router_id_cmd);
 
        install_element(LDP_NODE, &ldp_neighbor_ttl_security_cmd);
        install_element(LDP_NODE, &ldp_router_id_cmd);
 

-       install_element(LDP_IPV4_NODE, &ldp_discovery_holdtime_cmd);
-       install_element(LDP_IPV4_NODE, &ldp_discovery_interval_cmd);
+       install_element(LDP_IPV4_NODE, &ldp_discovery_link_holdtime_cmd);
+       install_element(LDP_IPV4_NODE, &ldp_discovery_targeted_holdtime_cmd);
+       install_element(LDP_IPV4_NODE, &ldp_discovery_link_interval_cmd);
+       install_element(LDP_IPV4_NODE, &ldp_discovery_targeted_interval_cmd);

        install_element(LDP_IPV4_NODE, &ldp_discovery_targeted_hello_accept_cmd);
        install_element(LDP_IPV4_NODE, &ldp_discovery_transport_address_ipv4_cmd);
        install_element(LDP_IPV4_NODE, &ldp_label_local_advertise_cmd);
        install_element(LDP_IPV4_NODE, &ldp_discovery_targeted_hello_accept_cmd);
        install_element(LDP_IPV4_NODE, &ldp_discovery_transport_address_ipv4_cmd);
        install_element(LDP_IPV4_NODE, &ldp_label_local_advertise_cmd);


@@ -770,8 +825,10 @@ ldp_vty_init (void)
        install_element(LDP_IPV4_NODE, &ldp_neighbor_ipv4_targeted_cmd);
        install_element(LDP_IPV4_NODE, &ldp_exit_address_family_cmd);
 
        install_element(LDP_IPV4_NODE, &ldp_neighbor_ipv4_targeted_cmd);
        install_element(LDP_IPV4_NODE, &ldp_exit_address_family_cmd);
 

-       install_element(LDP_IPV6_NODE, &ldp_discovery_holdtime_cmd);
-       install_element(LDP_IPV6_NODE, &ldp_discovery_interval_cmd);
+       install_element(LDP_IPV6_NODE, &ldp_discovery_link_holdtime_cmd);
+       install_element(LDP_IPV6_NODE, &ldp_discovery_targeted_holdtime_cmd);
+       install_element(LDP_IPV6_NODE, &ldp_discovery_link_interval_cmd);
+       install_element(LDP_IPV6_NODE, &ldp_discovery_targeted_interval_cmd);

        install_element(LDP_IPV6_NODE, &ldp_discovery_targeted_hello_accept_cmd);
        install_element(LDP_IPV6_NODE, &ldp_discovery_transport_address_ipv6_cmd);
        install_element(LDP_IPV6_NODE, &ldp_label_local_advertise_cmd);
        install_element(LDP_IPV6_NODE, &ldp_discovery_targeted_hello_accept_cmd);
        install_element(LDP_IPV6_NODE, &ldp_discovery_transport_address_ipv6_cmd);
        install_element(LDP_IPV6_NODE, &ldp_label_local_advertise_cmd);


@@ -780,15 +837,16 @@ ldp_vty_init (void)
        install_element(LDP_IPV6_NODE, &ldp_label_remote_accept_cmd);
        install_element(LDP_IPV6_NODE, &ldp_ttl_security_disable_cmd);
        install_element(LDP_IPV6_NODE, &ldp_interface_cmd);
        install_element(LDP_IPV6_NODE, &ldp_label_remote_accept_cmd);
        install_element(LDP_IPV6_NODE, &ldp_ttl_security_disable_cmd);
        install_element(LDP_IPV6_NODE, &ldp_interface_cmd);

+       install_element(LDP_IPV6_NODE, &no_ldp_interface_cmd);

        install_element(LDP_IPV6_NODE, &ldp_session_holdtime_cmd);
        install_element(LDP_IPV6_NODE, &ldp_neighbor_ipv6_targeted_cmd);
        install_element(LDP_IPV6_NODE, &ldp_exit_address_family_cmd);
 
        install_element(LDP_IPV6_NODE, &ldp_session_holdtime_cmd);
        install_element(LDP_IPV6_NODE, &ldp_neighbor_ipv6_targeted_cmd);
        install_element(LDP_IPV6_NODE, &ldp_exit_address_family_cmd);
 

-       install_element(LDP_IPV4_IFACE_NODE, &ldp_discovery_holdtime_cmd);
-       install_element(LDP_IPV4_IFACE_NODE, &ldp_discovery_interval_cmd);
+       install_element(LDP_IPV4_IFACE_NODE, &ldp_discovery_link_holdtime_cmd);
+       install_element(LDP_IPV4_IFACE_NODE, &ldp_discovery_link_interval_cmd);

 
 

-       install_element(LDP_IPV6_IFACE_NODE, &ldp_discovery_holdtime_cmd);
-       install_element(LDP_IPV6_IFACE_NODE, &ldp_discovery_interval_cmd);
+       install_element(LDP_IPV6_IFACE_NODE, &ldp_discovery_link_holdtime_cmd);
+       install_element(LDP_IPV6_IFACE_NODE, &ldp_discovery_link_interval_cmd);

 
        install_element(LDP_L2VPN_NODE, &ldp_bridge_cmd);
        install_element(LDP_L2VPN_NODE, &ldp_mtu_cmd);
 
        install_element(LDP_L2VPN_NODE, &ldp_bridge_cmd);
        install_element(LDP_L2VPN_NODE, &ldp_mtu_cmd);