diff options
author | Christian Kandeler <[email protected]> | 2018-11-23 11:07:57 +0100 |
---|---|---|
committer | Christian Kandeler <[email protected]> | 2018-12-13 15:10:11 +0000 |
commit | d7178b88c4b2572fb83b28f8178940766216deed (patch) | |
tree | 861eb8069fb97c8e8e79f56cb8f88f05126639fc /src/libs/ssh/sshremoteprocess.h | |
parent | 030d4d01084b04af361f07dd6360dfad8e2cc19c (diff) |
SSH: Use OpenSSH tools
... instead of our own SSH library.
Advantages:
- Full compatibility with OpenSSH behavior guaranteed.
- Minimal maintenance effort.
- Less code to build.
- Big chunk of 3rd party sources can be removed from our repository.
One the downside, Windows users now need to install OpenSSH for
RemoteLinux support. Hoewever, people doing embedded development
probably have it installed anyway.
[ChangeLog] Switched SSH backend to OpenSSH
Fixes: QTCREATORBUG-15744
Fixes: QTCREATORBUG-15807
Fixes: QTCREATORBUG-19306
Fixes: QTCREATORBUG-20210
Change-Id: Ifcfefdd39401e45ba1f4aca35d2c5bf7046c7aab
Reviewed-by: Eike Ziller <[email protected]>
Reviewed-by: Ulf Hermann <[email protected]>
Diffstat (limited to 'src/libs/ssh/sshremoteprocess.h')
-rw-r--r-- | src/libs/ssh/sshremoteprocess.h | 79 |
1 files changed, 11 insertions, 68 deletions
diff --git a/src/libs/ssh/sshremoteprocess.h b/src/libs/ssh/sshremoteprocess.h index 85f80182274..958847fcd81 100644 --- a/src/libs/ssh/sshremoteprocess.h +++ b/src/libs/ssh/sshremoteprocess.h @@ -26,97 +26,40 @@ #pragma once #include "ssh_global.h" +#include "sshprocess_p.h" -#include <QProcess> -#include <QSharedPointer> +#include <QStringList> QT_BEGIN_NAMESPACE class QByteArray; QT_END_NAMESPACE namespace QSsh { -class SshPseudoTerminal; -namespace Internal { -class SshChannelManager; -class SshRemoteProcessPrivate; -class SshSendFacility; -} // namespace Internal +class SshConnection; -// TODO: ProcessChannel -class QSSH_EXPORT SshRemoteProcess : public QIODevice +class QSSH_EXPORT SshRemoteProcess : public Internal::SshProcess { Q_OBJECT - friend class Internal::SshChannelManager; - friend class Internal::SshRemoteProcessPrivate; - + friend class SshConnection; public: - typedef QSharedPointer<SshRemoteProcess> Ptr; - enum ExitStatus { FailedToStart, CrashExit, NormalExit }; - enum Signal { - AbrtSignal, AlrmSignal, FpeSignal, HupSignal, IllSignal, IntSignal, KillSignal, PipeSignal, - QuitSignal, SegvSignal, TermSignal, Usr1Signal, Usr2Signal, NoSignal - }; - ~SshRemoteProcess(); - // QIODevice stuff - bool atEnd() const; - qint64 bytesAvailable() const; - bool canReadLine() const; - void close(); - bool isSequential() const { return true; } - - QProcess::ProcessChannel readChannel() const; - void setReadChannel(QProcess::ProcessChannel channel); - - /* - * Note that this is of limited value in practice, because servers are - * usually configured to ignore such requests for security reasons. - */ - void addToEnvironment(const QByteArray &var, const QByteArray &value); - void clearEnvironment(); - - void requestTerminal(const SshPseudoTerminal &terminal); + void requestTerminal(); void requestX11Forwarding(const QString &displayName); void start(); bool isRunning() const; - int exitCode() const; - Signal exitSignal() const; - - QByteArray readAllStandardOutput(); - QByteArray readAllStandardError(); - - // Note: This is ignored by the OpenSSH server. - void sendSignal(Signal signal); - void kill() { sendSignal(KillSignal); } signals: - void started(); - - void readyReadStandardOutput(); - void readyReadStandardError(); - - /* - * Parameter is of type ExitStatus, but we use int because of - * signal/slot awkwardness (full namespace required). - */ - void closed(int exitStatus); + void done(const QString &error); private: - SshRemoteProcess(const QByteArray &command, quint32 channelId, - Internal::SshSendFacility &sendFacility); - SshRemoteProcess(quint32 channelId, Internal::SshSendFacility &sendFacility); - - // QIODevice stuff - qint64 readData(char *data, qint64 maxlen); - qint64 writeData(const char *data, qint64 len); - - void init(); - QByteArray readAllFromChannel(QProcess::ProcessChannel channel); + SshRemoteProcess(const QByteArray &command, const QStringList &connectionArgs); + void doStart(); - Internal::SshRemoteProcessPrivate *d; + struct SshRemoteProcessPrivate; + SshRemoteProcessPrivate * const d; }; } // namespace QSsh |