session MAINTENANCE socket functions reorganized
Some will be used in both client and server for
Call Home.
diff --git a/src/session_client_ssh.c b/src/session_client_ssh.c
index 613a5de..086b830 100644
--- a/src/session_client_ssh.c
+++ b/src/session_client_ssh.c
@@ -943,7 +943,7 @@
}
/* create and assign communication socket */
- sock = nc_connect_getsocket(host, port);
+ sock = nc_sock_connect(host, port);
if (sock == -1) {
goto fail;
}
@@ -1029,7 +1029,7 @@
ssh_options_set(session->ti.libssh.session, SSH_OPTIONS_HOST, host);
/* create and connect socket */
- sock = nc_connect_getsocket(host, port);
+ sock = nc_sock_connect(host, port);
if (sock == -1) {
goto fail;
}
@@ -1192,7 +1192,7 @@
port = NC_PORT_CH_SSH;
}
- sock = nc_callhome_accept_connection(port, timeout, NULL, &server_host);
+ sock = nc_sock_accept(port, timeout, &server_host, NULL);
if (sock == -1) {
return NULL;
}