Chapril/xmpp.chapril.org-ejabberd
26
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-26 17:38:45 +01:00
Code Releases Activity

Don't add 'Record-Route' header for mid-dialog requests

Browse Source
This commit is contained in:
Evgeniy Khramtsov 2014-05-31 10:00:27 +04:00
parent 86f2af6fdc
commit c76201b6b4
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/mod_sip_proxy.erl
View File

@ -72,9 +72,10 @@ wait_for_request({#sip{type = request} = Req, TrID}, State) ->
fun(_SIPSocketWithURI, {error, _} = Err) -> fun(_SIPSocketWithURI, {error, _} = Err) ->
Err; Err;
({SIPSocket, URI}, #state{tr_ids = TrIDs} = AccState) -> ({SIPSocket, URI}, #state{tr_ids = TrIDs} = AccState) ->
Req2 = add_record_route(SIPSocket, State#state.host, Req1), Req2 = add_record_route_and_set_uri(
URI, State#state.host, Req1),
Req3 = add_via(SIPSocket, State#state.host, Req2), Req3 = add_via(SIPSocket, State#state.host, Req2),
case esip:request(SIPSocket, Req3#sip{uri = URI}, case esip:request(SIPSocket, Req3,
{?MODULE, route, [self()]}) of {?MODULE, route, [self()]}) of
{ok, ClientTrID} -> {ok, ClientTrID} ->
NewTrIDs = [ClientTrID|TrIDs], NewTrIDs = [ClientTrID|TrIDs],
@ -248,10 +249,19 @@ add_via(#sip_socket{type = Transport}, LServer, #sip{hdrs = Hdrs} = Req) ->
{<<"rport">>, <<"">>}]}, {<<"rport">>, <<"">>}]},
Req#sip{hdrs = [{'via', [Via]}|Hdrs]}. Req#sip{hdrs = [{'via', [Via]}|Hdrs]}.
add_record_route(_SIPSocket, LServer, #sip{hdrs = Hdrs} = Req) -> add_record_route_and_set_uri(URI, LServer, #sip{hdrs = Hdrs} = Req) ->
URI = #uri{host = LServer, params = [{<<"lr">>, <<"">>}]}, case is_request_within_dialog(Req) of
Hdrs1 = [{'record-route', [{<<>>, URI, []}]}|Hdrs], false ->
Req#sip{hdrs = Hdrs1}. RR_URI = #uri{host = LServer, params = [{<<"lr">>, <<"">>}]},
Hdrs1 = [{'record-route', [{<<>>, RR_URI, []}]}|Hdrs],
Req#sip{uri = URI, hdrs = Hdrs1};
true ->
Req
end.
is_request_within_dialog(#sip{hdrs = Hdrs}) ->
{_, _, Params} = esip:get_hdr('to', Hdrs),
esip:has_param(<<"tag">>, Params).
get_configured_vias(LServer) -> get_configured_vias(LServer) ->
gen_mod:get_module_opt( gen_mod:get_module_opt(