Commit 5e7a48fd authored by Antenore Gatta's avatar Antenore Gatta

Applying codying style guide

parent adf19655
......@@ -1043,7 +1043,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 LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 7, 0)
#if LIBSSH_VERSION_INT >= SSH_VERSION_INT(0, 7, 0)
if (ssh_channel_listen_forward(REMMINA_SSH(tunnel)->session, (tunnel->bindlocalhost ? "localhost" : NULL), 6000 + i, NULL)) {
continue;
}else {
......@@ -1080,9 +1080,9 @@ remmina_ssh_tunnel_main_thread_proc(gpointer data)
break;
case REMMINA_SSH_TUNNEL_REVERSE:
#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 7, 0)
#if LIBSSH_VERSION_INT >= SSH_VERSION_INT(0, 7, 0)
if (ssh_channel_listen_forward(REMMINA_SSH(tunnel)->session, NULL, tunnel->port, NULL)) {
remmina_ssh_set_error(REMMINA_SSH (tunnel), _("Failed to request port forwarding: %s"));
remmina_ssh_set_error(REMMINA_SSH(tunnel), _("Failed to request port forwarding: %s"));
if (tunnel->disconnect_func) {
(*tunnel->disconnect_func)(tunnel, tunnel->callback_data);
}
......@@ -1091,7 +1091,7 @@ remmina_ssh_tunnel_main_thread_proc(gpointer data)
}
#else
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"));
remmina_ssh_set_error(REMMINA_SSH(tunnel), _("Failed to request port forwarding: %s"));
if (tunnel->disconnect_func) {
(*tunnel->disconnect_func)(tunnel, tunnel->callback_data);
}
......@@ -1141,10 +1141,10 @@ remmina_ssh_tunnel_main_thread_proc(gpointer data)
}
if (tunnel->tunnel_type == REMMINA_SSH_TUNNEL_REVERSE) {
/* For reverse tunnel, we only need one connection. */
#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 7, 0)
ssh_channel_cancel_forward(REMMINA_SSH (tunnel)->session, NULL, tunnel->port);
#if LIBSSH_VERSION_INT >= SSH_VERSION_INT(0, 7, 0)
ssh_channel_cancel_forward(REMMINA_SSH(tunnel)->session, NULL, tunnel->port);
#else
ssh_forward_cancel(REMMINA_SSH (tunnel)->session, NULL, tunnel->port);
ssh_forward_cancel(REMMINA_SSH(tunnel)->session, NULL, tunnel->port);
#endif
}
}else if (tunnel->tunnel_type != REMMINA_SSH_TUNNEL_REVERSE) {
......@@ -1462,10 +1462,10 @@ remmina_ssh_tunnel_free(RemminaSSHTunnel* tunnel)
}
if (tunnel->tunnel_type == REMMINA_SSH_TUNNEL_XPORT && tunnel->remotedisplay > 0) {
#if LIBSSH_VERSION_INT >= SSH_VERSION_INT (0, 7, 0)
ssh_channel_cancel_forward(REMMINA_SSH (tunnel)->session, NULL, 6000 + tunnel->remotedisplay);
#if LIBSSH_VERSION_INT >= SSH_VERSION_INT(0, 7, 0)
ssh_channel_cancel_forward(REMMINA_SSH(tunnel)->session, NULL, 6000 + tunnel->remotedisplay);
#else
ssh_forward_cancel(REMMINA_SSH (tunnel)->session, NULL, 6000 + tunnel->remotedisplay);
ssh_forward_cancel(REMMINA_SSH(tunnel)->session, NULL, 6000 + tunnel->remotedisplay);
#endif
}
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