diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-03-03 21:09:27 +0300 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2018-03-03 21:09:27 +0300 |
| commit | 63dba3fd640c096c5e7956b8d910c55ecdb194d2 (patch) | |
| tree | b17fb85d04da9da05c950dc03dfabcf251cddf59 /src/ejabberd_iq.erl | |
| parent | Let a MUC room to route presences from its bare JID (diff) | |
| parent | Revert "Support for default values in default_room_opts" (diff) | |
Merge branch 'master' into muc-self-presence
Diffstat (limited to 'src/ejabberd_iq.erl')
| -rw-r--r-- | src/ejabberd_iq.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ejabberd_iq.erl b/src/ejabberd_iq.erl index 282ff7e15..2ac07e72a 100644 --- a/src/ejabberd_iq.erl +++ b/src/ejabberd_iq.erl @@ -144,7 +144,7 @@ noreply(#state{expire = Expire} = State) -> -spec encode_id(non_neg_integer(), binary()) -> binary(). encode_id(Expire, Rnd) -> ExpireBin = integer_to_binary(Expire), - Node = atom_to_binary(node(), utf8), + Node = ejabberd_cluster:node_id(), CheckSum = calc_checksum(<<ExpireBin/binary, Rnd/binary, Node/binary>>), <<"rr-", ExpireBin/binary, $-, Rnd/binary, $-, CheckSum/binary, $-, Node/binary>>. @@ -155,7 +155,7 @@ decode_id(<<"rr-", ID/binary>>) -> [Rnd, Rest] = binary:split(Tail, <<"-">>), [CheckSum, NodeBin] = binary:split(Rest, <<"-">>), CheckSum = calc_checksum(<<ExpireBin/binary, Rnd/binary, NodeBin/binary>>), - Node = erlang:binary_to_existing_atom(NodeBin, utf8), + Node = ejabberd_cluster:get_node_by_id(NodeBin), Expire = binary_to_integer(ExpireBin), {ok, Expire, Rnd, Node} catch _:{badmatch, _} -> |