summaryrefslogtreecommitdiff
path: root/libcli/smb
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-09-06 17:52:02 +0200
committerStefan Metzmacher <metze@samba.org>2011-11-24 19:02:31 +0100
commit9d06e0fcc73d60cb03a256847413dac7e8673e20 (patch)
treeea3cc8bf3569578469a20c3b8d7e80458d30f18a /libcli/smb
parentd5335431660825245fae39584dbf4233bed2c8e1 (diff)
downloadsamba-9d06e0fcc73d60cb03a256847413dac7e8673e20.tar.gz
samba-9d06e0fcc73d60cb03a256847413dac7e8673e20.tar.bz2
samba-9d06e0fcc73d60cb03a256847413dac7e8673e20.zip
smbXcli: add support for SMB2 multi-credit requests
metze
Diffstat (limited to 'libcli/smb')
-rw-r--r--libcli/smb/smbXcli_base.c69
-rw-r--r--libcli/smb/smbXcli_base.h3
2 files changed, 67 insertions, 5 deletions
diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index cb453856bd..4b1e7103c8 100644
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -111,6 +111,8 @@ struct smbXcli_conn {
} server;
uint64_t mid;
+ uint16_t cur_credits;
+ uint16_t max_credits;
} smb2;
};
@@ -164,6 +166,8 @@ struct smbXcli_req_state {
/* always an array of 3 talloc elements */
struct iovec *recv_iov;
+
+ uint16_t credit_charge;
} smb2;
};
@@ -276,6 +280,9 @@ struct smbXcli_conn *smbXcli_conn_create(TALLOC_CTX *mem_ctx,
conn->smb2.client.guid = *client_guid;
}
+ conn->smb2.cur_credits = 1;
+ conn->smb2.max_credits = 0;
+
talloc_set_destructor(conn, smbXcli_conn_destructor);
return conn;
@@ -1958,6 +1965,12 @@ uint32_t smb2cli_conn_max_write_size(struct smbXcli_conn *conn)
return conn->smb2.server.max_write_size;
}
+void smb2cli_conn_set_max_credits(struct smbXcli_conn *conn,
+ uint16_t max_credits)
+{
+ conn->smb2.max_credits = max_credits;
+}
+
struct tevent_req *smb2cli_req_create(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct smbXcli_conn *conn,
@@ -2002,10 +2015,7 @@ struct tevent_req *smb2cli_req_create(TALLOC_CTX *mem_ctx,
SIVAL(state->smb2.hdr, SMB2_HDR_PROTOCOL_ID, SMB2_MAGIC);
SSVAL(state->smb2.hdr, SMB2_HDR_LENGTH, SMB2_HDR_BODY);
- SSVAL(state->smb2.hdr, SMB2_HDR_CREDIT_CHARGE, 1);
- SIVAL(state->smb2.hdr, SMB2_HDR_STATUS, NT_STATUS_V(NT_STATUS_OK));
SSVAL(state->smb2.hdr, SMB2_HDR_OPCODE, cmd);
- SSVAL(state->smb2.hdr, SMB2_HDR_CREDIT, 31);
SIVAL(state->smb2.hdr, SMB2_HDR_FLAGS, flags);
SIVAL(state->smb2.hdr, SMB2_HDR_PID, pid);
SIVAL(state->smb2.hdr, SMB2_HDR_TID, tid);
@@ -2068,6 +2078,9 @@ NTSTATUS smb2cli_req_compound_submit(struct tevent_req **reqs,
for (i=0; i<num_reqs; i++) {
size_t reqlen;
bool ret;
+ uint64_t avail;
+ uint16_t charge;
+ uint16_t credits;
uint64_t mid;
if (!tevent_req_is_in_progress(reqs[i])) {
@@ -2085,13 +2098,41 @@ NTSTATUS smb2cli_req_compound_submit(struct tevent_req **reqs,
return NT_STATUS_REVISION_MISMATCH;
}
- if (state->conn->smb2.mid == UINT64_MAX) {
+ avail = UINT64_MAX - state->conn->smb2.mid;
+ if (avail < 1) {
return NT_STATUS_CONNECTION_ABORTED;
}
+ if (state->conn->smb2.server.capabilities & SMB2_CAP_LARGE_MTU) {
+ charge = (MAX(state->smb2.dyn_len, 1) - 1)/ 65536 + 1;
+ } else {
+ charge = 1;
+ }
+
+ charge = MAX(state->smb2.credit_charge, charge);
+
+ avail = MIN(avail, state->conn->smb2.cur_credits);
+ if (avail < charge) {
+ return NT_STATUS_INTERNAL_ERROR;
+ }
+
+ credits = 0;
+ if (state->conn->smb2.max_credits > state->conn->smb2.cur_credits) {
+ credits = state->conn->smb2.max_credits -
+ state->conn->smb2.cur_credits;
+ }
+ if (state->conn->smb2.max_credits >= state->conn->smb2.cur_credits) {
+ credits += 1;
+ }
+
mid = state->conn->smb2.mid;
- state->conn->smb2.mid += 1;
+ state->conn->smb2.mid += charge;
+ state->conn->smb2.cur_credits -= charge;
+ if (state->conn->smb2.server.capabilities & SMB2_CAP_LARGE_MTU) {
+ SSVAL(state->smb2.hdr, SMB2_HDR_CREDIT_CHARGE, charge);
+ }
+ SSVAL(state->smb2.hdr, SMB2_HDR_CREDIT, credits);
SBVAL(state->smb2.hdr, SMB2_HDR_MESSAGE_ID, mid);
iov[num_iov].iov_base = state->smb2.hdr;
@@ -2152,6 +2193,15 @@ NTSTATUS smb2cli_req_compound_submit(struct tevent_req **reqs,
return NT_STATUS_OK;
}
+void smb2cli_req_set_credit_charge(struct tevent_req *req, uint16_t charge)
+{
+ struct smbXcli_req_state *state =
+ tevent_req_data(req,
+ struct smbXcli_req_state);
+
+ state->smb2.credit_charge = charge;
+}
+
struct tevent_req *smb2cli_req_send(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
struct smbXcli_conn *conn,
@@ -2353,6 +2403,15 @@ static NTSTATUS smb2cli_conn_dispatch_incoming(struct smbXcli_conn *conn,
uint32_t flags = IVAL(inhdr, SMB2_HDR_FLAGS);
uint64_t mid = BVAL(inhdr, SMB2_HDR_MESSAGE_ID);
uint16_t req_opcode;
+ uint16_t credits = SVAL(inhdr, SMB2_HDR_CREDIT);
+ uint32_t new_credits;
+
+ new_credits = conn->smb2.cur_credits;
+ new_credits += credits;
+ if (new_credits > UINT16_MAX) {
+ return NT_STATUS_INVALID_NETWORK_RESPONSE;
+ }
+ conn->smb2.cur_credits += credits;
req = smb2cli_conn_find_pending(conn, mid);
if (req == NULL) {
diff --git a/libcli/smb/smbXcli_base.h b/libcli/smb/smbXcli_base.h
index 9c359b846c..df34d6c894 100644
--- a/libcli/smb/smbXcli_base.h
+++ b/libcli/smb/smbXcli_base.h
@@ -136,6 +136,8 @@ uint16_t smb2cli_conn_server_security_mode(struct smbXcli_conn *conn);
uint32_t smb2cli_conn_max_trans_size(struct smbXcli_conn *conn);
uint32_t smb2cli_conn_max_read_size(struct smbXcli_conn *conn);
uint32_t smb2cli_conn_max_write_size(struct smbXcli_conn *conn);
+void smb2cli_conn_set_max_credits(struct smbXcli_conn *conn,
+ uint16_t max_credits);
struct tevent_req *smb2cli_req_create(TALLOC_CTX *mem_ctx,
struct tevent_context *ev,
@@ -153,6 +155,7 @@ struct tevent_req *smb2cli_req_create(TALLOC_CTX *mem_ctx,
uint32_t dyn_len);
NTSTATUS smb2cli_req_compound_submit(struct tevent_req **reqs,
int num_reqs);
+void smb2cli_req_set_credit_charge(struct tevent_req *req, uint16_t charge);
struct smb2cli_req_expected_response {
NTSTATUS status;