s3:smb2_server: remove unused and confusing DEFAULT_SMB2_MAX_CREDIT_BITMAP_FACTOR

metze
(similar to commit d1ee774ed0b4b3882b4b85da16d9bb9c082a0c49)

diff --git a/source3/include/local.h b/source3/include/local.h
index d6595220730cb0b6e8576ca7db07ca38475d10cc..499f4688a58f5f497e989688f7970db9c9f1a08f 100644 (file)
--- a/source3/include/local.h
+++ b/source3/include/local.h
@@ -265,6 +265,5 @@
 #define DEFAULT_SMB2_MAX_WRITE (64*1024)
 #define DEFAULT_SMB2_MAX_TRANSACT (64*1024)
 #define DEFAULT_SMB2_MAX_CREDITS 8192
-#define DEFAULT_SMB2_MAX_CREDIT_BITMAP_FACTOR 2
 
 #endif

diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 1461d70c347adf674610ef72adc2e8ab8d58738f..f4f9be84c067c9b09d84cc7445659a249f244832 100644 (file)
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -117,7 +117,7 @@ static NTSTATUS smbd_initialize_smb2(struct smbd_server_connection *sconn)
        sconn->smb2.credits_granted = 1;
        sconn->smb2.max_credits = lp_smb2_max_credits();
        sconn->smb2.credits_bitmap = bitmap_talloc(sconn,
-                       DEFAULT_SMB2_MAX_CREDIT_BITMAP_FACTOR*sconn->smb2.max_credits);
+                                                  sconn->smb2.max_credits);
        if (sconn->smb2.credits_bitmap == NULL) {
                return NT_STATUS_NO_MEMORY;
        }
@@ -313,7 +313,7 @@ static bool smb2_validate_message_id(struct smbd_server_connection *sconn,
 
        if (message_id < sconn->smb2.seqnum_low ||
                        message_id > (sconn->smb2.seqnum_low +
-                       (sconn->smb2.max_credits * DEFAULT_SMB2_MAX_CREDIT_BITMAP_FACTOR))) {
+                       (sconn->smb2.max_credits))) {
                DEBUG(0,("smb2_validate_message_id: bad message_id "
                        "%llu (low = %llu, max = %lu)\n",
                        (unsigned long long)message_id,
@@ -333,8 +333,7 @@ static bool smb2_validate_message_id(struct smbd_server_connection *sconn,
        sconn->smb2.credits_granted -= 1;
 
        /* Mark the message_id as seen in the bitmap. */
-       bitmap_offset = (unsigned int)(message_id %
-                       (uint64_t)(sconn->smb2.max_credits * DEFAULT_SMB2_MAX_CREDIT_BITMAP_FACTOR));
+       bitmap_offset = message_id % sconn->smb2.max_credits;
        if (bitmap_query(credits_bm, bitmap_offset)) {
                DEBUG(0,("smb2_validate_message_id: duplicate message_id "
                        "%llu (bm offset %u)\n",
@@ -355,7 +354,7 @@ static bool smb2_validate_message_id(struct smbd_server_connection *sconn,
                        bitmap_clear(credits_bm, bitmap_offset);
                        sconn->smb2.seqnum_low += 1;
                        bitmap_offset = (bitmap_offset + 1) %
-                               (sconn->smb2.max_credits * DEFAULT_SMB2_MAX_CREDIT_BITMAP_FACTOR);
+                               sconn->smb2.max_credits;
                }
        }