This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from 3008b2a Use app.setQuitOnLastWindowClosed(false) for the X2Go Client QtApplication to assure that X2Go Client does not arbitrarily exit during a running session. This fixes X2Go Client crashes that occur when printing via the CUPS-X2Go printing mechanism with activate print dialog popup on incoming print jobs and minimized main window. (Fixes: #702). new e1597f9 Be more exact when reporting rev forwarding tunnel request failures to the GUI user. Include the purpose of the tunnel (NX, audio, foldersharing) in the error message. new c4e71a4 Enable debugging in sshprocess.cpp and sshmasterconnection.cpp if --debug is given. new f8fa118 sshmasterconnection.cpp: Fix several grammar issues in error messages. new 8889800 When sharing a client-side folder, do not write the SSH pub key to client-side authorized_keys file if the folder-to-be-shared does not exist on the client. (Partially solves #405). new 70cedd9 Fix string concatenation/layout of error message when tunnel I/O errors occur. new ae2c22b Improve debugging/logging the SSH connections made by X2Go Client. The 6 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: debian/changelog | 12 ++++++++++++ onmainwindow.cpp | 23 +++++++++++++++-------- sshmasterconnection.cpp | 23 +++++++++++------------ sshprocess.cpp | 18 ++++++++++++------ x2goclient_da.ts | 2 +- x2goclient_de.ts | 2 +- x2goclient_es.ts | 2 +- x2goclient_et.ts | 2 +- x2goclient_fi.ts | 2 +- x2goclient_fr.ts | 2 +- x2goclient_nb_no.ts | 2 +- x2goclient_nl.ts | 2 +- x2goclient_pt.ts | 2 +- x2goclient_ru.ts | 2 +- x2goclient_sv.ts | 2 +- x2goclient_tr.ts | 2 +- x2goclient_zh_tw.ts | 2 +- 17 files changed, 63 insertions(+), 39 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit e1597f9687736757d6784197fe2dc5e9b83a59a0 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 8 09:22:30 2015 +0100 Be more exact when reporting rev forwarding tunnel request failures to the GUI user. Include the purpose of the tunnel (NX, audio, foldersharing) in the error message. --- debian/changelog | 3 +++ onmainwindow.cpp | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index ae08442..d980d69 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium session. This fixes X2Go Client crashes that occur when printing via the CUPS-X2Go printing mechanism with activate print dialog popup on incoming print jobs and minimized main window. (Fixes: #702). + - Be more exact when reporting rev forwarding tunnel request failures to + the GUI user. Include the purpose of the tunnel (NX, audio, foldersharing) + in the error message. [ Jason Alavaliant ] * New upstream verson (4.0.3.2): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 71d51bf..1064680 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -5362,7 +5362,7 @@ void ONMainWindow::slotTunnelFailed ( bool result, QString output, { if ( !managedMode ) { - QString message=tr ( "Unable to create SSL tunnel:\n" ) + QString message=tr ( "Unable to create SSH tunnel for X2Go session (NX) startup:\n" ) +output; QMessageBox::critical ( 0l,tr ( "Error" ),message, QMessageBox::Ok, @@ -5392,7 +5392,7 @@ void ONMainWindow::slotSndTunnelFailed ( bool result, QString output, { if ( !managedMode ) { - QString message=tr ( "Unable to create SSL Tunnel:\n" ) + QString message=tr ( "Unable to create SSH Tunnel for audio data:\n" ) +output; QMessageBox::warning ( 0l,tr ( "Warning" ),message, QMessageBox::Ok, @@ -9014,7 +9014,7 @@ void ONMainWindow::slotFsTunnelFailed ( bool result, QString output, if ( !managedMode ) { - QString message=tr ( "Unable to create SSL tunnel:\n" ) + QString message=tr ( "Unable to create SSH tunnel for foldersharing and printing:\n" ) +output; QMessageBox::critical ( 0l,tr ( "Error" ),message, QMessageBox::Ok, -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit c4e71a4510a3316367376f7ee0cf3fcbdd56e2c9 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 8 09:28:40 2015 +0100 Enable debugging in sshprocess.cpp and sshmasterconnection.cpp if --debug is given. --- debian/changelog | 2 ++ sshmasterconnection.cpp | 3 +-- sshprocess.cpp | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index d980d69..790067e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Be more exact when reporting rev forwarding tunnel request failures to the GUI user. Include the purpose of the tunnel (NX, audio, foldersharing) in the error message. + - Enable debugging in sshprocess.cpp and sshmasterconnection.cpp if + --debug is given. [ Jason Alavaliant ] * New upstream verson (4.0.3.2): diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index 519548f..7187dfd 100755 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -48,8 +48,7 @@ #define PROXYTUNNELPORT 44444 -#undef DEBUG -// #define DEBUG +#define DEBUG #undef SSH_DEBUG // #define SSH_DEBUG diff --git a/sshprocess.cpp b/sshprocess.cpp index 1b9964b..b1a940c 100755 --- a/sshprocess.cpp +++ b/sshprocess.cpp @@ -28,8 +28,8 @@ #include <netinet/tcp.h> #endif -#undef DEBUG -// #define DEBUG +// #undef DEBUG +#define DEBUG #define KEEPALIVE_OPTION " -o ServerAliveInterval=60 " -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit f8fa11827b388479dd06c7180d0092e35ccd9613 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 8 09:35:59 2015 +0100 sshmasterconnection.cpp: Fix several grammar issues in error messages. --- debian/changelog | 1 + sshmasterconnection.cpp | 16 ++++++++-------- x2goclient_da.ts | 2 +- x2goclient_de.ts | 2 +- x2goclient_es.ts | 2 +- x2goclient_et.ts | 2 +- x2goclient_fi.ts | 2 +- x2goclient_fr.ts | 2 +- x2goclient_nb_no.ts | 2 +- x2goclient_nl.ts | 2 +- x2goclient_pt.ts | 2 +- x2goclient_ru.ts | 2 +- x2goclient_sv.ts | 2 +- x2goclient_tr.ts | 2 +- x2goclient_zh_tw.ts | 2 +- 15 files changed, 22 insertions(+), 21 deletions(-) diff --git a/debian/changelog b/debian/changelog index 790067e..205fe17 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,6 +19,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium in the error message. - Enable debugging in sshprocess.cpp and sshmasterconnection.cpp if --debug is given. + - sshmasterconnection.cpp: Fix several grammar issues in error messages. [ Jason Alavaliant ] * New upstream verson (4.0.3.2): diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index 7187dfd..2c8f3a3 100755 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -332,7 +332,7 @@ void SshMasterConnection::checkReverseTunnelConnections() if ( ::connect ( sock, ( struct sockaddr * ) &address,sizeof ( address ) ) !=0 ) { - QString errMsg=tr ( "can not connect to " ) + + QString errMsg=tr ( "Cannot connect to " ) + req.localHost+":"+QString::number ( req.localPort ); #ifdef DEBUG x2goDebug<<errMsg<<endl; @@ -479,7 +479,7 @@ void SshMasterConnection::run() #endif if ( ssh_init() !=0 ) { - QString err=tr ( "Can not initialize libssh" ); + QString err=tr ( "Cannot initialize libssh" ); #ifdef DEBUG x2goDebug<<err<<endl; #endif @@ -507,7 +507,7 @@ void SshMasterConnection::run() my_ssh_session = ssh_new(); if ( my_ssh_session == NULL ) { - QString err=tr ( "Can not create ssh session" ); + QString err=tr ( "Cannot create ssh session" ); #ifdef DEBUG x2goDebug<<err<<endl; #endif @@ -543,7 +543,7 @@ void SshMasterConnection::run() proxysocket = tcpProxySocket->socketDescriptor(); if (!tcpProxySocket->waitForConnected(30000)) { - QString message=tr ( "Can not connect to proxy server" ); + QString message=tr ( "Cannot connect to proxy server" ); #ifdef DEBUG x2goDebug<<message<<endl; #endif @@ -573,7 +573,7 @@ void SshMasterConnection::run() return; } QString err=ssh_get_error ( my_ssh_session ); - QString message=tr ( "Can not connect to " ) +host+":"+QString::number ( port ); + QString message=tr ( "Cannot connect to " ) +host+":"+QString::number ( port ); #ifdef DEBUG x2goDebug<<message<<" - "<<err; #endif @@ -1292,7 +1292,7 @@ void SshMasterConnection::copy() QFile file ( copyRequests[i].src ); if ( !file.open ( QIODevice::ReadOnly ) ) { - QString errMsg=tr ( "Can not open file " ) +copyRequests[i].src; + QString errMsg=tr ( "Cannot open file " ) +copyRequests[i].src; emit copyErr ( copyRequests[i].creator, errMsg, "" ); copyRequests.removeAt ( i ); ssh_scp_close ( scp ); @@ -1304,7 +1304,7 @@ void SshMasterConnection::copy() rc=ssh_scp_push_file ( scp,dstFile.toAscii(),arr.size(), 0600 ); if ( rc != SSH_OK ) { - QString errMsg=tr ( "Can not create remote file " ) +copyRequests[i].dst; + QString errMsg=tr ( "Cannot create remote file " ) +copyRequests[i].dst; QString serr=ssh_get_error ( my_ssh_session ); #ifdef DEBUG x2goDebug<<errMsg<<" - "<<serr<<endl; @@ -1319,7 +1319,7 @@ void SshMasterConnection::copy() if ( rc != SSH_OK ) { QString serr=ssh_get_error ( my_ssh_session ); - QString errMsg=tr ( "Can not write to remote file " ) +copyRequests[i].dst; + QString errMsg=tr ( "Cannot write to remote file " ) +copyRequests[i].dst; #ifdef DEBUG x2goDebug<<errMsg<<" - "<<serr<<endl; #endif diff --git a/x2goclient_da.ts b/x2goclient_da.ts index 94128ed..8ee0a58 100644 --- a/x2goclient_da.ts +++ b/x2goclient_da.ts @@ -3257,7 +3257,7 @@ lydsystemets forbindelse igennem firewalls</translation> </message> <message> <location filename="sshmasterconnection.cpp" line="336"/> - <source>can not connect to </source> + <source>Cannot connect to </source> <translation>kan ikke forbinde til</translation> </message> <message> diff --git a/x2goclient_de.ts b/x2goclient_de.ts index 4635cc4..607bc59 100644 --- a/x2goclient_de.ts +++ b/x2goclient_de.ts @@ -3806,7 +3806,7 @@ sound system connections through firewalls</source> </message> <message> <location filename="sshmasterconnection.cpp" line="336"/> - <source>can not connect to </source> + <source>Cannot connect to </source> <translation>Kann Verbindung nicht herstellen zu </translation> </message> <message> diff --git a/x2goclient_es.ts b/x2goclient_es.ts index e7ebcd2..1193519 100644 --- a/x2goclient_es.ts +++ b/x2goclient_es.ts @@ -3251,7 +3251,7 @@ el sonido en conexiones a través de firewalls</translation> </message> <message> <location filename="sshmasterconnection.cpp" line="336"/> - <source>can not connect to </source> + <source>Cannot connect to </source> <translation>no se puede conectar a </translation> </message> <message> diff --git a/x2goclient_et.ts b/x2goclient_et.ts index 147436d..c8eca8d 100644 --- a/x2goclient_et.ts +++ b/x2goclient_et.ts @@ -3227,7 +3227,7 @@ sound system connections through firewalls</source> </message> <message> <location filename="sshmasterconnection.cpp" line="336"/> - <source>can not connect to </source> + <source>Cannot connect to </source> <translation>ei suuda ühenduda </translation> </message> <message> diff --git a/x2goclient_fi.ts b/x2goclient_fi.ts index ac58379..ab7133c 100644 --- a/x2goclient_fi.ts +++ b/x2goclient_fi.ts @@ -3225,7 +3225,7 @@ sound system connections through firewalls</source> </message> <message> <location filename="sshmasterconnection.cpp" line="336"/> - <source>can not connect to </source> + <source>Cannot connect to </source> <translation>yhteys ei avaudu tähän kohteeseen </translation> </message> <message> diff --git a/x2goclient_fr.ts b/x2goclient_fr.ts index 570ece5..9a23453 100644 --- a/x2goclient_fr.ts +++ b/x2goclient_fr.ts @@ -2368,7 +2368,7 @@ Utiliser le mode caché de X2Go Client ?</translation> <translation type="unfinished"></translation> </message> <message> - <source>can not connect to </source> + <source>Cannot connect to </source> <translation type="unfinished"></translation> </message> <message> diff --git a/x2goclient_nb_no.ts b/x2goclient_nb_no.ts index a1f4484..473238e 100644 --- a/x2goclient_nb_no.ts +++ b/x2goclient_nb_no.ts @@ -2661,7 +2661,7 @@ lydsystem forbindelser gjennom brannmurer</translation> <translation>Klarer ikke å skrive til filen over nettverket </translation> </message> <message> - <source>can not connect to </source> + <source>Cannot connect to </source> <translation>Klarer ikke å koble til </translation> </message> <message> diff --git a/x2goclient_nl.ts b/x2goclient_nl.ts index 1721c60..f6ad85a 100644 --- a/x2goclient_nl.ts +++ b/x2goclient_nl.ts @@ -3129,7 +3129,7 @@ sound system connections through firewalls</source> <name>SshMasterConnection</name> <message> <location filename="sshmasterconnection.cpp" line="336"/> - <source>can not connect to </source> + <source>Cannot connect to </source> <translation>kan niet verbinden met</translation> </message> <message> diff --git a/x2goclient_pt.ts b/x2goclient_pt.ts index 07a7c4c..5e7b5dd 100644 --- a/x2goclient_pt.ts +++ b/x2goclient_pt.ts @@ -3012,7 +3012,7 @@ Use x2goclient hidden mode?</source> <name>SshMasterConnection</name> <message> <location filename="sshmasterconnection.cpp" line="336"/> - <source>can not connect to </source> + <source>Cannot connect to </source> <translation type="unfinished"></translation> </message> <message> diff --git a/x2goclient_ru.ts b/x2goclient_ru.ts index de45dd1..0f63716 100644 --- a/x2goclient_ru.ts +++ b/x2goclient_ru.ts @@ -3790,7 +3790,7 @@ sound system connections through firewalls</source> </message> <message> <location filename="sshmasterconnection.cpp" line="336"/> - <source>can not connect to </source> + <source>Cannot connect to </source> <translation></translation> </message> <message> diff --git a/x2goclient_sv.ts b/x2goclient_sv.ts index 51f32ee..9f8674b 100644 --- a/x2goclient_sv.ts +++ b/x2goclient_sv.ts @@ -3283,7 +3283,7 @@ ljudström genom brandväggar</translation> </message> <message> <location filename="sshmasterconnection.cpp" line="336"/> - <source>can not connect to </source> + <source>Cannot connect to </source> <translation>kan inte ansluta till </translation> </message> <message> diff --git a/x2goclient_tr.ts b/x2goclient_tr.ts index 1f4698d..4356b5e 100644 --- a/x2goclient_tr.ts +++ b/x2goclient_tr.ts @@ -3047,7 +3047,7 @@ tünellemek için ssh port yönlendirmesini kullanın</translation> <name>SshMasterConnection</name> <message> <location filename="sshmasterconnection.cpp" line="336"/> - <source>can not connect to </source> + <source>Cannot connect to </source> <translation>bağlanamıyor </translation> </message> <message> diff --git a/x2goclient_zh_tw.ts b/x2goclient_zh_tw.ts index a02fe81..ebd397c 100644 --- a/x2goclient_zh_tw.ts +++ b/x2goclient_zh_tw.ts @@ -3239,7 +3239,7 @@ sound system connections through firewalls</source> </message> <message> <location filename="sshmasterconnection.cpp" line="336"/> - <source>can not connect to </source> + <source>Cannot connect to </source> <translation>無法連線至 </translation> </message> <message> -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 88898003912ecb146c4020132b1913722f99b8fd Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 8 09:39:17 2015 +0100 When sharing a client-side folder, do not write the SSH pub key to client-side authorized_keys file if the folder-to-be-shared does not exist on the client. (Partially solves #405). --- debian/changelog | 3 +++ onmainwindow.cpp | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 205fe17..c04197f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,6 +20,9 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - Enable debugging in sshprocess.cpp and sshmasterconnection.cpp if --debug is given. - sshmasterconnection.cpp: Fix several grammar issues in error messages. + - When sharing a client-side folder, do not write the SSH pub key to + client-side authorized_keys file if the folder-to-be-shared does not + exist on the client. (Partially solves #405). [ Jason Alavaliant ] * New upstream verson (4.0.3.2): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 1064680..9bde5b2 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -9077,14 +9077,15 @@ void ONMainWindow::startX2goMount() return; } - QTextStream out ( &file1 ); - out<<line; - file1.close(); directory* dir=getExpDir ( fsExportKey ); bool rem=dir->isRemovable; if ( !dir ) return; + QTextStream out ( &file1 ); + out<<line; + file1.close(); + QString passwd=getCurrentPass(); QString user=getCurrentUname(); QString host=resumingSession.server; -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit 70cedd90d1ea52df5f02e47e5b32c8ffdd6134e2 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 8 09:41:55 2015 +0100 Fix string concatenation/layout of error message when tunnel I/O errors occur. --- debian/changelog | 2 ++ sshprocess.cpp | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index c04197f..ebf1c61 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,8 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - When sharing a client-side folder, do not write the SSH pub key to client-side authorized_keys file if the folder-to-be-shared does not exist on the client. (Partially solves #405). + - Fix string concatenation/layout of error message when tunnel I/O errors + occur. [ Jason Alavaliant ] * New upstream verson (4.0.3.2): diff --git a/sshprocess.cpp b/sshprocess.cpp index b1a940c..84af170 100755 --- a/sshprocess.cpp +++ b/sshprocess.cpp @@ -373,11 +373,13 @@ void SshProcess::slotIOerr(SshProcess* creator, QString message, QString sshSess { if (creator!=this) return; + if (sshSessionErr.length()) + sshSessionErr = " - "+sshSessionErr; #ifdef DEBUG - x2goDebug<<"io error:"<<message<<" - "<<sshSessionErr<<endl; + x2goDebug<<"I/O error: "<<message<<sshSessionErr<<" ("<<pid<<")."<<endl; #endif normalExited=false; - abortString=message+" - "+sshSessionErr; + abortString="I/O error: "+message+sshSessionErr; } void SshProcess::slotCopyErr(SshProcess* creator, QString message, QString sshSessionErr) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit ae2c22bced1099055d49fad3f3ff815054aa136b Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Jan 8 13:08:19 2015 +0100 Improve debugging/logging the SSH connections made by X2Go Client. --- debian/changelog | 1 + onmainwindow.cpp | 10 ++++++++-- sshmasterconnection.cpp | 4 ++-- sshprocess.cpp | 8 ++++++-- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index ebf1c61..3e67cf4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium exist on the client. (Partially solves #405). - Fix string concatenation/layout of error message when tunnel I/O errors occur. + - Improve debugging/logging the SSH connections made by X2Go Client. [ Jason Alavaliant ] * New upstream verson (4.0.3.2): diff --git a/onmainwindow.cpp b/onmainwindow.cpp index 9bde5b2..74cd535 100644 --- a/onmainwindow.cpp +++ b/onmainwindow.cpp @@ -7843,7 +7843,7 @@ directory* ONMainWindow::getExpDir ( QString key ) void ONMainWindow::slotRetExportDir ( bool result,QString output, int pid) { - + x2goDebug<<"Post-cleanup for startX2goMount triggered."<<endl; QString key; for ( int i=0; i<exportDir.size(); ++i ) if ( exportDir[i].pid==pid ) @@ -7853,10 +7853,10 @@ void ONMainWindow::slotRetExportDir ( bool result,QString output, break; } - if ( result==false ) { QString message=tr ( "<b>Connection failed</b>\n" ) +output; + x2goDebug<<"startX2goMount failed to mount client-side folder, reason: "<<message<<endl; if ( message.indexOf ( "publickey,password" ) !=-1 ) { message=tr ( "<b>Wrong password!</b><br><br>" ) + @@ -7868,6 +7868,7 @@ void ONMainWindow::slotRetExportDir ( bool result,QString output, QMessageBox::NoButton ); } QFile file ( key+".pub" ); + x2goDebug<<"Deactivating public key from "<<key<<".pub again."<<endl; if ( !file.open ( QIODevice::ReadOnly | QIODevice::Text ) ) { printSshDError_noExportPubKey(); @@ -9028,6 +9029,8 @@ void ONMainWindow::slotFsTunnelFailed ( bool result, QString output, void ONMainWindow::slotFsTunnelOk(int) { + x2goDebug<<"FS tunnel through SSH seems to be up and running..."<<endl; + fsTunReady=true; //start reverse mounting if RSA Key and FS tunnel are ready //start only once from slotFsTunnelOk() or slotCopyKey(). @@ -9086,6 +9089,8 @@ void ONMainWindow::startX2goMount() out<<line; file1.close(); + x2goDebug<<"Temporarily activated public key from file "<<fsExportKey<<".pub."<<endl; + QString passwd=getCurrentPass(); QString user=getCurrentUname(); QString host=resumingSession.server; @@ -9177,6 +9182,7 @@ void ONMainWindow::startX2goMount() } } + x2goDebug<<"Calling startX2goMount command."<<endl; dir->pid=sshConnection->executeCommand(cmd,this,SLOT ( slotRetExportDir ( bool, QString,int) )); } diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp index 2c8f3a3..63bb20d 100755 --- a/sshmasterconnection.cpp +++ b/sshmasterconnection.cpp @@ -1538,7 +1538,7 @@ void SshMasterConnection::channelLoop() if ( rez==SSH_EOF ) { #ifdef DEBUG - x2goDebug<<"EOF ON CHANNEL "<<channel<<endl; + x2goDebug<<"EOF ON CHANNEL "<<channel<<" (SshProcess: "<<channelConnections[i].creator->pid<<")"<<endl; #endif //////Finished//////// finalize ( i ); @@ -1593,7 +1593,7 @@ void SshMasterConnection::channelLoop() if ( channel_is_eof ( channel ) ) { #ifdef DEBUG - x2goDebug<<"EOF ON CHANNEL "<<channel<<endl; + x2goDebug<<"EOF ON CHANNEL "<<channel<<" (SshProcess: "<<channelConnections[i].creator->pid<<")"<<endl; #endif //////Finished//////// finalize ( i ); diff --git a/sshprocess.cpp b/sshprocess.cpp index 84af170..310f83f 100755 --- a/sshprocess.cpp +++ b/sshprocess.cpp @@ -186,7 +186,7 @@ void SshProcess::startNormal(const QString& cmd) //#ifdef DEBUG // ONLY UNCOMMENT FOR TESTING, MIGHT REVEAL PASSWORD WHEN command=RDP -// x2goDebug<<"executing remote command: "<<shcmd<<endl; + x2goDebug<<"executing remote command via SshProcess object ("<<pid<<"): "<<cmd<<endl; // #endif if(!masterCon->useKerberos()) { @@ -239,6 +239,8 @@ void SshProcess::startNormal(const QString& cmd) void SshProcess::start_cp(QString src, QString dst) { + x2goDebug<<"copying file via SshProcess object ("<<pid<<"): "<<src<<" -> "<<dst<<endl; + scpSource=src; if(!masterCon->useKerberos()) { @@ -287,6 +289,8 @@ void SshProcess::start_cp(QString src, QString dst) void SshProcess::startTunnel(const QString& forwardHost, uint forwardPort, const QString& localHost, uint localPort, bool reverse) { + x2goDebug<<"Starting tunnel via SshProcess object ("<<pid<<"): "<<forwardHost<<":"<<forwardPort<<" -> "<<localHost<<":"<<localPort<<endl; + tunnel=true; tunnelOkEmited=false; if(!masterCon->useKerberos()) @@ -440,7 +444,7 @@ void SshProcess::slotChannelClosed(SshProcess* creator, QString uuid) } } #ifdef DEBUG - x2goDebug<<"ssh finished:"<<normalExited<<" - "<<output<<uuid<<endl; + x2goDebug<<"ssh finished: "<<normalExited<<" - "<<output<<" ("<<pid<<")."<<endl; #endif emit sshFinished(normalExited, output, pid); } -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org