Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / lib / northbound_db.c

diff --git a/lib/northbound_db.c b/lib/northbound_db.c
index 244e760b2be8082d8e55a963b6c26ef084ad9dbe..74abcde955a9e3c49971087c05d0c5cb301ec6b1 100644 (file)
--- a/lib/northbound_db.c
+++ b/lib/northbound_db.c
@@ -1,20 +1,7 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Copyright (C) 2018  NetDEF, Inc.
  *                     Renato Westphal
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 #include <zebra.h>
@@ -86,10 +73,13 @@ int nb_db_transaction_save(const struct nb_transaction *transaction,
        if (!ss)
                goto exit;
 
-       client_name = nb_client_name(transaction->context->client);
-       /* Always record configurations in the XML format. */
+       client_name = nb_client_name(transaction->context.client);
+       /*
+        * Always record configurations in the XML format, save the default
+        * values too, as this covers the case where defaults may change.
+        */
        if (lyd_print_mem(&config_str, transaction->config->dnode, LYD_XML,
-                         LYP_FORMAT | LYP_WITHSIBLINGS)
+                         LYD_PRINT_WITHSIBLINGS | LYD_PRINT_WD_ALL)
            != 0)
                goto exit;
 
@@ -149,6 +139,7 @@ struct nb_config *nb_db_transaction_load(uint32_t transaction_id)
        struct lyd_node *dnode;
        const char *config_str;
        struct sqlite3_stmt *ss;
+       LY_ERR err;
 
        ss = db_prepare(
                "SELECT\n"
@@ -169,10 +160,11 @@ struct nb_config *nb_db_transaction_load(uint32_t transaction_id)
        if (db_loadf(ss, "%s", &config_str) != 0)
                goto exit;
 
-       dnode = lyd_parse_mem(ly_native_ctx, config_str, LYD_XML,
-                             LYD_OPT_CONFIG);
-       if (!dnode)
-               flog_warn(EC_LIB_LIBYANG, "%s: lyd_parse_mem() failed",
+       err = lyd_parse_data_mem(ly_native_ctx, config_str, LYD_XML,
+                                LYD_PARSE_STRICT | LYD_PARSE_NO_STATE,
+                                LYD_VALIDATE_NO_STATE, &dnode);
+       if (err || !dnode)
+               flog_warn(EC_LIB_LIBYANG, "%s: lyd_parse_data_mem() failed",
                          __func__);
        else
                config = nb_config_new(dnode);