summaryrefslogtreecommitdiff
path: root/lib/socket_wrapper
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2009-09-08 22:07:30 +0200
committerStefan Metzmacher <metze@samba.org>2009-09-08 22:07:30 +0200
commit4b6e9a8e49bb0f63eed65fd84c0aa28b394482cd (patch)
tree025c64e5e56c34d674b6f8e5431be2e9f2fa66cb /lib/socket_wrapper
parent2bc8e572016c79677f40c9aad63706293e11e294 (diff)
downloadsamba-4b6e9a8e49bb0f63eed65fd84c0aa28b394482cd.tar.gz
samba-4b6e9a8e49bb0f63eed65fd84c0aa28b394482cd.tar.bz2
samba-4b6e9a8e49bb0f63eed65fd84c0aa28b394482cd.zip
socket_wrapper: swrap_read() should use SWRAP_RECV* for swrap_dump_packet()
This is the same as swrap_recv(). metze
Diffstat (limited to 'lib/socket_wrapper')
-rw-r--r--lib/socket_wrapper/socket_wrapper.c8
1 files changed, 3 insertions, 5 deletions
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;