umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-14 12:20:24 +00:00
Code Issues Wiki Activity

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

Browse source
This commit is contained in:
Loïc Hoguin 2011-04-17 23:57:30 +02:00
parent 734f57aa8a
commit 9ad32386c0
5 changed files with 4 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/http.hrl
View file

@ -21,7 +21,7 @@
%% Request. %% Request.
method = 'GET' :: http_method(), method = 'GET' :: http_method(),
version = {1, 1} :: http_version(), 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(), host = undefined :: undefined | path_tokens(),
raw_host = undefined :: undefined | string(), raw_host = undefined :: undefined | string(),
path = undefined :: undefined | '*' | path_tokens(), path = undefined :: undefined | '*' | path_tokens(),

4
include/types.hrl
View file

@ -18,10 +18,6 @@
-type posix() :: atom(). -type posix() :: atom().
-opaque socket() :: term(). -opaque socket() :: term().
-opaque sslsocket() :: 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 port_number() :: 0..65535.
-type bindings() :: list({Key::atom(), Value::string()}). -type bindings() :: list({Key::atom(), Value::string()}).

2
src/cowboy_http_req.erl
View file

@ -48,7 +48,7 @@ version(Req) ->
{Req#http_req.version, Req}. {Req#http_req.version, Req}.
-spec peer(Req::#http_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}) -> peer(Req=#http_req{socket=Socket, transport=Transport, peer=undefined}) ->
{ok, Peer} = Transport:peername(Socket), {ok, Peer} = Transport:peername(Socket),
{Peer, Req#http_req{peer=Peer}}; {Peer, Req#http_req{peer=Peer}};

2
src/cowboy_ssl_transport.erl
View file

@ -69,7 +69,7 @@ controlling_process(Socket, Pid) ->
ssl:controlling_process(Socket, Pid). ssl:controlling_process(Socket, Pid).
-spec peername(Socket::sslsocket()) -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) -> peername(Socket) ->
ssl:peername(Socket). ssl:peername(Socket).

2
src/cowboy_tcp_transport.erl
View file

@ -59,7 +59,7 @@ controlling_process(Socket, Pid) ->
gen_tcp:controlling_process(Socket, Pid). gen_tcp:controlling_process(Socket, Pid).
-spec peername(Socket::socket()) -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) -> peername(Socket) ->
inet:peername(Socket). inet:peername(Socket).