Attachment 6458 Details for Bug 8154 – Patch against master and 3.6.0

[patch] Patch against master and 3.6.0

0001-Actually-make-use-of-the-SMBTA_SUBRELEASE-define-in.patch (text/plain), 1.87 KB, created by Holger Hetterich on 2011-05-19 20:19:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Holger Hetterich

Created: 2011-05-19 20:19:30 UTC

Size: 1.87 KB

patch

obsolete

>From 0d1e81047f8c792210c1ab6a345742df9c3d15c2 Mon Sep 17 00:00:00 2001
>From: Holger Hetterich <hhetter@novell.com>
>Date: Sun, 20 Feb 2011 11:32:39 +0100
>Subject: [PATCH] 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.
>
>---
> source3/modules/vfs_smb_traffic_analyzer.c |   11 +++++++++++
> 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 cf90960..267684a 100644
>--- a/source3/modules/vfs_smb_traffic_analyzer.c
>+++ b/source3/modules/vfs_smb_traffic_analyzer.c
>@@ -415,6 +415,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 bfc0614..817ffd8 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
>-- 
>1.7.1
>

Flags:

jra: review+

Actions: View

Attachments on bug 8154: 6458