Clarify nomaclature of socket names in process_single and process_prefork

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

diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c
index 96043021998f8500ef66aac6cb5042808c313b01..a7a27ef9e0a5f34b713c7aab1a331bf80e0c6497 100644 (file)
--- a/source4/smbd/process_single.c
+++ b/source4/smbd/process_single.c
@@ -9,7 +9,7 @@
    
    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 2 of the License, or
+   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,
@@ -18,13 +18,13 @@
    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, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
 #include "smbd/process_model.h"
 #include "system/filesys.h"
+#include "cluster/cluster.h"
 
 /*
   called when the process model is selected
@@ -37,42 +37,60 @@ static void single_model_init(struct event_context *ev)
   called when a listening socket becomes readable. 
 */
 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 *), 
+                                    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 *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, sock2, 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);
 }
 
 /*
   called to startup a new task
 */
 static void single_new_task(struct event_context *ev, 
-                           void (*new_task)(struct event_context *, uint32_t, void *), 
+                           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, 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);
 }
 
 
@@ -87,7 +105,7 @@ static void single_set_title(struct event_context *ev, const char *title)
 {
 }
 
-static const struct model_ops single_ops = {
+const struct model_ops single_ops = {
        .name                   = "single",
        .model_init             = single_model_init,
        .new_task               = single_new_task,