diff options
| author | Holger Hetterich <hhetter@novell.com> | 2011-02-20 11:32:39 +0100 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-05-24 21:23:22 +0200 |
| commit | 13d20faa1d294f99414e64343a3c36472506bf96 (patch) | |
| tree | 22aa42989ad57666c87e8db08630239cd306436f | |
| parent | 309a8fd7c62e7008b1a4c4c77c3a9ea35ed4bb07 (diff) | |
| download | samba-13d20faa1d294f99414e64343a3c36472506bf96.tar.gz samba-13d20faa1d294f99414e64343a3c36472506bf96.tar.bz2 samba-13d20faa1d294f99414e64343a3c36472506bf96.zip | |
Actually make use of the SMBTA_SUBRELEASE define in smb_traffic_analyzer.h. This will allow to introduce new features or fixes into the protocol after the 3.6.0 release. The client software is designed to take care for the subrelease number.
Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Tue May 24 21:23:22 CEST 2011 on sn-devel-104
| -rw-r--r-- | source3/modules/vfs_smb_traffic_analyzer.c | 11 | ||||
| -rw-r--r-- | source3/modules/vfs_smb_traffic_analyzer.h | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/source3/modules/vfs_smb_traffic_analyzer.c b/source3/modules/vfs_smb_traffic_analyzer.c index 4146d78624..462932ddb2 100644 --- a/source3/modules/vfs_smb_traffic_analyzer.c +++ b/source3/modules/vfs_smb_traffic_analyzer.c @@ -417,6 +417,17 @@ static void smb_traffic_analyzer_send_data(vfs_handle_struct *handle, */ char state_flags[9] = "000000\0"; + /** + * The first byte of the state flag string represents + * the modules protocol subversion number, defined + * in smb_traffic_analyzer.h. smbtatools/smbtad are designed + * to handle not yet implemented protocol enhancements + * by ignoring them. By recognizing the SMBTA_SUBRELEASE + * smbtatools can tell the user to update the client + * software. + */ + state_flags[0] = SMBTA_SUBRELEASE; + SMB_VFS_HANDLE_GET_DATA(handle, rf_sock, struct refcounted_sock, return); if (rf_sock == NULL || rf_sock->sock == -1) { diff --git a/source3/modules/vfs_smb_traffic_analyzer.h b/source3/modules/vfs_smb_traffic_analyzer.h index bfc0614132..817ffd83d1 100644 --- a/source3/modules/vfs_smb_traffic_analyzer.h +++ b/source3/modules/vfs_smb_traffic_analyzer.h @@ -77,7 +77,7 @@ */ /* Protocol subrelease number */ -#define SMBTA_SUBRELEASE 0 +#define SMBTA_SUBRELEASE '0' /* * Every data block sends a number of blocks sending common data |