The branch, master has been updated
via df0e330 s3: Remove cli_send/receive_smb
via ce9d63d s3: Remove the smbtorture3 OPLOCK3 test
via 9a787bb s3: Convert the OPEN4 test to async oplock handling
from feb1d9f s3: Remove clistr_align_out
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit df0e33008e516e0ae631a3760a4c5ff2a1237834
Author: Volker Lendecke v...@samba.org
Date: Sun May 22 19:00:50 2011 +0200
s3: Remove cli_send/receive_smb
A moment of silence is due here, R.I.P.
Autobuild-User: Volker Lendecke vlen...@samba.org
Autobuild-Date: Sun May 22 22:17:12 CEST 2011 on sn-devel-104
commit ce9d63d1618e1cd803e68a0d97ec352a8d125070
Author: Volker Lendecke v...@samba.org
Date: Sun May 22 14:16:46 2011 +0200
s3: Remove the smbtorture3 OPLOCK3 test
This is the last user of cli_receive_smb. Oplocks are nowadays tested
in smbtorture4, this mainly has historic value
commit 9a787bbad1f8a5b19242118fe7a37de76562edf8
Author: Volker Lendecke v...@samba.org
Date: Sun May 22 18:50:16 2011 +0200
s3: Convert the OPEN4 test to async oplock handling
This removes a caller of cli_receive_smb
---
Summary of changes:
source3/libsmb/clientgen.c| 282 -
source3/libsmb/proto.h|2 -
source3/selftest/tests.py |2 +-
source3/torture/torture.c | 184 ++-
testsuite/build_farm/runlist |2 +-
testsuite/build_farm/torture-OPLOCK3.test |2 -
6 files changed, 97 insertions(+), 377 deletions(-)
delete mode 100644 testsuite/build_farm/torture-OPLOCK3.test
Changeset truncated at 500 lines:
diff --git a/source3/libsmb/clientgen.c b/source3/libsmb/clientgen.c
index d6f909c..6bfc3cd 100644
--- a/source3/libsmb/clientgen.c
+++ b/source3/libsmb/clientgen.c
@@ -68,101 +68,6 @@ bool cli_ucs2(struct cli_state *cli)
return ((cli-capabilities CAP_UNICODE) != 0);
}
-
-/
- Read an smb from a fd ignoring all keepalive packets.
- The timeout is in milliseconds
-
- This is exactly the same as receive_smb except that it never returns
- a session keepalive packet (just as receive_smb used to do).
- receive_smb was changed to return keepalives as the oplock processing means
this call
- should never go into a blocking read.
-/
-
-static ssize_t client_receive_smb(struct cli_state *cli, size_t maxlen)
-{
- size_t len;
-
- for(;;) {
- NTSTATUS status;
-
- set_smb_read_error(cli-smb_rw_error, SMB_READ_OK);
-
- status = receive_smb_raw(cli-fd, cli-inbuf, cli-bufsize,
- cli-timeout, maxlen, len);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(10,(client_receive_smb failed\n));
- show_msg(cli-inbuf);
-
- if (NT_STATUS_EQUAL(status, NT_STATUS_END_OF_FILE)) {
- set_smb_read_error(cli-smb_rw_error,
- SMB_READ_EOF);
- return -1;
- }
-
- if (NT_STATUS_EQUAL(status, NT_STATUS_IO_TIMEOUT)) {
- set_smb_read_error(cli-smb_rw_error,
- SMB_READ_TIMEOUT);
- return -1;
- }
-
- set_smb_read_error(cli-smb_rw_error, SMB_READ_ERROR);
- return -1;
- }
-
- /*
-* I don't believe len can be 0 with NT_STATUS_OK
-* returned above, but this check doesn't hurt. JRA.
-*/
-
- if ((ssize_t)len 0) {
- return len;
- }
-
- /* Ignore session keepalive packets. */
- if(CVAL(cli-inbuf,0) != SMBkeepalive) {
- break;
- }
- }
-
- if (cli_encryption_on(cli)) {
- NTSTATUS status = cli_decrypt_message(cli);
- if (!NT_STATUS_IS_OK(status)) {
- DEBUG(0, (SMB decryption failed on incoming packet!
Error %s\n,
- nt_errstr(status)));
- cli-smb_rw_error = SMB_READ_BAD_DECRYPT;
- return -1;
- }
- }
-
- show_msg(cli-inbuf);
- return len;
-}
-
-static bool cli_state_set_seqnum(struct cli_state *cli, uint16_t mid, uint32_t
seqnum)
-{
- struct cli_state_seqnum *c;
-
- for (c = cli-seqnum; c; c = c-next) {
-
