git.annexia.org
/
libguestfs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.10.10.
[libguestfs.git]
/
daemon
/
proto.c
diff --git
a/daemon/proto.c
b/daemon/proto.c
index
6b7a187
..
238ee88
100644
(file)
--- a/
daemon/proto.c
+++ b/
daemon/proto.c
@@
-1,5
+1,5
@@
/* libguestfs - the guestfsd daemon
/* libguestfs - the guestfsd daemon
- * Copyright (C) 2009 Red Hat Inc.
+ * Copyright (C) 2009
-2011
Red Hat Inc.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@
-88,12
+88,6
@@
main_loop (int _sock)
sock = _sock;
for (;;) {
sock = _sock;
for (;;) {
- /* Most common errors are leaked memory and leaked file descriptors,
- * so run this between each command:
- */
- if (verbose && 0)
- ignore_value (system ("ls -l /proc/self/fd"));
-
/* Read the length word. */
if (xread (sock, lenbuf, 4) == -1)
exit (EXIT_FAILURE);
/* Read the length word. */
if (xread (sock, lenbuf, 4) == -1)
exit (EXIT_FAILURE);
@@
-107,6
+101,12
@@
main_loop (int _sock)
"guestfsd: main_loop: new request, len 0x%" PRIx32 "\n",
len);
"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);
if (len > GUESTFS_MESSAGE_MAX) {
fprintf (stderr, "guestfsd: incoming message is too long (%u bytes)\n",
len);