Browse Source

Use the inet:ip_address() type instead of the user-defined one.

Loïc Hoguin 14 years ago
parent
commit
9ad32386c0
5 changed files with 4 additions and 8 deletions
  1. 1 1
      include/http.hrl
  2. 0 4
      include/types.hrl
  3. 1 1
      src/cowboy_http_req.erl
  4. 1 1
      src/cowboy_ssl_transport.erl
  5. 1 1
      src/cowboy_tcp_transport.erl

+ 1 - 1
include/http.hrl

@@ -21,7 +21,7 @@
 	%% Request.
 	method     = 'GET'     :: http_method(),
 	version    = {1, 1}    :: http_version(),
-	peer       = undefined :: undefined | {Address::ip_address(), Port::port_number()},
+	peer       = undefined :: undefined | {Address::inet:ip_address(), Port::port_number()},
 	host       = undefined :: undefined | path_tokens(),
 	raw_host   = undefined :: undefined | string(),
 	path       = undefined :: undefined | '*' | path_tokens(),

+ 0 - 4
include/types.hrl

@@ -18,10 +18,6 @@
 -type posix() :: atom().
 -opaque socket() :: term().
 -opaque sslsocket() :: term().
--type ipv4_address() :: {0..255, 0..255, 0..255, 0..255}.
--type ipv6_address() :: {0..65535, 0..65535, 0..65535, 0..65535,
-						 0..65535, 0..65535, 0..65535, 0..65535}.
--type ip_address() :: ipv4_address() | ipv6_address().
 -type port_number() :: 0..65535.
 
 -type bindings() :: list({Key::atom(), Value::string()}).

+ 1 - 1
src/cowboy_http_req.erl

@@ -48,7 +48,7 @@ version(Req) ->
 	{Req#http_req.version, Req}.
 
 -spec peer(Req::#http_req{})
-	-> {{Address::ip_address(), Port::port_number()}, Req::#http_req{}}.
+	-> {{Address::inet:ip_address(), Port::port_number()}, Req::#http_req{}}.
 peer(Req=#http_req{socket=Socket, transport=Transport, peer=undefined}) ->
 	{ok, Peer} = Transport:peername(Socket),
 	{Peer, Req#http_req{peer=Peer}};

+ 1 - 1
src/cowboy_ssl_transport.erl

@@ -69,7 +69,7 @@ controlling_process(Socket, Pid) ->
 	ssl:controlling_process(Socket, Pid).
 
 -spec peername(Socket::sslsocket())
-	-> {ok, {Address::ip_address(), Port::port_number()}} | {error, posix()}.
+	-> {ok, {Address::inet:ip_address(), Port::port_number()}} | {error, posix()}.
 peername(Socket) ->
 	ssl:peername(Socket).
 

+ 1 - 1
src/cowboy_tcp_transport.erl

@@ -59,7 +59,7 @@ controlling_process(Socket, Pid) ->
 	gen_tcp:controlling_process(Socket, Pid).
 
 -spec peername(Socket::socket())
-	-> {ok, {Address::ip_address(), Port::port_number()}} | {error, posix()}.
+	-> {ok, {Address::inet:ip_address(), Port::port_number()}} | {error, posix()}.
 peername(Socket) ->
 	inet:peername(Socket).