[GLUE] Rsync SAMBA_3_2_0 SVN r25598 in order to create the v3-2-test branch.
[samba.git] / source / smbd / process.c
index 897bd56ba7bea4af8feb7ebfbc9a3d090c12d19b..7faf26af25e1bce35962f7e31c21bd5e29a5099d 100644 (file)
@@ -2,10 +2,11 @@
    Unix SMB/CIFS implementation.
    process incoming packets - main loop
    Copyright (C) Andrew Tridgell 1992-1998
+   Copyright (C) Volker Lendecke 2005-2007
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
    
    This program is distributed in the hope that it will be useful,
    GNU General Public License for more details.
    
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 
-extern uint16 global_smbpid;
-extern int keepalive;
 extern struct auth_context *negprot_global_auth_context;
 extern int smb_echo_count;
 
-struct timeval smb_last_time;
-
-static char *InBuffer = NULL;
-static char *OutBuffer = NULL;
-static char *current_inbuf = NULL;
+const int total_buffer_size = (BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE + SAFETY_MARGIN);
 
 /* 
  * Size of data we can send to client. Set
@@ -44,21 +38,49 @@ int max_send = BUFFER_SIZE;
 int max_recv = BUFFER_SIZE;
 
 extern int last_message;
-extern int global_oplock_break;
-extern userdom_struct current_user_info;
 extern int smb_read_error;
 SIG_ATOMIC_T reload_after_sighup = 0;
 SIG_ATOMIC_T got_sig_term = 0;
-BOOL global_machine_password_needs_changing = False;
+extern BOOL global_machine_password_needs_changing;
 extern int max_send;
 
-/****************************************************************************
- Function to return the current request mid from Inbuffer.
-****************************************************************************/
+/*
+ * Initialize a struct smb_request from an inbuf
+ */
 
-uint16 get_current_mid(void)
+void init_smb_request(struct smb_request *req, const uint8 *inbuf)
 {
-       return SVAL(InBuffer,smb_mid);
+       size_t req_size = smb_len(inbuf) + 4;
+       /* Ensure we have at least smb_size bytes. */
+       if (req_size < smb_size) {
+               DEBUG(0,("init_smb_request: invalid request size %u\n",
+                       (unsigned int)req_size ));
+               exit_server_cleanly("Invalid SMB request");
+       }
+       req->flags2 = SVAL(inbuf, smb_flg2);
+       req->smbpid = SVAL(inbuf, smb_pid);
+       req->mid    = SVAL(inbuf, smb_mid);
+       req->vuid   = SVAL(inbuf, smb_uid);
+       req->tid    = SVAL(inbuf, smb_tid);
+       req->wct    = CVAL(inbuf, smb_wct);
+       /* Ensure we have at least wct words and 2 bytes of bcc. */
+       if (smb_size + req->wct*2 > req_size) {
+               DEBUG(0,("init_smb_request: invalid wct number %u (size %u)\n",
+                       (unsigned int)req->wct,
+                       (unsigned int)req_size));
+               exit_server_cleanly("Invalid SMB request");
+       }
+       /* Ensure bcc is correct. */
+       if (((uint8 *)smb_buf(inbuf)) + smb_buflen(inbuf) > inbuf + req_size) {
+               DEBUG(0,("init_smb_request: invalid bcc number %u "
+                       "(wct = %u, size %u)\n",
+                       (unsigned int)smb_buflen(inbuf),
+                       (unsigned int)req->wct,
+                       (unsigned int)req_size));
+               exit_server_cleanly("Invalid SMB request");
+       }
+       req->inbuf  = inbuf;
+       req->outbuf = NULL;
 }
 
 /****************************************************************************
@@ -66,106 +88,72 @@ uint16 get_current_mid(void)
  for processing.
 ****************************************************************************/
 
-static struct pending_message_list *smb_oplock_queue;
-static struct pending_message_list *smb_sharing_violation_queue;
-
-enum q_type { OPLOCK_QUEUE, SHARE_VIOLATION_QUEUE };
-
-/****************************************************************************
- Free up a message.
-****************************************************************************/
-
-static void free_queued_message(struct pending_message_list *msg)
-{
-       data_blob_free(&msg->buf);
-       data_blob_free(&msg->private_data);
-       SAFE_FREE(msg);
-}
+static struct pending_message_list *deferred_open_queue;
 
 /****************************************************************************
  Function to push a message onto the tail of a linked list of smb messages ready
  for processing.
 ****************************************************************************/
 
-static BOOL push_queued_message(enum q_type qt, char *buf, int msg_len, struct timeval *ptv, char *private_data, size_t private_len)
+static BOOL push_queued_message(struct smb_request *req,
+                               struct timeval request_time,
+                               struct timeval end_time,
+                               char *private_data, size_t private_len)
 {
-       struct pending_message_list *tmp_msg;
-       struct pending_message_list *msg = SMB_MALLOC_P(struct pending_message_list);
+       int msg_len = smb_len(req->inbuf) + 4;
+       struct pending_message_list *msg;
+
+       msg = TALLOC_ZERO_P(NULL, struct pending_message_list);
 
        if(msg == NULL) {
                DEBUG(0,("push_message: malloc fail (1)\n"));
                return False;
        }
 
-       memset(msg,'\0',sizeof(*msg));
-
-       msg->buf = data_blob(buf, msg_len);
+       msg->buf = data_blob_talloc(msg, req->inbuf, msg_len);
        if(msg->buf.data == NULL) {
                DEBUG(0,("push_message: malloc fail (2)\n"));
-               SAFE_FREE(msg);
+               TALLOC_FREE(msg);
                return False;
        }
 
-       if (ptv) {
-               msg->msg_time = *ptv;
-       }
+       msg->request_time = request_time;
+       msg->end_time = end_time;
 
        if (private_data) {
-               msg->private_data = data_blob(private_data, private_len);
+               msg->private_data = data_blob_talloc(msg, private_data,
+                                                    private_len);
                if (msg->private_data.data == NULL) {
                        DEBUG(0,("push_message: malloc fail (3)\n"));
-                       data_blob_free(&msg->buf);
-                       SAFE_FREE(msg);
+                       TALLOC_FREE(msg);
                        return False;
                }
        }
 
-       if (qt == OPLOCK_QUEUE) {
-               DLIST_ADD_END(smb_oplock_queue, msg, tmp_msg);
-       } else {
-               DLIST_ADD_END(smb_sharing_violation_queue, msg, tmp_msg);
-       }
+       DLIST_ADD_END(deferred_open_queue, msg, struct pending_message_list *);
 
-       DEBUG(10,("push_message: pushed message length %u on queue %s\n",
-               (unsigned int)msg_len,
-               qt == OPLOCK_QUEUE ? "smb_oplock_queue" : "smb_sharing_violation_queue" ));
+       DEBUG(10,("push_message: pushed message length %u on "
+                 "deferred_open_queue\n", (unsigned int)msg_len));
 
        return True;
 }
 
-/****************************************************************************
- Function to push an oplock smb message onto a linked list of local smb messages ready
- for processing.
-****************************************************************************/
-
-BOOL push_oplock_pending_smb_message(char *buf, int msg_len)
-{
-       BOOL ret = push_queued_message(OPLOCK_QUEUE, buf, msg_len, NULL, NULL, 0);
-       if (ret) {
-               /* Push the MID of this packet on the signing queue. */
-               srv_defer_sign_response(SVAL(buf,smb_mid));
-       }
-       return ret;
-}
-
 /****************************************************************************
  Function to delete a sharing violation open message by mid.
 ****************************************************************************/
 
