r6530: the server ID of a connection in the single process model should be

[samba.git] / source / smbd / process_single.c

diff --git a/source/smbd/process_single.c b/source/smbd/process_single.c
index 8bd00c53b95e2c66bb494a82fe9881afbcd6f7d8..56b074a629491d41a8100fd0a39ee2fb37f8f7be 100644 (file)
--- a/source/smbd/process_single.c
+++ b/source/smbd/process_single.c
@@ -1,6 +1,8 @@
 /* 
    Unix SMB/CIFS implementation.
+
    process model: process (1 process handles all client connections)
+
    Copyright (C) Andrew Tridgell 2003
    Copyright (C) James J Myers 2003 <myersjj@samba.org>
    Copyright (C) Stefan (metze) Metzmacher 2004
@@ -21,103 +23,73 @@
 */
 
 #include "includes.h"
+#include "lib/events/events.h"
+#include "dlinklist.h"
+#include "smb_server/smb_server.h"
 
 
 /*
   called when the process model is selected
 */
-static void single_start_server(void)
+static void single_model_init(struct event_context *ev)
 {
-       smbd_process_init();
 }
 
 /*
-  called when a listening socket becomes readable
+  called when a listening socket becomes readable. 
 */
-static void single_accept_connection(struct event_context *ev, struct fd_event *srv_fde, time_t t, uint16_t flags)
+static void single_accept_connection(struct event_context *ev, 
+                                    struct socket_context *sock,
+                                    void (*new_conn)(struct event_context *, struct socket_context *, 
+                                                     uint32_t , void *), 
+                                    void *private)
 {
-       int accepted_fd;
-       struct sockaddr addr;
-       socklen_t in_addrlen = sizeof(addr);
-       struct server_socket *server_socket = srv_fde->private;
-       struct server_connection *conn;
+       NTSTATUS status;
+       struct socket_context *sock2;
 
        /* accept an incoming connection. */
-       accepted_fd = accept(srv_fde->fd,&addr,&in_addrlen);
-       if (accepted_fd == -1) {
-               DEBUG(0,("accept_connection_single: accept: %s\n",
-                        strerror(errno)));
-               return;
-       }
-
-       conn = server_setup_connection(ev, server_socket, accepted_fd, t);
-       if (!conn) {
-               DEBUG(0,("server_setup_connection(ev, server_socket, accepted_fd) failed\n"));
+       status = socket_accept(sock, &sock2);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("accept_connection_single: accept: %s\n", nt_errstr(status)));
                return;
        }
 
-       DLIST_ADD(server_socket->connection_list,conn);
+       talloc_steal(private, sock);
 
-       /* return to event handling */
-       return;
+       new_conn(ev, sock2, socket_get_fd(sock2), private);
 }
 
-
-
-/* called when a SMB connection goes down */
-static void single_terminate_connection(struct server_connection *conn, const char *reason) 
+/*
+  called to startup a new task
+*/
+static void single_new_task(struct event_context *ev, 
+                           void (*new_task)(struct event_context *, uint32_t, void *), 
+                           void *private)
 {
-       DEBUG(0,("single_terminate_connection: reason[%s]\n",reason));
-
-       if (conn) {
-               if (conn->service) {
-                       conn->service->ops->close_connection(conn,reason);
-               }
-
-               if (conn->server_socket) {
-                       DLIST_REMOVE(conn->server_socket->connection_list,conn);
-               }
-
-               server_destroy_connection(conn);
-       }
+       static uint32_t taskid = 0x10000000;
+       new_task(ev, taskid++, private);
 }
 
-static int single_get_id(struct smbsrv_request *req)
-{
-       return (int)req->smb_conn->pid;
-}
 
-static void single_exit_server(struct server_context *srv_ctx, const char *reason)
+/* called when a task goes down */
+static void single_terminate(struct event_context *ev, const char *reason) 
 {
-       DEBUG(1,("single_exit_server: reason[%s]\n",reason));
+       DEBUG(2,("single_terminate: reason[%s]\n",reason));
 }
 
+static const struct model_ops single_ops = {
+       .name                   = "single",
+       .model_init             = single_model_init,
+       .new_task               = single_new_task,
+       .accept_connection      = single_accept_connection,
+       .terminate              = single_terminate,
+};
+
 /*
-  initialise the single process model, registering ourselves with the process model subsystem
+  initialise the single process model, registering ourselves with the
+  process model subsystem
  */
 NTSTATUS process_model_single_init(void)
 {
-       NTSTATUS ret;
-       struct model_ops ops;
-
-       ZERO_STRUCT(ops);
-
-       /* fill in our name */
-       ops.name = "single";
-
-       /* fill in all the operations */
-       ops.model_startup               = single_start_server;
-       ops.accept_connection           = single_accept_connection;
-       ops.terminate_connection        = single_terminate_connection;
-       ops.exit_server                 = single_exit_server;
-       ops.get_id                      = single_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 'single'!\n"));
-               return ret;
-       }
-
-       return ret;
+       return register_process_model(&single_ops);
 }