Plugins::SSH: fix receive data bug

Author: KangLin

.github/workflows/build.yml

@@ -38,6 +38,7 @@ jobs:
 
   snap:
     uses: ./.github/workflows/snap.yml
+    if: false
     secrets: inherit
 
   docker:
@@ -67,7 +68,7 @@ jobs:
   deploy:
     #if: ${{ startsWith(github.ref, 'refs/tags/') }}
     runs-on: ubuntu-latest
-    needs: [linux, docker, flatpak, snap, msvc, doxygen, android, macos]
+    needs: [linux, docker, flatpak, msvc, doxygen, android, macos]
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
@@ -119,6 +120,7 @@ jobs:
 
       - name: Download snap
         uses: actions/download-artifact@v4
+        if: false
         with:
           pattern: ${{ needs.snap.outputs.name }}*
           path: ${{ env.artifact_path }}

Plugins/SSH/BackendSSH.cpp

@@ -54,23 +54,27 @@ CBackendSSH::OnInitReturnValue CBackendSSH::OnInit()
     Q_ASSERT(check);
     check = connect(m_pChannelSSH, &CChannelSSHTerminal::readyRead,
                     this, [&](){
-        QByteArray data(256, '\0');
-        int nLen = 0;
-        if(m_pChannelSSH)
-            nLen = m_pChannelSSH->read(data.data(), data.length());
-        if(m_pTerminal && nLen > 0) {
-#if defined(Q_OS_WIN)
-            if(m_pOperate) {
-                emit m_pOperate->sigReceiveData(data);
+        char* buf = nullptr;
+        qint64 nLen = 0;
+        qint64 nRet = 0;
+        if(m_pChannelSSH) {
+            nLen = m_pChannelSSH->bytesAvailable();
+            if(nLen <= 0) {
+                qDebug(log) << "No data";
+                return;
             }
-#else
-            write(m_pTerminal->getPtySlaveFd(), data.data(), data.length());
-#endif
+            buf = new char[nLen];
+            nRet = m_pChannelSSH->read(buf, nLen);
         }
-        else
-            qCritical(log) << "The m_pTerminal is nullptr or nLen <= 0";
-        qDebug(log) << "Write data to QTermWidget: " << nLen;
-
+        if(m_pTerminal && nRet > 0) {
+            QByteArray data(buf, nRet);
+            if(m_pOperate)
+                emit m_pOperate->sigReceiveData(data);
+        } else
+            qCritical(log) << "The m_pTerminal is nullptr or nRet <= 0";
+        //qDebug(log) << "Write data to QTermWidget: " << nRet << nLen;
+        if(buf)
+            delete []buf;
     });
     Q_ASSERT(check);
     check = connect(m_pTerminal, &QTermWidget::sendData,
@@ -122,9 +126,10 @@ bool CBackendSSH::event(QEvent *event)
         QEventTerminal *d = (QEventTerminal*)event;
         if(m_pChannelSSH && d->m_Data.length() > 0) {
             qint64 nRet = m_pChannelSSH->write(d->m_Data.data(), d->m_Data.length());
-            qDebug(log) << "Write data to ssh channel:" << nRet << d->m_Data.length();
+            Q_UNUSED(nRet);
+            //qDebug(log) << "Write data to ssh channel:" << nRet << d->m_Data.length();
         } else {
-            qCritical(log) << "m_pChannelSSH && len <= 0";
+            //qDebug(log) << "m_pChannelSSH && len <= 0";
         }
         break;
     }

Plugins/SSH/ChannelSSHTerminal.cpp

@@ -22,18 +22,19 @@ qint64 CChannelSSHTerminal::readData(char *data, qint64 maxlen)
     if(!m_Channel || !ssh_channel_is_open(m_Channel))
         return -1;
     nRet = ssh_channel_read(m_Channel, data, maxlen, 0);
-    qDebug(log) << "read data:" << nRet << maxlen;
+    m_nBytesAvailable -= nRet;
+    //qDebug(log) << Q_FUNC_INFO << nRet << maxlen << m_nBytesAvailable;
     return nRet;
 }
 
-qint64 CChannelSSHTerminal::writeData(const char *data, qint64 len)
+qint64 CChannelSSHTerminal::writeData(const char *data, qint64 maxlen)
 {
     qint64 nRet = 0;
     if(!m_Channel || !ssh_channel_is_open(m_Channel))
         return -1;
-    if(len > 0)
-        nRet = ssh_channel_write(m_Channel, data, len);
-    qDebug(log) << "write data:" << nRet << len;
+    if(maxlen > 0)
+        nRet = ssh_channel_write(m_Channel, data, maxlen);
+    //qDebug(log) << Q_FUNC_INFO << nRet << maxlen;
     return nRet;
 }
 
@@ -102,7 +103,8 @@ void CChannelSSHTerminal::SetSize(int row, int column)
 int CChannelSSHTerminal::OnProcess(int tm)
 {
     int nRet = 0;
-
+    
+    m_nBytesAvailable = 0;
     if(!m_Channel || !ssh_channel_is_open(m_Channel)
         || ssh_channel_is_eof(m_Channel)) {
         QString szErr = "The channel is not open";
@@ -187,8 +189,14 @@ int CChannelSSHTerminal::OnProcess(int tm)
         //qDebug(log) << "The channel has not data";
         return 0;
     }
-
+    
+    m_nBytesAvailable = nRet;
     emit readyRead();
 
     return 0;
 }
+
+qint64 CChannelSSHTerminal::bytesAvailable() const
+{
+    return m_nBytesAvailable;
+}

Plugins/SSH/ChannelSSHTerminal.h

@@ -21,10 +21,16 @@ class CChannelSSHTerminal : public CChannelSSH
     // QIODevice interface
 protected:
     virtual qint64 readData(char *data, qint64 maxlen) override;
-    virtual qint64 writeData(const char *data, qint64 len) override;
+    virtual qint64 writeData(const char *data, qint64 maxlen) override;
 
     // CChannelSSH interface
 private:
     virtual int OnOpen(ssh_session session) override;
     virtual void OnClose() override;
+    
+    // QIODevice interface
+public:
+    virtual qint64 bytesAvailable() const override;
+private:
+    qint64 m_nBytesAvailable;
 };

