[X2Go-Commits] [x2goclient] 05/15: src/sshmasterconnection.cpp: replace deprecated channel_open_forward () function with ssh_channel_open_forward ().

git-admin at x2go.org git-admin at x2go.org
Sat Jan 28 18:43:09 CET 2017


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch feature/libssh-api-upgrade
in repository x2goclient.

commit 6a9f84b9aade4b8a0c6b87919eb9ed53036dfe4d
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Jan 28 17:45:31 2017 +0100

    src/sshmasterconnection.cpp: replace deprecated channel_open_forward () function with ssh_channel_open_forward ().
    
    Might break on ancient systems, but we don't care.
---
 debian/changelog            |    3 +++
 src/sshmasterconnection.cpp |   14 +++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f1b9498..320a023 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -572,6 +572,9 @@ x2goclient (4.1.0.0-0x2go1) UNRELEASED; urgency=medium
     - src/sshmasterconnection.cpp: replace deprecated channel_new () function
       with ssh_channel_new (). Might break on ancient systems, but we don't
       care. Also, add error handling in case ssh_channel_new () failed...
+    - src/sshmasterconnection.cpp: replace deprecated channel_open_forward ()
+      function with ssh_channel_open_forward (). Might break on ancient
+      systems, but we don't care.
 
   [ Bernard Cafarelli ]
   * New upstream version (4.1.0.0):
diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp
index 1b10511..2a822ef 100644
--- a/src/sshmasterconnection.cpp
+++ b/src/sshmasterconnection.cpp
@@ -1571,15 +1571,15 @@ void SshMasterConnection::channelLoop()
 #ifdef DEBUG
                     x2goDebug<<"Forwarding new channel, local port: "<<channelConnections.at ( i ).localPort<<endl;
 #endif
-                    if ( channel_open_forward ( channel,
-                                                channelConnections.at ( i ).forwardHost.toLatin1(),
-                                                channelConnections.at ( i ).forwardPort,
-                                                channelConnections.at ( i ).localHost.toLatin1(),
-                                                channelConnections.at ( i ).localPort ) != SSH_OK )
+                    if ( ssh_channel_open_forward ( channel,
+                                                    channelConnections.at ( i ).forwardHost.toLatin1(),
+                                                    channelConnections.at ( i ).forwardPort,
+                                                    channelConnections.at ( i ).localHost.toLatin1(),
+                                                    channelConnections.at ( i ).localPort ) != SSH_OK )
                     {
                         QString err=ssh_get_error ( my_ssh_session );
-                        QString errorMsg=tr ( "channel_open_forward failed." );
-                        emit ioErr ( channelConnections[i].creator, errorMsg, err );
+                        QString errorMsg=tr ( "ssh_channel_open_forward failed" );
+                        emit ioErr ( channelConnections[i].creator, errorMsg + ".", err );
 #ifdef DEBUG
                         x2goDebug<<errorMsg<<": "<<err<<endl;
 #endif

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list