Commit 184de2ed authored by Antenore Gatta's avatar Antenore Gatta

libssh depracation warnings

parent 6d3830cf
......@@ -276,12 +276,12 @@ static gboolean remmina_nx_session_get_response(RemminaNXSession *nx)
timeout.tv_usec = 0;
ch[0] = nx->channel;
ch[1] = NULL;
channel_select(ch, NULL, NULL, &timeout);
ssh_channel_select(ch, NULL, NULL, &timeout);
is_stderr = 0;
while (is_stderr <= 1)
{
len = channel_poll(nx->channel, is_stderr);
len = ssh_channel_poll(nx->channel, is_stderr);
if (len == SSH_ERROR)
{
remmina_nx_session_set_error(nx, "Error reading channel: %s");
......@@ -295,7 +295,7 @@ static gboolean remmina_nx_session_get_response(RemminaNXSession *nx)
return FALSE;
buffer = buffer_new();
len = channel_read_buffer(nx->channel, buffer, len, is_stderr);
len = ssh_channel_read_buffer(nx->channel, buffer, len, is_stderr);
if (len <= 0)
{
remmina_nx_session_set_application_error(nx, "Channel closed.");
......
......@@ -701,7 +701,7 @@ gboolean remmina_protocol_widget_ssh_exec(RemminaProtocolWidget* gp, gboolean wa
gchar *cmd, *ptr;
va_list args;
if ((channel = channel_new (REMMINA_SSH (tunnel)->session)) == NULL)
if ((channel = ssh_channel_new (REMMINA_SSH (tunnel)->session)) == NULL)
{
return FALSE;
}
......@@ -710,13 +710,13 @@ gboolean remmina_protocol_widget_ssh_exec(RemminaProtocolWidget* gp, gboolean wa
cmd = g_strdup_vprintf (fmt, args);
va_end (args);
if (channel_open_session (channel) == SSH_OK &&
channel_request_exec (channel, cmd) == SSH_OK)
if (ssh_channel_open_session (channel) == SSH_OK &&
ssh_channel_request_exec (channel, cmd) == SSH_OK)
{
if (wait)
{
channel_send_eof (channel);
status = channel_get_exit_status (channel);
ssh_channel_send_eof (channel);
status = ssh_channel_get_exit_status (channel);
ptr = strchr (cmd, ' ');
if (ptr) *ptr = '\0';
switch (status)
......@@ -745,8 +745,8 @@ gboolean remmina_protocol_widget_ssh_exec(RemminaProtocolWidget* gp, gboolean wa
}
g_free(cmd);
if (wait)
channel_close (channel);
channel_free (channel);
ssh_channel_close (channel);
ssh_channel_free (channel);
return ret;
#else
......
This diff is collapsed.
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