If we already have an smb1req attached to the struct smbd_smb2_request, don't recreat...

[metze/samba/wip.git] / source3 / smbd / smb2_glue.c

diff --git a/source3/smbd/smb2_glue.c b/source3/smbd/smb2_glue.c
index ac31ce54f038f83ba8ad12626f0fccacc8466198..9fc1e49c2e5fa91c442988497df59f0c69bb956a 100644 (file)
--- a/source3/smbd/smb2_glue.c
+++ b/source3/smbd/smb2_glue.c
@@ -19,37 +19,29 @@
 */
 
 #include "includes.h"
+#include "smbd/smbd.h"
 #include "smbd/globals.h"
 #include "../libcli/smb/smb_common.h"
 
-static uint16_t allocate_next_mid(void)
-{
-       struct smbd_server_connection *sconn = smbd_server_conn;
-
-       sconn->smb2.next_compat_mid++;
-       /* Avoid mid == 0 and mid == 0xffff. */
-       if (sconn->smb2.next_compat_mid == 0xFFFF) {
-               sconn->smb2.next_compat_mid += 2;
-       }
-       return sconn->smb2.next_compat_mid;
-}
-
 struct smb_request *smbd_smb2_fake_smb_request(struct smbd_smb2_request *req)
 {
        struct smb_request *smbreq;
-       const uint8_t *inhdr;
-       int i = req->current_idx;
-
-       inhdr = (const uint8_t *)req->in.vector[i+0].iov_base;
-
-       smbreq = talloc_zero(req, struct smb_request);
-       if (smbreq == NULL) {
-               return NULL;
+       const uint8_t *inhdr = SMBD_SMB2_IN_HDR_PTR(req);
+
+       if (req->smb1req) {
+               smbreq = req->smb1req;
+       } else {
+               smbreq = talloc_zero(req, struct smb_request);
+               if (smbreq == NULL) {
+                       return NULL;
+               }
        }
 
-       smbreq->vuid = req->session->compat_vuser->vuid;
-       smbreq->tid = req->tcon->compat_conn->cnum;
-       smbreq->conn = req->tcon->compat_conn;
+       smbreq->request_time = req->request_time;
+       smbreq->vuid = req->session->compat->vuid;
+       smbreq->tid = req->tcon->compat->cnum;
+       smbreq->conn = req->tcon->compat;
+       smbreq->sconn = req->sconn;
        smbreq->smbpid = (uint16_t)IVAL(inhdr, SMB2_HDR_PID);
        smbreq->flags2 = FLAGS2_UNICODE_STRINGS |
                         FLAGS2_32_BIT_ERROR_CODES |
@@ -58,41 +50,29 @@ struct smb_request *smbd_smb2_fake_smb_request(struct smbd_smb2_request *req)
        if (IVAL(inhdr, SMB2_HDR_FLAGS) & SMB2_HDR_FLAG_DFS) {
                smbreq->flags2 |= FLAGS2_DFS_PATHNAMES;
        }
-       req->compat_mid = smbreq->mid = allocate_next_mid();
+       smbreq->mid = BVAL(inhdr, SMB2_HDR_MESSAGE_ID);
        smbreq->chain_fsp = req->compat_chain_fsp;
        smbreq->smb2req = req;
+       req->smb1req = smbreq;
 
        return smbreq;
 }
 
-/* Dummy functions for the SMB1 -> SMB2 deferred open message
- * hooks. */
-
-void remove_deferred_open_message_smb2(uint16_t mid)
-{
-}
-
-void schedule_deferred_open_message_smb2(uint16_t mid)
-{
-}
-
-bool open_was_deferred_smb2(uint16_t mid)
-{
-       return false;
-}
-
-bool get_deferred_open_message_state_smb2(uint16_t mid,
-                       struct timeval *p_request_time,
-                       void **pp_state)
-{
-       return false;
-}
+/*********************************************************
+ Called from file_free() to remove any chained fsp pointers.
+*********************************************************/
 
-bool push_deferred_open_message_smb2(struct smb_request *req,
-                               struct timeval request_time,
-                               struct timeval timeout,
-                               char *private_data,
-                               size_t priv_len)
+void remove_smb2_chained_fsp(files_struct *fsp)
 {
-       return false;
+       struct smbd_server_connection *sconn = fsp->conn->sconn;
+       struct smbd_smb2_request *smb2req;
+
+       for (smb2req = sconn->smb2.requests; smb2req; smb2req = smb2req->next) {
+               if (smb2req->compat_chain_fsp == fsp) {
+                       smb2req->compat_chain_fsp = NULL;
+               }
+               if (smb2req->smb1req && smb2req->smb1req->chain_fsp == fsp) {
+                       smb2req->smb1req->chain_fsp = NULL;
+               }
+       }
 }