Author: metze Date: 2006-07-30 16:48:41 +0000 (Sun, 30 Jul 2006) New Revision: 17317
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=17317 Log: - add a composite_create() function that allocates and initialize the composite_context structue, we should try to convert all code to use this because there're a lot of places where the we have bugs with this task... - add a composite_continue_smb2() helper We should try to hide the internals of the composite code from the users to avoid errors (and I found a lot of them... and will fix then step by step) metze Modified: branches/SAMBA_4_0/source/libcli/composite/composite.c branches/SAMBA_4_0/source/libcli/composite/composite.h Changeset: Modified: branches/SAMBA_4_0/source/libcli/composite/composite.c =================================================================== --- branches/SAMBA_4_0/source/libcli/composite/composite.c 2006-07-30 16:36:56 UTC (rev 17316) +++ branches/SAMBA_4_0/source/libcli/composite/composite.c 2006-07-30 16:48:41 UTC (rev 17317) @@ -24,12 +24,30 @@ #include "includes.h" #include "lib/events/events.h" #include "libcli/raw/libcliraw.h" +#include "libcli/smb2/smb2.h" #include "libcli/composite/composite.h" #include "lib/messaging/irpc.h" #include "librpc/rpc/dcerpc.h" #include "libcli/nbt/libnbt.h" /* + create a new composite_context structure + and initialize it +*/ +_PUBLIC_ struct composite_context *composite_create(TALLOC_CTX *mem_ctx, + struct event_context *ev) +{ + struct composite_context *c; + + c = talloc_zero(mem_ctx, struct composite_context); + if (!c) return NULL; + c->state = COMPOSITE_STATE_IN_PROGRESS; + c->event_ctx = ev; + + return c; +} + +/* block until a composite function has completed, then return the status */ _PUBLIC_ NTSTATUS composite_wait(struct composite_context *c) @@ -156,6 +174,16 @@ new_req->async.private = private_data; } +_PUBLIC_ void composite_continue_smb2(struct composite_context *ctx, + struct smb2_request *new_req, + void (*continuation)(struct smb2_request *), + void *private_data) +{ + if (composite_nomem(new_req, ctx)) return; + new_req->async.fn = continuation; + new_req->async.private = private_data; +} + _PUBLIC_ void composite_continue_nbt(struct composite_context *ctx, struct nbt_name_request *new_req, void (*continuation)(struct nbt_name_request *), Modified: branches/SAMBA_4_0/source/libcli/composite/composite.h =================================================================== --- branches/SAMBA_4_0/source/libcli/composite/composite.h 2006-07-30 16:36:56 UTC (rev 17316) +++ branches/SAMBA_4_0/source/libcli/composite/composite.h 2006-07-30 16:48:41 UTC (rev 17317) @@ -63,6 +63,7 @@ struct irpc_request; struct smbcli_request; +struct smb2_request; struct rpc_request; struct nbt_name_request;
