diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-10-28 07:55:33 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:04:53 -0500 |
| commit | 990d76f7cbd4339c30f650781c40463234fc47e1 (patch) | |
| tree | e65cae139e5028f46ea635c0aabd99d6efbe71c6 /source4/lib/socket/socket_ipv4.c | |
| parent | 34cd0662f0340720fa45dd16c82496cd76e92268 (diff) | |
| download | samba-990d76f7cbd4339c30f650781c40463234fc47e1.tar.gz samba-990d76f7cbd4339c30f650781c40463234fc47e1.tar.bz2 samba-990d76f7cbd4339c30f650781c40463234fc47e1.zip | |
r3314: added a option "socket:testnonblock" to the generic socket code. If
you set this option (either on the command line using --option or in
smb.conf) then every socket recv or send will return short by random
amounts. This allows you to test that the non-blocking socket logic in
your code works correctly.
I also removed the flags argument to socket_accept(), and instead made
the new socket inherit the flags of the old socket, which makes more
sense to me.
(This used to be commit 406d356e698da01c84e8aa5b7894752b4403f63c)
Diffstat (limited to 'source4/lib/socket/socket_ipv4.c')
| -rw-r--r-- | source4/lib/socket/socket_ipv4.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source4/lib/socket/socket_ipv4.c b/source4/lib/socket/socket_ipv4.c index 71e1c62235..f9318a29bb 100644 --- a/source4/lib/socket/socket_ipv4.c +++ b/source4/lib/socket/socket_ipv4.c @@ -130,7 +130,7 @@ static NTSTATUS ipv4_tcp_listen(struct socket_context *sock, return NT_STATUS_OK; } -static NTSTATUS ipv4_tcp_accept(struct socket_context *sock, struct socket_context **new_sock, uint32_t flags) +static NTSTATUS ipv4_tcp_accept(struct socket_context *sock, struct socket_context **new_sock) { struct sockaddr_in cli_addr; socklen_t cli_addr_len = sizeof(cli_addr); @@ -141,7 +141,7 @@ static NTSTATUS ipv4_tcp_accept(struct socket_context *sock, struct socket_conte return map_nt_error_from_unix(errno); } - if (!(flags & SOCKET_FLAG_BLOCK)) { + if (!(sock->flags & SOCKET_FLAG_BLOCK)) { int ret = set_blocking(new_fd, False); if (ret == -1) { close(new_fd); @@ -164,7 +164,7 @@ static NTSTATUS ipv4_tcp_accept(struct socket_context *sock, struct socket_conte /* copy the socket_context */ (*new_sock)->type = sock->type; (*new_sock)->state = SOCKET_STATE_SERVER_CONNECTED; - (*new_sock)->flags = flags; + (*new_sock)->flags = sock->flags; (*new_sock)->fd = new_fd; |