yetangitu/ejabberd
1
0
Fork 0
mirror of https://github.com/processone/ejabberd synced 2025-10-05 19:42:11 +02:00
Code Issues Releases Wiki Activity

Do not duplicate enc_pid/dec_pid functions

Browse source
This commit is contained in:
Evgeniy Khramtsov 2017-03-30 17:44:43 +03:00
parent bfde473c3b
commit f5f353d90a
5 changed files with 39 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/ejabberd_router_sql.erl
View file

@ -51,7 +51,7 @@ init() ->
end.
register_route(Domain, ServerHost, LocalHint, _, Pid) ->
PidS = enc_pid(Pid),
PidS = aux:encode_pid(Pid),
LocalHintS = enc_local_hint(LocalHint),
Node = erlang:atom_to_binary(node(Pid), latin1),
case ?SQL_UPSERT(?MYNAME, "route",
@ -68,7 +68,7 @@ register_route(Domain, ServerHost, LocalHint, _, Pid) ->
end.
unregister_route(Domain, _, Pid) ->
PidS = enc_pid(Pid),
PidS = aux:encode_pid(Pid),
Node = erlang:atom_to_binary(node(Pid), latin1),
ejabberd_sql:sql_query(
?MYNAME,
@ -153,37 +153,10 @@ dec_local_hint(<<"">>) ->
dec_local_hint(S) ->
ejabberd_sql:decode_term(S).
-spec enc_pid(pid()) -> binary().
enc_pid(Pid) ->
list_to_binary(erlang:pid_to_list(Pid)).
-spec dec_pid(binary(), binary()) -> pid().
dec_pid(PidBin, NodeBin) ->
PidStr = binary_to_list(PidBin),
Pid = erlang:list_to_pid(PidStr),
case erlang:binary_to_atom(NodeBin, latin1) of
Node when Node == node() ->
Pid;
Node ->
try set_node_id(PidStr, NodeBin)
catch _:badarg ->
erlang:error({node_down, Node})
end
end.
-spec set_node_id(string(), binary()) -> pid().
set_node_id(PidStr, NodeBin) ->
ExtPidStr = erlang:pid_to_list(
binary_to_term(
<<131,103,100,(size(NodeBin)):16,NodeBin/binary,0:72>>)),
[H|_] = string:tokens(ExtPidStr, "."),
[_|T] = string:tokens(PidStr, "."),
erlang:list_to_pid(string:join([H|T], ".")).
row_to_route(Domain, {ServerHost, NodeS, PidS, LocalHintS} = Row) ->
try [#route{domain = Domain,
server_host = ServerHost,
pid = dec_pid(PidS, NodeS),
pid = aux:decode_pid(PidS, NodeS),
local_hint = dec_local_hint(LocalHintS)}]
catch _:{node_down, _} ->
[];