X-Git-Url: http://git.onelab.eu/?p=vsys.git;a=blobdiff_plain;f=unixsocketwatcher.ml;h=7663be93f8c9512072df23a0d65fd42d09841d81;hp=75250553d5cc8f111c3062d05c508357438e92bf;hb=c83cc6c663566b82531b670f8b492c6ff1e1f18f;hpb=0c0e4e2126ae5c30e9142ab360826d53ab3d52bd

diff --git a/unixsocketwatcher.ml b/unixsocketwatcher.ml
index 7525055..7663be9 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 = try fork () with _ -> -1 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,53 +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) =
-  print "Here\n";
-    let (_,listening_socket) = listening_socket_spec in
-  try 
-    let (data_socket, addr) = accept listening_socket in
-      match addr with 
-        | ADDR_UNIX(fname) ->
-            begin
-              let entry_info = 
-                try
-                  Hashtbl.find unix_socket_table fname 
-                with _ -> None in
-                match entry_info with
-                  | Some(execpath,slice_name,fd) ->
-                      begin
-                        let child = fork () in
-                          if (child == 0) then
-                               begin
-                                 (*Child*)
-                                 (* Close all fds except for the socket *)
-                                 execv execpath,[execpath];
-                                 logprint "Could not execve %s" execpath
-                               end
-                      end
-                  | None -> ()
-            end
-        | _ -> logprint "Serious error! Got a non UNIX connection over a UNIX socket\n"
-  with e-> logprint "Error accepting 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