summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorHolger Hetterich <hhetter@novell.com>2010-02-15 17:47:30 +0100
committerJim McDonough <jmcd@samba.org>2010-03-16 09:52:10 -0400
commita0e2632e119c2e3e086cd485d448b44836c1499b (patch)
tree62c8a31548e249e5ab86ae9507182b963a68fc15 /source3
parentf6ae16e318145224cc38180628e542bb3fc6bb8c (diff)
downloadsamba-a0e2632e119c2e3e086cd485d448b44836c1499b.tar.gz
samba-a0e2632e119c2e3e086cd485d448b44836c1499b.tar.bz2
samba-a0e2632e119c2e3e086cd485d448b44836c1499b.zip
s3: vfs_smb_traffic_analyzer.c: add VFS functions for file open and close
Diffstat (limited to 'source3')
-rw-r--r--source3/modules/vfs_smb_traffic_analyzer.c52
-rw-r--r--source3/modules/vfs_smb_traffic_analyzer.h15
2 files changed, 65 insertions, 2 deletions
diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c
index 99c32333a2..f454c45781 100644
--- a/source3/modules/vfs_smb_traffic_analyzer.c
+++ b/source3/modules/vfs_smb_traffic_analyzer.c
@@ -478,6 +478,22 @@ static void smb_traffic_analyzer_send_data(vfs_handle_struct *handle,
} else if ( strcmp( protocol_version, "V2") == 0) {
switch( vfs_operation ) {
+ case vfs_id_open: ;
+ str = smb_traffic_analyzer_create_string( talloc_tos(),
+ tm, seconds, handle, username, vfs_id_open,
+ 3, ((struct open_data *) data)->filename,
+ talloc_asprintf( talloc_tos(), "%u",
+ ((struct open_data *) data)->mode),
+ talloc_asprintf( talloc_tos(), "%u",
+ ((struct open_data *) data)->result));
+ break;
+ case vfs_id_close: ;
+ str = smb_traffic_analyzer_create_string( talloc_tos(),
+ tm, seconds, handle, username, vfs_id_close,
+ 2, ((struct close_data *) data)->filename,
+ talloc_asprintf( talloc_tos(), "%u",
+ ((struct close_data *) data)->result));
+ break;
case vfs_id_mkdir: ;
str = smb_traffic_analyzer_create_string( talloc_tos(),
tm, seconds, handle, username, vfs_id_mkdir, \
@@ -782,6 +798,38 @@ static ssize_t smb_traffic_analyzer_pwrite(vfs_handle_struct *handle, \
return s_data.len;
}
+static int smb_traffic_analyzer_open(vfs_handle_struct *handle, \
+ struct smb_filename *smb_fname, files_struct *fsp,\
+ int flags, mode_t mode)
+{
+ struct open_data s_data;
+
+ s_data.result = SMB_VFS_NEXT_OPEN( handle, smb_fname, fsp,
+ flags, mode);
+ DEBUG(10,("smb_traffic_analyzer_open: OPEN: %s\n",
+ fsp_str_dbg(fsp)));
+ s_data.filename = fsp->fsp_name->base_name;
+ smb_traffic_analyzer_send_data(handle,
+ &s_data,
+ vfs_id_open);
+ return s_data.result;
+}
+
+static int smb_traffic_analyzer_close(vfs_handle_struct *handle, \
+ files_struct *fsp)
+{
+ struct close_data s_data;
+ s_data.result = SMB_VFS_NEXT_CLOSE(handle, fsp);
+ DEBUG(10,("smb_traffic_analyzer_close: CLOSE: %s\n",
+ fsp_str_dbg(fsp)));
+ s_data.filename = fsp->fsp_name->base_name;
+ smb_traffic_analyzer_send_data(handle,
+ &s_data,
+ vfs_id_close);
+ return s_data.result;
+}
+
+
static struct vfs_fn_pointers vfs_smb_traffic_analyzer_fns = {
.connect_fn = smb_traffic_analyzer_connect,
.vfs_read = smb_traffic_analyzer_read,
@@ -790,7 +838,9 @@ static struct vfs_fn_pointers vfs_smb_traffic_analyzer_fns = {
.pwrite = smb_traffic_analyzer_pwrite,
.mkdir = smb_traffic_analyzer_mkdir,
.rename = smb_traffic_analyzer_rename,
- .chdir = smb_traffic_analyzer_chdir
+ .chdir = smb_traffic_analyzer_chdir,
+ .open = smb_traffic_analyzer_open,
+ .close_fn = smb_traffic_analyzer_close
};
/* Module initialization */
diff --git a/source3/modules/vfs_smb_traffic_analyzer.h b/source3/modules/vfs_smb_traffic_analyzer.h
index 1e8375d17b..3f47ea5a72 100644
--- a/source3/modules/vfs_smb_traffic_analyzer.h
+++ b/source3/modules/vfs_smb_traffic_analyzer.h
@@ -104,7 +104,9 @@ enum vfs_id {
vfs_id_mkdir,
vfs_id_rmdir,
vfs_id_rename,
- vfs_id_chdir
+ vfs_id_chdir,
+ vfs_id_open,
+ vfs_id_close
};
@@ -113,6 +115,17 @@ enum vfs_id {
* Specific data sets for the VFS functions.
* A compatible receiver has to have the exact same dataset.
*/
+struct open_data {
+ const char *filename;
+ mode_t mode;
+ int result;
+};
+
+struct close_data {
+ const char *filename;
+ int result;
+};
+
struct mkdir_data {
const char *path;
mode_t mode;