Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
de6ab50
)
Improve handling of MSG_IO_ERROR message.
author
Wayne Davison
<wayned@samba.org>
Wed, 23 Dec 2009 22:10:25 +0000
(14:10 -0800)
committer
Wayne Davison
<wayned@samba.org>
Wed, 23 Dec 2009 22:14:54 +0000
(14:14 -0800)
io.c
patch
|
blob
|
blame
|
history
diff --git
a/io.c
b/io.c
index
ae60775
..
077e503
100644
(file)
--- a/
io.c
+++ b/
io.c
@@
-1405,12
+1405,12
@@
static void read_a_msg(void)
got_flist_entry_status(FES_REDO, val);
break;
case MSG_IO_ERROR:
got_flist_entry_status(FES_REDO, val);
break;
case MSG_IO_ERROR:
- if (msg_bytes != 4
|| am_sender
)
+ if (msg_bytes != 4)
goto invalid_msg;
val = raw_read_int();
iobuf.in_multiplexed = 1;
io_error |= val;
goto invalid_msg;
val = raw_read_int();
iobuf.in_multiplexed = 1;
io_error |= val;
- if (
!am_generato
r)
+ if (
am_receive
r)
send_msg_int(MSG_IO_ERROR, val);
break;
case MSG_IO_TIMEOUT:
send_msg_int(MSG_IO_ERROR, val);
break;
case MSG_IO_TIMEOUT: