cmake UPDATE libnetconf2 updates

CESNET · May 14, 2024 · 572441f · 572441f
1 parent c14b7bb
commit 572441f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -49,8 +49,8 @@ set(LIBYANG_DEP_SOVERSION 3.0.0)
 set(LIBYANG_DEP_SOVERSION_MAJOR 3)
 
 # libnetconf2 required version
-set(LIBNETCONF2_DEP_VERSION 3.0.10)
-set(LIBNETCONF2_DEP_SOVERSION 4.1.7)
+set(LIBNETCONF2_DEP_VERSION 3.1.1)
+set(LIBNETCONF2_DEP_SOVERSION 4.2.0)
 set(LIBNETCONF2_DEP_SOVERSION_MAJOR 4)
 
 # sysrepo required version

diff --git a/cli/commands.c b/cli/commands.c
@@ -2773,12 +2773,12 @@ cmd_status(const char *UNUSED(arg), char **UNUSED(tmp_config_file))
         printf("  ID          : %u\n", nc_session_get_id(session));
         switch (transport) {
 #ifdef NC_ENABLED_SSH_TLS
-        case NC_TI_LIBSSH:
+        case NC_TI_SSH:
             s = "SSH";
             printf("  Host        : %s\n", nc_session_get_host(session));
             printf("  Port        : %u\n", nc_session_get_port(session));
             break;
-        case NC_TI_OPENSSL:
+        case NC_TI_TLS:
             s = "TLS";
             printf("  Host        : %s\n", nc_session_get_host(session));
             printf("  Port        : %u\n", nc_session_get_port(session));
@@ -2867,10 +2867,10 @@ cmd_connect_listen(const char *arg, int is_connect)
             break;
 #ifdef NC_ENABLED_SSH_TLS
         case 's':
-            ti = NC_TI_LIBSSH;
+            ti = NC_TI_SSH;
             break;
         case 't':
-            ti = NC_TI_OPENSSL;
+            ti = NC_TI_TLS;
             break;
 #endif
         case 'u':
@@ -2884,7 +2884,7 @@ cmd_connect_listen(const char *arg, int is_connect)
     if (!ti) {
         /* default transport */
 #ifdef NC_ENABLED_SSH_TLS
-        ti = NC_TI_LIBSSH;
+        ti = NC_TI_SSH;
 #endif
     }
 
@@ -2900,10 +2900,10 @@ cmd_connect_listen(const char *arg, int is_connect)
         ret = cmd_connect_listen_unix(&cmd, is_connect);
         break;
 #ifdef NC_ENABLED_SSH_TLS
-    case NC_TI_LIBSSH:
+    case NC_TI_SSH:
         ret = cmd_connect_listen_ssh(&cmd, is_connect);
         break;
-    case NC_TI_OPENSSL:
+    case NC_TI_TLS:
         ret = cmd_connect_listen_tls(&cmd, is_connect);
         break;
 #endif

diff --git a/src/netconf_monitoring.c b/src/netconf_monitoring.c
@@ -67,9 +67,9 @@ ncm_is_monitored(struct nc_session *session)
 {
     switch (nc_session_get_ti(session)) {
 #ifdef NC_ENABLED_SSH_TLS
-    case NC_TI_LIBSSH:
+    case NC_TI_SSH:
         return 1;
-    case NC_TI_OPENSSL:
+    case NC_TI_TLS:
         return 1;
 #endif
     default:
@@ -347,10 +347,10 @@ np2srv_ncm_oper_cb(sr_session_ctx_t *session, uint32_t UNUSED(sub_id), const cha
 
             switch (nc_session_get_ti(stats.sessions[i])) {
 #ifdef NC_ENABLED_SSH_TLS
-            case NC_TI_LIBSSH:
+            case NC_TI_SSH:
                 lyd_new_term(list, NULL, "transport", "netconf-ssh", 0, NULL);
                 break;
-            case NC_TI_OPENSSL:
+            case NC_TI_TLS:
                 lyd_new_term(list, NULL, "transport", "netconf-tls", 0, NULL);
                 break;
 #endif