aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2014-02-03 07:25:05 +0100
committerKim Alvefur <zash@zash.se>2014-02-03 07:25:05 +0100
commit7a257adaffd2bc14ac33045c4563d428b41d69cb (patch)
treec840902603d1482af5f9156d6170461fd47b8e69 /plugins
parent4159b9cfe19ede5b674a3328944c4ca02de99cd7 (diff)
parentc92bbefd9c5e36913afe0d796a84df180faaf0af (diff)
downloadprosody-7a257adaffd2bc14ac33045c4563d428b41d69cb.tar.gz
prosody-7a257adaffd2bc14ac33045c4563d428b41d69cb.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_c2s.lua22
-rw-r--r--plugins/mod_posix.lua2
-rw-r--r--plugins/mod_unknown.lua4
-rw-r--r--plugins/mod_windows.lua4
-rw-r--r--plugins/muc/muc.lib.lua1
5 files changed, 26 insertions, 7 deletions
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index 3bdffc7d..7a8af406 100644
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -38,7 +38,6 @@ local runner_callbacks = {};
--- Stream events handlers
local stream_xmlns_attr = {xmlns='urn:ietf:params:xml:ns:xmpp-streams'};
-local default_stream_attr = { ["xmlns:stream"] = "http://etherx.jabber.org/streams", xmlns = stream_callbacks.default_ns, version = "1.0", id = "" };
function stream_callbacks.streamopened(session, attr)
local send = session.send;
@@ -58,9 +57,7 @@ function stream_callbacks.streamopened(session, attr)
return;
end
- send("<?xml version='1.0'?>"..st.stanza("stream:stream", {
- xmlns = 'jabber:client', ["xmlns:stream"] = 'http://etherx.jabber.org/streams';
- id = session.streamid, from = session.host, version = '1.0', ["xml:lang"] = 'en' }):top_tag());
+ session:open_stream();
(session.log or log)("debug", "Sent reply <stream:stream> to client");
session.notopen = nil;
@@ -129,8 +126,7 @@ local function session_close(session, reason)
local log = session.log or log;
if session.conn then
if session.notopen then
- session.send("<?xml version='1.0'?>");
- session.send(st.stanza("stream:stream", default_stream_attr):top_tag());
+ session:open_stream();
end
if reason then -- nil == no err, initiated by us, false == initiated by client
local stream_error = st.stanza("stream:error");
@@ -178,6 +174,19 @@ local function session_close(session, reason)
end
end
+local function session_open_stream(session)
+ local attr = {
+ ["xmlns:stream"] = 'http://etherx.jabber.org/streams',
+ xmlns = stream_callbacks.default_ns,
+ version = "1.0",
+ ["xml:lang"] = 'en',
+ id = session.streamid or "",
+ from = session.host
+ };
+ session.send("<?xml version='1.0'?>");
+ session.send(st.stanza("stream:stream", attr):top_tag());
+end
+
module:hook_global("user-deleted", function(event)
local username, host = event.username, event.host;
local user = hosts[host].sessions[username];
@@ -225,6 +234,7 @@ function listener.onconnect(conn)
conn:setoption("keepalive", opt_keepalives);
end
+ session.open_stream = session_open_stream;
session.close = session_close;
local stream = new_xmpp_stream(session, stream_callbacks);
diff --git a/plugins/mod_posix.lua b/plugins/mod_posix.lua
index 7a6ccd94..69542c96 100644
--- a/plugins/mod_posix.lua
+++ b/plugins/mod_posix.lua
@@ -128,7 +128,7 @@ function syslog_sink_maker(config)
end
require "core.loggingmanager".register_sink_type("syslog", syslog_sink_maker);
-local daemonize = module:get_option("daemonize");
+local daemonize = module:get_option("daemonize", prosody.installed);
if daemonize == nil then
local no_daemonize = module:get_option("no_daemonize"); --COMPAT w/ 0.5
daemonize = not no_daemonize;
diff --git a/plugins/mod_unknown.lua b/plugins/mod_unknown.lua
new file mode 100644
index 00000000..4d20b8ad
--- /dev/null
+++ b/plugins/mod_unknown.lua
@@ -0,0 +1,4 @@
+-- Unknown platform stub
+module:set_global();
+
+-- TODO Do things that make sense if we don't know about the platform
diff --git a/plugins/mod_windows.lua b/plugins/mod_windows.lua
new file mode 100644
index 00000000..8085fd88
--- /dev/null
+++ b/plugins/mod_windows.lua
@@ -0,0 +1,4 @@
+-- Windows platform stub
+module:set_global();
+
+-- TODO Add Windows-specific things here
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 462d6893..d09c768e 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -570,6 +570,7 @@ function room_mt:handle_to_occupant(origin, stanza) -- PM, vCards, etc
end
stanza.attr.from, stanza.attr.to, stanza.attr.id = from, to, id;
else -- message
+ stanza:tag("x", { xmlns = "http://jabber.org/protocol/muc#user" }):up();
stanza.attr.from = current_nick;
for jid in pairs(o_data.sessions) do
stanza.attr.to = jid;