Skip to content

Commit

Permalink
Removed unused function Ocsigen_socket.socket_type_of_string
Browse files Browse the repository at this point in the history
  • Loading branch information
vouillon committed Apr 8, 2015
1 parent 9260404 commit 99d9797
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 28 deletions.
23 changes: 0 additions & 23 deletions src/server/ocsigen_socket.ml
Expand Up @@ -64,26 +64,3 @@ 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 socket_type_of_string =
let all_ipv6 = Netstring_pcre.regexp "^\\[::\\]:([0-9]+)$" in
let all_ipv4 = Netstring_pcre.regexp "^\\*:([0-9]+)$" in
let single_ipv6 = Netstring_pcre.regexp "^\\[([0-9A-Fa-f.:]+)\\]:([0-9]+)+" in
let single_ipv4 = Netstring_pcre.regexp "^([0-9.]+):([0-9]+)$" in
let aux str =
let match_addr regexp = Netstring_pcre.string_match regexp str 0 in
let get_addr regexp = Netstring_pcre.matched_group regexp 1 str in
match_addr all_ipv6
|> function
| Some r -> IPv6 Unix.inet6_addr_any
| None -> match_addr all_ipv4
|> function
| Some r -> IPv4 Unix.inet_addr_any
| None -> match_addr single_ipv6
|> function
| Some r -> IPv6 (Unix.inet_addr_of_string (get_addr r))
| None -> match_addr single_ipv4
|> function
| Some r -> IPv4 (Unix.inet_addr_of_string (get_addr r))
| None -> All
in aux
5 changes: 0 additions & 5 deletions src/server/ocsigen_socket.mli
Expand Up @@ -26,8 +26,3 @@ val port_of_sockaddr : Unix.sockaddr -> int
@param A socket_type
*)
val string_of_socket_type : socket_type -> string

(** socket_type_of_string cast a string addr:port to a socket_type
@param str string in format "addr:port"
*)
val socket_type_of_string : string -> socket_type

0 comments on commit 99d9797

Please sign in to comment.