From 4abdd3981e9688aaaf19173182ace7b1fdf93f6d Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 19 Dec 2008 14:27:20 +0100 Subject: Pass "bytes_alignment" up through cli_request_send This parameter makes smb_spice_chain add padding before the bytes field --- source3/include/async_smb.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/include/async_smb.h') diff --git a/source3/include/async_smb.h b/source3/include/async_smb.h index 25fd353632a..fd0b0d2c539 100644 --- a/source3/include/async_smb.h +++ b/source3/include/async_smb.h @@ -119,6 +119,7 @@ struct async_req *cli_request_send(TALLOC_CTX *mem_ctx, uint8_t smb_command, uint8_t additional_flags, uint8_t wct, const uint16_t *vwv, + size_t bytes_alignment, uint16_t num_bytes, const uint8_t *bytes); bool cli_chain_cork(struct cli_state *cli, struct event_context *ev, -- cgit From 398ef0fb855b3b2d6e55ae26304589fd89110628 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 19 Dec 2008 16:11:14 +0100 Subject: For large smbwrite&x, we need more than 64k bcc --- source3/include/async_smb.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/include/async_smb.h') diff --git a/source3/include/async_smb.h b/source3/include/async_smb.h index fd0b0d2c539..f8f94aa4c9c 100644 --- a/source3/include/async_smb.h +++ b/source3/include/async_smb.h @@ -120,7 +120,7 @@ struct async_req *cli_request_send(TALLOC_CTX *mem_ctx, uint8_t additional_flags, uint8_t wct, const uint16_t *vwv, size_t bytes_alignment, - uint16_t num_bytes, const uint8_t *bytes); + uint32_t num_bytes, const uint8_t *bytes); bool cli_chain_cork(struct cli_state *cli, struct event_context *ev, size_t size_hint); @@ -129,7 +129,7 @@ bool cli_in_chain(struct cli_state *cli); bool smb_splice_chain(char **poutbuf, uint8_t smb_command, uint8_t wct, const uint16_t *vwv, size_t bytes_alignment, - uint16_t num_bytes, const uint8_t *bytes); + uint32_t num_bytes, const uint8_t *bytes); NTSTATUS cli_pull_reply(struct async_req *req, uint8_t *pwct, uint16_t **pvwv, -- cgit From 1f04d07db0d53630d400ed35cecf7c66d3bb491c Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 19 Dec 2008 17:44:32 +0100 Subject: Convert cli_request->outbuf to uint8_t --- source3/include/async_smb.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/include/async_smb.h') diff --git a/source3/include/async_smb.h b/source3/include/async_smb.h index f8f94aa4c9c..ef53ee21639 100644 --- a/source3/include/async_smb.h +++ b/source3/include/async_smb.h @@ -66,7 +66,7 @@ struct cli_request { /** * The bytes we have to ship to the server */ - char *outbuf; + uint8_t *outbuf; /** * How much from "outbuf" did we already send @@ -126,7 +126,7 @@ bool cli_chain_cork(struct cli_state *cli, struct event_context *ev, size_t size_hint); void cli_chain_uncork(struct cli_state *cli); bool cli_in_chain(struct cli_state *cli); -bool smb_splice_chain(char **poutbuf, uint8_t smb_command, +bool smb_splice_chain(uint8_t **poutbuf, uint8_t smb_command, uint8_t wct, const uint16_t *vwv, size_t bytes_alignment, uint32_t num_bytes, const uint8_t *bytes); -- cgit