sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

r12125: make the deferred connection termination the default,

Browse Source 
so that I can remove all the other versions of it

metze
(This used to be commit 82de98b8e9)
This commit is contained in:
Stefan Metzmacher 2005-12-08 09:13:28 +00:00 committed by Gerald (Jerry) Carter
parent 91cf3943d3
commit 7eb3fc533d
2 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
source4/smbd/service_stream.c
View File

@ -55,7 +55,24 @@ void stream_terminate_connection(struct stream_connection *srv_conn, const char
{
struct event_context *event_ctx = srv_conn->event.ctx;
const struct model_ops *model_ops = srv_conn->model_ops;
if (!reason) reason = "unknwon reason";
srv_conn->terminate = reason;
if (srv_conn->processing) {
/*
* if we're currently inside the stream_io_handler(),
* deferr the termination to the end of stream_io_hendler()
*
* and we don't want to read or write to the connection...
*/
event_set_fd_flags(srv_conn->event.fde, 0);
return;
}
talloc_free(srv_conn->event.fde);
srv_conn->event.fde = NULL;
talloc_free(srv_conn);
model_ops->terminate(event_ctx, reason);
}
@ -68,14 +85,18 @@ static void stream_io_handler(struct event_context *ev, struct fd_event *fde,
{
struct stream_connection *conn = talloc_get_type(private,
struct stream_connection);
conn->processing = True;
if (flags & EVENT_FD_WRITE) {
conn->ops->send_handler(conn, flags);
return;
}
if (flags & EVENT_FD_READ) {
} else if (flags & EVENT_FD_READ) {
conn->ops->recv_handler(conn, flags);
}
conn->processing = False;
if (conn->terminate) {
stream_terminate_connection(conn, conn->terminate);
}
}
/*

9
source4/smbd/service_stream.h
View File

@ -23,10 +23,10 @@
/* modules can use the following to determine if the interface has changed
* please increment the version number after each interface change
* with a comment and maybe update struct process_model_critical_sizes.
* with a comment and maybe update struct stream_connection_critical_sizes.
*/
/* version 1 - initial version - metze */
#define SERVER_SERVICE_VERSION 1
/* version 0 - initial version - metze */
#define SERVER_SERVICE_VERSION 0
/*
top level context for an established stream connection
@ -44,6 +44,9 @@ struct stream_connection {
struct socket_context *socket;
struct messaging_context *msg_ctx;
BOOL processing;
const char *terminate;
};