diff options
Diffstat (limited to 'source4/smbd')
| -rw-r--r-- | source4/smbd/process_model.h | 3 | ||||
| -rw-r--r-- | source4/smbd/process_model.mk | 10 | ||||
| -rw-r--r-- | source4/smbd/process_prefork.c | 222 | ||||
| -rw-r--r-- | source4/smbd/process_single.c | 40 | ||||
| -rw-r--r-- | source4/smbd/process_standard.c | 11 | ||||
| -rw-r--r-- | source4/smbd/process_thread.c | 7 | ||||
| -rw-r--r-- | source4/smbd/service.c | 11 | ||||
| -rw-r--r-- | source4/smbd/service_stream.c | 16 | ||||
| -rw-r--r-- | source4/smbd/service_task.c | 3 |
9 files changed, 292 insertions, 31 deletions
diff --git a/source4/smbd/process_model.h b/source4/smbd/process_model.h index c2a5c9e9e8..796c8ee17b 100644 --- a/source4/smbd/process_model.h +++ b/source4/smbd/process_model.h @@ -25,7 +25,7 @@ #define __PROCESS_MODEL_H__ #include "lib/socket/socket.h" -#include "smbd/service_task.h" +#include "smbd/service.h" /* modules can use the following to determine if the interface has changed * please increment the version number after each interface change @@ -56,6 +56,7 @@ struct model_ops { /* function to create a task */ void (*new_task)(struct event_context *, struct loadparm_context *lp_ctx, + const char *service_name, void (*)(struct event_context *, struct loadparm_context *, struct server_id, void *), diff --git a/source4/smbd/process_model.mk b/source4/smbd/process_model.mk index d6b7698e74..5201a2e46e 100644 --- a/source4/smbd/process_model.mk +++ b/source4/smbd/process_model.mk @@ -32,6 +32,16 @@ PRIVATE_DEPENDENCIES = PTHREAD # End MODULE process_model_thread ################################################ +################################################ +# Start MODULE process_model_prefork +[MODULE::process_model_prefork] +INIT_FUNCTION = process_model_prefork_init +SUBSYSTEM = process_model +OBJ_FILES = \ + process_prefork.o +# End MODULE process_model_thread +################################################ + [SUBSYSTEM::process_model] PRIVATE_PROTO_HEADER = process_model_proto.h OBJ_FILES = \ diff --git a/source4/smbd/process_prefork.c b/source4/smbd/process_prefork.c new file mode 100644 index 0000000000..839c7209d2 --- /dev/null +++ b/source4/smbd/process_prefork.c @@ -0,0 +1,222 @@ +/* + Unix SMB/CIFS implementation. + + process model: prefork (n client connections per process) + + Copyright (C) Andrew Tridgell 1992-2005 + Copyright (C) James J Myers 2003 <myersjj@samba.org> + Copyright (C) Stefan (metze) Metzmacher 2004 + Copyright (C) Andrew Bartlett 2008 <abartlet@samba.org> + Copyright (C) David Disseldorp 2008 <ddiss@sgi.com> + + 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 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + 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, see <http://www.gnu.org/licenses/>. +*/ + +#include "includes.h" +#include "lib/events/events.h" +#include "lib/tdb/include/tdb.h" +#include "lib/socket/socket.h" +#include "smbd/process_model.h" +#include "param/secrets.h" +#include "system/filesys.h" +#include "cluster/cluster.h" +#include "param/param.h" + +#ifdef HAVE_SETPROCTITLE +#ifdef HAVE_SETPROCTITLE_H +#include <setproctitle.h> +#endif +#else +#define setproctitle none_setproctitle +static int none_setproctitle(const char *fmt, ...) PRINTF_ATTRIBUTE(1, 2); +static int none_setproctitle(const char *fmt, ...) +{ + return 0; +} +#endif + +/* + called when the process model is selected +*/ +static void prefork_model_init(struct event_context *ev) +{ + signal(SIGCHLD, SIG_IGN); +} + +static void prefork_reload_after_fork(void) +{ + /* tdb needs special fork handling */ + if (tdb_reopen_all(1) == -1) { + DEBUG(0,("prefork_reload_after_fork: tdb_reopen_all failed.\n")); + } + + /* Ensure that the forked children do not expose identical random streams */ + set_need_random_reseed(); +} + +/* + called when a listening socket becomes readable. +*/ +static void prefork_accept_connection(struct event_context *ev, + struct loadparm_context *lp_ctx, + struct socket_context *listen_socket, + void (*new_conn)(struct event_context *, + struct loadparm_context *, struct socket_context *, + struct server_id , void *), + void *private) +{ + NTSTATUS status; + struct socket_context *connected_socket; + pid_t pid = getpid(); + + /* accept an incoming connection. */ + status = socket_accept(listen_socket, &connected_socket); + if (!NT_STATUS_IS_OK(status)) { + return; + } + + talloc_steal(private, connected_socket); + + new_conn(ev, lp_ctx, connected_socket, cluster_id(pid, socket_get_fd(connected_socket)), private); +} + +/* + called to create a new server task +*/ +static void prefork_new_task(struct event_context *ev, + struct loadparm_context *lp_ctx, + const char *service_name, + void (*new_task_fn)(struct event_context *, struct loadparm_context *lp_ctx, struct server_id , void *), + void *private) +{ + pid_t pid; + int i, num_children; + + struct event_context *ev2, *ev_parent; + + pid = fork(); + + if (pid != 0) { + /* parent or error code ... go back to the event loop */ + return; + } + + pid = getpid(); + + /* This is now the child code. We need a completely new event_context to work with */ + ev2 = event_context_init(NULL); + + /* the service has given us a private pointer that + encapsulates the context it needs for this new connection - + everything else will be freed */ + talloc_steal(ev2, private); + + /* this will free all the listening sockets and all state that + is not associated with this new connection */ + talloc_free(ev); + + setproctitle("task %s server_id[%d]", service_name, pid); + + prefork_reload_after_fork(); + + /* setup this new connection: process will bind to it's sockets etc */ + new_task_fn(ev2, lp_ctx, cluster_id(pid, 0), private); + + num_children = lp_parm_int(lp_ctx, NULL, "prefork children", service_name, 0); + if (num_children == 0) { + + /* We don't want any kids hanging around for this one, + * let the parent do all the work */ + event_loop_wait(ev2); + + talloc_free(ev2); + exit(0); + } + + /* We are now free to spawn some child proccesses */ + + for (i=0; i < num_children; i++) { + + pid = fork(); + if (pid > 0) { + continue; + } else if (pid == -1) { + return; + } else { + pid = getpid(); + setproctitle("task %s server_id[%d]", service_name, pid); + + prefork_reload_after_fork(); + + /* we can't return to the top level here, as that event context is gone, + so we now process events in the new event context until there are no + more to process */ + event_loop_wait(ev2); + + talloc_free(ev2); + exit(0); + } + } + + /* Don't listen on the sockets we just gave to the children */ + talloc_free(ev2); + + /* But we need a events system to handle reaping children */ + ev_parent = event_context_init(NULL); + + /* TODO: Handle some events... */ + + /* we can't return to the top level here, as that event context is gone, + so we now process events in the new event context until there are no + more to process */ + event_loop_wait(ev_parent); + + talloc_free(ev_parent); + exit(0); + +} + + +/* called when a task goes down */ +_NORETURN_ static void prefork_terminate(struct event_context *ev, const char *reason) +{ + DEBUG(2,("prefork_terminate: reason[%s]\n",reason)); +} + +/* called to set a title of a task or connection */ +static void prefork_set_title(struct event_context *ev, const char *title) +{ + if (title) { + setproctitle("%s", title); + } else { + setproctitle(NULL); + } +} + +static const struct model_ops prefork_ops = { + .name = "prefork", + .model_init = prefork_model_init, + .accept_connection = prefork_accept_connection, + .new_task = prefork_new_task, + .terminate = prefork_terminate, + .set_title = prefork_set_title, +}; + +/* + initialise the prefork process model, registering ourselves with the process model subsystem + */ +NTSTATUS process_model_prefork_init(void) +{ + return register_process_model(&prefork_ops); +} diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c index 5d3c36adb9..a7a27ef9e0 100644 --- a/source4/smbd/process_single.c +++ b/source4/smbd/process_single.c @@ -38,7 +38,7 @@ static void single_model_init(struct event_context *ev) */ static void single_accept_connection(struct event_context *ev, struct loadparm_context *lp_ctx, - struct socket_context *sock, + struct socket_context *listen_socket, void (*new_conn)(struct event_context *, struct loadparm_context *, struct socket_context *, @@ -46,25 +46,33 @@ static void single_accept_connection(struct event_context *ev, void *private) { NTSTATUS status; - struct socket_context *sock2; + struct socket_context *connected_socket; /* accept an incoming connection. */ - status = socket_accept(sock, &sock2); + status = socket_accept(listen_socket, &connected_socket); if (!NT_STATUS_IS_OK(status)) { DEBUG(0,("single_accept_connection: accept: %s\n", nt_errstr(status))); - /* this looks strange, but is correct. We need to - throttle things until the system clears enough - resources to handle this new socket. If we don't - then we will spin filling the log and causing more - problems. We don't panic as this is probably a - temporary resource constraint */ + /* this looks strange, but is correct. + + We can only be here if woken up from select, due to + an incomming connection. + + We need to throttle things until the system clears + enough resources to handle this new socket. + + If we don't then we will spin filling the log and + causing more problems. We don't panic as this is + probably a temporary resource constraint */ sleep(1); return; } - talloc_steal(private, sock); + talloc_steal(private, connected_socket); - new_conn(ev, lp_ctx, sock2, cluster_id(socket_get_fd(sock2)), private); + /* The cluster_id(0, fd) cannot collide with the incrementing + * task below, as the first component is 0, not 1 */ + new_conn(ev, lp_ctx, connected_socket, + cluster_id(0, socket_get_fd(connected_socket)), private); } /* @@ -72,11 +80,17 @@ static void single_accept_connection(struct event_context *ev, */ static void single_new_task(struct event_context *ev, struct loadparm_context *lp_ctx, + const char *service_name, void (*new_task)(struct event_context *, struct loadparm_context *, struct server_id, void *), void *private) { - static uint32_t taskid = 0x10000000; - new_task(ev, lp_ctx, cluster_id(taskid++), private); + static uint32_t taskid = 0; + + /* We use 1 so we cannot collide in with cluster ids generated + * in the accept connection above, and unlikly to collide with + * PIDs from process modal standard (don't run samba as + * init) */ + new_task(ev, lp_ctx, cluster_id(1, taskid++), private); } diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c index c088ea3b1a..deb44c0a68 100644 --- a/source4/smbd/process_standard.c +++ b/source4/smbd/process_standard.c @@ -127,8 +127,8 @@ static void standard_accept_connection(struct event_context *ev, talloc_free(c); talloc_free(s); - /* setup this new connection */ - new_conn(ev2, lp_ctx, sock2, cluster_id(pid), private); + /* setup this new connection. Cluster ID is PID based for this process modal */ + new_conn(ev2, lp_ctx, sock2, cluster_id(pid, 0), private); /* we can't return to the top level here, as that event context is gone, so we now process events in the new event context until there are no @@ -144,6 +144,7 @@ static void standard_accept_connection(struct event_context *ev, */ static void standard_new_task(struct event_context *ev, struct loadparm_context *lp_ctx, + const char *service_name, void (*new_task)(struct event_context *, struct loadparm_context *lp_ctx, struct server_id , void *), void *private) { @@ -179,10 +180,10 @@ static void standard_new_task(struct event_context *ev, /* Ensure that the forked children do not expose identical random streams */ set_need_random_reseed(); - setproctitle("task server_id[%d]", pid); + setproctitle("task %s server_id[%d]", service_name, pid); - /* setup this new connection */ - new_task(ev2, lp_ctx, cluster_id(pid), private); + /* setup this new task. Cluster ID is PID based for this process modal */ + new_task(ev2, lp_ctx, cluster_id(pid, 0), private); /* we can't return to the top level here, as that event context is gone, so we now process events in the new event context until there are no diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c index 6c5f4816c0..5a45cdfeac 100644 --- a/source4/smbd/process_thread.c +++ b/source4/smbd/process_thread.c @@ -148,6 +148,7 @@ static void *thread_task_fn(void *thread_parm) */ static void thread_new_task(struct event_context *ev, struct loadparm_context *lp_ctx, + const char *service_name, void (*new_task)(struct event_context *, struct loadparm_context *, uint32_t , void *), @@ -178,10 +179,10 @@ static void thread_new_task(struct event_context *ev, rc = pthread_create(&thread_id, &thread_attr, thread_task_fn, state); pthread_attr_destroy(&thread_attr); if (rc == 0) { - DEBUG(4,("thread_new_task: created thread_id=%lu\n", - (unsigned long int)thread_id)); + DEBUG(4,("thread_new_task: created %s thread_id=%lu\n", + service_name, (unsigned long int)thread_id)); } else { - DEBUG(0,("thread_new_task: thread create failed rc=%d\n", rc)); + DEBUG(0,("thread_new_task: thread create for %s failed rc=%d\n", service_name, rc)); talloc_free(ev2); } } diff --git a/source4/smbd/service.c b/source4/smbd/service.c index 525b245616..2b1fcc4bd8 100644 --- a/source4/smbd/service.c +++ b/source4/smbd/service.c @@ -30,20 +30,20 @@ static struct registered_server { struct registered_server *next, *prev; const char *service_name; - NTSTATUS (*service_init)(struct event_context *, struct loadparm_context *lp_ctx, const struct model_ops *); + void (*task_init)(struct task_server *); } *registered_servers; /* register a server service. */ NTSTATUS register_server_service(const char *name, - NTSTATUS (*service_init)(struct event_context *, struct loadparm_context *lp_ctx, const struct model_ops *)) + void (*task_init)(struct task_server *)) { struct registered_server *srv; srv = talloc(talloc_autofree_context(), struct registered_server); NT_STATUS_HAVE_NO_MEMORY(srv); srv->service_name = name; - srv->service_init = service_init; + srv->task_init = task_init; DLIST_ADD_END(registered_servers, srv, struct registered_server *); return NT_STATUS_OK; } @@ -53,14 +53,15 @@ NTSTATUS register_server_service(const char *name, initialise a server service */ static NTSTATUS server_service_init(const char *name, - struct event_context *event_ctx, + struct event_context *event_context, struct loadparm_context *lp_ctx, const struct model_ops *model_ops) { struct registered_server *srv; for (srv=registered_servers; srv; srv=srv->next) { if (strcasecmp(name, srv->service_name) == 0) { - return srv->service_init(event_ctx, lp_ctx, model_ops); + return task_server_startup(event_context, lp_ctx, srv->service_name, + model_ops, srv->task_init); } } return NT_STATUS_INVALID_SYSTEM_SERVICE; diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c index 0d6f1b7281..7e1f6493ee 100644 --- a/source4/smbd/service_stream.c +++ b/source4/smbd/service_stream.c @@ -136,7 +136,7 @@ NTSTATUS stream_new_connection_merge(struct event_context *ev, srv_conn->private = private_data; srv_conn->model_ops = model_ops; srv_conn->socket = sock; - srv_conn->server_id = cluster_id(0); + srv_conn->server_id = cluster_id(0, 0); srv_conn->ops = stream_ops; srv_conn->msg_ctx = msg_ctx; srv_conn->event.ctx = ev; @@ -274,8 +274,11 @@ NTSTATUS stream_setup_socket(struct event_context *event_context, NT_STATUS_NOT_OK_RETURN(status); } - /* TODO: set socket ACL's here when they're implemented */ + /* TODO: set socket ACL's (host allow etc) here when they're + * implemented */ + /* Some sockets don't have a port, or are just described from + * the string. We are indicating this by having port == NULL */ if (!port) { socket_address = socket_address_from_strings(stream_socket, stream_socket->sock->backend_name, @@ -314,9 +317,16 @@ NTSTATUS stream_setup_socket(struct event_context *event_context, return status; } - /* we will close the socket using the events system */ + /* By specifying EVENT_FD_AUTOCLOSE below, we indicate that we + * will close the socket using the events system. This avoids + * nasty interactions with waiting for talloc to close the socket. */ + socket_set_flags(stream_socket->sock, SOCKET_FLAG_NOCLOSE); + /* Add the FD from the newly created socket into the event + * subsystem. it will call the accept handler whenever we get + * new connections */ + event_add_fd(event_context, stream_socket->sock, socket_get_fd(stream_socket->sock), EVENT_FD_READ|EVENT_FD_AUTOCLOSE, diff --git a/source4/smbd/service_task.c b/source4/smbd/service_task.c index 08588464cc..2274685059 100644 --- a/source4/smbd/service_task.c +++ b/source4/smbd/service_task.c @@ -85,6 +85,7 @@ static void task_server_callback(struct event_context *event_ctx, */ NTSTATUS task_server_startup(struct event_context *event_ctx, struct loadparm_context *lp_ctx, + const char *service_name, const struct model_ops *model_ops, void (*task_init)(struct task_server *)) { @@ -96,7 +97,7 @@ NTSTATUS task_server_startup(struct event_context *event_ctx, state->task_init = task_init; state->model_ops = model_ops; - model_ops->new_task(event_ctx, lp_ctx, task_server_callback, state); + model_ops->new_task(event_ctx, lp_ctx, service_name, task_server_callback, state); return NT_STATUS_OK; } |