mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-05 14:17:37 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

mod_component, mod_s2s: Iterate over child tags instead of child nodes (can include text) in stream error (same as 176b7f4e4ac9)

Browse source
This commit is contained in:
Kim Alvefur 2017-09-14 01:27:36 +02:00
parent 12cdea49b3
commit 5dee36d838
2 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
plugins/mod_component.lua
View file

@ -151,8 +151,7 @@ function stream_callbacks.error(session, error, data, data2)
session:close("not-well-formed"); session:close("not-well-formed");
elseif error == "stream-error" then elseif error == "stream-error" then
local condition, text = "undefined-condition"; local condition, text = "undefined-condition";
for child in data:children() do for child in data:childtags(nil, xmlns_xmpp_streams) do
if child.attr.xmlns == xmlns_xmpp_streams then
if child.name ~= "text" then if child.name ~= "text" then
condition = child.name; condition = child.name;
else else
@ -162,7 +161,6 @@ function stream_callbacks.error(session, error, data, data2)
break; break;
end end
end end
end
text = condition .. (text and (" ("..text..")") or ""); text = condition .. (text and (" ("..text..")") or "");
session.log("info", "Session closed by remote with error: %s", text); session.log("info", "Session closed by remote with error: %s", text);
session:close(nil, text); session:close(nil, text);

4
plugins/mod_s2s/mod_s2s.lua
View file

@ -416,8 +416,7 @@ function stream_callbacks.error(session, error, data)
session:close("not-well-formed"); session:close("not-well-formed");
elseif error == "stream-error" then elseif error == "stream-error" then
local condition, text = "undefined-condition"; local condition, text = "undefined-condition";
for child in data:children() do for child in data:childtags(nil, xmlns_xmpp_streams) do
if child.attr.xmlns == xmlns_xmpp_streams then
if child.name ~= "text" then if child.name ~= "text" then
condition = child.name; condition = child.name;
else else
@ -427,7 +426,6 @@ function stream_callbacks.error(session, error, data)
break; break;
end end
end end
end
text = condition .. (text and (" ("..text..")") or ""); text = condition .. (text and (" ("..text..")") or "");
session.log("info", "Session closed by remote with error: %s", text); session.log("info", "Session closed by remote with error: %s", text);
session:close(nil, text); session:close(nil, text);