Changeset f47c5505c30559e53309acf51db69912dec55033

Timestamp:

02/09/12 12:32:29 (3 months ago)

Author:

David C. Lonie <loniedavid@…>

Parents:

0d27765b65ba66dea0413789ed7b3c83d0486c9b

Children:

3b1426dce275c146696e284ef7e2a97e29f16847

git-committer:

David C. Lonie <loniedavid@…> (02/09/12 12:32:29)

Message:

Add a timeout to execute ssh commands.

This seems to be necessary for newer version of libssh.

Files:

• src/globalsearch/sshconnection.cpp (modified) (2 diffs)

src/globalsearch/sshconnection.cpp

@@ -80 +80 @@
     }
 
-    // Set a three timeout, check every 50 ms for new data.
+    // Set a three second timeout, check every 50 ms for new data.
     int bytesAvail;
     int timeout = 3000;
@@ -410 +410 @@
     // Read output
     char buffer[SSH_BUFFER_SIZE];
-    int len;
-    while ((len = channel_read(channel, buffer, sizeof(buffer), 0)) > 0) {
-      ossout.write(buffer,len);
+    int bytesAvail;
+    // Wait three seconds for output
+    int timeout = 3000;
+    do {
+      bytesAvail = channel_poll(channel, 0);
+      if (bytesAvail == 0) {
+        GS_MSLEEP(50);
+        timeout -= 50;
+      }
+    }
+    while (timeout > 0 && bytesAvail == 0);
+
+    if (bytesAvail == SSH_ERROR) {
+      qWarning() << "Poll returns error:" << ssh_get_error(m_session);
+      channel_close(channel);
+      channel_free(channel);
+      END;
+      return false;
+    }
+
+    while ((bytesAvail = channel_read(channel, buffer, sizeof(buffer), 0)) > 0) {
+      ossout.write(buffer,bytesAvail);
     }
     stdout_str = QString(ossout.str().c_str());
-    while ((len = channel_read(channel, buffer, sizeof(buffer), 1)) > 0) {
-      osserr.write(buffer,len);
+    while ((bytesAvail = channel_read(channel, buffer, sizeof(buffer), 1)) > 0) {
+      osserr.write(buffer,bytesAvail);
     }
     stderr_str = QString(osserr.str().c_str());