File bug-986644_pacemaker-remote-recv-msg-timeouts.p... of Package pacemaker.3535

Overview Repositories Revisions Requests Users Attributes Meta

File bug-986644_pacemaker-remote-recv-msg-timeouts.patch of Package pacemaker.3535 (Revision f732394c2fbb56cc45d88a2780677441)

Currently displaying revision f732394c2fbb56cc45d88a2780677441 , Show latest

commit a8115c1e2543cbfa9bb7dbd21435e5c927ba2ccf
Author: Gao,Yan <ygao@suse.com>
Date:   Mon Sep 5 17:48:33 2016 +0200

Fix: remote: Correctly calculate the remaining timeouts when receiving messages
    
    Previously due to the incorrectly calculated timeouts, incomplete messages could
    be received and handled when it was not supposed to time out.

diff --git a/lib/common/remote.c b/lib/common/remote.c
index 37b6a7e..fd6a9c2 100644
--- a/lib/common/remote.c
+++ b/lib/common/remote.c
@@ -447,12 +447,13 @@ crm_remote_parse_buffer(crm_remote_t * remote)
  * \retval negative, session has ended
  */
 int
-crm_remote_ready(crm_remote_t * remote, int timeout /* ms */ )
+crm_remote_ready(crm_remote_t * remote, int total_timeout /* ms */ )
 {
     struct pollfd fds = { 0, };
     int sock = 0;
     int rc = 0;
     time_t start;
+    int timeout = total_timeout;
 
 #ifdef HAVE_GNUTLS_GNUTLS_H
     if (remote->tls_session) {
@@ -483,7 +484,7 @@ crm_remote_ready(crm_remote_t * remote, int timeout /* ms */ )
          * specific timeout we are trying to honor, attempt
          * to adjust the timeout to the closest second. */
         if (errno == EINTR && (timeout > 0)) {
-            timeout = timeout - ((time(NULL) - start) * 1000);
+            timeout = total_timeout - ((time(NULL) - start) * 1000);
             if (timeout < 1000) {
                 timeout = 1000;
             }
@@ -651,7 +652,7 @@ crm_remote_recv(crm_remote_t * remote, int total_timeout /*ms */ , int *disconne
             return FALSE;
         }
 
-        remaining_timeout = remaining_timeout - ((time(NULL) - start) * 1000);
+        remaining_timeout = total_timeout - ((time(NULL) - start) * 1000);
     }
 
     return FALSE;
diff --git a/lib/lrmd/lrmd_client.c b/lib/lrmd/lrmd_client.c
index a7e1bc6..e009078 100644
--- a/lib/lrmd/lrmd_client.c
+++ b/lib/lrmd/lrmd_client.c
@@ -610,7 +610,7 @@ lrmd_tls_recv_reply(lrmd_t * lrmd, int total_timeout, int expected_reply_id, int
         if (!xml) {
             /* read some more off the tls buffer if we still have time left. */
             if (remaining_timeout) {
-                remaining_timeout = remaining_timeout - ((time(NULL) - start) * 1000);
+                remaining_timeout = total_timeout - ((time(NULL) - start) * 1000);
             } else {
                 remaining_timeout = total_timeout;
             }

Places

File bug-986644_pacemaker-remote-recv-msg-timeouts.patch of Package pacemaker.3535 (Revision f732394c2fbb56cc45d88a2780677441)

Places