Mercurial > prosody-hg
view plugins/muc/persistent.lib.lua @ 11592:64cfa396bb84
net.server_epoll: Fix reporting of socket connect timeout
If the underlying TCP connection times out before the write timeout
kicks in, end up here with err="timeout", which the following code
treats as a minor issue.
Then, due to epoll apparently returning the EPOLLOUT (writable) event
too, we go on and try to write to the socket (commonly stream headers).
This fails because the socket is closed, which becomes the error
returned up the stack to the rest of Prosody.
This also trips the 'onconnect' signal, which has effects on various
things, such as the net.connect state machine. Probably undesirable
effects.
With this, we instead return "connection timeout", like server_event,
and destroy the connection handle properly. And then nothing else
happens because the connection has been destroyed.
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 07 Jun 2021 17:37:14 +0200 |
| parents | ea9e1f8f3013 |
| children | 9061f9621330 |
line wrap: on
line source
-- Prosody IM -- Copyright (C) 2008-2010 Matthew Wild -- Copyright (C) 2008-2010 Waqas Hussain -- Copyright (C) 2014 Daurnimator -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- local restrict_persistent = not module:get_option_boolean("muc_room_allow_persistent", true); local um_is_admin = require "core.usermanager".is_admin; local function get_persistent(room) return room._data.persistent; end local function set_persistent(room, persistent) persistent = persistent and true or nil; if get_persistent(room) == persistent then return false; end room._data.persistent = persistent; return true; end module:hook("muc-config-form", function(event) if restrict_persistent and not um_is_admin(event.actor, module.host) then -- Don't show option if hidden rooms are restricted and user is not admin of this host return; end table.insert(event.form, { name = "muc#roomconfig_persistentroom"; type = "boolean"; label = "Persistent (room should remain even when it is empty)"; desc = "Rooms are automatically deleted when they are empty, unless this option is enabled"; value = get_persistent(event.room); }); end, 100-5); module:hook("muc-config-submitted/muc#roomconfig_persistentroom", function(event) if restrict_persistent and not um_is_admin(event.actor, module.host) then return; -- Not allowed end if set_persistent(event.room, event.value) then event.status_codes["104"] = true; end end); module:hook("muc-disco#info", function(event) event.reply:tag("feature", {var = get_persistent(event.room) and "muc_persistent" or "muc_temporary"}):up(); end); module:hook("muc-room-destroyed", function(event) set_persistent(event.room, false); end, -100); return { get = get_persistent; set = set_persistent; };
