Carbons: fix inserting from and to early in c2s

esl · Aug 17, 2022 · f7992c4 · f7992c4
1 parent db412cc
commit f7992c4
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/big_tests/tests/carboncopy_SUITE.erl b/big_tests/tests/carboncopy_SUITE.erl
@@ -15,7 +15,7 @@ all() ->
     [{group, all}].
 
 groups() ->
-    G = [{all, [parallel],
+    [{all, [parallel],
           [discovering_support,
            enabling_carbons,
            disabling_carbons,
@@ -28,8 +28,7 @@ groups() ->
            prop_forward_received_chat_messages,
            prop_forward_sent_chat_messages,
            prop_normal_routing_to_bare_jid
-          ]}],
-    ct_helper:repeat_all_until_all_ok(G).
+          ]}].
 
 %%%===================================================================
 %%% Overall setup/teardown

diff --git a/src/c2s/mongoose_c2s.erl b/src/c2s/mongoose_c2s.erl
@@ -693,11 +693,15 @@ handle_outgoing_stanza(StateData = #state{host_type = HostType}, Acc, _) ->
 
 -spec handle_incoming_stanza(c2s_data(), c2s_state(), mongoose_acc:t()) -> fsm_res().
 handle_incoming_stanza(StateData = #state{host_type = HostType}, C2SState, Acc) ->
-    case mongoose_c2s_hooks:user_receive_packet(HostType, Acc, hook_arg(StateData)) of
-        {ok, Acc1} ->
-            Res = process_incoming_stanza(StateData, Acc1, mongoose_acc:stanza_name(Acc1)),
-            Acc2 = maybe_deliver(StateData, Res),
-            handle_state_after_packet(StateData, C2SState, Acc2);
+    {From, To, El} = mongoose_acc:packet(Acc),
+    FinalEl = jlib:replace_from_to(From, To, El),
+    ParamsAcc = #{from_jid => From, to_jid => To, element => FinalEl},
+    Acc1 = mongoose_acc:update_stanza(ParamsAcc, Acc),
+    case mongoose_c2s_hooks:user_receive_packet(HostType, Acc1, hook_arg(StateData)) of
+        {ok, Acc2} ->
+            Res = process_incoming_stanza(StateData, Acc2, mongoose_acc:stanza_name(Acc2)),
+            Acc3 = maybe_deliver(StateData, Res),
+            handle_state_after_packet(StateData, C2SState, Acc3);
         {stop, _Acc1} ->
             keep_state_and_data
     end.
@@ -753,9 +757,8 @@ maybe_send_xml(StateData, Acc, ToSend) ->
 
 -spec maybe_deliver(c2s_data(), gen_hook:hook_fn_ret(mongoose_acc:t())) -> mongoose_acc:t().
 maybe_deliver(StateData, {ok, Acc}) ->
-    {From, To, El} = mongoose_acc:packet(Acc),
-    FinalEl = jlib:replace_from_to(From, To, El),
-    send_element(StateData, FinalEl, Acc),
+    Element = mongoose_acc:element(Acc),
+    send_element(StateData, Element, Acc),
     Acc;
 maybe_deliver(_, {stop, Acc}) ->
     Acc.