diff options
| author | Volker Lendecke <vl@samba.org> | 2008-08-01 23:14:51 +0200 |
|---|---|---|
| committer | Volker Lendecke <vl@samba.org> | 2008-08-28 17:53:36 +0200 |
| commit | 58aa97c0d9db06588d1aba4f06a3c98ed2098d8f (patch) | |
| tree | 601782ac1e5f1d214e7df883b421100f3409f505 /source3/include | |
| parent | 52e23fe460ed662e10137503abd08f4bd6596651 (diff) | |
| download | samba-58aa97c0d9db06588d1aba4f06a3c98ed2098d8f.tar.gz samba-58aa97c0d9db06588d1aba4f06a3c98ed2098d8f.tar.bz2 samba-58aa97c0d9db06588d1aba4f06a3c98ed2098d8f.zip | |
Refactoring: Add the routine cli_request_send()
cli_request_send() is supposed to bundle all generic SMB-header handling. This
makes cli_request_new static to async_smb.c.
(This used to be commit 7e73dd4e7622db64d30d48ba106892e0895fc188)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/async_smb.h | 12 | ||||
| -rw-r--r-- | source3/include/proto.h | 15 |
2 files changed, 6 insertions, 21 deletions
diff --git a/source3/include/async_smb.h b/source3/include/async_smb.h index 19408be74b..5ec6b12050 100644 --- a/source3/include/async_smb.h +++ b/source3/include/async_smb.h @@ -20,14 +20,14 @@ #include "includes.h" /* - * Create a fresh async smb request + * Ship a new smb request to the server */ -struct async_req *cli_request_new(TALLOC_CTX *mem_ctx, - struct event_context *ev, - struct cli_state *cli, - uint8_t num_words, size_t num_bytes, - struct cli_request **preq); +struct async_req *cli_request_send(TALLOC_CTX *mem_ctx, struct cli_state *cli, + uint8_t smb_command, + uint8_t additional_flags, + uint8_t wct, const uint16_t *vwv, + uint16_t num_bytes, const uint8_t *bytes); /* * Convenience function to get the SMB part out of an async_req diff --git a/source3/include/proto.h b/source3/include/proto.h index d5e942a6d7..0e691d9062 100644 --- a/source3/include/proto.h +++ b/source3/include/proto.h @@ -4201,21 +4201,6 @@ bool asn1_write_enumerated(ASN1_DATA *data, uint8 v); bool ber_write_OID_String(DATA_BLOB *blob, const char *OID); bool ber_read_OID_String(TALLOC_CTX *mem_ctx, DATA_BLOB blob, const char **OID); -/* The following definitions come from libsmb/async_smb.c */ - -NTSTATUS cli_pull_error(char *buf); -void cli_set_error(struct cli_state *cli, NTSTATUS status); -struct async_req *cli_request_new(TALLOC_CTX *mem_ctx, - struct event_context *ev, - struct cli_state *cli, - uint8_t num_words, size_t num_bytes, - struct cli_request **preq); -struct cli_request *cli_request_get(struct async_req *req); -struct cli_tmp_event *cli_tmp_event_ctx(TALLOC_CTX *mem_ctx, - struct cli_state *cli); -NTSTATUS cli_add_event_ctx(struct cli_state *cli, - struct event_context *event_ctx); - /* The following definitions come from libsmb/cliconnect.c */ ADS_STATUS cli_session_setup_spnego(struct cli_state *cli, const char *user, |