Merge pull request #5721 from mjstapp/vty_copy_to_runn

[mirror_frr.git] / bfdd / config.c

diff --git a/bfdd/config.c b/bfdd/config.c
index cd57ea9fe38b03ecd01aeb7dfe1cf4744b7299d9..dd4a1926942bd66c41d618e825fbd448977d6d29 100644 (file)
--- a/bfdd/config.c
+++ b/bfdd/config.c
@@ -30,6 +30,8 @@
 
 #include "bfd.h"
 
+DEFINE_MTYPE_STATIC(BFDD, BFDD_LABEL, "long-lived label memory")
+
 /*
  * Definitions
  */
@@ -68,7 +70,7 @@ static int config_add(struct bfd_peer_cfg *bpc,
 static int config_del(struct bfd_peer_cfg *bpc,
                      void *arg __attribute__((unused)))
 {
-       return ptm_bfd_ses_del(bpc) != 0;
+       return ptm_bfd_sess_del(bpc) != 0;
 }
 
 static int parse_config_json(struct json_object *jo, bpc_handle h, void *arg)
@@ -213,7 +215,8 @@ static int parse_peer_config(struct json_object *jo, struct bfd_peer_cfg *bpc)
                        if (strlcpy(bpc->bpc_localif, sval,
                                    sizeof(bpc->bpc_localif))
                            > sizeof(bpc->bpc_localif)) {
-                               log_debug("\tlocal-interface: %s (truncated)");
+                               log_debug("\tlocal-interface: %s (truncated)",
+                                         sval);
                                error++;
                        } else {
                                log_debug("\tlocal-interface: %s", sval);
@@ -233,7 +236,7 @@ static int parse_peer_config(struct json_object *jo, struct bfd_peer_cfg *bpc)
                        bpc->bpc_detectmultiplier =
                                json_object_get_int64(jo_val);
                        bpc->bpc_has_detectmultiplier = true;
-                       log_debug("\tdetect-multiplier: %llu",
+                       log_debug("\tdetect-multiplier: %u",
                                  bpc->bpc_detectmultiplier);
                } else if (strcmp(key, "receive-interval") == 0) {
                        bpc->bpc_recvinterval = json_object_get_int64(jo_val);