X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fproto.c;h=bbba2054e948010997c081c87c1f0bd76fdf0e3a;hb=d81c0829ea4a99aadb98df37be9543a973269041;hp=88e2d28c793739a19cd6b46d990586ecdd087b85;hpb=5ce759bfdc70c97121ef34ab4d5c918d568f2474;p=libguestfs.git

diff --git a/daemon/proto.c b/daemon/proto.c
index 88e2d28..bbba205 100644
--- a/daemon/proto.c
+++ b/daemon/proto.c
@@ -13,7 +13,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #include <config.h>
@@ -101,6 +101,12 @@ main_loop (int _sock)
 	       "guestfsd: main_loop: new request, len 0x%" PRIx32 "\n",
 	       len);
 
+    /* Cancellation sent from the library and received after the
+     * previous request has finished processing.  Just ignore it.
+     */
+    if (len == GUESTFS_CANCEL_FLAG)
+      continue;
+
     if (len > GUESTFS_MESSAGE_MAX) {
       fprintf (stderr, "guestfsd: incoming message is too long (%u bytes)\n",
                len);