X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=unixsocketwatcher.ml;h=99fe554190da248b587779f9db811c8e78c99d44;hb=4d3b3106c2210fa433241a91a7aae34e7840ba64;hp=4fe845bdc343759d6970a45879c7938bf89f2465;hpb=99f2f33d2b4582259a8100c81497d784b4c84415;p=vsys.git

diff --git a/unixsocketwatcher.ml b/unixsocketwatcher.ml
index 4fe845b..99fe554 100644
--- a/unixsocketwatcher.ml
+++ b/unixsocketwatcher.ml
@@ -13,15 +13,56 @@ open Globals
 open Fdwatcher
 open Printf
 
+exception Exec_failed
+
 let close_if_open fd = (try (ignore(close fd);) with _ -> ())
 
 type control_path_name = string
 type exec_path_name = string
 type slice_name = string
 
-let unix_socket_table: (control_path_name,(exec_path_name*slice_name*Unix.file_descr) option) Hashtbl.t = 
+let unix_socket_table_fname: (control_path_name,Unix.file_descr option) Hashtbl.t = 
+  Hashtbl.create 1024
+
+let unix_socket_table_fd: (Unix.file_descr, (exec_path_name * slice_name) option) Hashtbl.t =
   Hashtbl.create 1024
 
+let receive_event (listening_socket_spec:fname_and_fd) (_:fname_and_fd) =
+  let (_,listening_socket) = listening_socket_spec in
+    try 
+      let (data_socket, _) = accept listening_socket in
+      let (mapping) = 
+        try
+          Hashtbl.find unix_socket_table_fd listening_socket
+        with _ -> None in
+        match mapping with
+          |None -> logprint "Received unexpected socket event\n";()
+          |Some (execpath, slice_name) ->
+              begin
+                let child = fork () in
+                  if (child == 0) then
+                    begin
+                      (* Child *)
+                      (* Close all fds except for the socket *)
+                      let fd = Obj.magic data_socket in
+                        let _ = 
+                          (* Close fds *)
+                          for i = 3 to 1023 do
+                            if (i != fd) then close_if_open(Obj.magic i)
+                          done;
+                            execv execpath [|execpath;slice_name;sprintf "%d" fd|];
+                            raise Exec_failed
+                        (*with
+                                Unix_error(num,str1,str2)->logprint "Error %d: %s (%s)" (Obj.magic num) str1 str2;raise (Unix_error(num,str1,str2))*)
+                        in
+                            logprint "Could not execve %s" execpath
+                    end
+                  else
+                    close_if_open(data_socket)
+              end
+          | None -> ()
+    with e-> logprint "Error accepting socket\n"
+
 (** Make a pair of fifo entries *)
 let mkentry fqp exec_fqp perm slice_name = 
   logprint "Making control entry %s->%s\n" fqp exec_fqp;
@@ -37,62 +78,25 @@ let mkentry fqp exec_fqp perm slice_name =
               let pwentry = Unix.getpwnam slice_name in
                 Unix.chown control_filename pwentry.pw_uid pwentry.pw_gid
           );
-          Hashtbl.replace unix_socket_table control_filename (Some(exec_fqp,slice_name,listening_socket));
+          Hashtbl.replace unix_socket_table_fname control_filename (Some(listening_socket));
+          Hashtbl.replace unix_socket_table_fd listening_socket (Some(exec_fqp,slice_name));
+          Fdwatcher.add_fd (None,listening_socket) (None,listening_socket) receive_event;
           Success
     with 
         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 unix_socket_table control_filename with Not_found -> None in
+  let entry = try Hashtbl.find unix_socket_table_fname control_filename with Not_found -> None in
     match entry with
       | None -> ()
-      | Some(_,_,fd) -> 
+      | Some(fd) -> 
+          Hashtbl.remove unix_socket_table_fd 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
-
-
+          Hashtbl.remove unix_socket_table_fname control_filename