hack smbd_smb2_flush_send_queue
authorStefan Metzmacher <metze@samba.org>
Thu, 5 Dec 2013 12:20:45 +0000 (13:20 +0100)
committerStefan Metzmacher <metze@samba.org>
Wed, 12 Mar 2014 23:04:54 +0000 (00:04 +0100)
source3/smbd/smb2_server.c

index edd5d322981814ef96c720917c7d80c0b585c14b..ad375ce278d61fffc7046b75bab2af9cf6ad9710 100644 (file)
@@ -36,6 +36,7 @@ static void smbd_smb2_connection_handler(struct tevent_context *ev,
                                         void *private_data);
 static NTSTATUS smbd_smb2_io_handler(struct smbd_server_connection *sconn,
                                     uint16_t fde_flags);
+static NTSTATUS smbd_smb2_flush_send_queue(struct smbd_server_connection *sconn);
 
 static const struct smbd_smb2_dispatch_table {
        uint16_t opcode;
@@ -1269,7 +1270,7 @@ static NTSTATUS smb2_send_async_interim_response(const struct smbd_smb2_request
        DLIST_ADD_END(nreq->sconn->smb2.send_queue, &nreq->queue_entry, NULL);
        nreq->sconn->smb2.send_queue_len++;
 
-       status = smbd_smb2_io_handler(sconn, TEVENT_FD_WRITE);
+       status = smbd_smb2_flush_send_queue(sconn);//smbd_smb2_io_handler(sconn, TEVENT_FD_WRITE);
        if (unlikely(!NT_STATUS_IS_OK(status))) {
                return status;
        }
@@ -1602,7 +1603,7 @@ static void smbd_smb2_request_pending_timer(struct tevent_context *ev,
        DLIST_ADD_END(sconn->smb2.send_queue, &state->queue_entry, NULL);
        sconn->smb2.send_queue_len++;
 
-       status = smbd_smb2_io_handler(sconn, TEVENT_FD_WRITE);
+       status = smbd_smb2_flush_send_queue(sconn);//smbd_smb2_io_handler(sconn, TEVENT_FD_WRITE);
        if (unlikely(!NT_STATUS_IS_OK(status))) {
                smbd_server_connection_terminate(sconn,
                                                 nt_errstr(status));
@@ -2503,7 +2504,7 @@ static NTSTATUS smbd_smb2_request_reply(struct smbd_smb2_request *req)
        DLIST_ADD_END(req->sconn->smb2.send_queue, &req->queue_entry, NULL);
        req->sconn->smb2.send_queue_len++;
 
-       status = smbd_smb2_io_handler(sconn, TEVENT_FD_WRITE);
+       status = smbd_smb2_flush_send_queue(sconn);//smbd_smb2_io_handler(sconn, TEVENT_FD_WRITE);
        if (unlikely(!NT_STATUS_IS_OK(status))) {
                return status;
        }
@@ -2833,7 +2834,7 @@ NTSTATUS smbd_smb2_send_oplock_break(struct smbd_server_connection *sconn,
        DLIST_ADD_END(state->sconn->smb2.send_queue, &state->queue_entry, NULL);
        state->sconn->smb2.send_queue_len++;
 
-       status = smbd_smb2_io_handler(sconn, TEVENT_FD_WRITE);
+       status = smbd_smb2_flush_send_queue(sconn);//smbd_smb2_io_handler(sconn, TEVENT_FD_WRITE);
        if (unlikely(!NT_STATUS_IS_OK(status))) {
                return status;
        }