sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

libsmb: Adapt cli_echo_send() to modern conventions

Browse Source 
Nowadays we rather do protocol-specific _done() functions, and overall
this cuts a few lines.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
This commit is contained in:
Volker Lendecke 2023-03-11 13:51:43 +01:00
parent efdae5d2fa
commit 33194ad234
1 changed files with 22 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
source3/libsmb/clientgen.c
View File

@ -499,10 +499,11 @@ time_t cli_state_server_time(struct cli_state *cli)
}
struct cli_echo_state {
bool is_smb2;
uint8_t dummy;
};
static void cli_echo_done(struct tevent_req *subreq);
static void cli_echo_done1(struct tevent_req *subreq);
static void cli_echo_done2(struct tevent_req *subreq);
struct tevent_req *cli_echo_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
struct cli_state *cli, uint16_t num_echos,
@ -517,45 +518,35 @@ struct tevent_req *cli_echo_send(TALLOC_CTX *mem_ctx, struct tevent_context *ev,
}
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);
subreq = smb2cli_echo_send(
state, ev, cli->conn, cli->timeout);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
}
tevent_req_set_callback(subreq, cli_echo_done2, req);
return req;
}
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);
tevent_req_set_callback(subreq, cli_echo_done1, req);
return req;
}
static void cli_echo_done(struct tevent_req *subreq)
static void cli_echo_done1(struct tevent_req *subreq)
{
struct tevent_req *req = tevent_req_callback_data(
subreq, struct tevent_req);
struct cli_echo_state *state = tevent_req_data(
req, struct cli_echo_state);
NTSTATUS status;
NTSTATUS status = smb1cli_echo_recv(subreq);
return tevent_req_simple_finish_ntstatus(subreq, status);
}
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;
}
tevent_req_done(req);
static void cli_echo_done2(struct tevent_req *subreq)
{
NTSTATUS status = smb2cli_echo_recv(subreq);
return tevent_req_simple_finish_ntstatus(subreq, status);
}
/**