Commit a8331a6e authored by Antenore Gatta's avatar Antenore Gatta

libssh deprecation warning - wrong name space

parent 1b235690
......@@ -281,7 +281,7 @@ static gboolean remmina_nx_session_get_response(RemminaNXSession *nx)
return FALSE;
buffer = buffer_new();
len = ssh_channel_read_buffer(nx->channel, buffer, len, is_stderr);
len = channel_read_buffer(nx->channel, buffer, len, is_stderr);
if (len <= 0) {
remmina_nx_session_set_application_error(nx, "Channel closed.");
return FALSE;
......
......@@ -40,6 +40,7 @@
/* Define this before stdlib.h to have posix_openpt */
#define _XOPEN_SOURCE 600
#include <libssh/libssh.h>
#include <gtk/gtk.h>
#include <glib/gi18n.h>
#include <stdlib.h>
......@@ -734,8 +735,7 @@ remmina_ssh_tunnel_main_thread_proc (gpointer data)
case REMMINA_SSH_TUNNEL_XPORT:
/* Detect the next available port starting from 6010 on the server */
for (i = 10; i <= MAX_X_DISPLAY_NUMBER; i++) {
if (ssh_channel_listen_forward (REMMINA_SSH (tunnel)->session,
(tunnel->bindlocalhost ? "localhost" : NULL), 6000 + i, NULL)) {
if (ssh_forward_listen (REMMINA_SSH (tunnel)->session, (tunnel->bindlocalhost ? "localhost" : NULL), 6000 + i, NULL)) {
continue;
} else {
tunnel->remotedisplay = i;
......@@ -763,7 +763,7 @@ remmina_ssh_tunnel_main_thread_proc (gpointer data)
break;
case REMMINA_SSH_TUNNEL_REVERSE:
if (ssh_channel_listen_forward (REMMINA_SSH (tunnel)->session, NULL, tunnel->port, NULL)) {
if (ssh_forward_listen (REMMINA_SSH (tunnel)->session, NULL, tunnel->port, NULL)) {
remmina_ssh_set_error (REMMINA_SSH (tunnel), _("Failed to request port forwarding : %s"));
if (tunnel->disconnect_func) {
(*tunnel->disconnect_func) (tunnel, tunnel->callback_data);
......@@ -813,7 +813,7 @@ remmina_ssh_tunnel_main_thread_proc (gpointer data)
}
if (tunnel->tunnel_type == REMMINA_SSH_TUNNEL_REVERSE) {
/* For reverse tunnel, we only need one connection. */
ssh_channel_cancel_forward (REMMINA_SSH (tunnel)->session, NULL, tunnel->port);
ssh_forward_cancel (REMMINA_SSH (tunnel)->session, NULL, tunnel->port);
}
} else if (tunnel->tunnel_type != REMMINA_SSH_TUNNEL_REVERSE) {
/* Poll once per some period of time if no incoming connections.
......@@ -1105,7 +1105,7 @@ remmina_ssh_tunnel_free (RemminaSSHTunnel* tunnel)
}
if (tunnel->tunnel_type == REMMINA_SSH_TUNNEL_XPORT && tunnel->remotedisplay > 0) {
ssh_channel_cancel_forward (REMMINA_SSH (tunnel)->session,
ssh_forward_cancel (REMMINA_SSH (tunnel)->session,
NULL, 6000 + tunnel->remotedisplay);
}
if (tunnel->server_sock >= 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment