From: Daniel P. Berrange <berrange@redhat.com>
Date: Wed, 9 Nov 2011 13:54:01 +0000 (+0000)
Subject: Don't return a fatal error if receiving unexpected stream data
X-Git-Tag: v0.9.6.1~24
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=96c3c2752ee9b45a8ed05112fbccf55f20e0d1af;p=thirdparty%2Flibvirt.git

Don't return a fatal error if receiving unexpected stream data

Due to the asynchronous nature of streams, we might continue to
receive some stream packets from the server even after we have
shutdown the stream on the client side. These should be discarded
silently, rather than raising an error in the RPC layer.

* src/rpc/virnetclient.c: Discard stream data silently
(cherry picked from commit a38710bd652c1a4a79df7d4ef171d20ff322e566)
---

diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
index b2c528a10f..a56efb7b09 100644
--- a/src/rpc/virnetclient.c
+++ b/src/rpc/virnetclient.c
@@ -604,7 +604,9 @@ static int virNetClientCallDispatchStream(virNetClientPtr client)
         VIR_DEBUG("No stream found for packet with prog=%d vers=%d serial=%u proc=%u",
                   client->msg.header.prog, client->msg.header.vers,
                   client->msg.header.serial, client->msg.header.proc);
-        return -1;
+        /* Don't return -1, because we expect to see further stream packets
+         * after we've shut it down sometimes */
+        return 0;
     }
 
     /* Finish/Abort are synchronous, so also see if there's an