annotate mod_block_s2s_subscriptions/mod_block_s2s_subscriptions.lua @ 2491:5fbca7de2088

mod_smacks: Send out more ack requests where needed Under some circumstances it was possible that more than "max_unacked_stanzas" where left in the outgoing stanza queue without forcing an ack. This could happen, when more stanzas entered the queue while the last ack request was still unanswered. Now the test "#queue > max_unacked_stanzas" is done upon receiving an ack as well as when sending out stanzas, which fixes this bug.
author tmolitor <thilo@eightysoft.de>
date Sun, 12 Feb 2017 19:27:50 +0100
parents 70ff25db37fa
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
775
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
1
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
2 local jid_split = require "util.jid".split;
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
3 local jid_bare = require "util.jid".bare;
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
4 local load_roster = require "core.rostermanager".load_roster;
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
5
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
6 local blocked_servers = module:get_option_set("block_s2s_subscriptions")._items;
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
7
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
8 function filter_presence(event)
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
9 if blocked_servers[event.origin.from_host] and event.stanza.attr.type == "subscribe" then
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
10 local stanza = event.stanza;
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
11 local to_user, to_host = jid_split(stanza.attr.to);
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
12 local roster = load_roster(to_user, to_host);
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
13 if roster and roster[jid_bare(stanza.attr.from)] then
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
14 return; -- In roster, pass through
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
15 end
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
16 return true; -- Drop
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
17 end
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
18 end
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
19
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
20 module:hook("presence/bare", filter_presence, 200); -- Client receiving