sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

r4938: allow the caller to supply an existing event_context if they want to

Browse Source 
in smb_composite_connect_send(). This makes doing parallel calls much
easier.
This commit is contained in:
Andrew Tridgell 2005-01-23 09:01:46 +00:00 committed by Gerald (Jerry) Carter
parent 347dfa4724
commit 442308970c
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/libcli/cliconnect.c
View File

@ -32,7 +32,7 @@ BOOL smbcli_socket_connect(struct smbcli_state *cli, const char *server)
{
struct smbcli_socket *sock;
sock = smbcli_sock_init(cli);
sock = smbcli_sock_init(cli, NULL);
if (!sock) return False;
if (!smbcli_sock_connect_byname(sock, server, 0)) {

9
source/libcli/composite/connect.c
View File

@ -330,7 +330,8 @@ static void composite_handler(struct smbcli_composite *req)
/*
a function to establish a smbcli_tree from scratch
*/
struct smbcli_composite *smb_composite_connect_send(struct smb_composite_connect *io)
struct smbcli_composite *smb_composite_connect_send(struct smb_composite_connect *io,
struct event_context *event_ctx)
{
struct smbcli_composite *c;
struct connect_state *state;
@ -342,14 +343,14 @@ struct smbcli_composite *smb_composite_connect_send(struct smb_composite_connect
state = talloc(c, struct connect_state);
if (state == NULL) goto failed;
state->sock = smbcli_sock_init(state);
state->sock = smbcli_sock_init(state, event_ctx);
if (state->sock == NULL) goto failed;
state->io = io;
state->stage = CONNECT_RESOLVE;
c->state = SMBCLI_REQUEST_SEND;
c->event_ctx = state->sock->event.ctx;
c->event_ctx = talloc_reference(c, state->sock->event.ctx);
c->private = state;
name.name = io->in.dest_host;
@ -391,6 +392,6 @@ NTSTATUS smb_composite_connect_recv(struct smbcli_composite *c, TALLOC_CTX *mem_
*/
NTSTATUS smb_composite_connect(struct smb_composite_connect *io, TALLOC_CTX *mem_ctx)
{
struct smbcli_composite *c = smb_composite_connect_send(io);
struct smbcli_composite *c = smb_composite_connect_send(io, NULL);
return smb_composite_connect_recv(c, mem_ctx);
}

10
source/libcli/raw/clisocket.c
View File

@ -49,8 +49,10 @@ static int smbcli_sock_destructor(void *ptr)
/*
create a smbcli_socket context
The event_ctx is optional - if not supplied one will be created
*/
struct smbcli_socket *smbcli_sock_init(TALLOC_CTX *mem_ctx)
struct smbcli_socket *smbcli_sock_init(TALLOC_CTX *mem_ctx,
struct event_context *event_ctx)
{
struct smbcli_socket *sock;
@ -59,7 +61,11 @@ struct smbcli_socket *smbcli_sock_init(TALLOC_CTX *mem_ctx)
return NULL;
}
sock->event.ctx = event_context_init(sock);
if (event_ctx) {
sock->event.ctx = talloc_reference(sock, event_ctx);
} else {
sock->event.ctx = event_context_init(sock);
}
if (sock->event.ctx == NULL) {
talloc_free(sock);
return NULL;

2
source/torture/rpc/xplogin.c
View File

@ -43,7 +43,7 @@ static NTSTATUS after_negprot(struct smbcli_transport **dst_transport,
struct smbcli_transport *transport;
NTSTATUS status;
sock = smbcli_sock_init(NULL);
sock = smbcli_sock_init(NULL, NULL);
if (sock == NULL)
return NT_STATUS_NO_MEMORY;