From 4b6e9a8e49bb0f63eed65fd84c0aa28b394482cd Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 8 Sep 2009 22:07:30 +0200 Subject: socket_wrapper: swrap_read() should use SWRAP_RECV* for swrap_dump_packet() This is the same as swrap_recv(). metze --- lib/socket_wrapper/socket_wrapper.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'lib/socket_wrapper') diff --git a/lib/socket_wrapper/socket_wrapper.c b/lib/socket_wrapper/socket_wrapper.c index eb53c9c6ea..a188cc623c 100644 --- a/lib/socket_wrapper/socket_wrapper.c +++ b/lib/socket_wrapper/socket_wrapper.c @@ -671,8 +671,6 @@ enum swrap_packet_type { SWRAP_CLOSE_SEND, SWRAP_CLOSE_RECV, SWRAP_CLOSE_ACK, - SWRAP_READ, - SWRAP_READ_RST }; struct swrap_file_hdr { @@ -2060,11 +2058,11 @@ _PUBLIC_ ssize_t swrap_read(int s, void *buf, size_t len) ret = real_read(s, buf, len); if (ret == -1 && errno != EAGAIN && errno != ENOBUFS) { - swrap_dump_packet(si, NULL, SWRAP_READ_RST, NULL, 0); + swrap_dump_packet(si, NULL, SWRAP_RECV_RST, NULL, 0); } else if (ret == 0) { /* END OF FILE */ - swrap_dump_packet(si, NULL, SWRAP_READ_RST, NULL, 0); + swrap_dump_packet(si, NULL, SWRAP_RECV_RST, NULL, 0); } else if (ret > 0) { - swrap_dump_packet(si, NULL, SWRAP_READ, buf, ret); + swrap_dump_packet(si, NULL, SWRAP_RECV, buf, ret); } return ret; -- cgit