(no commit message)

diff --git a/unixsocketwatcher.ml b/unixsocketwatcher.ml
index 6ab7314..4fe845b 100644 (file)
--- a/unixsocketwatcher.ml
+++ b/unixsocketwatcher.ml
@@ -10,7 +10,7 @@
 
 open Unix
 open Globals
-open Dirwatcher
+open Fdwatcher
 open Printf
 
 let close_if_open fd = (try (ignore(close fd);) with _ -> ())
@@ -23,7 +23,7 @@ let unix_socket_table: (control_path_name,(exec_path_name*slice_name*Unix.file_d
   Hashtbl.create 1024
 
 (** Make a pair of fifo entries *)
-let mkentry fqp exec_fqp perm uname = 
+let mkentry fqp exec_fqp perm slice_name = 
   logprint "Making control entry %s->%s\n" fqp exec_fqp;
   let control_filename=sprintf "%s.control" fqp in
     try
@@ -34,56 +34,64 @@ let mkentry fqp exec_fqp perm uname =
           listen listening_socket 10;
           ( (* Make the user the owner of the pipes in a non-chroot environment *)
             if (!Globals.nochroot) then
-              let pwentry = Unix.getpwnam uname in
+              let pwentry = Unix.getpwnam slice_name in
                 Unix.chown control_filename pwentry.pw_uid pwentry.pw_gid
           );
-          Hashtbl.replace unix_socket_table control_file (Some(exec_fqp,slice_name,listening_socket));
+          Hashtbl.replace unix_socket_table control_filename (Some(exec_fqp,slice_name,listening_socket));
           Success
     with 
-        e->logprint "Error creating FIFO: %s->%s. May be something wrong at the frontend.\n" fqp fifoout;Failed
+        e->logprint "Error creating FIFO: %s->%s. May be something wrong at the frontend.\n" fqp exec_fqp;Failed
 
+let receive_event (listening_socket_spec:fname_and_fd) (_:fname_and_fd) =
+  (* Do we care about this file? *)
+  try 
+    let (_,listening_socket) = listening_socket_spec in
+    let (data_socket, addr) = accept listening_socket in
+      match addr with 
+        | ADDR_UNIX(fname) ->
+            let entry_info = try
+              Hashtbl.find unix_socket_watcher addr with _ -> None in
+              match entry_info with
+                | Some(_,execpath,slice_name,fd) ->
+                    begin
+                      let len = String.length fqp_in in
+                      let fqp = String.sub fqp_in 0 (len-3) in
+                      let fqp_out = String.concat "." [fqp;"out"] in
+                      let fifo_fdout =
+                        try openfile fqp_out [O_WRONLY;O_NONBLOCK] 0o777 with
+                            _-> (* The client is opening the descriptor too fast *)
+                              sleep 1;try openfile fqp_out [O_WRONLY;O_NONBLOCK] 0o777 with
+                                  _->
+                                    logprint "%s Output pipe not open, using stdout in place of %s\n" slice_name fqp_out;stdout
+                      in
+                        ignore(sigprocmask SIG_BLOCK [Sys.sigchld]);
+                        (
+                          clear_nonblock fifo_fdin;
+                          let pid=try Some(create_process execpath [|execpath;slice_name|] fifo_fdin fifo_fdout fifo_fdout) with e -> None in
+                            match pid with 
+                              | Some(pid) ->
+                                  if (fifo_fdout <> stdout) then close_if_open fifo_fdout;
+                                  Hashtbl.add pidmap pid (fqp_in,fifo_fdout)
+                              | None ->logprint "Error executing service: %s\n" execpath;reopenentry fqp_in
+                        );
+                        ignore(sigprocmask SIG_UNBLOCK [Sys.sigchld]);
+                    end
+                | None -> ()
+  with e-> logprint "Error connecting service %s\n" execpath
+    | _ -> logprint "Serious error! Got a non UNIX connection over a UNIX socket\n"
+  
 (** Close sockets that just got removed *)
 let closeentry fqp =
   let control_filename = String.concat "." [fqp;"control"] in
-  let entry = try Hashtbl.find direct_fifo_table control_filename with Not_found -> None in
+  let entry = try Hashtbl.find unix_socket_table control_filename with Not_found -> None in
     match entry with
       | None -> ()
-      | Some(_,_,_,fd) -> 
+      | Some(_,_,fd) -> 
           shutdown fd SHUTDOWN_ALL;
           close_if_open fd;
+          Fdwatcher.add_fd (None,fd) (None,fd) receive_event;
           Hashtbl.remove unix_socket_table control_filename
 
-(* vsys is activated when a client opens an in file *)
-let connect_file fqp_in =
-  (* Do we care about this file? *)
-  let entry_info = try
-    Hashtbl.find direct_fifo_table fqp_in with _ -> None in
-    match entry_info with
-      | Some(_,execpath,slice_name,fifo_fdin) ->
-          begin
-            let len = String.length fqp_in in
-            let fqp = String.sub fqp_in 0 (len-3) in
-            let fqp_out = String.concat "." [fqp;"out"] in
-            let fifo_fdout =
-              try openfile fqp_out [O_WRONLY;O_NONBLOCK] 0o777 with
-                  _-> (* The client is opening the descriptor too fast *)
-                    sleep 1;try openfile fqp_out [O_WRONLY;O_NONBLOCK] 0o777 with
-                        _->
-                        logprint "%s Output pipe not open, using stdout in place of %s\n" slice_name fqp_out;stdout
-            in
-              ignore(sigprocmask SIG_BLOCK [Sys.sigchld]);
-              (
-                clear_nonblock fifo_fdin;
-                let pid=try Some(create_process execpath [|execpath;slice_name|] fifo_fdin fifo_fdout fifo_fdout) with e -> None in
-                  match pid with 
-                    | Some(pid) ->
-                        if (fifo_fdout <> stdout) then close_if_open fifo_fdout;
-                        Hashtbl.add pidmap pid (fqp_in,fifo_fdout)
-                    | None ->logprint "Error executing service: %s\n" execpath;reopenentry fqp_in
-              );
-              ignore(sigprocmask SIG_UNBLOCK [Sys.sigchld]);
-          end
-      | None -> ()