Merge pull request #6789 from volta-networks/feat_ldp_igp_sync

ldpd: Add support for LDP-IGP Synchronization

diff --cc isisd/isis_circuit.c
Simple merge

diff --cc isisd/isis_cli.c
Simple merge

diff --cc isisd/isis_main.c
Simple merge

diff --cc isisd/isis_nb.c
Simple merge

diff --cc isisd/isis_nb.h
Simple merge

diff --cc isisd/isis_nb_config.c
Simple merge

diff --cc isisd/isis_zebra.c
Simple merge

diff --cc isisd/isisd.c
index 2a2c71b1fd551a118aec72b593c0c059d3229ce9,438d87d9fb5bf00a7a78bddf6497b61dfecf3c92..7bba783b39ce5b56dbbe5529767c61e92afdfbed
--- 1/isisd/isisd.c
--- 2/isisd/isisd.c
+++ b/isisd/isisd.c
@@@ -1668,13 -1557,34 +1677,34 @@@ DEFUN (no_debug_isis_bfd
        return CMD_SUCCESS;
  }
  
- DEFUN(show_hostname, show_hostname_cmd,
-       "show " PROTO_NAME " [vrf <NAME|all>] hostname",
-       SHOW_STR PROTO_HELP VRF_CMD_HELP_STR
-       "All VRFs\n"
-       "IS-IS Dynamic hostname mapping\n")
+ DEFUN(debug_isis_ldp_sync, debug_isis_ldp_sync_cmd,
+       "debug " PROTO_NAME " ldp-sync",
+       DEBUG_STR PROTO_HELP PROTO_NAME " interaction with LDP-Sync\n")
+ {
+       debug_ldp_sync |= DEBUG_LDP_SYNC;
+       print_debug(vty, DEBUG_LDP_SYNC, 1);
+ 
+       return CMD_SUCCESS;
+ }
+ 
+ DEFUN(no_debug_isis_ldp_sync, no_debug_isis_ldp_sync_cmd,
+       "no debug " PROTO_NAME " ldp-sync",
+       NO_STR UNDEBUG_STR PROTO_HELP PROTO_NAME " interaction with LDP-Sync\n")
+ {
+       debug_ldp_sync &= ~DEBUG_LDP_SYNC;
+       print_debug(vty, DEBUG_LDP_SYNC, 0);
+ 
+       return CMD_SUCCESS;
+ }
+ 
+ DEFUN (show_hostname,
+        show_hostname_cmd,
+        "show " PROTO_NAME " hostname",
+        SHOW_STR
+        PROTO_HELP
+        "IS-IS Dynamic hostname mapping\n")
  {
 -      struct listnode *nnode, *inode;
 +      struct listnode *node;
        const char *vrf_name = VRF_DEFAULT_NAME;
        bool all_vrf = false;
        int idx_vrf = 0;

diff --cc isisd/isisd.h
Simple merge

diff --cc ldpd/ldp_vty_cmds.c
Simple merge

diff --cc ldpd/ldpd.c
Simple merge

diff --cc ldpd/ldpe.c
Simple merge

diff --cc lib/zclient.h
Simple merge

diff --cc ospfd/ospf_interface.c
Simple merge

diff --cc ospfd/ospf_vty.c
Simple merge

diff --cc ospfd/ospf_zebra.c
Simple merge

diff --cc ospfd/ospfd.c
Simple merge

diff --cc ospfd/ospfd.h
Simple merge

diff --cc yang/frr-isisd.yang
Simple merge