diff options
| author | Loïc Hoguin <[email protected]> | 2011-04-18 13:52:32 +0200 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2011-04-18 13:52:32 +0200 |
| commit | 63a92df14e25599c6903a8178b5e89acc4482645 (patch) | |
| tree | e52aa7c39e54dd0729b3b435100e1294045106e1 /src | |
| parent | 731d839323e74b95a326001e4e424a1f2b18902e (diff) | |
| download | cowboy-63a92df14e25599c6903a8178b5e89acc4482645.tar.gz cowboy-63a92df14e25599c6903a8178b5e89acc4482645.tar.bz2 cowboy-63a92df14e25599c6903a8178b5e89acc4482645.zip | |
Replace port_number() by ip_port() from kernel/include/inet.hrl.
Diffstat (limited to 'src')
| -rw-r--r-- | src/cowboy_http_req.erl | 2 | ||||
| -rw-r--r-- | src/cowboy_ssl_transport.erl | 5 | ||||
| -rw-r--r-- | src/cowboy_tcp_transport.erl | 5 |
3 files changed, 7 insertions, 5 deletions
diff --git a/src/cowboy_http_req.erl b/src/cowboy_http_req.erl index 932ba3e..d7c217f 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::inet:ip_address(), Port::port_number()}, Req::#http_req{}}. + -> {{Address::ip_address(), Port::ip_port()}, 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 3909409..e7a96ed 100644 --- a/src/cowboy_ssl_transport.erl +++ b/src/cowboy_ssl_transport.erl @@ -19,6 +19,7 @@ -opaque sslsocket() :: term(). -include("include/types.hrl"). +-include_lib("kernel/include/inet.hrl"). %% API. @@ -28,7 +29,7 @@ name() -> ssl. -spec messages() -> {ssl, ssl_closed, ssl_error}. messages() -> {ssl, ssl_closed, ssl_error}. --spec listen([{port, Port::port_number()} | {certfile, CertPath::string()} +-spec listen([{port, Port::ip_port()} | {certfile, CertPath::string()} | {keyfile, KeyPath::string()} | {password, Password::string()}]) -> {ok, LSocket::sslsocket()} | {error, Reason::atom()}. listen(Opts) -> @@ -71,7 +72,7 @@ controlling_process(Socket, Pid) -> ssl:controlling_process(Socket, Pid). -spec peername(Socket::sslsocket()) - -> {ok, {Address::inet:ip_address(), Port::port_number()}} | {error, atom()}. + -> {ok, {Address::ip_address(), Port::ip_port()}} | {error, atom()}. peername(Socket) -> ssl:peername(Socket). diff --git a/src/cowboy_tcp_transport.erl b/src/cowboy_tcp_transport.erl index fa46451..d67e096 100644 --- a/src/cowboy_tcp_transport.erl +++ b/src/cowboy_tcp_transport.erl @@ -17,6 +17,7 @@ controlling_process/2, peername/1, close/1]). %% API. -include("include/types.hrl"). +-include_lib("kernel/include/inet.hrl"). %% API. @@ -26,7 +27,7 @@ name() -> tcp. -spec messages() -> {tcp, tcp_closed, tcp_error}. messages() -> {tcp, tcp_closed, tcp_error}. --spec listen([{port, Port::port_number()}]) +-spec listen([{port, Port::ip_port()}]) -> {ok, LSocket::inet:socket()} | {error, Reason::atom()}. listen(Opts) -> {port, Port} = lists:keyfind(port, 1, Opts), @@ -60,7 +61,7 @@ controlling_process(Socket, Pid) -> gen_tcp:controlling_process(Socket, Pid). -spec peername(Socket::inet:socket()) - -> {ok, {Address::inet:ip_address(), Port::port_number()}} | {error, atom()}. + -> {ok, {Address::ip_address(), Port::ip_port()}} | {error, atom()}. peername(Socket) -> inet:peername(Socket). |