commit c111ac5a3c680e49655141b318e86e239450bde6
author Michal Vasko <mvasko@cesnet.cz> Tue Dec 08 14:36:36 2015 +0100
committer Michal Vasko <mvasko@cesnet.cz> Tue Dec 08 14:36:36 2015 +0100
tree 563cdb1d83667a6da960f17e572f37d0fefef216
parent a601f5ceeb4086c44ac52d61f033332ca5cabe3c

session REFACTOR name changes and minor enhancements

src/session_ssh.c

diff --git a/src/session_ssh.c b/src/session_ssh.c
index 81a717b..cb8901d 100644
--- a/src/session_ssh.c
+++ b/src/session_ssh.c
@@ -53,14 +53,14 @@
 };
 
 API void
-nc_client_init_ssh(void)
+nc_ssh_client_init(void)
 {
     ssh_threads_set_callbacks(ssh_threads_get_pthread());
     ssh_init();
 }
 
 API void
-nc_client_destroy_ssh(void)
+nc_ssh_client_destroy(void)
 {
     int i;
 
@@ -510,7 +510,7 @@
                 /* store the key into the host file */
                 ret = ssh_write_knownhost(session);
                 if (ret < 0) {
-                    WRN("Adding the known host %s failed (%s).", hostname, strerror(errno));
+                    WRN("Adding the known host %s failed (%s).", hostname, ssh_get_error(session));
                 }
             } else if (!strcmp("no", answer)) {
                 goto fail;
@@ -538,7 +538,7 @@
 }
 
 API int
-nc_add_ssh_keypair(const char *pub_key, const char *priv_key)
+nc_ssh_add_keypair(const char *pub_key, const char *priv_key)
 {
     int i;
     FILE *key;
@@ -596,7 +596,7 @@
 }
 
 API int
-nc_del_ssh_keypair(int idx)
+nc_ssh_del_keypair(int idx)
 {
     if (idx >= ssh_opts.key_count) {
         return EXIT_FAILURE;
@@ -614,13 +614,13 @@
 }
 
 API int
-nc_get_ssh_keypair_count(void)
+nc_ssh_get_keypair_count(void)
 {
     return ssh_opts.key_count;
 }
 
 API int
-nc_get_ssh_keypair(int idx, const char **pub_key, const char **priv_key)
+nc_ssh_get_keypair(int idx, const char **pub_key, const char **priv_key)
 {
     if (idx >= ssh_opts.key_count) {
         return EXIT_FAILURE;
@@ -637,7 +637,7 @@
 }
 
 API void
-nc_set_ssh_auth_pref(NC_SSH_AUTH_TYPE auth_type, short int pref)
+nc_ssh_set_auth_pref(NC_SSH_AUTH_TYPE auth_type, short int pref)
 {
     if (pref < 0) {
         pref = -1;
@@ -653,7 +653,7 @@
 }
 
 API short int
-nc_get_ssh_auth_pref(NC_SSH_AUTH_TYPE auth_type)
+nc_ssh_get_auth_pref(NC_SSH_AUTH_TYPE auth_type)
 {
     short int pref = 0;
 
@@ -716,7 +716,7 @@
     }
 
     /* select authentication according to preferences */
-    for (i = 0; i < SSH_AUTH_COUNT; i++) {
+    for (i = 0; i < NC_SSH_AUTH_COUNT; i++) {
         if (!(ssh_opts.auth_pref[i].type & auth)) {
             /* method not supported by server, skip */
             continue;
@@ -859,9 +859,9 @@
 }
 
 API struct nc_session *
-nc_connect_ssh(const char *host, unsigned short port, const char *username, struct ly_ctx *ctx)
+nc_connect_ssh(const char *host, uint16_t port, const char *username, struct ly_ctx *ctx)
 {
-    const int timeout = SSH_TIMEOUT;
+    const int timeout = NC_SSH_TIMEOUT;
     int sock;
     struct passwd *pw;
     struct nc_session *session = NULL;