Skip to content

fix: fix udp listen address error #163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: bug_fixs/5.8.x
Choose a base branch
from
Draft

fix: fix udp listen address error #163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 23 additions & 14 deletions src/esockd_udp.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,18 +80,18 @@

-spec(server(atom(), esockd:listen_on(), [gen_udp:option()], mfa())
-> {ok, pid()} | {error, term()}).
server(Proto, Port, Opts, MFA) when is_integer(Port) ->
gen_server:start_link(?MODULE, [Proto, Port, Opts, MFA], []);
server(Proto, {Host, Port}, Opts, MFA) when is_integer(Port) ->
IfAddr = case proplists:get_value(ip, Opts) of
undefined -> proplists:get_value(ifaddr, Opts);
server(Proto, ListenOn, Opts, MFA) ->
gen_server:start_link(?MODULE, [Proto, ListenOn, Opts, MFA], []).

merge_addr(Port, SockOpts) when is_integer(Port) ->
SockOpts;
merge_addr({Addr, _Port}, SockOpts) ->
IfAddr = case proplists:get_value(ip, SockOpts) of
undefined -> proplists:get_value(ifaddr, SockOpts);
Addr -> Addr
end,
(IfAddr == undefined) orelse (IfAddr = Host),
gen_server:start_link(?MODULE, [Proto, Port, merge_addr(Host, Opts), MFA], []).

merge_addr(Addr, Opts) ->
lists:keystore(ip, 1, Opts, {ip, Addr}).
(IfAddr == undefined) orelse (IfAddr = Addr),
lists:keystore(ip, 1, SockOpts, {ip, Addr}).

-spec(count_peers(pid()) -> integer()).
count_peers(Pid) ->
Expand Down Expand Up @@ -146,19 +146,20 @@ deny(Pid, CIDR) ->
%% gen_server callbacks
%%--------------------------------------------------------------------

init([Proto, Port, Opts, MFA]) ->
init([Proto, ListenOn, Opts, MFA]) ->
process_flag(trap_exit, true),
put(incoming_peers, 0),

RawRules = proplists:get_value(access_rules, Opts, [{allow, all}]),
AccessRules = [esockd_access:compile(Rule) || Rule <- RawRules],

UdpOpts = proplists:get_value(udp_options, Opts, []),
Port = port(ListenOn),
UdpOpts = merge_addr(ListenOn, sockopts(Opts)),
case gen_udp:open(Port, esockd:merge_opts(?DEFAULT_OPTS, UdpOpts)) of
{ok, Sock} ->
%% Trigger the udp_passive event
ok = inet:setopts(Sock, [{active, 1}]),
Limiter = conn_rate_limiter({listener, Proto, Port}, proplists:get_value(max_conn_rate, Opts)),
Limiter = conn_rate_limiter({listener, Proto, ListenOn}, proplists:get_value(max_conn_rate, Opts)),
MaxPeers = proplists:get_value(max_connections, Opts, infinity),
{ok, #state{proto = Proto,
sock = Sock,
Expand All @@ -173,6 +174,15 @@ init([Proto, Port, Opts, MFA]) ->
{stop, Reason}
end.

port(Port) when is_integer(Port) -> Port;
port({_Addr, Port}) -> Port.

sockopts(Opts) ->
esockd:merge_opts(
?DEFAULT_OPTS,
proplists:get_value(udp_options, Opts, [])
).

handle_call(count_peers, _From, State = #state{peers = Peers}) ->
{reply, maps:size(Peers) div 2, State};

Expand Down Expand Up @@ -346,4 +356,3 @@ raw({deny, CIDR = {_Start, _End, _Len}}) ->
{deny, esockd_cidr:to_string(CIDR)};
raw(Rule) ->
Rule.