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

mod_proxy65: Some more cleanup.

Browse source
This commit is contained in:
Waqas Hussain 2011-09-03 00:37:37 +05:00
parent 9baee6217e
commit 827d473985
1 changed files with 11 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

31
plugins/mod_proxy65.lua
View file

@ -158,35 +158,25 @@ module.unload = function()
connlisteners.deregister(module.host .. ':proxy65'); connlisteners.deregister(module.host .. ':proxy65');
end end
local function set_activation(stanza)
local to, reply;
local from = stanza.attr.from;
local query = stanza.tags[1];
local sid = query.attr.sid;
if query.tags[1] and query.tags[1].name == "activate" then
to = query.tags[1][1];
end
if from ~= nil and to ~= nil and sid ~= nil then
reply = st.iq({type="result", from=host, to=from});
reply.attr.id = stanza.attr.id;
end
return reply, from, to, sid;
end
module:hook("iq-set/host/http://jabber.org/protocol/bytestreams:query", function(event) module:hook("iq-set/host/http://jabber.org/protocol/bytestreams:query", function(event)
local origin, stanza = event.origin, event.stanza; local origin, stanza = event.origin, event.stanza;
module:log("debug", "Received activation request from %s", stanza.attr.from); local query = stanza.tags[1];
local reply, from, to, sid = set_activation(stanza); local sid = query.attr.sid;
if reply ~= nil and from ~= nil and to ~= nil and sid ~= nil then local from = stanza.attr.from;
local to = query:get_child_text("activate");
module:log("debug", "received activation request from %s", stanza.attr.from);
if to and sid then
local sha = sha1(sid .. from .. to, true); local sha = sha1(sid .. from .. to, true);
if transfers[sha] == nil then if transfers[sha] == nil then
module:log("error", "transfers[sha]: nil"); module:log("error", "transfers[sha]: nil");
origin.send(st.error_reply(stanza, "modify", "item-not-found"));
elseif(transfers[sha] ~= nil and transfers[sha].initiator ~= nil and transfers[sha].target ~= nil) then elseif(transfers[sha] ~= nil and transfers[sha].initiator ~= nil and transfers[sha].target ~= nil) then
origin.send(reply);
transfers[sha].activated = true; transfers[sha].activated = true;
transfers[sha].target:lock_read(false); transfers[sha].target:lock_read(false);
transfers[sha].initiator:lock_read(false); transfers[sha].initiator:lock_read(false);
origin.send(st.reply(stanza));
else else
module:log("debug", "Both parties were not yet connected"); module:log("debug", "Both parties were not yet connected");
local message = "Neither party is connected to the proxy"; local message = "Neither party is connected to the proxy";
@ -197,10 +187,11 @@ module:hook("iq-set/host/http://jabber.org/protocol/bytestreams:query", function
end end
origin.send(st.error_reply(stanza, "cancel", "not-allowed", message)); origin.send(st.error_reply(stanza, "cancel", "not-allowed", message));
end end
return true;
else else
module:log("error", "activation failed: sid: %s, initiator: %s, target: %s", tostring(sid), tostring(from), tostring(to)); module:log("error", "activation failed: sid: %s, initiator: %s, target: %s", tostring(sid), tostring(from), tostring(to));
origin.send(st.error_reply(stanza, "modify", "bad-request"));
end end
return true;
end); end);
if not connlisteners.register(module.host .. ':proxy65', connlistener) then if not connlisteners.register(module.host .. ':proxy65', connlistener) then