diff options
author | Andrew Bartlett <abartlet@samba.org> | 2006-04-30 05:58:31 +0000 |
---|---|---|
committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:25 -0500 |
commit | c2cc10c7869221c7f43cbbb151feb4c4db173cb9 (patch) | |
tree | ed23d0cc677288c81b317b4d7f82567622b032c6 /source4/lib/socket/socket_ipv6.c | |
parent | 4bdc83ad5c7cfb7c33dc7e4b02316c35a589c299 (diff) | |
download | samba-c2cc10c7869221c7f43cbbb151feb4c4db173cb9.tar.gz samba-c2cc10c7869221c7f43cbbb151feb4c4db173cb9.tar.bz2 samba-c2cc10c7869221c7f43cbbb151feb4c4db173cb9.zip |
r15356: Remove unused 'flags' argument from socket_send() and friends.
This is in preperation for making TLS a socket library.
Andrew Bartlett
(This used to be commit a312812b92f5ac7e6bd2c4af725dbbbc900d4452)
Diffstat (limited to 'source4/lib/socket/socket_ipv6.c')
-rw-r--r-- | source4/lib/socket/socket_ipv6.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/source4/lib/socket/socket_ipv6.c b/source4/lib/socket/socket_ipv6.c index 9b6dcbf985..3e987b4306 100644 --- a/source4/lib/socket/socket_ipv6.c +++ b/source4/lib/socket/socket_ipv6.c @@ -224,23 +224,13 @@ static NTSTATUS ipv6_tcp_accept(struct socket_context *sock, struct socket_conte } static NTSTATUS ipv6_tcp_recv(struct socket_context *sock, void *buf, - size_t wantlen, size_t *nread, uint32_t flags) + size_t wantlen, size_t *nread) { ssize_t gotlen; - int flgs = 0; - - /* TODO: we need to map all flags here */ - if (flags & SOCKET_FLAG_PEEK) { - flgs |= MSG_PEEK; - } - - if (flags & SOCKET_FLAG_BLOCK) { - flgs |= MSG_WAITALL; - } *nread = 0; - gotlen = recv(sock->fd, buf, wantlen, flgs); + gotlen = recv(sock->fd, buf, wantlen, 0); if (gotlen == 0) { return NT_STATUS_END_OF_FILE; } else if (gotlen == -1) { @@ -253,14 +243,13 @@ static NTSTATUS ipv6_tcp_recv(struct socket_context *sock, void *buf, } static NTSTATUS ipv6_tcp_send(struct socket_context *sock, - const DATA_BLOB *blob, size_t *sendlen, uint32_t flags) + const DATA_BLOB *blob, size_t *sendlen) { ssize_t len; - int flgs = 0; *sendlen = 0; - len = send(sock->fd, blob->data, blob->length, flgs); + len = send(sock->fd, blob->data, blob->length, 0); if (len == -1) { return map_nt_error_from_unix(errno); } |