-void remove_sharing_violation_open_smb_message(uint16 mid)
+void remove_deferred_open_smb_message(uint16 mid)
 {
        struct pending_message_list *pml;
 
-       if (!lp_defer_sharing_violations()) {
-               return;
-       }
-
-       for (pml = smb_sharing_violation_queue; pml; pml = pml->next) {
+       for (pml = deferred_open_queue; pml; pml = pml->next) {
                if (mid == SVAL(pml->buf.data,smb_mid)) {
-                       DEBUG(10,("remove_sharing_violation_open_smb_message: deleting mid %u len %u\n",
-                               (unsigned int)mid, (unsigned int)pml->buf.length ));
-                       DLIST_REMOVE(smb_sharing_violation_queue, pml);
-                       free_queued_message(pml);
+                       DEBUG(10,("remove_sharing_violation_open_smb_message: "
+                                 "deleting mid %u len %u\n",
+                                 (unsigned int)mid,
+                                 (unsigned int)pml->buf.length ));
+                       DLIST_REMOVE(deferred_open_queue, pml);
+                       TALLOC_FREE(pml);
                        return;
                }
        }
@@ -176,30 +164,26 @@ void remove_sharing_violation_open_smb_message(uint16 mid)
  schedule it for immediate processing.
 ****************************************************************************/
 
-void schedule_sharing_violation_open_smb_message(uint16 mid)
+void schedule_deferred_open_smb_message(uint16 mid)
 {
        struct pending_message_list *pml;
        int i = 0;
 
-       if (!lp_defer_sharing_violations()) {
-               return;
-       }
-
-       for (pml = smb_sharing_violation_queue; pml; pml = pml->next) {
+       for (pml = deferred_open_queue; pml; pml = pml->next) {
                uint16 msg_mid = SVAL(pml->buf.data,smb_mid);
-               DEBUG(10,("schedule_sharing_violation_open_smb_message: [%d] msg_mid = %u\n", i++,
+               DEBUG(10,("schedule_deferred_open_smb_message: [%d] msg_mid = %u\n", i++,
                        (unsigned int)msg_mid ));
                if (mid == msg_mid) {
-                       DEBUG(10,("schedule_sharing_violation_open_smb_message: scheduling mid %u\n",
+                       DEBUG(10,("schedule_deferred_open_smb_message: scheduling mid %u\n",
                                mid ));
-                       pml->msg_time.tv_sec = 0;
-                       pml->msg_time.tv_usec = 0;
-                       DLIST_PROMOTE(smb_sharing_violation_queue, pml);
+                       pml->end_time.tv_sec = 0;
+                       pml->end_time.tv_usec = 0;
+                       DLIST_PROMOTE(deferred_open_queue, pml);
                        return;
                }
        }
 
-       DEBUG(10,("schedule_sharing_violation_open_smb_message: failed to find message mid %u\n",
+       DEBUG(10,("schedule_deferred_open_smb_message: failed to find message mid %u\n",
                mid ));
 }
 
@@ -211,13 +195,8 @@ BOOL open_was_deferred(uint16 mid)
 {
        struct pending_message_list *pml;
 
-       if (!lp_defer_sharing_violations()) {
-               return False;
-       }
-
-       for (pml = smb_sharing_violation_queue; pml; pml = pml->next) {
+       for (pml = deferred_open_queue; pml; pml = pml->next) {
                if (SVAL(pml->buf.data,smb_mid) == mid) {
-                       set_saved_error_triple(SMB_SUCCESS, 0, NT_STATUS_OK);
                        return True;
                }
        }
@@ -232,11 +211,7 @@ struct pending_message_list *get_open_deferred_message(uint16 mid)
 {
        struct pending_message_list *pml;
 
-       if (!lp_defer_sharing_violations()) {
-               return NULL;
-       }
-
-       for (pml = smb_sharing_violation_queue; pml; pml = pml->next) {
+       for (pml = deferred_open_queue; pml; pml = pml->next) {
                if (SVAL(pml->buf.data,smb_mid) == mid) {
                        return pml;
                }
@@ -245,66 +220,124 @@ struct pending_message_list *get_open_deferred_message(uint16 mid)
 }
 
 /****************************************************************************
- Function to push a sharing violation open smb message onto a linked list of local smb messages ready
for processing. We must use current_inbuf here not Inbuf in case we're in a chained message set.
+ Function to push a deferred open smb message onto a linked list of local smb
messages ready for processing.
 ****************************************************************************/
 
-BOOL push_sharing_violation_open_smb_message(struct timeval *ptv, char *private_data, size_t priv_len)
+BOOL push_deferred_smb_message(struct smb_request *req,
+                              struct timeval request_time,
+                              struct timeval timeout,
+                              char *private_data, size_t priv_len)
 {
-       uint16 mid = SVAL(current_inbuf,smb_mid);
-       struct timeval tv;
-       SMB_BIG_INT tdif;
+       struct timeval end_time;
+
+       end_time = timeval_sum(&request_time, &timeout);
+
+       DEBUG(10,("push_deferred_open_smb_message: pushing message len %u mid %u "
+                 "timeout time [%u.%06u]\n",
+                 (unsigned int) smb_len(req->inbuf)+4, (unsigned int)req->mid,
+                 (unsigned int)end_time.tv_sec,
+                 (unsigned int)end_time.tv_usec));
+
+       return push_queued_message(req, request_time, end_time,
+                                  private_data, priv_len);
+}
+
+struct idle_event {
+       struct timed_event *te;
+       struct timeval interval;
+       char *name;
+       BOOL (*handler)(const struct timeval *now, void *private_data);
+       void *private_data;
+};
 
-       if (!lp_defer_sharing_violations()) {
-               return True;
+static void idle_event_handler(struct event_context *ctx,
+                              struct timed_event *te,
+                              const struct timeval *now,
+                              void *private_data)
+{
+       struct idle_event *event =
+               talloc_get_type_abort(private_data, struct idle_event);
+
+       TALLOC_FREE(event->te);
+
+       if (!event->handler(now, event->private_data)) {
+               /* Don't repeat, delete ourselves */
+               TALLOC_FREE(event);
+               return;
        }
 
-       tv = *ptv;
-       tdif = tv.tv_sec;
-       tdif *= 1000000;
-       tdif += tv.tv_usec;
+       event->te = event_add_timed(ctx, event,
+                                   timeval_sum(now, &event->interval),
+                                   event->name,
+                                   idle_event_handler, event);
 
-       /* Add on the timeout. */
-       tdif += SHARING_VIOLATION_USEC_WAIT;
-       
-       tv.tv_sec = tdif / 1000000;
-       tv.tv_usec = tdif % 1000000;
-       
-       DEBUG(10,("push_sharing_violation_open_smb_message: pushing message len %u mid %u\
- timeout time [%u.%06u]\n", (unsigned int) smb_len(current_inbuf)+4, (unsigned int)mid,
-               (unsigned int)tv.tv_sec, (unsigned int)tv.tv_usec));
+       /* We can't do much but fail here. */
+       SMB_ASSERT(event->te != NULL);
+}
+
+struct idle_event *event_add_idle(struct event_context *event_ctx,
+                                 TALLOC_CTX *mem_ctx,
+                                 struct timeval interval,
+                                 const char *name,
+                                 BOOL (*handler)(const struct timeval *now,
+                                                 void *private_data),
+                                 void *private_data)
+{
+       struct idle_event *result;
+       struct timeval now = timeval_current();
+
+       result = TALLOC_P(mem_ctx, struct idle_event);
+       if (result == NULL) {
+               DEBUG(0, ("talloc failed\n"));
+               return NULL;
+       }
 
-       return push_queued_message(SHARE_VIOLATION_QUEUE, current_inbuf,
-                       smb_len(current_inbuf)+4, &tv, private_data, priv_len);
+       result->interval = interval;
+       result->handler = handler;
+       result->private_data = private_data;
+
+       if (!(result->name = talloc_asprintf(result, "idle_evt(%s)", name))) {
+               DEBUG(0, ("talloc failed\n"));
+               TALLOC_FREE(result);
+               return NULL;
+       }
+
+       result->te = event_add_timed(event_ctx, result,
+                                    timeval_sum(&now, &interval),
+                                    result->name,
+                                    idle_event_handler, result);
+       if (result->te == NULL) {
+               DEBUG(0, ("event_add_timed failed\n"));
+               TALLOC_FREE(result);
+               return NULL;
+       }
+
+       return result;
 }
 
 /****************************************************************************
- Do all async processing in here. This includes UDB oplock messages, kernel
oplock messages, change notify events etc.
+ Do all async processing in here. This includes kernel oplock messages, change
+ notify events etc.
 ****************************************************************************/
 
-static void async_processing(char *buffer, int buffer_len)
+static void async_processing(fd_set *pfds)
 {
        DEBUG(10,("async_processing: Doing async processing.\n"));
 
        process_aio_queue();
 
-       /* check for oplock messages (both UDP and kernel) */
-       if (receive_local_message(buffer, buffer_len, 1)) {
-               process_local_message(buffer, buffer_len);
-       }
+       process_kernel_oplocks(smbd_messaging_context(), pfds);
 
-       /* Do the aio check again after receive_local_message as it does a select
-          and may have eaten our signal. */
+       /* Do the aio check again after receive_local_message as it does a
+          select and may have eaten our signal. */
+       /* Is this till true? -- vl */
        process_aio_queue();
 
        if (got_sig_term) {
-               exit_server("Caught TERM signal");
+               exit_server_cleanly("termination signal");
        }
 
-       /* check for async change notify events */
-       process_pending_change_notify_queue(0);
-
        /* check for sighup processing */
        if (reload_after_sighup) {
                change_to_root_user();
@@ -314,6 +347,20 @@ static void async_processing(char *buffer, int buffer_len)
        }
 }
 
+/****************************************************************************
+ Add a fd to the set we will be select(2)ing on.
+****************************************************************************/
+
+static int select_on_fd(int fd, int maxfd, fd_set *fds)
+{
+       if (fd != -1) {
+               FD_SET(fd, fds);
+               maxfd = MAX(maxfd, fd);
+       }
+
+       return maxfd;
+}
+
 /****************************************************************************
   Do a select on an two fd's - with timeout. 
 
@@ -335,61 +382,50 @@ static void async_processing(char *buffer, int buffer_len)
 The timeout is in milliseconds
 ****************************************************************************/
 
-static BOOL receive_message_or_smb(char *buffer, int buffer_len, int timeout)
+static BOOL receive_message_or_smb(TALLOC_CTX *mem_ctx, char **buffer,
+                                  size_t *buffer_len, int timeout)
 {
-       fd_set fds;
+       fd_set r_fds, w_fds;
        int selrtn;
        struct timeval to;
-       struct timeval *pto;
-       int maxfd;
+       int maxfd = 0;
+       ssize_t len;
 
        smb_read_error = 0;
 
  again:
 
-       to.tv_sec = timeout / 1000;
-       to.tv_usec = (timeout % 1000) * 1000;
-       pto = timeout > 0 ? &to : NULL;
+       if (timeout >= 0) {
+               to.tv_sec = timeout / 1000;
+               to.tv_usec = (timeout % 1000) * 1000;
+       } else {
+               to.tv_sec = SMBD_SELECT_TIMEOUT;
+               to.tv_usec = 0;
+       }
 
        /*
         * Note that this call must be before processing any SMB
         * messages as we need to synchronously process any messages
         * we may have sent to ourselves from the previous SMB.
         */
-       message_dispatch();
-
-       /*
-        * Check to see if we already have a message on the smb queue.
-        * If so - copy and return it.
-        */
-       if(smb_oplock_queue != NULL) {
-               struct pending_message_list *msg = smb_oplock_queue;
-               memcpy(buffer, msg->buf.data, MIN(buffer_len, msg->buf.length));
-  
-               /* Free the message we just copied. */
-               DLIST_REMOVE(smb_oplock_queue, msg);
-               free_queued_message(msg);
-               
-               DEBUG(5,("receive_message_or_smb: returning queued smb message.\n"));
-               return True;
-       }
+       message_dispatch(smbd_messaging_context());
 
        /*
         * Check to see if we already have a message on the deferred open queue
         * and it's time to schedule.
         */
-       if(smb_sharing_violation_queue != NULL) {
+       if(deferred_open_queue != NULL) {
                BOOL pop_message = False;
-               struct pending_message_list *msg = smb_sharing_violation_queue;
+               struct pending_message_list *msg = deferred_open_queue;
 
-               if (msg->msg_time.tv_sec == 0 && msg->msg_time.tv_usec == 0) {
+               if (timeval_is_zero(&msg->end_time)) {
                        pop_message = True;
                } else {
                        struct timeval tv;
                        SMB_BIG_INT tdif;
 
                        GetTimeOfDay(&tv);
-                       tdif = usec_time_diff(&msg->msg_time, &tv);
+                       tdif = usec_time_diff(&msg->end_time, &tv);
                        if (tdif <= 0) {
                                /* Timed out. Schedule...*/
                                pop_message = True;
@@ -398,15 +434,22 @@ static BOOL receive_message_or_smb(char *buffer, int buffer_len, int timeout)
                                /* Make a more accurate select timeout. */
                                to.tv_sec = tdif / 1000000;
                                to.tv_usec = tdif % 1000000;
-                               pto = &to;
                                DEBUG(10,("receive_message_or_smb: select with timeout of [%u.%06u]\n",
-                                       (unsigned int)pto->tv_sec, (unsigned int)pto->tv_usec ));
+                                       (unsigned int)to.tv_sec, (unsigned int)to.tv_usec ));
                        }
                }
 
                if (pop_message) {
-                       memcpy(buffer, msg->buf.data, MIN(buffer_len, msg->buf.length));
-  
+
+                       *buffer = (char *)talloc_memdup(mem_ctx, msg->buf.data,
+                                                       msg->buf.length);
+                       if (*buffer == NULL) {
+                               DEBUG(0, ("talloc failed\n"));
+                               smb_read_error = READ_ERROR;
+                               return False;
+                       }
+                       *buffer_len = msg->buf.length;
+
                        /* We leave this message on the queue so the open code can
                           know this is a retry. */
                        DEBUG(5,("receive_message_or_smb: returning deferred open smb message.\n"));
@@ -415,10 +458,11 @@ static BOOL receive_message_or_smb(char *buffer, int buffer_len, int timeout)
        }
 
        /*
-        * Setup the select read fd set.
+        * Setup the select fd sets.
         */
 
-       FD_ZERO(&fds);
+       FD_ZERO(&r_fds);
+       FD_ZERO(&w_fds);
 
        /*
         * Ensure we process oplock break messages by preference.
@@ -429,9 +473,9 @@ static BOOL receive_message_or_smb(char *buffer, int buffer_len, int timeout)
         * This is hideously complex - *MUST* be simplified for 3.0 ! JRA.
         */
 
-       if (oplock_message_waiting(&fds)) {
+       if (oplock_message_waiting(&r_fds)) {
                DEBUG(10,("receive_message_or_smb: oplock_message is waiting.\n"));
-               async_processing(buffer, buffer_len);
+               async_processing(&r_fds);
                /*
                 * After async processing we must go and do the select again, as
                 * the state of the flag in fds for the server file descriptor is
@@ -439,18 +483,51 @@ static BOOL receive_message_or_smb(char *buffer, int buffer_len, int timeout)
                 */
                goto again;
        }
+
+       /*
+        * Are there any timed events waiting ? If so, ensure we don't
+        * select for longer than it would take to wait for them.
+        */
+
+       {
+               struct timeval now;
+               GetTimeOfDay(&now);
+
+               event_add_to_select_args(smbd_event_context(), &now,
+                                        &r_fds, &w_fds, &to, &maxfd);
+       }
+
+       if (timeval_is_zero(&to)) {
+               /* Process a timed event now... */
+               if (run_events(smbd_event_context(), 0, NULL, NULL)) {
+                       goto again;
+               }
+       }
        
-       FD_SET(smbd_server_fd(),&fds);
-       maxfd = setup_oplock_select_set(&fds);
+       {
+               int sav;
+               START_PROFILE(smbd_idle);
+
+               maxfd = select_on_fd(smbd_server_fd(), maxfd, &r_fds);
+               maxfd = select_on_fd(oplock_notify_fd(), maxfd, &r_fds);
+
+               selrtn = sys_select(maxfd+1,&r_fds,&w_fds,NULL,&to);
+               sav = errno;
 
-       selrtn = sys_select(MAX(maxfd,smbd_server_fd())+1,&fds,NULL,NULL,pto);
+               END_PROFILE(smbd_idle);
+               errno = sav;
+       }
+
+       if (run_events(smbd_event_context(), selrtn, &r_fds, &w_fds)) {
+               goto again;
+       }
 
        /* if we get EINTR then maybe we have received an oplock
           signal - treat this as select returning 1. This is ugly, but
           is the best we can do until the oplock code knows more about
           signals */
        if (selrtn == -1 && errno == EINTR) {
-               async_processing(buffer, buffer_len);
+               async_processing(&r_fds);
                /*
                 * After async processing we must go and do the select again, as
                 * the state of the flag in fds for the server file descriptor is
@@ -478,8 +555,8 @@ static BOOL receive_message_or_smb(char *buffer, int buffer_len, int timeout)
         * sending us an oplock break message. JRA.
         */
 
-       if (oplock_message_waiting(&fds)) {
-               async_processing(buffer, buffer_len);
+       if (oplock_message_waiting(&r_fds)) {
+               async_processing(&r_fds);
                /*
                 * After async processing we must go and do the select again, as
                 * the state of the flag in fds for the server file descriptor is
@@ -487,26 +564,39 @@ static BOOL receive_message_or_smb(char *buffer, int buffer_len, int timeout)
                 */
                goto again;
        }
-       
-       return receive_smb(smbd_server_fd(), buffer, 0);
+
+       len = receive_smb_talloc(mem_ctx, smbd_server_fd(), buffer, 0);
+
+       if (len == -1) {
+               return False;
+       }
+
+       *buffer_len = (size_t)len;
+
+       return True;
 }
 
-/****************************************************************************
-Get the next SMB packet, doing the local message processing automatically.
-****************************************************************************/
+/*
+ * Only allow 5 outstanding trans requests. We're allocating memory, so
+ * prevent a DoS.
+ */
 
-BOOL receive_next_smb(char *inbuf, int bufsize, int timeout)
+NTSTATUS allow_new_trans(struct trans_state *list, int mid)
 {
-       BOOL got_keepalive;
-       BOOL ret;
+       int count = 0;
+       for (; list != NULL; list = list->next) {
 
-       do {
-               ret = receive_message_or_smb(inbuf,bufsize,timeout);
-               
-               got_keepalive = (ret && (CVAL(inbuf,0) == SMBkeepalive));
-       } while (ret && got_keepalive);
+               if (list->mid == mid) {
+                       return NT_STATUS_INVALID_PARAMETER;
+               }
+
+               count += 1;
+       }
+       if (count > 5) {
+               return NT_STATUS_INSUFFICIENT_RESOURCES;
+       }
 
-       return ret;
+       return NT_STATUS_OK;
 }
 
 /****************************************************************************
@@ -518,8 +608,6 @@ BOOL receive_next_smb(char *inbuf, int bufsize, int timeout)
 
 void respond_to_all_remaining_local_messages(void)
 {
-       char buffer[1024];
-
        /*
         * Assert we have no exclusive open oplocks.
         */
@@ -530,15 +618,7 @@ void respond_to_all_remaining_local_messages(void)
                return;
        }
 
-       /*
-        * Keep doing receive_local_message with a 1 ms timeout until
-        * we have no more messages.
-        */
-
-       while(receive_local_message(buffer, sizeof(buffer), 1)) {
-               /* Deal with oplock break requests from other smbd's. */
-               process_local_message(buffer, sizeof(buffer));
-       }
+       process_kernel_oplocks(smbd_messaging_context(), NULL);
 
        return;
 }
@@ -552,12 +632,11 @@ are used by some brain-dead clients when printing, and I don't want to
 force write permissions on print services.
 */
 #define AS_USER (1<<0)
-#define NEED_WRITE (1<<1)
+#define NEED_WRITE (1<<1) /* Must be paired with AS_USER */
 #define TIME_INIT (1<<2)
-#define CAN_IPC (1<<3)
-#define AS_GUEST (1<<5)
-#define QUEUE_IN_OPLOCK (1<<6)
-#define DO_CHDIR (1<<7)
+#define CAN_IPC (1<<3) /* Must be paired with AS_USER */
+#define AS_GUEST (1<<5) /* Must *NOT* be paired with AS_USER */
+#define DO_CHDIR (1<<6)
 
 /* 
    define a list of possible SMB messages and their corresponding
@@ -566,27 +645,27 @@ force write permissions on print services.
 */
 static const struct smb_message_struct {
        const char *name;
-       int (*fn)(connection_struct *conn, char *, char *, int, int);
+       void (*fn_new)(connection_struct *conn, struct smb_request *req);
        int flags;
 } smb_messages[256] = {
 
 /* 0x00 */ { "SMBmkdir",reply_mkdir,AS_USER | NEED_WRITE},
 /* 0x01 */ { "SMBrmdir",reply_rmdir,AS_USER | NEED_WRITE},
-/* 0x02 */ { "SMBopen",reply_open,AS_USER | QUEUE_IN_OPLOCK },
+/* 0x02 */ { "SMBopen",reply_open,AS_USER },
 /* 0x03 */ { "SMBcreate",reply_mknew,AS_USER},
 /* 0x04 */ { "SMBclose",reply_close,AS_USER | CAN_IPC },
 /* 0x05 */ { "SMBflush",reply_flush,AS_USER},
-/* 0x06 */ { "SMBunlink",reply_unlink,AS_USER | NEED_WRITE | QUEUE_IN_OPLOCK},
-/* 0x07 */ { "SMBmv",reply_mv,AS_USER | NEED_WRITE | QUEUE_IN_OPLOCK},
+/* 0x06 */ { "SMBunlink",reply_unlink,AS_USER | NEED_WRITE },
+/* 0x07 */ { "SMBmv",reply_mv,AS_USER | NEED_WRITE },
 /* 0x08 */ { "SMBgetatr",reply_getatr,AS_USER},
 /* 0x09 */ { "SMBsetatr",reply_setatr,AS_USER | NEED_WRITE},
 /* 0x0a */ { "SMBread",reply_read,AS_USER},
 /* 0x0b */ { "SMBwrite",reply_write,AS_USER | CAN_IPC },
 /* 0x0c */ { "SMBlock",reply_lock,AS_USER},
 /* 0x0d */ { "SMBunlock",reply_unlock,AS_USER},
-/* 0x0e */ { "SMBctemp",reply_ctemp,AS_USER | QUEUE_IN_OPLOCK },
-/* 0x0f */ { "SMBmknew",reply_mknew,AS_USER}, 
-/* 0x10 */ { "SMBchkpth",reply_chkpth,AS_USER},
+/* 0x0e */ { "SMBctemp",reply_ctemp,AS_USER },
+/* 0x0f */ { "SMBmknew",reply_mknew,AS_USER},
+/* 0x10 */ { "SMBcheckpath",reply_checkpath,AS_USER},
 /* 0x11 */ { "SMBexit",reply_exit,DO_CHDIR},
 /* 0x12 */ { "SMBlseek",reply_lseek,AS_USER},
 /* 0x13 */ { "SMBlockread",reply_lockread,AS_USER},
@@ -598,32 +677,32 @@ static const struct smb_message_struct {
 /* 0x19 */ { NULL, NULL, 0 },
 /* 0x1a */ { "SMBreadbraw",reply_readbraw,AS_USER},
 /* 0x1b */ { "SMBreadBmpx",reply_readbmpx,AS_USER},
-/* 0x1c */ { "SMBreadBs",NULL,0 },
+/* 0x1c */ { "SMBreadBs",reply_readbs,AS_USER },
 /* 0x1d */ { "SMBwritebraw",reply_writebraw,AS_USER},
 /* 0x1e */ { "SMBwriteBmpx",reply_writebmpx,AS_USER},
 /* 0x1f */ { "SMBwriteBs",reply_writebs,AS_USER},
-/* 0x20 */ { "SMBwritec",NULL,0},
+/* 0x20 */ { "SMBwritec", NULL,0},
 /* 0x21 */ { NULL, NULL, 0 },
 /* 0x22 */ { "SMBsetattrE",reply_setattrE,AS_USER | NEED_WRITE },
 /* 0x23 */ { "SMBgetattrE",reply_getattrE,AS_USER },
 /* 0x24 */ { "SMBlockingX",reply_lockingX,AS_USER },
 /* 0x25 */ { "SMBtrans",reply_trans,AS_USER | CAN_IPC },
-/* 0x26 */ { "SMBtranss",NULL,AS_USER | CAN_IPC},
+/* 0x26 */ { "SMBtranss",reply_transs,AS_USER | CAN_IPC},
 /* 0x27 */ { "SMBioctl",reply_ioctl,0},
-/* 0x28 */ { "SMBioctls",NULL,AS_USER},
-/* 0x29 */ { "SMBcopy",reply_copy,AS_USER | NEED_WRITE | QUEUE_IN_OPLOCK },
-/* 0x2a */ { "SMBmove",NULL,AS_USER | NEED_WRITE | QUEUE_IN_OPLOCK },
+/* 0x28 */ { "SMBioctls", NULL,AS_USER},
+/* 0x29 */ { "SMBcopy",reply_copy,AS_USER | NEED_WRITE },
+/* 0x2a */ { "SMBmove", NULL,AS_USER | NEED_WRITE },
 /* 0x2b */ { "SMBecho",reply_echo,0},
 /* 0x2c */ { "SMBwriteclose",reply_writeclose,AS_USER},
-/* 0x2d */ { "SMBopenX",reply_open_and_X,AS_USER | CAN_IPC | QUEUE_IN_OPLOCK },
+/* 0x2d */ { "SMBopenX",reply_open_and_X,AS_USER | CAN_IPC },
 /* 0x2e */ { "SMBreadX",reply_read_and_X,AS_USER | CAN_IPC },
 /* 0x2f */ { "SMBwriteX",reply_write_and_X,AS_USER | CAN_IPC },
 /* 0x30 */ { NULL, NULL, 0 },
 /* 0x31 */ { NULL, NULL, 0 },
-/* 0x32 */ { "SMBtrans2", reply_trans2, AS_USER | CAN_IPC },
-/* 0x33 */ { "SMBtranss2", reply_transs2, AS_USER},
-/* 0x34 */ { "SMBfindclose", reply_findclose,AS_USER},
-/* 0x35 */ { "SMBfindnclose", reply_findnclose, AS_USER},
+/* 0x32 */ { "SMBtrans2",reply_trans2, AS_USER | CAN_IPC },
+/* 0x33 */ { "SMBtranss2",reply_transs2, AS_USER},
+/* 0x34 */ { "SMBfindclose",reply_findclose,AS_USER},
+/* 0x35 */ { "SMBfindnclose",reply_findnclose,AS_USER},
 /* 0x36 */ { NULL, NULL, 0 },
 /* 0x37 */ { NULL, NULL, 0 },
 /* 0x38 */ { NULL, NULL, 0 },
@@ -686,7 +765,7 @@ static const struct smb_message_struct {
 /* 0x71 */ { "SMBtdis",reply_tdis,DO_CHDIR},
 /* 0x72 */ { "SMBnegprot",reply_negprot,0},
 /* 0x73 */ { "SMBsesssetupX",reply_sesssetup_and_X,0},
-/* 0x74 */ { "SMBulogoffX", reply_ulogoffX, 0}, /* ulogoff doesn't give a valid TID */
+/* 0x74 */ { "SMBulogoffX",reply_ulogoffX, 0}, /* ulogoff doesn't give a valid TID */
 /* 0x75 */ { "SMBtconX",reply_tcon_and_X,0},
 /* 0x76 */ { NULL, NULL, 0 },
 /* 0x77 */ { NULL, NULL, 0 },
@@ -730,12 +809,12 @@ static const struct smb_message_struct {
 /* 0x9d */ { NULL, NULL, 0 },
 /* 0x9e */ { NULL, NULL, 0 },
 /* 0x9f */ { NULL, NULL, 0 },
-/* 0xa0 */ { "SMBnttrans", reply_nttrans, AS_USER | CAN_IPC | QUEUE_IN_OPLOCK},
-/* 0xa1 */ { "SMBnttranss", reply_nttranss, AS_USER | CAN_IPC },
-/* 0xa2 */ { "SMBntcreateX", reply_ntcreate_and_X, AS_USER | CAN_IPC | QUEUE_IN_OPLOCK },
+/* 0xa0 */ { "SMBnttrans",reply_nttrans, AS_USER | CAN_IPC },
+/* 0xa1 */ { "SMBnttranss",reply_nttranss, AS_USER | CAN_IPC },
+/* 0xa2 */ { "SMBntcreateX",reply_ntcreate_and_X, AS_USER | CAN_IPC },
 /* 0xa3 */ { NULL, NULL, 0 },
-/* 0xa4 */ { "SMBntcancel", reply_ntcancel, 0 },
-/* 0xa5 */ { "SMBntrename", reply_ntrename, AS_USER | NEED_WRITE | QUEUE_IN_OPLOCK },
+/* 0xa4 */ { "SMBntcancel",reply_ntcancel, 0 },
+/* 0xa5 */ { "SMBntrename",reply_ntrename, AS_USER | NEED_WRITE },
 /* 0xa6 */ { NULL, NULL, 0 },
 /* 0xa7 */ { NULL, NULL, 0 },
 /* 0xa8 */ { NULL, NULL, 0 },
@@ -762,7 +841,7 @@ static const struct smb_message_struct {
 /* 0xbd */ { NULL, NULL, 0 },
 /* 0xbe */ { NULL, NULL, 0 },
 /* 0xbf */ { NULL, NULL, 0 },
-/* 0xc0 */ { "SMBsplopen",reply_printopen,AS_USER | QUEUE_IN_OPLOCK },
+/* 0xc0 */ { "SMBsplopen",reply_printopen,AS_USER},
 /* 0xc1 */ { "SMBsplwr",reply_printwrite,AS_USER},
 /* 0xc2 */ { "SMBsplclose",reply_printclose,AS_USER},
 /* 0xc3 */ { "SMBsplretq",reply_printqueue,AS_USER},
@@ -779,10 +858,10 @@ static const struct smb_message_struct {
 /* 0xce */ { NULL, NULL, 0 },
 /* 0xcf */ { NULL, NULL, 0 },
 /* 0xd0 */ { "SMBsends",reply_sends,AS_GUEST},
-/* 0xd1 */ { "SMBsendb",NULL,AS_GUEST},
-/* 0xd2 */ { "SMBfwdname",NULL,AS_GUEST},
-/* 0xd3 */ { "SMBcancelf",NULL,AS_GUEST},
-/* 0xd4 */ { "SMBgetmac",NULL,AS_GUEST},
+/* 0xd1 */ { "SMBsendb", NULL,AS_GUEST},
+/* 0xd2 */ { "SMBfwdname", NULL,AS_GUEST},
+/* 0xd3 */ { "SMBcancelf", NULL,AS_GUEST},
+/* 0xd4 */ { "SMBgetmac", NULL,AS_GUEST},
 /* 0xd5 */ { "SMBsendstrt",reply_sendstrt,AS_GUEST},
 /* 0xd6 */ { "SMBsendend",reply_sendend,AS_GUEST},
 /* 0xd7 */ { "SMBsendtxt",reply_sendtxt,AS_GUEST},
@@ -829,11 +908,48 @@ static const struct smb_message_struct {
 
 };
 
+/*******************************************************************
+ allocate and initialize a reply packet
+********************************************************************/
+
+void reply_outbuf(struct smb_request *req, uint8 num_words, uint32 num_bytes)
+{
+       /*
+         * Protect against integer wrap
+         */
+       if ((num_bytes > 0xffffff)
+           || ((num_bytes + smb_size + num_words*2) > 0xffffff)) {
+               char *msg;
+               asprintf(&msg, "num_bytes too large: %u",
+                        (unsigned)num_bytes);
+               smb_panic(msg);
+       }
+
+       if (!(req->outbuf = TALLOC_ARRAY(
+                     req, uint8,
+                     smb_size + num_words*2 + num_bytes))) {
+               smb_panic("could not allocate output buffer\n");
+       }
+
+       construct_reply_common((char *)req->inbuf, (char *)req->outbuf);
+       set_message((char *)req->outbuf, num_words, num_bytes, False);
+       /*
+        * Zero out the word area, the caller has to take care of the bcc area
+        * himself
+        */
+       if (num_words != 0) {
+               memset(req->outbuf + smb_vwv0, 0, num_words*2);
+       }
+
+       return;
+}
+
+
 /*******************************************************************
  Dump a packet to a file.
 ********************************************************************/
 
-static void smb_dump(const char *name, int type, char *data, ssize_t len)
+static void smb_dump(const char *name, int type, const char *data, ssize_t len)
 {
        int fd, i;
        pstring fname;
@@ -855,243 +971,191 @@ static void smb_dump(const char *name, int type, char *data, ssize_t len)
        }
 }
 
-
 /****************************************************************************
- Do a switch on the message type, and return the response size
+ Prepare everything for calling the actual request function, and potentially
+ call the request function via the "new" interface.
+
+ Return False if the "legacy" function needs to be called, everything is
+ prepared.
+
+ Return True if we're done.
+
+ I know this API sucks, but it is the one with the least code change I could
+ find.
 ****************************************************************************/
 
-static int switch_message(int type,char *inbuf,char *outbuf,int size,int bufsize)
+static void switch_message(uint8 type, struct smb_request *req, int size)
 {
-       static pid_t pid= (pid_t)-1;
-       int outsize = 0;
-
-       type &= 0xff;
+       int flags;
+       uint16 session_tag;
+       connection_struct *conn;
 
-       if (pid == (pid_t)-1)
-               pid = sys_getpid();
+       static uint16 last_session_tag = UID_FIELD_INVALID;
 
        errno = 0;
-       set_saved_error_triple(0, 0, NT_STATUS_OK);
 
        last_message = type;
 
-       /* Make sure this is an SMB packet. smb_size contains NetBIOS header so subtract 4 from it. */
-       if ((strncmp(smb_base(inbuf),"\377SMB",4) != 0) || (size < (smb_size - 4))) {
-               DEBUG(2,("Non-SMB packet of length %d. Terminating server\n",smb_len(inbuf)));
-               exit_server("Non-SMB packet");
-               return(-1);
+       /* Make sure this is an SMB packet. smb_size contains NetBIOS header
+        * so subtract 4 from it. */
+       if ((strncmp(smb_base(req->inbuf),"\377SMB",4) != 0)
+           || (size < (smb_size - 4))) {
+               DEBUG(2,("Non-SMB packet of length %d. Terminating server\n",
+                        smb_len(req->inbuf)));
+               exit_server_cleanly("Non-SMB packet");
        }
 
-       /* yuck! this is an interim measure before we get rid of our
-               current inbuf/outbuf system */
-       global_smbpid = SVAL(inbuf,smb_pid);
-
-       if (smb_messages[type].fn == NULL) {
+       if (smb_messages[type].fn_new == NULL) {
                DEBUG(0,("Unknown message type %d!\n",type));
-               smb_dump("Unknown", 1, inbuf, size);
-               outsize = reply_unknown(inbuf,outbuf);
-       } else {
-               int flags = smb_messages[type].flags;
-               static uint16 last_session_tag = UID_FIELD_INVALID;
-               /* In share mode security we must ignore the vuid. */
-               uint16 session_tag = (lp_security() == SEC_SHARE) ? UID_FIELD_INVALID : SVAL(inbuf,smb_uid);
-               connection_struct *conn = conn_find(SVAL(inbuf,smb_tid));
-
-               DEBUG(3,("switch message %s (pid %d) conn 0x%x\n",smb_fn_name(type),(int)pid,(unsigned int)conn));
-
-               smb_dump(smb_fn_name(type), 1, inbuf, size);
-               if(global_oplock_break) {
-                       if(flags & QUEUE_IN_OPLOCK) {
-                               /* 
-                                * Queue this message as we are the process of an oplock break.
-                                */
-
-                               DEBUG( 2, ( "switch_message: queueing message due to being in " ) );
-                               DEBUGADD( 2, ( "oplock break state.\n" ) );
-
-                               push_oplock_pending_smb_message( inbuf, size );
-                               return -1;
-                       }
-               }
+               smb_dump("Unknown", 1, (char *)req->inbuf, size);
+               reply_unknown_new(req, type);
+               return;
+       }
 
-               /* Ensure this value is replaced in the incoming packet. */
-               SSVAL(inbuf,smb_uid,session_tag);
+       flags = smb_messages[type].flags;
 
-               /*
-                * Ensure the correct username is in current_user_info.
-                * This is a really ugly bugfix for problems with
-                * multiple session_setup_and_X's being done and
-                * allowing %U and %G substitutions to work correctly.
-                * There is a reason this code is done here, don't
-                * move it unless you know what you're doing... :-).
-                * JRA.
-                */
+       /* In share mode security we must ignore the vuid. */
+       session_tag = (lp_security() == SEC_SHARE)
+               ? UID_FIELD_INVALID : req->vuid;
+       conn = conn_find(req->tid);
+
+       DEBUG(3,("switch message %s (pid %d) conn 0x%lx\n", smb_fn_name(type),
+                (int)sys_getpid(), (unsigned long)conn));
+
+       smb_dump(smb_fn_name(type), 1, (char *)req->inbuf, size);
+
+       /* Ensure this value is replaced in the incoming packet. */
+       SSVAL(req->inbuf,smb_uid,session_tag);
+
+       /*
+        * Ensure the correct username is in current_user_info.  This is a
+        * really ugly bugfix for problems with multiple session_setup_and_X's
+        * being done and allowing %U and %G substitutions to work correctly.
+        * There is a reason this code is done here, don't move it unless you
+        * know what you're doing... :-).
+        * JRA.
+        */
 
-               if (session_tag != last_session_tag) {
-                       user_struct *vuser = NULL;
+       if (session_tag != last_session_tag) {
+               user_struct *vuser = NULL;
 
-                       last_session_tag = session_tag;
-                       if(session_tag != UID_FIELD_INVALID)
-                               vuser = get_valid_user_struct(session_tag);           
-                       if(vuser != NULL)
+               last_session_tag = session_tag;
+               if(session_tag != UID_FIELD_INVALID) {
+                       vuser = get_valid_user_struct(session_tag);
+                       if (vuser) {
                                set_current_user_info(&vuser->user);
+                       }
                }
+       }
 
-               /* does this protocol need to be run as root? */
-               if (!(flags & AS_USER))
-                       change_to_root_user();
+       /* Does this call need to be run as the connected user? */
+       if (flags & AS_USER) {
 
-               /* does this protocol need a valid tree connection? */
-               if ((flags & AS_USER) && !conn) {
-                       /* Amazingly, the error code depends on the command (from Samba4). */
+               /* Does this call need a valid tree connection? */
+               if (!conn) {
+                       /*
+                        * Amazingly, the error code depends on the command
+                        * (from Samba4).
+                        */
                        if (type == SMBntcreateX) {
-                               return ERROR_NT(NT_STATUS_INVALID_HANDLE);
+                               reply_nterror(req, NT_STATUS_INVALID_HANDLE);
                        } else {
-                               return ERROR_DOS(ERRSRV, ERRinvnid);
+                               reply_doserror(req, ERRSRV, ERRinvnid);
                        }
+                       return;
                }
 
-
-               /* does this protocol need to be run as the connected user? */
-               if ((flags & AS_USER) && !change_to_user(conn,session_tag)) {
-                       if (flags & AS_GUEST) 
-                               flags &= ~AS_USER;
-                       else
-                               return(ERROR_FORCE_DOS(ERRSRV,ERRbaduid));
+               if (!change_to_user(conn,session_tag)) {
+                       reply_nterror(req, NT_STATUS_DOS(ERRSRV, ERRbaduid));
+                       return;
                }
 
-               /* this code is to work around a bug is MS client 3 without
-                       introducing a security hole - it needs to be able to do
-                       print queue checks as guest if it isn't logged in properly */
-               if (flags & AS_USER)
-                       flags &= ~AS_GUEST;
-
-               /* does it need write permission? */
-               if ((flags & NEED_WRITE) && !CAN_WRITE(conn))
-                       return(ERROR_DOS(ERRSRV,ERRaccess));
+               /* All NEED_WRITE and CAN_IPC flags must also have AS_USER. */
 
-               /* ipc services are limited */
-               if (IS_IPC(conn) && (flags & AS_USER) && !(flags & CAN_IPC))
-                       return(ERROR_DOS(ERRSRV,ERRaccess));        
-
-               /* load service specific parameters */
-               if (conn) {
-                       if (!set_current_service(conn,SVAL(inbuf,smb_flg),(flags & (AS_USER|DO_CHDIR)?True:False))) {
-                               return(ERROR_DOS(ERRSRV,ERRaccess));
-                       }
-                       conn->num_smb_operations++;
+               /* Does it need write permission? */
+               if ((flags & NEED_WRITE) && !CAN_WRITE(conn)) {
+                       reply_nterror(req, NT_STATUS_MEDIA_WRITE_PROTECTED);
+                       return;
                }
 
-               /* does this protocol need to be run as guest? */
-               if ((flags & AS_GUEST) && (!change_to_guest() || 
-                               !check_access(smbd_server_fd(), lp_hostsallow(-1), lp_hostsdeny(-1))))
-                       return(ERROR_DOS(ERRSRV,ERRaccess));
+               /* IPC services are limited */
+               if (IS_IPC(conn) && !(flags & CAN_IPC)) {
+                       reply_doserror(req, ERRSRV,ERRaccess);
+                       return;
+               }
+       } else {
+               /* This call needs to be run as root */
+               change_to_root_user();
+       }
 
-               current_inbuf = inbuf; /* In case we need to defer this message in open... */
-               outsize = smb_messages[type].fn(conn, inbuf,outbuf,size,bufsize);
+       /* load service specific parameters */
+       if (conn) {
+               if (!set_current_service(conn,SVAL(req->inbuf,smb_flg),
+                                        (flags & (AS_USER|DO_CHDIR)
+                                         ?True:False))) {
+                       reply_doserror(req, ERRSRV, ERRaccess);
+                       return;
+               }
+               conn->num_smb_operations++;
        }
 
-       smb_dump(smb_fn_name(type), 0, outbuf, outsize);
+       /* does this protocol need to be run as guest? */
+       if ((flags & AS_GUEST)
+           && (!change_to_guest() ||
+               !check_access(smbd_server_fd(), lp_hostsallow(-1),
+                             lp_hostsdeny(-1)))) {
+               reply_doserror(req, ERRSRV, ERRaccess);
+               return;
+       }
 
-       return(outsize);
+       smb_messages[type].fn_new(conn, req);
 }
 
-
 /****************************************************************************
  Construct a reply to the incoming packet.
 ****************************************************************************/
 
-static int construct_reply(char *inbuf,char *outbuf,int size,int bufsize)
+static void construct_reply(char *inbuf, int size)
 {
-       int type = CVAL(inbuf,smb_com);
-       int outsize = 0;
-       int msg_type = CVAL(inbuf,0);
-
-       GetTimeOfDay(&smb_last_time);
+       uint8 type = CVAL(inbuf,smb_com);
+       struct smb_request *req;
 
        chain_size = 0;
        file_chain_reset();
        reset_chain_p();
 
-       if (msg_type != 0)
-               return(reply_special(inbuf,outbuf));  
-
-       construct_reply_common(inbuf, outbuf);
-
-       outsize = switch_message(type,inbuf,outbuf,size,bufsize);
-
-       outsize += chain_size;
-
-       if(outsize > 4)
-               smb_setlen(outbuf,outsize - 4);
-       return(outsize);
-}
-
-/****************************************************************************
- Keep track of the number of running smbd's. This functionality is used to
- 'hard' limit Samba overhead on resource constrained systems. 
-****************************************************************************/
-
-static BOOL process_count_update_successful = False;
-
-static int32 increment_smbd_process_count(void)
-{
-       int32 total_smbds;
-
-       if (lp_max_smbd_processes()) {
-               total_smbds = 0;
-               if (tdb_change_int32_atomic(conn_tdb_ctx(), "INFO/total_smbds", &total_smbds, 1) == -1)
-                       return 1;
-               process_count_update_successful = True;
-               return total_smbds + 1;
+       if (!(req = talloc(talloc_tos(), struct smb_request))) {
+               smb_panic("could not allocate smb_request");
        }
-       return 1;
-}
+       init_smb_request(req, (uint8 *)inbuf);
 
-void decrement_smbd_process_count(void)
-{
-       int32 total_smbds;
+       switch_message(type, req, size);
 
-       if (lp_max_smbd_processes() && process_count_update_successful) {
-               total_smbds = 1;
-               tdb_change_int32_atomic(conn_tdb_ctx(), "INFO/total_smbds", &total_smbds, -1);
+       if (req->outbuf == NULL) {
+               return;
        }
-}
 
-static BOOL smbd_process_limit(void)
-{
-       int32  total_smbds;
-       
-       if (lp_max_smbd_processes()) {
+       if (CVAL(req->outbuf,0) == 0) {
+               show_msg((char *)req->outbuf);
+       }
 
-               /* Always add one to the smbd process count, as exit_server() always
-                * subtracts one.
-                */
+       if (!send_smb(smbd_server_fd(), (char *)req->outbuf)) {
+               exit_server_cleanly("construct_reply: send_smb failed.");
+       }
 
-               if (!conn_tdb_ctx()) {
-                       DEBUG(0,("smbd_process_limit: max smbd processes parameter set with status parameter not \
-set. Ignoring max smbd restriction.\n"));
-                       return False;
-               }
+       TALLOC_FREE(req);
 
-               total_smbds = increment_smbd_process_count();
-               return total_smbds > lp_max_smbd_processes();
-       }
-       else
-               return False;
+       return;
 }
 
 /****************************************************************************
- Process an smb from the client - split out from the smbd_process() code so
- it can be used by the oplock break code.
+ Process an smb from the client
 ****************************************************************************/
 
-void process_smb(char *inbuf, char *outbuf)
+static void process_smb(char *inbuf, size_t nread)
 {
        static int trans_num;
        int msg_type = CVAL(inbuf,0);
-       int32 len = smb_len(inbuf);
-       int nread = len + 4;
 
        DO_PROFILE_INC(smb_count);
 
@@ -1100,37 +1164,32 @@ void process_smb(char *inbuf, char *outbuf)
                deny parameters before doing any parsing of the packet
                passed to us by the client.  This prevents attacks on our
                parsing code from hosts not in the hosts allow list */
-               if (smbd_process_limit() ||
-                               !check_access(smbd_server_fd(), lp_hostsallow(-1), lp_hostsdeny(-1))) {
+               if (!check_access(smbd_server_fd(), lp_hostsallow(-1),
+                                 lp_hostsdeny(-1))) {
                        /* send a negative session response "not listening on calling name" */
                        static unsigned char buf[5] = {0x83, 0, 0, 1, 0x81};
                        DEBUG( 1, ( "Connection denied from %s\n", client_addr() ) );
                        (void)send_smb(smbd_server_fd(),(char *)buf);
-                       exit_server("connection denied");
+                       exit_server_cleanly("connection denied");
                }
        }
 
-       DEBUG( 6, ( "got message type 0x%x of len 0x%x\n", msg_type, len ) );
-       DEBUG( 3, ( "Transaction %d of length %d\n", trans_num, nread ) );
+       DEBUG( 6, ( "got message type 0x%x of len 0x%x\n", msg_type,
+                   smb_len(inbuf) ) );
+       DEBUG( 3, ( "Transaction %d of length %d\n", trans_num, (int)nread ) );
+
+       if (msg_type != 0) {
+               /*
+                * NetBIOS session request, keepalive, etc.
+                */
+               reply_special(inbuf);
+               return;
+       }
 
-       if (msg_type == 0)
-               show_msg(inbuf);
-       else if(msg_type == SMBkeepalive)
-               return; /* Keepalive packet. */
+       show_msg(inbuf);
 
-       nread = construct_reply(inbuf,outbuf,nread,max_send);
+       construct_reply(inbuf,nread);
       
-       if(nread > 0) {
-               if (CVAL(outbuf,0) == 0)
-                       show_msg(outbuf);
-       
-               if (nread != smb_len(outbuf) + 4) {
-                       DEBUG(0,("ERROR: Invalid message response size! %d %d\n",
-                               nread, smb_len(outbuf)));
-               } else if (!send_smb(smbd_server_fd(),outbuf)) {
-                       exit_server("process_smb: send_smb failed.");
-               }
-       }
        trans_num++;
 }
 
@@ -1164,22 +1223,18 @@ void remove_from_common_flags2(uint32 v)
        common_flags2 &= ~v;
 }
 
-void construct_reply_common(char *inbuf,char *outbuf)
+void construct_reply_common(const char *inbuf, char *outbuf)
 {
-       memset(outbuf,'\0',smb_size);
-
-       set_message(outbuf,0,0,True);
-       SCVAL(outbuf,smb_com,CVAL(inbuf,smb_com));
+       set_message(outbuf,0,0,False);
        
-       memcpy(outbuf+4,inbuf+4,4);
-       SCVAL(outbuf,smb_rcls,SMB_SUCCESS);
-       SCVAL(outbuf,smb_reh,0);
+       SCVAL(outbuf,smb_com,CVAL(inbuf,smb_com));
+       SIVAL(outbuf,smb_rcls,0);
        SCVAL(outbuf,smb_flg, FLAG_REPLY | (CVAL(inbuf,smb_flg) & FLAG_CASELESS_PATHNAMES)); 
        SSVAL(outbuf,smb_flg2,
                (SVAL(inbuf,smb_flg2) & FLAGS2_UNICODE_STRINGS) |
                common_flags2);
+       memset(outbuf+smb_pidhigh,'\0',(smb_tid-smb_pidhigh));
 
-       SSVAL(outbuf,smb_err,SMB_SUCCESS);
        SSVAL(outbuf,smb_tid,SVAL(inbuf,smb_tid));
        SSVAL(outbuf,smb_pid,SVAL(inbuf,smb_pid));
        SSVAL(outbuf,smb_uid,SVAL(inbuf,smb_uid));
@@ -1190,28 +1245,56 @@ void construct_reply_common(char *inbuf,char *outbuf)
  Construct a chained reply and add it to the already made reply
 ****************************************************************************/
 
-int chain_reply(char *inbuf,char *outbuf,int size,int bufsize)
+void chain_reply(struct smb_request *req)
 {
        static char *orig_inbuf;
-       static char *orig_outbuf;
+
+       /*
+        * Dirty little const_discard: We mess with req->inbuf, which is
+        * declared as const. If maybe at some point this routine gets
+        * rewritten, this const_discard could go away.
+        */
+       char *inbuf = CONST_DISCARD(char *, req->inbuf);
+       int size = smb_len(req->inbuf)+4;
+
        int smb_com1, smb_com2 = CVAL(inbuf,smb_vwv0);
        unsigned smb_off2 = SVAL(inbuf,smb_vwv1);
-       char *inbuf2, *outbuf2;
+       char *inbuf2;
        int outsize2;
+       int new_size;
        char inbuf_saved[smb_wct];
-       char outbuf_saved[smb_wct];
-       int outsize = smb_len(outbuf) + 4;
+       char *outbuf = (char *)req->outbuf;
+       size_t outsize = smb_len(outbuf) + 4;
+       size_t outsize_padded;
+       size_t ofs, to_move;
 
-       /* maybe its not chained */
-       if (smb_com2 == 0xFF) {
+       struct smb_request *req2;
+       size_t caller_outputlen;
+       char *caller_output;
+
+       /* Maybe its not chained, or it's an error packet. */
+       if (smb_com2 == 0xFF || SVAL(outbuf,smb_rcls) != 0) {
                SCVAL(outbuf,smb_vwv0,0xFF);
-               return outsize;
+               return;
        }
 
        if (chain_size == 0) {
                /* this is the first part of the chain */
                orig_inbuf = inbuf;
-               orig_outbuf = outbuf;
+       }
+
+       /*
+        * We need to save the output the caller added to the chain so that we
+        * can splice it into the final output buffer later.
+        */
+
+       caller_outputlen = outsize - smb_wct;
+
+       caller_output = (char *)memdup(outbuf + smb_wct, caller_outputlen);
+
+       if (caller_output == NULL) {
+               /* TODO: NT_STATUS_NO_MEMORY */
+               smb_panic("could not dup outbuf");
        }
 
        /*
@@ -1220,27 +1303,25 @@ int chain_reply(char *inbuf,char *outbuf,int size,int bufsize)
         * 4 byte aligned. JRA.
         */
 
-       outsize = (outsize + 3) & ~3;
-
-       /* we need to tell the client where the next part of the reply will be */
-       SSVAL(outbuf,smb_vwv1,smb_offset(outbuf+outsize,outbuf));
-       SCVAL(outbuf,smb_vwv0,smb_com2);
+       outsize_padded = (outsize + 3) & ~3;
 
-       /* remember how much the caller added to the chain, only counting stuff
-               after the parameter words */
-       chain_size += outsize - smb_wct;
+       /*
+        * remember how much the caller added to the chain, only counting
+        * stuff after the parameter words
+        */
+       chain_size += outsize_padded - smb_wct;
 
-       /* work out pointers into the original packets. The
-               headers on these need to be filled in */
+       /*
+        * work out pointers into the original packets. The
+        * headers on these need to be filled in
+        */
        inbuf2 = orig_inbuf + smb_off2 + 4 - smb_wct;
-       outbuf2 = orig_outbuf + SVAL(outbuf,smb_vwv1) + 4 - smb_wct;
 
        /* remember the original command type */
        smb_com1 = CVAL(orig_inbuf,smb_com);
 
        /* save the data which will be overwritten by the new headers */
        memcpy(inbuf_saved,inbuf2,smb_wct);
-       memcpy(outbuf_saved,outbuf2,smb_wct);
 
        /* give the new packet the same header as the last part of the SMB */
        memmove(inbuf2,inbuf,smb_wct);
@@ -1248,52 +1329,131 @@ int chain_reply(char *inbuf,char *outbuf,int size,int bufsize)
        /* create the in buffer */
        SCVAL(inbuf2,smb_com,smb_com2);
 
-       /* create the out buffer */
-       construct_reply_common(inbuf2, outbuf2);
+       /* work out the new size for the in buffer. */
+       new_size = size - (inbuf2 - inbuf);
+       if (new_size < 0) {
+               DEBUG(0,("chain_reply: chain packet size incorrect "
+                        "(orig size = %d, offset = %d)\n",
+                        size, (int)(inbuf2 - inbuf) ));
+               exit_server_cleanly("Bad chained packet");
+               return;
+       }
+
+       /* And set it in the header. */
+       smb_setlen(inbuf2, new_size - 4);
 
        DEBUG(3,("Chained message\n"));
        show_msg(inbuf2);
 
+       if (!(req2 = talloc(talloc_tos(), struct smb_request))) {
+               smb_panic("could not allocate smb_request");
+       }
+       init_smb_request(req2, (uint8 *)inbuf2);
+
        /* process the request */
-       outsize2 = switch_message(smb_com2,inbuf2,outbuf2,size-chain_size,
-                               bufsize-chain_size);
+       switch_message(smb_com2, req2, new_size);
 
-       /* copy the new reply and request headers over the old ones, but
-               preserve the smb_com field */
-       memmove(orig_outbuf,outbuf2,smb_wct);
-       SCVAL(orig_outbuf,smb_com,smb_com1);
+       /*
+        * We don't accept deferred operations in chained requests.
+        */
+       SMB_ASSERT(req2->outbuf != NULL);
+       outsize2 = smb_len(req2->outbuf)+4;
 
-       /* restore the saved data, being careful not to overwrite any
-               data from the reply header */
-       memcpy(inbuf2,inbuf_saved,smb_wct);
+       /*
+        * Move away the new command output so that caller_output fits in,
+        * copy in the caller_output saved above.
+        */
 
-       {
-               int ofs = smb_wct - PTR_DIFF(outbuf2,orig_outbuf);
-               if (ofs < 0) ofs = 0;
-                       memmove(outbuf2+ofs,outbuf_saved+ofs,smb_wct-ofs);
+       SMB_ASSERT(outsize_padded >= smb_wct);
+
+       /*
+        * "ofs" is the space we need for caller_output. Equal to
+        * caller_outputlen plus the padding.
+        */
+
+       ofs = outsize_padded - smb_wct;
+
+       /*
+        * "to_move" is the amount of bytes the secondary routine gave us
+        */
+
+       to_move = outsize2 - smb_wct;
+
+       if (to_move + ofs + smb_wct + chain_size > max_send) {
+               smb_panic("replies too large -- would have to cut");
+       }
+
+       /*
+        * In the "new" API "outbuf" is allocated via reply_outbuf, just for
+        * the first request in the chain. So we have to re-allocate it. In
+        * the "old" API the only outbuf ever used is the global OutBuffer
+        * which is always large enough.
+        */
+
+       outbuf = TALLOC_REALLOC_ARRAY(NULL, outbuf, char,
+                                     to_move + ofs + smb_wct);
+       if (outbuf == NULL) {
+               smb_panic("could not realloc outbuf");
+       }
+
+       req->outbuf = (uint8 *)outbuf;
+
+       memmove(outbuf + smb_wct + ofs, req2->outbuf + smb_wct, to_move);
+       memcpy(outbuf + smb_wct, caller_output, caller_outputlen);
+
+       /*
+        * copy the new reply header over the old one but preserve the smb_com
+        * field
+        */
+       memmove(outbuf, req2->outbuf, smb_wct);
+       SCVAL(outbuf, smb_com, smb_com1);
+
+       /*
+        * We've just copied in the whole "wct" area from the secondary
+        * function. Fix up the chaining: com2 and the offset need to be
+        * readjusted.
+        */
+
+       SCVAL(outbuf, smb_vwv0, smb_com2);
+       SSVAL(outbuf, smb_vwv1, chain_size + smb_wct - 4);
+
+       if (outsize_padded > outsize) {
+
+               /*
+                * Due to padding we have some uninitialized bytes after the
+                * caller's output
+                */
+
+               memset(outbuf + outsize, 0, outsize_padded - outsize);
        }
 
-       return outsize2;
+       smb_setlen(outbuf, outsize2 + chain_size - 4);
+
+       /*
+        * restore the saved data, being careful not to overwrite any data
+        * from the reply header
+        */
+       memcpy(inbuf2,inbuf_saved,smb_wct);
+
+       SAFE_FREE(caller_output);
+       TALLOC_FREE(req2);
+
+       return;
 }
 
 /****************************************************************************
- Setup the needed select timeout.
+ Setup the needed select timeout in milliseconds.
 ****************************************************************************/
 
 static int setup_select_timeout(void)
 {
        int select_timeout;
-       int t;
-
-       select_timeout = blocking_locks_timeout(SMBD_SELECT_TIMEOUT);
-       select_timeout *= 1000;
 
-       t = change_notify_timeout();
-       if (t != -1)
-               select_timeout = MIN(select_timeout, t*1000);
+       select_timeout = SMBD_SELECT_TIMEOUT*1000;
 
-       if (print_notify_messages_pending())
+       if (print_notify_messages_pending()) {
                select_timeout = MIN(select_timeout, 1000);
+       }
 
        return select_timeout;
 }
@@ -1302,7 +1462,7 @@ static int setup_select_timeout(void)
  Check if services need reloading.
 ****************************************************************************/
 
-void check_reload(int t)
+void check_reload(time_t t)
 {
        static pid_t mypid = 0;
        static time_t last_smb_conf_reload_time = 0;
@@ -1355,12 +1515,10 @@ void check_reload(int t)
  Process any timeout housekeeping. Return False if the caller should exit.
 ****************************************************************************/
 
-static BOOL timeout_processing(int deadtime, int *select_timeout, time_t *last_timeout_processing_time)
+static BOOL timeout_processing(int *select_timeout,
+                              time_t *last_timeout_processing_time)
 {
-       static time_t last_keepalive_sent_time = 0;
-       static time_t last_idle_closed_check = 0;
        time_t t;
-       BOOL allidle = True;
 
        if (smb_read_error == READ_EOF) {
                DEBUG(3,("timeout_processing: End of file from client (client has disconnected).\n"));
@@ -1380,56 +1538,12 @@ static BOOL timeout_processing(int deadtime, int *select_timeout, time_t *last_t
 
        *last_timeout_processing_time = t = time(NULL);
 
-       if(last_keepalive_sent_time == 0)
-               last_keepalive_sent_time = t;
-
-       if(last_idle_closed_check == 0)
-               last_idle_closed_check = t;
-
        /* become root again if waiting */
        change_to_root_user();
 
-       /* run all registered idle events */
-       smb_run_idle_events(t);
-
        /* check if we need to reload services */
        check_reload(t);
 
-       /* automatic timeout if all connections are closed */      
-       if (conn_num_open()==0 && (t - last_idle_closed_check) >= IDLE_CLOSED_TIMEOUT) {
-               DEBUG( 2, ( "Closing idle connection\n" ) );
-               return False;
-       } else {
-               last_idle_closed_check = t;
-       }
-
-       if (keepalive && (t - last_keepalive_sent_time)>keepalive) {
-               if (!send_keepalive(smbd_server_fd())) {
-                       DEBUG( 2, ( "Keepalive failed - exiting.\n" ) );
-                       return False;
-               }
-
-               /* send a keepalive for a password server or the like.
-                       This is attached to the auth_info created in the
-               negprot */
-               if (negprot_global_auth_context && negprot_global_auth_context->challenge_set_method 
-                               && negprot_global_auth_context->challenge_set_method->send_keepalive) {
-
-                       negprot_global_auth_context->challenge_set_method->send_keepalive
-                       (&negprot_global_auth_context->challenge_set_method->private_data);
-               }
-
-               last_keepalive_sent_time = t;
-       }
-
-       /* check for connection timeouts */
-       allidle = conn_idle_all(t, deadtime);
-
-       if (allidle && conn_num_open()>0) {
-               DEBUG(2,("Closing idle connection 2.\n"));
-               return False;
-       }
-
        if(global_machine_password_needs_changing && 
                        /* for ADS we need to do a regular ADS password change, not a domain
                                        password change */
@@ -1478,22 +1592,10 @@ machine %s in domain %s.\n", global_myname(), lp_workgroup()));
                secrets_lock_trust_account_password(lp_workgroup(), False);
        }
 
-       /*
-        * Check to see if we have any blocking locks
-        * outstanding on the queue.
-        */
-       process_blocking_lock_queue(t);
-
        /* update printer queue caches if necessary */
   
        update_monitored_printq_cache();
   
-       /*
-        * Check to see if we have any change notifies 
-        * outstanding on the queue.
-        */
-       process_pending_change_notify_queue(t);
-
        /*
         * Now we are root, check if the log files need pruning.
         * Force a log file check.
@@ -1503,7 +1605,7 @@ machine %s in domain %s.\n", global_myname(), lp_workgroup()));
 
        /* Send any queued printer notify message to interested smbd's. */
 
-       print_notify_send_messages(0);
+       print_notify_send_messages(smbd_messaging_context(), 0);
 
        /*
         * Modify the select timeout depending upon
@@ -1515,94 +1617,6 @@ machine %s in domain %s.\n", global_myname(), lp_workgroup()));
        return True;
 }
 
-/****************************************************************************
- Accessor functions for InBuffer, OutBuffer.
-****************************************************************************/
-
-char *get_InBuffer(void)
-{
-       return InBuffer;
-}
-
-void set_InBuffer(char *new_inbuf)
-{
-       InBuffer = new_inbuf;
-}
-
-char *get_OutBuffer(void)
-{
-       return OutBuffer;
-}
-
-void set_OutBuffer(char *new_outbuf)
-{
-       OutBuffer = new_outbuf;
-}
-
-/****************************************************************************
- Free an InBuffer. Checks if not in use by aio system.
- Must have been allocated by NewInBuffer.
-****************************************************************************/
-
-void free_InBuffer(char *inbuf)
-{
-       if (!aio_inbuffer_in_use(inbuf)) {
-               SAFE_FREE(inbuf);
-       }
-}
-
-/****************************************************************************
- Free an OutBuffer. No outbuffers currently stolen by aio system.
- Must have been allocated by NewInBuffer.
-****************************************************************************/
-
-void free_OutBuffer(char *outbuf)
-{
-       SAFE_FREE(outbuf);
-}
-
-const int total_buffer_size = (BUFFER_SIZE + LARGE_WRITEX_HDR_SIZE + SAFETY_MARGIN);
-
-/****************************************************************************
- Allocate a new InBuffer. Returns the new and old ones.
-****************************************************************************/
-
-char *NewInBuffer(char **old_inbuf)
-{
-       char *new_inbuf = (char *)SMB_MALLOC(total_buffer_size);
-       if (!new_inbuf) {
-               return NULL;
-       }
-       if (old_inbuf) {
-               *old_inbuf = InBuffer;
-       }
-       InBuffer = new_inbuf;
-#if defined(DEVELOPER)
-       clobber_region(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, InBuffer, total_buffer_size);
-#endif
-       return InBuffer;
-}
-
-/****************************************************************************
- Allocate a new OutBuffer. Returns the new and old ones.
-****************************************************************************/
-
-char *NewOutBuffer(char **old_outbuf)
-{
-       char *new_outbuf = (char *)SMB_MALLOC(total_buffer_size);
-       if (!new_outbuf) {
-               return NULL;
-       }
-       if (old_outbuf) {
-               *old_outbuf = OutBuffer;
-       }
-       OutBuffer = new_outbuf;
-#if defined(DEVELOPER)
-       clobber_region(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, OutBuffer, total_buffer_size);
-#endif
-       return OutBuffer;
-}
-
 /****************************************************************************
  Process commands from the client
 ****************************************************************************/
@@ -1612,48 +1626,36 @@ void smbd_process(void)
        time_t last_timeout_processing_time = time(NULL);
        unsigned int num_smbs = 0;
 
-       /* Allocate the primary Inbut/Output buffers. */
-
-       if ((NewInBuffer(NULL) == NULL) || (NewOutBuffer(NULL) == NULL)) 
-               return;
-
        max_recv = MIN(lp_maxxmit(),BUFFER_SIZE);
 
        while (True) {
-               int deadtime = lp_deadtime()*60;
                int select_timeout = setup_select_timeout();
                int num_echos;
-
-               if (deadtime <= 0)
-                       deadtime = DEFAULT_SMBD_TIMEOUT;
+               char *inbuf;
+               size_t inbuf_len;
+               TALLOC_CTX *frame = talloc_stackframe();
 
                errno = 0;      
                
-               /* free up temporary memory */
-               lp_talloc_free();
-               main_loop_talloc_free();
-
-               /* run all registered idle events */
-               smb_run_idle_events(time(NULL));
-
-
                /* Did someone ask for immediate checks on things like blocking locks ? */
                if (select_timeout == 0) {
-                       if(!timeout_processing( deadtime, &select_timeout, &last_timeout_processing_time))
+                       if(!timeout_processing(&select_timeout,
+                                              &last_timeout_processing_time))
                                return;
                        num_smbs = 0; /* Reset smb counter. */
                }
 
-#if defined(DEVELOPER)
-               clobber_region(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, InBuffer, total_buffer_size);
-#endif
+               run_events(smbd_event_context(), 0, NULL, NULL);
 
-               while (!receive_message_or_smb(InBuffer,BUFFER_SIZE+LARGE_WRITEX_HDR_SIZE,select_timeout)) {
-                       if(!timeout_processing( deadtime, &select_timeout, &last_timeout_processing_time))
+               while (!receive_message_or_smb(NULL, &inbuf, &inbuf_len,
+                                              select_timeout)) {
+                       if(!timeout_processing(&select_timeout,
+                                              &last_timeout_processing_time))
                                return;
                        num_smbs = 0; /* Reset smb counter. */
                }
 
+
                /*
                 * Ensure we do timeout processing if the SMB we just got was
                 * only an echo request. This allows us to set the select
@@ -1665,12 +1667,12 @@ void smbd_process(void)
                 */ 
                num_echos = smb_echo_count;
 
-               clobber_region(SAFE_STRING_FUNCTION_NAME, SAFE_STRING_LINE, OutBuffer, total_buffer_size);
+               process_smb(inbuf, inbuf_len);
 
-               process_smb(InBuffer, OutBuffer);
+               TALLOC_FREE(inbuf);
 
                if (smb_echo_count != num_echos) {
-                       if(!timeout_processing( deadtime, &select_timeout, &last_timeout_processing_time))
+                       if(!timeout_processing( &select_timeout, &last_timeout_processing_time))
                                return;
                        num_smbs = 0; /* Reset smb counter. */
                }
@@ -1687,7 +1689,9 @@ void smbd_process(void)
                if ((num_smbs % 200) == 0) {
                        time_t new_check_time = time(NULL);
                        if(new_check_time - last_timeout_processing_time >= (select_timeout/1000)) {
-                               if(!timeout_processing( deadtime, &select_timeout, &last_timeout_processing_time))
+                               if(!timeout_processing(
+                                          &select_timeout,
+                                          &last_timeout_processing_time))
                                        return;
                                num_smbs = 0; /* Reset smb counter. */
                                last_timeout_processing_time = new_check_time; /* Reset time. */
@@ -1705,5 +1709,6 @@ void smbd_process(void)
                        change_to_root_user();
                        check_log_size();
                }
+               TALLOC_FREE(frame);
        }
 }