Adapt to Ocsigen_request API change

Adapt to changes in ocsigenserver: ocsigen/ocsigenserver#273

Author: Julow

src/lib/eliom_common.server.ml

@@ -298,6 +298,11 @@ let network_of_ip k mask4 mask6 =
   | Ipaddr.V4 ip -> Ipaddr.(V4 V4.Prefix.(network (make mask4 ip)))
   | Ipaddr.V6 ip -> Ipaddr.(V6 V6.Prefix.(network (make mask6 ip)))
 
+let network_of_request r ~mask4 ~mask6 =
+  match Ocsigen_request.client_conn r with
+  | `Inet (ip, _) -> network_of_ip ip mask4 mask6
+  | _ -> Ipaddr.(V6 V6.localhost)
+
 module Net_addr_Hashtbl : sig
   type key = Ipaddr.t
   type 'a t
@@ -792,6 +797,8 @@ let add_dlist_ dlist v =
   | Some a -> a
   | None -> assert false
 
+let default_ip_table_key = Ipaddr.(V6 V6.localhost)
+
 let empty_tables max forsession =
   let t1 = [] in
   let t2 = ref (empty_naservice_table ()) in
@@ -812,15 +819,22 @@ let empty_tables max forsession =
            let ip, max, sitedata =
              match sp with
              | None -> (
-                 ( Ipaddr.(V6 V6.localhost)
+                 ( default_ip_table_key
                  , max
                  , match global_register_allowed () with
                    | None ->
                        failwith "global tables created outside initialisation"
                    | Some get -> get () ))
              | Some sp ->
-                 ( Ocsigen_request.remote_ip_parsed
-                     sp.sp_request.Ocsigen_extensions.request_info
+                 let ip =
+                   match
+                     Ocsigen_request.client_conn
+                       sp.sp_request.Ocsigen_extensions.request_info
+                   with
+                   | `Inet (ip, _) -> ip
+                   | _ -> default_ip_table_key
+                 in
+                 ( ip
                  , fst sp.sp_sitedata.max_anonymous_services_per_subnet
                  , sp.sp_sitedata )
            in

src/lib/eliom_common.server.mli

@@ -674,7 +674,7 @@ val remove_naservice_table :
 
 val get_mask4 : sitedata -> int
 val get_mask6 : sitedata -> int
-val network_of_ip : Ipaddr.t -> int -> int -> Ipaddr.t
+val network_of_request : Ocsigen_request.t -> mask4:int -> mask6:int -> Ipaddr.t
 val ipv4mask : int ref
 val ipv6mask : int ref
 val create_dlist_ip_table : int -> dlist_ip_table

src/lib/eliom_request_info.server.ml

@@ -49,9 +49,9 @@ let get_full_url () =
   let sp = Eliom_common.get_sp () in
   get_full_url_sp sp
 
-let get_remote_ip () =
+let get_client_conn_to_string () =
   let sp = Eliom_common.get_sp () in
-  Ocsigen_request.remote_ip sp.Eliom_common.sp_request.request_info
+  Ocsigen_request.client_conn_to_string sp.Eliom_common.sp_request.request_info
 
 let get_get_params () =
   let sp = Eliom_common.get_sp () in

src/lib/eliom_request_info.server.mli

@@ -36,8 +36,9 @@ val get_user_agent : unit -> string
 val get_full_url : unit -> string
 (** returns the full URL as a string *)
 
-val get_remote_ip : unit -> string
-(** returns the internet address of the client as a string *)
+val get_client_conn_to_string : unit -> string
+(** returns the address of the client in textual format. This is an IP address
+    if the client is connected through the internet. *)
 
 val get_original_full_path_string : unit -> string
 (** returns the full path of the URL as first sent by the browser

src/lib/server/eliommod_sessiongroups.ml

@@ -30,9 +30,7 @@ let make_full_group_name ~cookie_level ri site_dir_string ipv4mask ipv6mask
       ( site_dir_string
       , cookie_level
       , Right
-          (Eliom_common.network_of_ip
-             (Ocsigen_request.remote_ip_parsed ri)
-             ipv4mask ipv6mask) )
+          (Eliom_common.network_of_request ri ~mask4:ipv4mask ~mask6:ipv6mask) )
   | Some g -> site_dir_string, cookie_level, Left g
 
 let make_persistent_full_group_name =