#include "async_smb.h"
#include "../libcli/smb/smbXcli_base.h"
#include "../librpc/ndr/libndr.h"
+#include "../include/client.h"
/*******************************************************************
Setup the word count and byte count for a client smb message.
return old_state;
}
-/****************************************************************************
- convenience routine to find if we negotiated ucs2
-****************************************************************************/
-
-bool cli_ucs2(struct cli_state *cli)
-{
- return smbXcli_conn_use_unicode(cli->conn);
-}
-
/****************************************************************************
Initialize Domain, user or password.
****************************************************************************/
}
cli->raw_status = NT_STATUS_INTERNAL_ERROR;
cli->map_dos_errors = true; /* remove this */
- cli->timeout = 20000; /* Timeout is in milliseconds. */
+ cli->timeout = CLIENT_TIMEOUT;
cli->case_sensitive = false;
/* Set the CLI_FORCE_DOSERR environment variable to test
if (getenv("CLI_FORCE_ASCII")) {
force_ascii = true;
}
+ if (!lp_unicode()) {
+ force_ascii = true;
+ }
if (flags & CLI_FULL_CONNECTION_FORCE_ASCII) {
force_ascii = true;
}
cli->use_ccache = true;
}
+ if (flags & CLI_FULL_CONNECTION_USE_NT_HASH) {
+ cli->pw_nt_hash = true;
+ }
+
if (flags & CLI_FULL_CONNECTION_OPLOCKS) {
cli->use_oplocks = true;
}
cli->smb1.pid = (uint16_t)getpid();
cli->smb1.vc_num = cli->smb1.pid;
- cli->smb1.tid = UINT16_MAX;
- cli->smb1.uid = UID_FIELD_INVALID;
+ cli->smb1.tcon = smbXcli_tcon_create(cli);
+ if (cli->smb1.tcon == NULL) {
+ goto error;
+ }
+ smb1cli_tcon_set_id(cli->smb1.tcon, UINT16_MAX);
+ cli->smb1.session = smbXcli_session_create(cli, cli->conn);
+ if (cli->smb1.session == NULL) {
+ goto error;
+ }
cli->initialised = 1;
return cli;
return NULL;
}
-bool cli_state_encryption_on(struct cli_state *cli)
-{
- return smb1cli_conn_encryption_on(cli->conn);
-}
-
-
/****************************************************************************
Close all pipes open on this session.
****************************************************************************/
if (cli_state_has_tcon(cli)) {
cli_tdis(cli);
}
-
- data_blob_free(&cli->user_session_key);
- cli_state_disconnect(cli);
+ smbXcli_conn_disconnect(cli->conn, NT_STATUS_OK);
TALLOC_FREE(cli);
}
return cli->smb1.vc_num;
}
-uint32_t cli_state_server_session_key(struct cli_state *cli)
-{
- return smb1cli_conn_server_session_key(cli->conn);
-}
-
/****************************************************************************
Set the PID to use for smb messages. Return the old pid.
****************************************************************************/
bool cli_state_has_tcon(struct cli_state *cli)
{
- if (cli->smb1.tid == UINT16_MAX) {
+ uint16_t tid = cli_state_get_tid(cli);
+
+ if (tid == UINT16_MAX) {
return false;
}
uint16_t cli_state_get_tid(struct cli_state *cli)
{
- return cli->smb1.tid;
+ return smb1cli_tcon_current_id(cli->smb1.tcon);
}
uint16_t cli_state_set_tid(struct cli_state *cli, uint16_t tid)
{
- uint16_t ret = cli->smb1.tid;
- cli->smb1.tid = tid;
+ uint16_t ret = smb1cli_tcon_current_id(cli->smb1.tcon);
+ smb1cli_tcon_set_id(cli->smb1.tcon, tid);
return ret;
}
uint16_t cli_state_get_uid(struct cli_state *cli)
{
- return cli->smb1.uid;
+ return smb1cli_session_current_id(cli->smb1.session);
}
uint16_t cli_state_set_uid(struct cli_state *cli, uint16_t uid)
{
- uint16_t ret = cli->smb1.uid;
- cli->smb1.uid = uid;
+ uint16_t ret = smb1cli_session_current_id(cli->smb1.session);
+ smb1cli_session_set_id(cli->smb1.session, uid);
return ret;
}
bool cli_set_case_sensitive(struct cli_state *cli, bool case_sensitive)
{
bool ret = cli->case_sensitive;
- cli->case_sensitive = case_sensitive;
- return ret;
-}
+ uint32_t fs_attrs;
+ struct smbXcli_tcon *tcon;
-enum protocol_types cli_state_protocol(struct cli_state *cli)
-{
- return smbXcli_conn_protocol(cli->conn);
-}
+ if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
+ tcon = cli->smb2.tcon;
+ } else {
+ tcon = cli->smb1.tcon;
+ }
-uint32_t cli_state_capabilities(struct cli_state *cli)
-{
- return smb1cli_conn_capabilities(cli->conn);
+ fs_attrs = smbXcli_tcon_get_fs_attributes(tcon);
+ if (case_sensitive) {
+ fs_attrs |= FILE_CASE_SENSITIVE_SEARCH;
+ } else {
+ fs_attrs &= ~FILE_CASE_SENSITIVE_SEARCH;
+ }
+ smbXcli_tcon_set_fs_attributes(tcon, fs_attrs);
+
+ cli->case_sensitive = case_sensitive;
+ return ret;
}
uint32_t cli_state_available_size(struct cli_state *cli, uint32_t ofs)
return ret;
}
-uint16_t cli_state_max_requests(struct cli_state *cli)
-{
- return smbXcli_conn_max_requests(cli->conn);
-}
-
-const uint8_t *cli_state_server_challenge(struct cli_state *cli)
-{
- return smb1cli_conn_server_challenge(cli->conn);
-}
-
-const DATA_BLOB *cli_state_server_gss_blob(struct cli_state *cli)
-{
- return smbXcli_conn_server_gss_blob(cli->conn);
-}
-
-uint16_t cli_state_security_mode(struct cli_state *cli)
-{
- return smb1cli_conn_server_security_mode(cli->conn);
-}
-
-int cli_state_server_time_zone(struct cli_state *cli)
-{
- return smb1cli_conn_server_time_zone(cli->conn);
-}
-
time_t cli_state_server_time(struct cli_state *cli)
{
NTTIME nt;
}
struct cli_echo_state {
- uint16_t vwv[1];
- DATA_BLOB data;
- int num_echos;
+ bool is_smb2;
};
static void cli_echo_done(struct tevent_req *subreq);
-struct tevent_req *cli_echo_send(TALLOC_CTX *mem_ctx, struct event_context *ev,
+struct tevent_req *cli_echo_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
struct cli_state *cli, uint16_t num_echos,
DATA_BLOB data)
{
if (req == NULL) {
return NULL;
}
- SSVAL(state->vwv, 0, num_echos);
- state->data = data;
- state->num_echos = num_echos;
- subreq = cli_smb_send(state, ev, cli, SMBecho, 0, 1, state->vwv,
- data.length, data.data);
- if (subreq == NULL) {
- goto fail;
+ if (smbXcli_conn_protocol(cli->conn) >= PROTOCOL_SMB2_02) {
+ state->is_smb2 = true;
+ subreq = smb2cli_echo_send(state, ev,
+ cli->conn,
+ cli->timeout);
+ } else {
+ subreq = smb1cli_echo_send(state, ev,
+ cli->conn,
+ cli->timeout,
+ num_echos,
+ data);
+ }
+ if (tevent_req_nomem(subreq, req)) {
+ return tevent_req_post(req, ev);
}
tevent_req_set_callback(subreq, cli_echo_done, req);
+
return req;
- fail:
- TALLOC_FREE(req);
- return NULL;
}
static void cli_echo_done(struct tevent_req *subreq)
struct cli_echo_state *state = tevent_req_data(
req, struct cli_echo_state);
NTSTATUS status;
- uint32_t num_bytes;
- uint8_t *bytes;
- uint8_t *inbuf;
- status = cli_smb_recv(subreq, state, &inbuf, 0, NULL, NULL,
- &num_bytes, &bytes);
+ if (state->is_smb2) {
+ status = smb2cli_echo_recv(subreq);
+ } else {
+ status = smb1cli_echo_recv(subreq);
+ }
+ TALLOC_FREE(subreq);
if (!NT_STATUS_IS_OK(status)) {
tevent_req_nterror(req, status);
return;
}
- if ((num_bytes != state->data.length)
- || (memcmp(bytes, state->data.data, num_bytes) != 0)) {
- tevent_req_nterror(req, NT_STATUS_INVALID_NETWORK_RESPONSE);
- return;
- }
-
- state->num_echos -=1;
- if (state->num_echos == 0) {
- tevent_req_done(req);
- return;
- }
- if (!smbXcli_req_set_pending(subreq)) {
- tevent_req_nterror(req, NT_STATUS_NO_MEMORY);
- return;
- }
+ tevent_req_done(req);
}
/**
NTSTATUS cli_echo(struct cli_state *cli, uint16_t num_echos, DATA_BLOB data)
{
TALLOC_CTX *frame = talloc_stackframe();
- struct event_context *ev;
+ struct tevent_context *ev;
struct tevent_req *req;
NTSTATUS status = NT_STATUS_OK;
- if (cli_has_async_calls(cli)) {
+ if (smbXcli_conn_has_async_calls(cli->conn)) {
/*
* Can't use sync call while an async call is in flight
*/
goto fail;
}
- ev = event_context_init(frame);
+ ev = samba_tevent_context_init(frame);
if (ev == NULL) {
status = NT_STATUS_NO_MEMORY;
goto fail;
struct tevent_req *req = NULL;
NTSTATUS status = NT_STATUS_NO_MEMORY;
- if (cli_has_async_calls(cli)) {
+ if (smbXcli_conn_has_async_calls(cli->conn)) {
return NT_STATUS_INVALID_PARAMETER;
}
- ev = tevent_context_init(mem_ctx);
+ ev = samba_tevent_context_init(mem_ctx);
if (ev == NULL) {
goto fail;
}
git.samba.org / mat / samba.git / blobdiff