commit 506354a02199263e82c8ae977c99295ac25ee604
author roman <xjanot04@fit.vutbr.cz> Thu Apr 11 09:37:22 2024 +0200
committer Michal Vasko <mvasko@cesnet.cz> Tue May 14 11:40:10 2024 +0200
tree f8d3382ea6de85a6400ab15400b5bd09c8e39c89
parent 008cfe73dfab6e3c6ec81f6cf44cc4bc00cb579b

session UPDATE rename transport implementations

src/server_config_util.c

diff --git a/src/server_config_util.c b/src/server_config_util.c
index 9fcea1f..d7c627c 100644
--- a/src/server_config_util.c
+++ b/src/server_config_util.c
@@ -877,11 +877,11 @@
 
     NC_CHECK_ARG_RET(NULL, ctx, endpt_name, address, config, 1);
 
-    if (transport == NC_TI_LIBSSH) {
+    if (transport == NC_TI_SSH) {
         /* SSH path */
         address_fmt = "/ietf-netconf-server:netconf-server/listen/endpoints/endpoint[name='%s']/ssh/tcp-server-parameters/local-address";
         port_fmt = "/ietf-netconf-server:netconf-server/listen/endpoints/endpoint[name='%s']/ssh/tcp-server-parameters/local-port";
-    } else if (transport == NC_TI_OPENSSL) {
+    } else if (transport == NC_TI_TLS) {
         /* TLS path */
         address_fmt = "/ietf-netconf-server:netconf-server/listen/endpoints/endpoint[name='%s']/tls/tcp-server-parameters/local-address";
         port_fmt = "/ietf-netconf-server:netconf-server/listen/endpoints/endpoint[name='%s']/tls/tcp-server-parameters/local-port";
@@ -915,11 +915,11 @@
 
     NC_CHECK_ARG_RET(NULL, ctx, client_name, endpt_name, address, port, config, 1);
 
-    if (transport == NC_TI_LIBSSH) {
+    if (transport == NC_TI_SSH) {
         /* SSH path */
         address_fmt = "/ietf-netconf-server:netconf-server/call-home/netconf-client[name='%s']/endpoints/endpoint[name='%s']/ssh/tcp-client-parameters/remote-address";
         port_fmt = "/ietf-netconf-server:netconf-server/call-home/netconf-client[name='%s']/endpoints/endpoint[name='%s']/ssh/tcp-client-parameters/remote-port";
-    } else if (transport == NC_TI_OPENSSL) {
+    } else if (transport == NC_TI_TLS) {
         /* TLS path */
         address_fmt = "/ietf-netconf-server:netconf-server/call-home/netconf-client[name='%s']/endpoints/endpoint[name='%s']/tls/tcp-client-parameters/remote-address";
         port_fmt = "/ietf-netconf-server:netconf-server/call-home/netconf-client[name='%s']/endpoints/endpoint[name='%s']/tls/tcp-client-parameters/remote-port";
@@ -993,10 +993,10 @@
     NC_CHECK_ARG_RET(NULL, ctx, asym_key_name, privkey_path, config, 1);
 
     /* get the keys as a string from the given files */
-    if (ti == NC_TI_LIBSSH) {
+    if (ti == NC_TI_SSH) {
         ret = nc_server_config_util_get_asym_key_pair(privkey_path, pubkey_path, NC_PUBKEY_FORMAT_SSH, &privkey,
                 &privkey_type, &pubkey);
-    } else if (ti == NC_TI_OPENSSL) {
+    } else if (ti == NC_TI_TLS) {
         ret = nc_server_config_util_get_asym_key_pair(privkey_path, pubkey_path, NC_PUBKEY_FORMAT_X509, &privkey,
                 &privkey_type, &pubkey);
     } else {
@@ -1009,7 +1009,7 @@
     }
 
     /* get pubkey format str */
-    if (ti == NC_TI_LIBSSH) {
+    if (ti == NC_TI_SSH) {
         pubkey_format = "ietf-crypto-types:ssh-public-key-format";
     } else {
         pubkey_format = "ietf-crypto-types:subject-public-key-info-format";