summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Hetterich <hhetter@novell.com>2011-02-13 18:20:00 +0100
committerJeremy Allison <jra@samba.org>2011-02-19 01:53:18 +0100
commit464c69609aa7e582f484c1d357b7c6d3eb2bcbe3 (patch)
treeea20e7a2a6e5fc445cdca4ca59cb18b771dde2d7
parent187f695469071d0550613e037b36170facb85460 (diff)
downloadsamba-464c69609aa7e582f484c1d357b7c6d3eb2bcbe3.tar.gz
samba-464c69609aa7e582f484c1d357b7c6d3eb2bcbe3.tar.xz
samba-464c69609aa7e582f484c1d357b7c6d3eb2bcbe3.zip
vfs_smb_traffic_analyzer shall also transfer the clients IP address.
Autobuild-User: Jeremy Allison <jra@samba.org> Autobuild-Date: Sat Feb 19 01:53:18 CET 2011 on sn-devel-104
-rw-r--r--source3/modules/vfs_smb_traffic_analyzer.c9
-rw-r--r--source3/modules/vfs_smb_traffic_analyzer.h2
2 files changed, 7 insertions, 4 deletions
diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c
index 6b41affb06a..cf90960540e 100644
--- a/source3/modules/vfs_smb_traffic_analyzer.c
+++ b/source3/modules/vfs_smb_traffic_analyzer.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "../smbd/globals.h"
#include "../lib/crypto/crypto.h"
#include "vfs_smb_traffic_analyzer.h"
#include "../libcli/security/security.h"
@@ -313,6 +314,7 @@ static char *smb_traffic_analyzer_create_string( TALLOC_CTX *ctx,
* 4.affected share
* 5.domain
* 6.timestamp
+ * 7.IP Addresss of client
*/
/*
@@ -348,10 +350,9 @@ static char *smb_traffic_analyzer_create_string( TALLOC_CTX *ctx,
tm->tm_sec, \
(int)seconds);
len = strlen( timestr );
-
/* create the string of common data */
buf = talloc_asprintf(ctx,
- "%s%04u%s%04u%s%04u%s%04u%s%04u%s%04u%s",
+ "%s%04u%s%04u%s%04u%s%04u%s%04u%s%04u%s%04u%s",
common_data_count_str,
(unsigned int) strlen(vfs_operation_str),
vfs_operation_str,
@@ -365,7 +366,9 @@ static char *smb_traffic_analyzer_create_string( TALLOC_CTX *ctx,
strlen(handle->conn->server_info->info3->base.domain.string),
handle->conn->server_info->info3->base.domain.string,
(unsigned int) strlen(timestr),
- timestr);
+ timestr,
+ (unsigned int) strlen(handle->conn->sconn->client_id.addr),
+ handle->conn->sconn->client_id.addr);
talloc_free(common_data_count_str);
diff --git a/source3/modules/vfs_smb_traffic_analyzer.h b/source3/modules/vfs_smb_traffic_analyzer.h
index 3f47ea5a72f..bfc0614132d 100644
--- a/source3/modules/vfs_smb_traffic_analyzer.h
+++ b/source3/modules/vfs_smb_traffic_analyzer.h
@@ -85,7 +85,7 @@
* so that if the receiver is using an older version of the protocol
* it knows which blocks it can ignore.
*/
-#define SMBTA_COMMON_DATA_COUNT "00016"
+#define SMBTA_COMMON_DATA_COUNT "00017"
/*
* VFS Functions identifier table. In protocol version 2, every vfs