/*
Unix SMB/CIFS implementation.
+
process model: standard (1 process per client connection)
- Copyright (C) Andrew Tridgell 1992-2003
+
+ Copyright (C) Andrew Tridgell 1992-2005
Copyright (C) James J Myers 2003 <myersjj@samba.org>
Copyright (C) Stefan (metze) Metzmacher 2004
*/
#include "includes.h"
+#include "lib/events/events.h"
+#include "lib/tdb/include/tdb.h"
+#include "dlinklist.h"
+#include "smb_server/smb_server.h"
/*
called when the process model is selected
*/
-static void standard_model_startup(void)
+static void standard_model_init(struct event_context *ev)
{
signal(SIGCHLD, SIG_IGN);
- smbd_process_init();
}
/*
- called when a listening socket becomes readable
+ called when a listening socket becomes readable.
*/
-static void standard_accept_connection(struct event_context *ev, struct fd_event *srv_fde, time_t t, uint16_t flags)
+static void standard_accept_connection(struct event_context *ev,
+ struct socket_context *sock,
+ void (*new_conn)(struct event_context *, struct socket_context *,
+ uint32_t , void *),
+ void *private)
{
NTSTATUS status;
- struct socket_context *sock;
- struct server_socket *server_socket = srv_fde->private;
- struct server_connection *conn;
+ struct socket_context *sock2;
pid_t pid;
+ struct event_context *ev2;
/* accept an incoming connection. */
- status = socket_accept(server_socket->socket, &sock, 0);
+ status = socket_accept(sock, &sock2);
if (!NT_STATUS_IS_OK(status)) {
DEBUG(0,("standard_accept_connection: accept: %s\n",
nt_errstr(status)));
if (pid != 0) {
/* parent or error code ... */
-
- socket_destroy(sock);
+ talloc_free(sock2);
/* go back to the event loop */
return;
}
- /* Child code ... */
+ /* This is now the child code. We need a completely new event_context to work with */
+ ev2 = event_context_init(NULL);
- /* close all the listening sockets */
- event_remove_fd_all_handler(ev, standard_accept_connection);
+ /* 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);
+ talloc_steal(private, sock2);
+
+ /* this will free all the listening sockets and all state that
+ is not associated with this new connection */
+ talloc_free(sock);
+ talloc_free(ev);
+
+ /* we don't care if the dup fails, as its only a select()
+ speed optimisation */
+ socket_dup(sock2);
/* tdb needs special fork handling */
if (tdb_reopen_all() == -1) {
}
/* Ensure that the forked children do not expose identical random streams */
-
set_need_random_reseed();
- conn = server_setup_connection(ev, server_socket, sock, t);
- if (!conn) {
- DEBUG(0,("server_setup_connection(ev, server_socket, sock, t) failed\n"));
+ /* setup this new connection */
+ new_conn(ev2, sock2, getpid(), 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
+ more to process */
+ event_loop_wait(ev2);
+
+ talloc_free(ev2);
+ exit(0);
+}
+
+/*
+ called to create a new server task
+*/
+static void standard_new_task(struct event_context *ev,
+ void (*new_task)(struct event_context *, uint32_t , void *),
+ void *private)
+{
+ pid_t pid;
+ struct event_context *ev2;
+
+ pid = fork();
+
+ if (pid != 0) {
+ /* parent or error code ... go back to the event loop */
return;
}
- talloc_steal(conn, sock);
+ /* This is now the child code. We need a completely new event_context to work with */
+ ev2 = event_context_init(NULL);
- DLIST_ADD(server_socket->connection_list,conn);
+ /* 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);
- /* return to the event loop */
+ /* this will free all the listening sockets and all state that
+ is not associated with this new connection */
+ talloc_free(ev);
+
+ /* tdb needs special fork handling */
+ if (tdb_reopen_all() == -1) {
+ DEBUG(0,("standard_accept_connection: tdb_reopen_all failed.\n"));
+ }
+
+ /* Ensure that the forked children do not expose identical random streams */
+ set_need_random_reseed();
+
+ /* setup this new connection */
+ new_task(ev2, getpid(), 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
+ more to process */
+ event_loop_wait(ev2);
+
+ talloc_free(ev2);
+ exit(0);
}
-/* called when a SMB connection goes down */
-static void standard_terminate_connection(struct server_connection *conn, const char *reason)
+/* called when a task goes down */
+static void standard_terminate(struct event_context *ev, const char *reason)
{
- DEBUG(2,("standard_terminate_connection: reason[%s]\n",reason));
-
- if (conn) {
- talloc_free(conn->service->srv_ctx);
- }
+ DEBUG(2,("standard_terminate: reason[%s]\n",reason));
/* this init_iconv() has the effect of freeing the iconv context memory,
which makes leak checking easier */
init_iconv();
+ /* the secrets db should really hang off the connection structure */
+ secrets_shutdown();
+
+ talloc_free(ev);
+
/* terminate this process */
exit(0);
}
-static int standard_get_id(struct smbsrv_request *req)
-{
- return (int)req->smb_conn->pid;
-}
-static void standard_exit_server(struct server_context *srv_ctx, const char *reason)
-{
- DEBUG(1,("standard_exit_server: reason[%s]\n",reason));
-}
+static const struct model_ops standard_ops = {
+ .name = "standard",
+ .model_init = standard_model_init,
+ .accept_connection = standard_accept_connection,
+ .new_task = standard_new_task,
+ .terminate = standard_terminate,
+};
/*
initialise the standard process model, registering ourselves with the process model subsystem
*/
NTSTATUS process_model_standard_init(void)
{
- NTSTATUS ret;
- struct model_ops ops;
-
- ZERO_STRUCT(ops);
-
- /* fill in our name */
- ops.name = "standard";
-
- /* fill in all the operations */
- ops.model_startup = standard_model_startup;
- ops.accept_connection = standard_accept_connection;
- ops.terminate_connection = standard_terminate_connection;
- ops.exit_server = standard_exit_server;
- ops.get_id = standard_get_id;
-
- /* register ourselves with the PROCESS_MODEL subsystem. */
- ret = register_backend("process_model", &ops);
- if (!NT_STATUS_IS_OK(ret)) {
- DEBUG(0,("Failed to register process_model 'standard'!\n"));
- return ret;
- }
-
- return ret;
+ return register_process_model(&standard_ops);
}
git.samba.org / kai / samba.git / blobdiff