Plugins/SSH/OperateSSH.cpp

@@ -54,10 +54,12 @@ CBackend *COperateSSH::InstanceBackend()
 
 void COperateSSH::slotReceiveData(const QByteArray &data)
 {
-    qDebug(log) << Q_FUNC_INFO;
+    //qDebug(log) << Q_FUNC_INFO << data.length();
 #if defined(Q_OS_WIN)
     if(m_pTerminal) {
         m_pTerminal->receiveData(data.data(), data.length());
     }
+#else
+    write(m_pTerminal->getPtySlaveFd(), data.data(), data.length());
 #endif
 }

Src/SSH/ChannelSSH.cpp

@@ -238,18 +238,6 @@ void CChannelSSH::close()
     QIODevice::close();
 }
 
-qint64 CChannelSSH::readData(char *data, qint64 maxlen)
-{
-    qint64 nRet = 0;
-    return nRet;
-}
-
-qint64 CChannelSSH::writeData(const char *data, qint64 len)
-{
-    qint64 nRet = 0;
-    return nRet;
-}
-
 int CChannelSSH::verifyKnownhost(ssh_session session)
 {
     int nRet = -1;

Src/SSH/ChannelSSH.h

@@ -22,9 +22,6 @@ class PLUGIN_EXPORT CChannelSSH : public CChannel
     virtual bool open(OpenMode mode) override;
     virtual void close() override;
     virtual int WakeUp();
-protected:
-    virtual qint64 readData(char *data, qint64 maxlen) override;
-    virtual qint64 writeData(const char *data, qint64 len) override;
 
     // CChannel interface
 public: