diff options
| -rw-r--r-- | include/http.hrl | 2 | ||||
| -rw-r--r-- | include/types.hrl | 4 | ||||
| -rw-r--r-- | src/cowboy_http_req.erl | 2 | ||||
| -rw-r--r-- | src/cowboy_ssl_transport.erl | 2 | ||||
| -rw-r--r-- | src/cowboy_tcp_transport.erl | 2 |
5 files changed, 4 insertions, 8 deletions
diff --git a/include/http.hrl b/include/http.hrl index a3b2e9b..ad95c0f 100644 --- a/include/http.hrl +++ b/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(), diff --git a/include/types.hrl b/include/types.hrl index bdd4c5f..5938f0e 100644 --- a/include/types.hrl +++ b/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()}). diff --git a/src/cowboy_http_req.erl b/src/cowboy_http_req.erl index 2f52eeb..ba37fba 100644 --- a/src/cowboy_http_req.erl +++ b/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}}; diff --git a/src/cowboy_ssl_transport.erl b/src/cowboy_ssl_transport.erl index 1122bfb..f72d1b1 100644 --- a/src/cowboy_ssl_transport.erl +++ b/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). diff --git a/src/cowboy_tcp_transport.erl b/src/cowboy_tcp_transport.erl index 5049b84..8bcd062 100644 --- a/src/cowboy_tcp_transport.erl +++ b/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). |