repair all bugs

Author: Petr Hanzlik

cli/configuration.c

@@ -14,13 +14,15 @@
  *     https://opensource.org/licenses/BSD-3-Clause
  */
 
+
 #define _GNU_SOURCE
 #include <assert.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <pwd.h>
 #include <stdio.h>
+#include <stdint.h>
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
@@ -314,27 +316,32 @@ load_config(void)
             /* <netconf-client> -> <output-format> */
             if (!strcmp(lyd_get_value(child), "json")) {
                 opts.output_format = LYD_JSON;
-                opts.output_flag = 0;
-            } else if (!strcmp(lyd_get_value(child), "json_noformat")) {
-                opts.output_format = LYD_JSON;
-                opts.output_flag = LYD_PRINT_SHRINK;
-            } else if (!strcmp(lyd_get_value(child), "xml_noformat")) {
-                opts.output_format = LYD_XML;
-                opts.output_flag = LYD_PRINT_SHRINK;
+            } /* else default (formatted XML) */
+        } else if (!strcmp(LYD_NAME(child), "shrink")) {
+            /* <netconf-client> -> <shrink> */
+            if (!strcmp(lyd_get_value(child), "true")) {
+                opts.output_flag = 1;
             } /* else default (formatted XML) */
         }
 #ifdef NC_ENABLED_SSH_TLS
         else if (!strcmp(LYD_NAME(child), "authentication")) {
             /* <netconf-client> -> <authentication> */
             LY_LIST_FOR(lyd_child(child), auth_child) {
-                if (!strcmp(LYD_NAME(auth_child), "method-preference ")) {
+                if (!strcmp(LYD_NAME(auth_child), "method-preference")) {
                     LY_LIST_FOR(lyd_child(auth_child), pref_child) {
+                        uint16_t pref_value;
+                        if (!strcmp(lyd_get_value(pref_child), "disabled")) {
+                            pref_value = -1;
+                        } else {
+                            pref_value = strtoul(lyd_get_value(pref_child), NULL, 10);
+                        }
+
                         if (!strcmp(LYD_NAME(pref_child), "publickey")) {
-                            nc_client_ssh_set_auth_pref(NC_SSH_AUTH_PUBLICKEY, atoi(lyd_get_value(pref_child)));
+                            nc_client_ssh_set_auth_pref(NC_SSH_AUTH_PUBLICKEY, pref_value);
                         } else if (!strcmp(LYD_NAME(pref_child), "interactive")) {
-                            nc_client_ssh_set_auth_pref(NC_SSH_AUTH_INTERACTIVE, atoi(lyd_get_value(pref_child)));
+                            nc_client_ssh_set_auth_pref(NC_SSH_AUTH_INTERACTIVE, pref_value);
                         } else if (!strcmp(LYD_NAME(pref_child), "password")) {
-                            nc_client_ssh_set_auth_pref(NC_SSH_AUTH_PASSWORD, atoi(lyd_get_value(pref_child)));
+                            nc_client_ssh_set_auth_pref(NC_SSH_AUTH_PASSWORD, pref_value);
                         }
                     }
                 } else if (!strcmp(LYD_NAME(auth_child), "keys")) {
@@ -368,19 +375,38 @@ load_config(void)
     free(netconf_dir);
 }
 
+int 
+store_pref(int pref_type, struct lyd_node *pref_parent, const char *pref_name) 
+{
+    int pref_value;
+    char buf[23];
+
+    pref_value = nc_client_ssh_get_auth_pref(pref_type);
+    if (pref_value < 0) {
+        if (lyd_new_term(pref_parent, NULL, pref_name, "disabled", 0, NULL)) {
+            return 1;
+        }
+    } else {
+        sprintf(buf, "%d", pref_value);
+        if (lyd_new_term(pref_parent, NULL, pref_name, buf, 0, NULL)) {
+            return 1;
+        }
+    }
+
+    return 0;
+}
+
 void
 store_config(void)
 {
 #ifdef NC_ENABLED_SSH_TLS
-    char buf[23];
     struct lyd_node *auth, *pref, *keys, *pair;
 #endif /* NC_ENABLED_SSH_TLS */
     char *netconf_dir = NULL, *history_file = NULL, *config_file = NULL;
     struct ly_ctx *ctx = NULL;
     struct lyd_node *root = NULL;
     struct lys_module *cli = NULL;
     const char *str;
-    int pref_value;
 
     if (ly_ctx_new(NULL, 0, &ctx)) {
         ERROR(__func__, "Failed to create context.");
@@ -439,41 +465,17 @@ store_config(void)
     if (lyd_new_inner(auth, NULL, "method-preference", 0,&pref)) {
         goto cleanup;
     }
-
-    pref_value = nc_client_ssh_get_auth_pref(NC_SSH_AUTH_PUBLICKEY);
-    if (pref_value < 0) {
-        if (lyd_new_term(pref, NULL, "publickey", "disabled", 0, NULL)) {
-            goto cleanup;
-        }
-    } else {
-        sprintf(buf, "%d", pref_value);
-        if (lyd_new_term(pref, NULL, "publickey", buf, 0, NULL)) {
-            goto cleanup;
-        }
+    
+    if (store_pref(NC_SSH_AUTH_PUBLICKEY, pref, "publickey")) {
+        goto cleanup;
     }
 
-    pref_value = nc_client_ssh_get_auth_pref(NC_SSH_AUTH_PASSWORD);
-    if (pref_value < 0) {
-        if (lyd_new_term(pref, NULL, "password", "disabled", 0, NULL)) {
-            goto cleanup;
-        }
-    } else {
-        sprintf(buf, "%d", pref_value);
-        if (lyd_new_term(pref, NULL, "password", buf, 0, NULL)) {
-            goto cleanup;
-        }
+    if (store_pref(NC_SSH_AUTH_PASSWORD, pref, "password")) {
+        goto cleanup;
     }
 
-    pref_value = nc_client_ssh_get_auth_pref(NC_SSH_AUTH_INTERACTIVE);
-    if (pref_value < 0) {
-        if (lyd_new_term(pref, NULL, "interactive", "disabled", 0, NULL)) {
-            goto cleanup;
-        }
-    } else {
-        sprintf(buf, "%d", nc_client_ssh_get_auth_pref(NC_SSH_AUTH_INTERACTIVE));
-        if (lyd_new_term(pref, NULL, "interactive", buf, 0, NULL)) {
-            goto cleanup;
-        }
+    if (store_pref(NC_SSH_AUTH_INTERACTIVE, pref, "interactive")) {
+        goto cleanup;
     }
 
     /* keys */