Remove assertion in Ocsigen_cohttp_server

dinosaure · dinosaure · commit d851d6fa6288 · 2015-05-21T05:28:33.000+02:00
Fix a misconception between the initialization of server in
Ocsigen_server and the main loop in Ocsigen_cohttp_server about the type
of address (before this patch, we cast an inet_addr to a string in
    initialization, and we cast this string (with possible fail) to
    inet_addr, now we keep inet_addr).
diff --git a/src/server/ocsigen_cohttp_server.ml b/src/server/ocsigen_cohttp_server.ml
@@ -322,22 +322,16 @@ let service ?ssl ~address ~port ~connector () =
   in
   (* We create a specific context for Conduit and Cohttp. *)
   Conduit_lwt_unix.init
-    ~src:address
+    ~src:(Ocsigen_socket.string_of_socket_type address)
     ~tls_server_key ()
   >>= fun conduit_ctx ->
   Lwt.return
     (Cohttp_lwt_unix_net.init
        ~ctx:conduit_ctx ())
   (* We catch the INET_ADDR of the server *)
   >>= fun ctx ->
-  Lwt_unix.getaddrinfo
-    address
-    "0"
-    [Unix.AI_PASSIVE; Unix.AI_SOCKTYPE Unix.SOCK_STREAM]
-  >>= function
-  | { ai_addr = ADDR_INET (ai_addr, _); } :: _ ->
     let callback =
-      handler ~address:ai_addr ~port ~extensions_connector:connector
+      handler ~address:(Ocsigen_socket.to_inet_addr address) ~port ~extensions_connector:connector
     in
     let config = Server.make ~conn_closed ~callback () in
     let mode =
@@ -349,10 +343,3 @@ let service ?ssl ~address ~port ~connector () =
     Server.create ~stop ~ctx ~mode  config
     >>= fun () ->
     Lwt.return (Lwt.wakeup stop_wakener ())
-  | _ ->
-    (* This case is not possible:
-       - Conduit raise an error if we have an [ADDR_UNIX].
-       - The result of [getaddrinfo] must not be empty
-         (or Conduit would also raise an error).
-    *)
-    assert false
diff --git a/src/server/ocsigen_cohttp_server.mli b/src/server/ocsigen_cohttp_server.mli
@@ -21,7 +21,7 @@ val shutdown_server : float option -> unit
 (** initialize a main loop of http server *)
 val service :
   ?ssl:string * string * (bool -> string) option ->
-  address:string ->
+  address:Ocsigen_socket.socket_type ->
   port:int ->
   connector:(Ocsigen_request_info.request_info -> unit -> Ocsigen_http_frame.result Lwt.t) ->
   unit -> unit Lwt.t
diff --git a/src/server/ocsigen_server.ml b/src/server/ocsigen_server.ml
@@ -203,12 +203,8 @@ let start_server () = try
            (fun a i -> (listen true i wait_end_init extensions_connector)@a) [] sslports;
       *)
 
-      let l =
-        List.map (fun (a, p) -> Ocsigen_socket.string_of_socket_type a, p)
-          ports
-      in
-      let connection = match l with
-        | [] -> [("0.0.0.0", 80)]
+      let connection = match ports with
+        | [] -> [(Ocsigen_socket.All, 80)]
         | l -> l
       in
 
@@ -221,10 +217,8 @@ let start_server () = try
             raise (Ocsigen_config.Config_file_error "SSL key is missing")
           | Some (None, Some _) ->
             raise (Ocsigen_config.Config_file_error "SSL certificate is missing")
-        in match List.map
-                   (fun (a, p) -> Ocsigen_socket.string_of_socket_type a, p)
-                   sslports, ssl with
-        | [], Some (crt, key) -> [("0.0.0.0", 443, (crt, key))]
+        in match sslports, ssl with
+        | [], Some (crt, key) -> [(Ocsigen_socket.All, 443, (crt, key))]
         | l, Some (crt, key) ->
           List.map (fun (a, p) -> (a, p, (crt, key))) l
         | _ -> []
diff --git a/src/server/ocsigen_socket.ml b/src/server/ocsigen_socket.ml
@@ -64,3 +64,8 @@ let string_of_socket_type = function
   | All -> Unix.string_of_inet_addr Unix.inet_addr_any
   | IPv4 u -> Unix.string_of_inet_addr u
   | IPv6 u -> Unix.string_of_inet_addr u
+
+let to_inet_addr = function
+  | All -> Unix.inet_addr_any
+  | IPv4 u -> u
+  | IPv6 u -> u
diff --git a/src/server/ocsigen_socket.mli b/src/server/ocsigen_socket.mli
@@ -26,3 +26,8 @@ val port_of_sockaddr : Unix.sockaddr -> int
     @param A socket_type
 *)
 val string_of_socket_type : socket_type -> string
+
+(** to_inet_addr accessor of inet addr
+    @param A socket_type
+*)
+val to_inet_addr : socket_type -> Unix.inet_addr
