s3:smb2_server: add message mid to SMB2 request done log message

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Wed Oct 30 18:42:35 UTC 2019 on sn-devel-184

diff --git a/source3/smbd/smb2_server.c b/source3/smbd/smb2_server.c
index 416ef00b74f07575c86452617c5a663cf94c58c2..130fe5048c008326208ad88f12fa520a1efc531d 100644 (file)
--- a/source3/smbd/smb2_server.c
+++ b/source3/smbd/smb2_server.c
@@ -3148,8 +3148,14 @@ NTSTATUS smbd_smb2_request_done_ex(struct smbd_smb2_request *req,
        struct iovec *outbody_v;
        struct iovec *outdyn_v;
        uint32_t next_command_ofs;
+       uint64_t mid;
+
+       outhdr = SMBD_SMB2_OUT_HDR_PTR(req);
+       mid = BVAL(outhdr, SMB2_HDR_MESSAGE_ID);
 
-       DBG_DEBUG("idx[%d] status[%s] body[%u] dyn[%s:%u] at %s\n",
+       DBG_DEBUG("mid [%"PRIu64"] idx[%d] status[%s] "
+                 "body[%u] dyn[%s:%u] at %s\n",
+                 mid,
                  req->current_idx,
                  nt_errstr(status),
                  (unsigned int)body.length,
@@ -3165,7 +3171,6 @@ NTSTATUS smbd_smb2_request_done_ex(struct smbd_smb2_request *req,
                return smbd_smb2_request_error(req, NT_STATUS_INTERNAL_ERROR);
        }
 
-       outhdr = SMBD_SMB2_OUT_HDR_PTR(req);
        outbody_v = SMBD_SMB2_OUT_BODY_IOV(req);
        outdyn_v = SMBD_SMB2_OUT_DYN_IOV(req);