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

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

This commit is contained in:
Loïc Hoguin 2011-04-18 00:06:26 +02:00
parent 9ad32386c0
commit 15dc645596
6 changed files with 17 additions and 17 deletions

View file

@ -14,7 +14,7 @@
-record(http_req, { -record(http_req, {
%% Transport. %% Transport.
socket = undefined :: undefined | socket(), socket = undefined :: undefined | inet:socket(),
transport = undefined :: undefined | module(), transport = undefined :: undefined | module(),
connection = keepalive :: keepalive | close, connection = keepalive :: keepalive | close,

View file

@ -16,7 +16,6 @@
{takeover, Node::node()} | {failover, Node::node()}. {takeover, Node::node()} | {failover, Node::node()}.
-type posix() :: atom(). -type posix() :: atom().
-opaque socket() :: term().
-opaque sslsocket() :: term(). -opaque sslsocket() :: term().
-type port_number() :: 0..65535. -type port_number() :: 0..65535.

View file

@ -20,7 +20,7 @@
%% API. %% API.
-spec start_link(LSocket::socket(), Transport::module(), -spec start_link(LSocket::inet:socket(), Transport::module(),
Protocol::module(), Opts::term(), ReqsSup::pid()) -> {ok, Pid::pid()}. Protocol::module(), Opts::term(), ReqsSup::pid()) -> {ok, Pid::pid()}.
start_link(LSocket, Transport, Protocol, Opts, ReqsSup) -> start_link(LSocket, Transport, Protocol, Opts, ReqsSup) ->
Pid = spawn_link(?MODULE, acceptor, Pid = spawn_link(?MODULE, acceptor,
@ -29,7 +29,7 @@ start_link(LSocket, Transport, Protocol, Opts, ReqsSup) ->
%% Internal. %% Internal.
-spec acceptor(LSocket::socket(), Transport::module(), -spec acceptor(LSocket::inet:socket(), Transport::module(),
Protocol::module(), Opts::term(), ReqsSup::pid()) -> no_return(). Protocol::module(), Opts::term(), ReqsSup::pid()) -> no_return().
acceptor(LSocket, Transport, Protocol, Opts, ReqsSup) -> acceptor(LSocket, Transport, Protocol, Opts, ReqsSup) ->
case Transport:accept(LSocket, 2000) of case Transport:accept(LSocket, 2000) of

View file

@ -20,7 +20,7 @@
-include("include/http.hrl"). -include("include/http.hrl").
-record(state, { -record(state, {
socket :: socket(), socket :: inet:socket(),
transport :: module(), transport :: module(),
dispatch :: dispatch(), dispatch :: dispatch(),
handler :: {Handler::module(), Opts::term()}, handler :: {Handler::module(), Opts::term()},
@ -32,7 +32,7 @@
%% API. %% API.
-spec start_link(Socket::socket(), Transport::module(), Opts::term()) -spec start_link(Socket::inet:socket(), Transport::module(), Opts::term())
-> {ok, Pid::pid()}. -> {ok, Pid::pid()}.
start_link(Socket, Transport, Opts) -> start_link(Socket, Transport, Opts) ->
Pid = spawn_link(?MODULE, init, [Socket, Transport, Opts]), Pid = spawn_link(?MODULE, init, [Socket, Transport, Opts]),
@ -40,7 +40,7 @@ start_link(Socket, Transport, Opts) ->
%% FSM. %% FSM.
-spec init(Socket::socket(), Transport::module(), Opts::term()) -> ok. -spec init(Socket::inet:socket(), Transport::module(), Opts::term()) -> ok.
init(Socket, Transport, Opts) -> init(Socket, Transport, Opts) ->
Dispatch = proplists:get_value(dispatch, Opts, []), Dispatch = proplists:get_value(dispatch, Opts, []),
MaxEmptyLines = proplists:get_value(max_empty_lines, Opts, 5), MaxEmptyLines = proplists:get_value(max_empty_lines, Opts, 5),

View file

@ -26,7 +26,7 @@
start_link() -> start_link() ->
supervisor:start_link(?MODULE, []). supervisor:start_link(?MODULE, []).
-spec start_request(Socket::socket(), Transport::module(), -spec start_request(Socket::inet:socket(), Transport::module(),
Protocol::module(), Opts::term()) -> {ok, Pid::pid()}. Protocol::module(), Opts::term()) -> {ok, Pid::pid()}.
start_request(Socket, Transport, Protocol, Opts) -> start_request(Socket, Transport, Protocol, Opts) ->
Protocol:start_link(Socket, Transport, Opts). Protocol:start_link(Socket, Transport, Opts).

View file

@ -27,42 +27,43 @@ name() -> tcp.
messages() -> {tcp, tcp_closed, tcp_error}. messages() -> {tcp, tcp_closed, tcp_error}.
-spec listen([{port, Port::port_number()}]) -spec listen([{port, Port::port_number()}])
-> {ok, LSocket::socket()} | {error, Reason::posix()}. -> {ok, LSocket::inet:socket()} | {error, Reason::posix()}.
listen(Opts) -> listen(Opts) ->
{port, Port} = lists:keyfind(port, 1, Opts), {port, Port} = lists:keyfind(port, 1, Opts),
gen_tcp:listen(Port, [binary, {active, false}, gen_tcp:listen(Port, [binary, {active, false},
{packet, raw}, {reuseaddr, true}]). {packet, raw}, {reuseaddr, true}]).
-spec accept(LSocket::socket(), Timeout::timeout()) -spec accept(LSocket::inet:socket(), Timeout::timeout())
-> {ok, Socket::socket()} | {error, Reason::closed | timeout | posix()}. -> {ok, Socket::inet:socket()}
| {error, Reason::closed | timeout | posix()}.
accept(LSocket, Timeout) -> accept(LSocket, Timeout) ->
gen_tcp:accept(LSocket, Timeout). gen_tcp:accept(LSocket, Timeout).
-spec recv(Socket::socket(), Length::integer(), Timeout::timeout()) -spec recv(Socket::inet:socket(), Length::integer(), Timeout::timeout())
-> {ok, Packet::term()} | {error, Reason::closed | posix()}. -> {ok, Packet::term()} | {error, Reason::closed | posix()}.
recv(Socket, Length, Timeout) -> recv(Socket, Length, Timeout) ->
gen_tcp:recv(Socket, Length, Timeout). gen_tcp:recv(Socket, Length, Timeout).
-spec send(Socket::socket(), Packet::iolist()) -spec send(Socket::inet:socket(), Packet::iolist())
-> ok | {error, Reason::posix()}. -> ok | {error, Reason::posix()}.
send(Socket, Packet) -> send(Socket, Packet) ->
gen_tcp:send(Socket, Packet). gen_tcp:send(Socket, Packet).
-spec setopts(Socket::socket(), Opts::list(term())) -spec setopts(Socket::inet:socket(), Opts::list(term()))
-> ok | {error, Reason::posix()}. -> ok | {error, Reason::posix()}.
setopts(Socket, Opts) -> setopts(Socket, Opts) ->
inet:setopts(Socket, Opts). inet:setopts(Socket, Opts).
-spec controlling_process(Socket::socket(), Pid::pid()) -spec controlling_process(Socket::inet:socket(), Pid::pid())
-> ok | {error, Reason::closed | not_owner | posix()}. -> ok | {error, Reason::closed | not_owner | posix()}.
controlling_process(Socket, Pid) -> controlling_process(Socket, Pid) ->
gen_tcp:controlling_process(Socket, Pid). gen_tcp:controlling_process(Socket, Pid).
-spec peername(Socket::socket()) -spec peername(Socket::inet:socket())
-> {ok, {Address::inet: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).
-spec close(Socket::socket()) -> ok. -spec close(Socket::inet:socket()) -> ok.
close(Socket) -> close(Socket) ->
gen_tcp:close(Socket). gen_tcp:close(Socket).