Merge pull request #9492 from Jafaral/pim-cov

[mirror_frr.git] / pathd / path_pcep_debug.c

diff --git a/pathd/path_pcep_debug.c b/pathd/path_pcep_debug.c
index bcaadfe4d855757f8a5fde37526e00b593051a81..b0802ae6c3ecb0c19bb37675396a6f4477aea2db 100644 (file)
--- a/pathd/path_pcep_debug.c
+++ b/pathd/path_pcep_debug.c
@@ -16,6 +16,8 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <zebra.h>
+
 #include <string.h>
 #include <stdbool.h>
 #include <time.h>
@@ -636,8 +638,8 @@ const char *pcep_message_type_name(enum pcep_message_types pcep_message_type)
                return "UPDATE";
        case PCEP_TYPE_INITIATE:
                return "INITIATE";
-       case PCEP_TYPE_UNKOWN_MSG:
-               return "UNKOWN_MSG";
+       case PCEP_TYPE_START_TLS:
+               return "START_TLS";
        default:
                return "UNKNOWN";
        }
@@ -778,6 +780,10 @@ const char *pcep_tlv_type_name(enum pcep_object_tlv_types tlv_type)
        switch (tlv_type) {
        case PCEP_OBJ_TLV_TYPE_NO_PATH_VECTOR:
                return "NO_PATH_VECTOR";
+       case PCEP_OBJ_TLV_TYPE_OBJECTIVE_FUNCTION_LIST:
+               return "OBJECTIVE_FUNCTION_LIST";
+       case PCEP_OBJ_TLV_TYPE_VENDOR_INFO:
+               return "VENDOR_INFO";
        case PCEP_OBJ_TLV_TYPE_STATEFUL_PCE_CAPABILITY:
                return "STATEFUL_PCE_CAPABILITY";
        case PCEP_OBJ_TLV_TYPE_SYMBOLIC_PATH_NAME:
@@ -800,6 +806,18 @@ const char *pcep_tlv_type_name(enum pcep_object_tlv_types tlv_type)
                return "PATH_SETUP_TYPE";
        case PCEP_OBJ_TLV_TYPE_PATH_SETUP_TYPE_CAPABILITY:
                return "PATH_SETUP_TYPE_CAPABILITY";
+       case PCEP_OBJ_TLV_TYPE_SRPOLICY_POL_ID:
+               return "SRPOLICY_POL_ID";
+       case PCEP_OBJ_TLV_TYPE_SRPOLICY_POL_NAME:
+               return "SRPOLICY_POL_NAME";
+       case PCEP_OBJ_TLV_TYPE_SRPOLICY_CPATH_ID:
+               return "SRPOLICY_CPATH_ID";
+       case PCEP_OBJ_TLV_TYPE_SRPOLICY_CPATH_PREFERENCE:
+               return "SRPOLICY_CPATH_PREFERENCE";
+       case PCEP_OBJ_TLV_TYPE_UNKNOWN:
+               return "UNKNOWN";
+       case PCEP_OBJ_TLV_TYPE_ARBITRARY:
+               return "ARBITRARY";
        default:
                return "UNKNOWN";
        }
@@ -973,18 +991,6 @@ const char *format_pcep_message(struct pcep_message *msg)
        return PATHD_FORMAT_FINI();
 }
 
-const char *format_yang_dnode(struct lyd_node *dnode)
-{
-       char *buff;
-       int len;
-
-       lyd_print_mem(&buff, dnode, LYD_JSON, LYP_FORMAT);
-       len = strlen(buff);
-       memcpy(_debug_buff, buff, len);
-       free(buff);
-       return _debug_buff;
-}
-
 void _format_pcc_opts(int ps, struct pcc_opts *opts)
 {
        if (opts == NULL) {
@@ -1288,7 +1294,7 @@ void _format_path_hop(int ps, struct path_hop *hop)
                                     &hop->nai.remote_addr.ipaddr_v6);
                        break;
                case PCEP_SR_SUBOBJ_NAI_UNNUMBERED_IPV4_ADJACENCY:
-                       PATHD_FORMAT("%*sNAI: %pI4(%u)/%pI4(%u)\n", ps, "",
+                       PATHD_FORMAT("%*sNAI: %pI6(%u)/%pI6(%u)\n", ps, "",
                                     &hop->nai.local_addr.ipaddr_v6,
                                     hop->nai.local_iface,
                                     &hop->nai.remote_addr.ipaddr_v6,