summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-08-18 12:59:25 +0200
committerJelmer Vernooij <jelmer@samba.org>2011-08-18 12:59:25 +0200
commit56f7bebd3a45e444136fcf2d3168b90042a4b9f7 (patch)
tree6f465fbd8978e2cab18edc5fc54a4f91f9bf5439 /source4
parenteeee09d27368a55bcdb56e3b0f40b303a6de2e3e (diff)
downloadsamba-56f7bebd3a45e444136fcf2d3168b90042a4b9f7.tar.gz
samba-56f7bebd3a45e444136fcf2d3168b90042a4b9f7.tar.bz2
samba-56f7bebd3a45e444136fcf2d3168b90042a4b9f7.zip
smb_composite: Integrate prototypes in header file.
Diffstat (limited to 'source4')
-rw-r--r--source4/libcli/smb_composite/sesssetup.c1
-rw-r--r--source4/libcli/smb_composite/smb_composite.h71
-rw-r--r--source4/libcli/wscript_build1
3 files changed, 69 insertions, 4 deletions
diff --git a/source4/libcli/smb_composite/sesssetup.c b/source4/libcli/smb_composite/sesssetup.c
index d617055c41..9023ef9cfb 100644
--- a/source4/libcli/smb_composite/sesssetup.c
+++ b/source4/libcli/smb_composite/sesssetup.c
@@ -25,7 +25,6 @@
#include "libcli/raw/raw_proto.h"
#include "libcli/composite/composite.h"
#include "libcli/smb_composite/smb_composite.h"
-#include "libcli/smb_composite/proto.h"
#include "libcli/auth/libcli_auth.h"
#include "auth/auth.h"
#include "auth/gensec/gensec.h"
diff --git a/source4/libcli/smb_composite/smb_composite.h b/source4/libcli/smb_composite/smb_composite.h
index 84d9e78b91..d8cdb6116a 100644
--- a/source4/libcli/smb_composite/smb_composite.h
+++ b/source4/libcli/smb_composite/smb_composite.h
@@ -27,11 +27,13 @@
particularly designed to be used in async applications
*/
+#ifndef __SMB_COMPOSITE_H__
+#define __SMB_COMPOSITE_H__
+
#include "libcli/raw/signing.h"
#include "libcli/raw/libcliraw.h"
#include "libcli/smb2/smb2.h"
-
/*
a composite open/read(s)/close request that loads a whole file
into memory. Used as a demo of the composite system.
@@ -46,6 +48,13 @@ struct smb_composite_loadfile {
} out;
};
+struct composite_context *smb_composite_loadfile_send(struct smbcli_tree *tree,
+ struct smb_composite_loadfile *io);
+NTSTATUS smb_composite_loadfile_recv(struct composite_context *c, TALLOC_CTX *mem_ctx);
+NTSTATUS smb_composite_loadfile(struct smbcli_tree *tree,
+ TALLOC_CTX *mem_ctx,
+ struct smb_composite_loadfile *io);
+
struct smb_composite_fetchfile {
struct {
const char *dest_host;
@@ -68,6 +77,13 @@ struct smb_composite_fetchfile {
} out;
};
+struct composite_context *smb_composite_fetchfile_send(struct smb_composite_fetchfile *io,
+ struct tevent_context *event_ctx);
+NTSTATUS smb_composite_fetchfile_recv(struct composite_context *c,
+ TALLOC_CTX *mem_ctx);
+NTSTATUS smb_composite_fetchfile(struct smb_composite_fetchfile *io,
+ TALLOC_CTX *mem_ctx);
+
/*
a composite open/write(s)/close request that saves a whole file from
memory. Used as a demo of the composite system.
@@ -80,6 +96,11 @@ struct smb_composite_savefile {
} in;
};
+struct composite_context *smb_composite_savefile_send(struct smbcli_tree *tree,
+ struct smb_composite_savefile *io);
+NTSTATUS smb_composite_savefile_recv(struct composite_context *c);
+NTSTATUS smb_composite_savefile(struct smbcli_tree *tree,
+ struct smb_composite_savefile *io);
/*
a composite request for a full connection to a remote server. Includes
@@ -111,6 +132,15 @@ struct smb_composite_connect {
} out;
};
+struct composite_context *smb_composite_connect_send(struct smb_composite_connect *io,
+ TALLOC_CTX *mem_ctx,
+ struct resolve_context *resolve_ctx,
+ struct tevent_context *event_ctx);
+NTSTATUS smb_composite_connect_recv(struct composite_context *c, TALLOC_CTX *mem_ctx);
+NTSTATUS smb_composite_connect(struct smb_composite_connect *io, TALLOC_CTX *mem_ctx,
+ struct resolve_context *resolve_ctx,
+ struct tevent_context *ev);
+
/*
generic session setup interface that takes care of which
@@ -129,6 +159,11 @@ struct smb_composite_sesssetup {
} out;
};
+struct composite_context *smb_composite_sesssetup_send(struct smbcli_session *session,
+ struct smb_composite_sesssetup *io);
+NTSTATUS smb_composite_sesssetup_recv(struct composite_context *c);
+NTSTATUS smb_composite_sesssetup(struct smbcli_session *session, struct smb_composite_sesssetup *io);
+
/*
query file system info
*/
@@ -151,6 +186,15 @@ struct smb_composite_fsinfo {
} out;
};
+struct composite_context *smb_composite_fsinfo_send(struct smbcli_tree *tree,
+ struct smb_composite_fsinfo *io,
+ struct resolve_context *resolve_ctx);
+NTSTATUS smb_composite_fsinfo_recv(struct composite_context *c, TALLOC_CTX *mem_ctx);
+NTSTATUS smb_composite_fsinfo(struct smbcli_tree *tree,
+ TALLOC_CTX *mem_ctx,
+ struct smb_composite_fsinfo *io,
+ struct resolve_context *resolve_ctx);
+
/*
composite call for appending new acl to the file's security descriptor and get
new full acl
@@ -168,6 +212,13 @@ struct smb_composite_appendacl {
} out;
};
+struct composite_context *smb_composite_appendacl_send(struct smbcli_tree *tree,
+ struct smb_composite_appendacl *io);
+NTSTATUS smb_composite_appendacl_recv(struct composite_context *c, TALLOC_CTX *mem_ctx);
+NTSTATUS smb_composite_appendacl(struct smbcli_tree *tree,
+ TALLOC_CTX *mem_ctx,
+ struct smb_composite_appendacl *io);
+
/*
a composite API to fire connect() calls to multiple targets, picking the
first one.
@@ -189,4 +240,20 @@ struct smb_composite_connectmulti {
struct smbcli_session;
struct resolve_context;
-#include "libcli/smb_composite/proto.h"
+struct composite_context *smb2_composite_unlink_send(struct smb2_tree *tree,
+ union smb_unlink *io);
+NTSTATUS smb2_composite_unlink(struct smb2_tree *tree, union smb_unlink *io);
+struct composite_context *smb2_composite_mkdir_send(struct smb2_tree *tree,
+ union smb_mkdir *io);
+NTSTATUS smb2_composite_mkdir(struct smb2_tree *tree, union smb_mkdir *io);
+struct composite_context *smb2_composite_rmdir_send(struct smb2_tree *tree,
+ struct smb_rmdir *io);
+NTSTATUS smb2_composite_rmdir(struct smb2_tree *tree, struct smb_rmdir *io);
+struct tevent_req *smb2_composite_setpathinfo_send(TALLOC_CTX *mem_ctx,
+ struct tevent_context *ev,
+ struct smb2_tree *tree,
+ const union smb_setfileinfo *io);
+NTSTATUS smb2_composite_setpathinfo_recv(struct tevent_req *req);
+NTSTATUS smb2_composite_setpathinfo(struct smb2_tree *tree, union smb_setfileinfo *io);
+
+#endif /* __SMB_COMPOSITE_H__ */
diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index 3184a19c04..ed786f9be1 100644
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -26,7 +26,6 @@ bld.SAMBA_SUBSYSTEM('cli_composite',
bld.SAMBA_SUBSYSTEM('LIBCLI_SMB_COMPOSITE',
source='smb_composite/loadfile.c smb_composite/savefile.c smb_composite/connect.c smb_composite/sesssetup.c smb_composite/fetchfile.c smb_composite/appendacl.c smb_composite/fsinfo.c smb_composite/smb2.c',
- autoproto='smb_composite/proto.h',
deps='LIBCLI_SMB2 tevent-util',
public_deps='cli_composite credentials gensec LIBCLI_RESOLVE tevent'
)