1
0
mirror of https://github.com/samba-team/samba.git synced 2025-11-07 12:23:51 +03:00

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 commit is contained in:
Andrew Tridgell
2004-10-28 07:55:33 +00:00
committed by Gerald (Jerry) Carter
parent a2d92aa431
commit 406d356e69
8 changed files with 34 additions and 17 deletions

View File

@@ -60,6 +60,14 @@ NTSTATUS socket_create(const char *name, enum socket_type type, struct socket_co
return status;
}
/* by enabling "testnonblock" mode, all socket receive and
send calls on non-blocking sockets will randomly recv/send
less data than requested */
if (!(flags & SOCKET_FLAG_BLOCK) &&
lp_parm_bool(-1, "socket", "testnonblock", False)) {
(*new_sock)->flags |= SOCKET_FLAG_TESTNONBLOCK;
}
talloc_set_destructor(*new_sock, socket_destructor);
return NT_STATUS_OK;
@@ -108,7 +116,7 @@ NTSTATUS socket_listen(struct socket_context *sock, const char *my_address, int
return sock->ops->listen(sock, my_address, port, queue_size, flags);
}
NTSTATUS socket_accept(struct socket_context *sock, struct socket_context **new_sock, uint32_t flags)
NTSTATUS socket_accept(struct socket_context *sock, struct socket_context **new_sock)
{
NTSTATUS status;
@@ -124,7 +132,7 @@ NTSTATUS socket_accept(struct socket_context *sock, struct socket_context **new_
return NT_STATUS_NOT_IMPLEMENTED;
}
status = sock->ops->accept(sock, new_sock, flags);
status = sock->ops->accept(sock, new_sock);
if (NT_STATUS_IS_OK(status)) {
talloc_set_destructor(*new_sock, socket_destructor);
@@ -149,6 +157,10 @@ NTSTATUS socket_recv(struct socket_context *sock, void *buf,
return NT_STATUS_NOT_IMPLEMENTED;
}
if ((sock->flags & SOCKET_FLAG_TESTNONBLOCK) && wantlen > 1) {
return sock->ops->recv(sock, buf, 1+(random() % (wantlen-1)), nread, flags);
}
return sock->ops->recv(sock, buf, wantlen, nread, flags);
}
@@ -168,6 +180,12 @@ NTSTATUS socket_send(struct socket_context *sock,
return NT_STATUS_NOT_IMPLEMENTED;
}
if ((sock->flags & SOCKET_FLAG_TESTNONBLOCK) && blob->length > 1) {
DATA_BLOB blob2 = *blob;
blob2.length = 1+(random() % (blob2.length-1));
return sock->ops->send(sock, &blob2, sendlen, flags);
}
return sock->ops->send(sock, blob, sendlen, flags);
}