diff options
| -rw-r--r-- | source4/smb_server/smb_server.c | 14 | ||||
| -rw-r--r-- | source4/smb_server/smb_server.h | 2 |
2 files changed, 16 insertions, 0 deletions
diff --git a/source4/smb_server/smb_server.c b/source4/smb_server/smb_server.c index 3b4d06f3b2..7e0aa2c0cb 100644 --- a/source4/smb_server/smb_server.c +++ b/source4/smb_server/smb_server.c @@ -665,7 +665,18 @@ static void smbsrv_recv(struct stream_connection *conn, uint16_t flags) DEBUG(10,("smbsrv_recv\n")); + /* our backends are designed to process one request at a time, + unless they deliberately mark the request as async and + process it later on a timer or other event. This enforces + that ordering. */ + if (smb_conn->processing) { + EVENT_FD_NOT_READABLE(conn->event.fde); + return; + } + + smb_conn->processing = True; status = receive_smb_request(smb_conn); + smb_conn->processing = False; if (NT_STATUS_IS_ERR(status)) { talloc_free(conn->event.fde); conn->event.fde = NULL; @@ -673,6 +684,8 @@ static void smbsrv_recv(struct stream_connection *conn, uint16_t flags) return; } + EVENT_FD_READABLE(conn->event.fde); + /* free up temporary memory */ lp_talloc_free(); } @@ -749,6 +762,7 @@ static void smbsrv_accept(struct stream_connection *conn) smbsrv_tcon_init(smb_conn); smb_conn->connection = conn; + smb_conn->processing = False; conn->private = smb_conn; } diff --git a/source4/smb_server/smb_server.h b/source4/smb_server/smb_server.h index 01222adc0c..a8e9d7ed34 100644 --- a/source4/smb_server/smb_server.h +++ b/source4/smb_server/smb_server.h @@ -254,4 +254,6 @@ struct smbsrv_connection { struct smb_trans2 *trans; uint8_t command; } *trans_partial; + + BOOL processing; }; |