if stanza.attr.type ~= nil and stanza.attr.type ~= "unavailable" and stanza.attr.type ~= "error" then
local node, host = jid_split(stanza.attr.to);
host = hosts[host];
- if host and host.type == "local" then
+ if node and host and host.type == "local" then
handle_inbound_presence_subscriptions_and_probes(origin, stanza, jid_bare(stanza.attr.from), jid_bare(stanza.attr.to), core_route_stanza);
return;
end
function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_bare, to_bare, core_route_stanza)
local node, host = jid_split(from_bare);
+ if to_bare == origin.username.."@"..origin.host then return; end -- No self contacts
local st_from, st_to = stanza.attr.from, stanza.attr.to;
stanza.attr.from, stanza.attr.to = from_bare, to_bare;
log("debug", "outbound presence "..stanza.attr.type.." from "..from_bare.." for "..to_bare);
local st_from, st_to = stanza.attr.from, stanza.attr.to;
stanza.attr.from, stanza.attr.to = from_bare, to_bare;
log("debug", "inbound presence "..stanza.attr.type.." from "..from_bare.." for "..to_bare);
+
+ if not node then
+ log("debug", "dropping presence sent to host or invalid address '%s'", tostring(to_bare));
+ end
+
if stanza.attr.type == "probe" then
if rostermanager.is_contact_subscribed(node, host, from_bare) then
if 0 == send_presence_of_available_resources(node, host, st_from, origin, core_route_stanza) then
pres:tag("status"):text("Disconnected: "..err):up();
session:dispatch_stanza(pres);
elseif session.directed then
- local pres = st.presence{ type = "unavailable" };
+ local pres = st.presence{ type = "unavailable", from = session.full_jid };
if not(err) or err == "closed" then err = "connection closed"; end
pres:tag("status"):text("Disconnected: "..err):up();
for jid in pairs(session.directed) do