Commit graph

127 commits

Author SHA1 Message Date
Matthew Wild
d6833915bc Merge 0.10->trunk 2017-09-26 17:24:25 +01:00
Matthew Wild
86ee041be8 mod_s2s: Use a separate resolver object for each outgoing session
Cleaner approach hopefully fixes problems with some peoples' DNS
hanging after a while, failed DNS when a large number of queries
are made at once, and source port re-use.

Related issues: #487, 761, #991, #992, #1001
2017-09-25 23:12:47 +01:00
Kim Alvefur
4c6c255113 Merge 0.10->trunk 2017-09-14 02:48:34 +02:00
Kim Alvefur
989c0783cb Merge 0.9->0.10 2017-09-14 02:47:40 +02:00
Kim Alvefur
5dee36d838 mod_component, mod_s2s: Iterate over child tags instead of child nodes (can include text) in stream error (same as 176b7f4e4ac9) 2017-09-14 01:27:36 +02:00
Kim Alvefur
4c6a84a00e Merge 0.10->trunk 2017-01-26 19:47:33 +01:00
Kim Alvefur
befdc64576 mod_c2s, mod_s2s: Remove comment that no longer applies since 946871f6e3c8 2017-01-25 11:18:00 +01:00
Kim Alvefur
ac7a1daba8 mod_s2s: Clarify that it is stream features that can't be offered (here too) 2017-01-25 11:13:40 +01:00
Kim Alvefur
67c41ef89e Merge 0.10->trunk 2016-10-07 16:52:18 +02:00
Kim Alvefur
70ba6bf40f Merge 0.9->0.10 2016-09-28 14:45:02 +02:00
Matthew Wild
4c0ea8780e mod_s2s: Lower log message to 'warn' level, standard for remotely-triggered protocol issues 2016-09-27 22:01:46 +01:00
Matthew Wild
f4690a6063 Merge 0.10->trunk 2016-09-12 22:31:25 +01:00
Kim Alvefur
522f448b35 mod_c2s, mod_s2s: Switch connection counting to 'amount' type and enumerate once per statistics interval 2016-09-12 15:01:16 +02:00
Matthew Wild
37913e5ce8 Merge 0.10->trunk 2016-08-31 16:25:21 +01:00
Matthew Wild
9ab7221521 Backed out changeset a23b5cb8c22b
It was a nice idea, but our s2s connection logic is too complicated. The
session may have been destroyed inside attempt_connection().
2016-08-31 11:42:03 +01:00
Kim Alvefur
2ec447915f Merge 0.10->trunk 2016-08-28 05:15:13 +02:00
Matthew Wild
f6fd68b0dd mod_s2s: Fire event when s2s connection fails 2016-08-27 13:40:10 +01:00
Kim Alvefur
68f3c9dede Merge 0.10->trunk 2016-08-08 16:41:09 +02:00
Kim Alvefur
6cff8fa474 mod_s2s: Index session after checking if it exists (fixes traceback in case of a connection without a session having a read timeout) 2016-08-07 20:48:37 +02:00
Kim Alvefur
8c0ca748b5 Merge 0.10->trunk 2016-07-08 15:12:44 +02:00
Kim Alvefur
ddccdcd00d mod_c2s, mod_s2s: Bootstrap connection count statistic on module load 2016-07-07 18:48:58 +02:00
Kim Alvefur
a994aa71fb mod_s2s: Add util.async support 2016-05-30 13:36:43 +02:00
Kim Alvefur
08ef5f83f5 Merge 0.10->trunk 2016-05-30 13:30:53 +02:00
Kim Alvefur
9dc461298a mod_s2s: Remove compat with namespace issue from Prosody pre-0.6.2 2016-05-30 13:30:32 +02:00
Emmanuel Gil Peyrot
c6048a7cb4 Update every link to the documentation to use HTTPS 2016-04-16 21:08:05 +01:00
Kim Alvefur
3ec49d31af Merge 0.10->trunk 2016-03-14 14:20:37 +01:00
Kim Alvefur
d1578059cb mod_s2s: Include name of remote server when it's missing the stream ID (thanks Ge0rG) 2016-03-14 13:27:02 +01:00
Kim Alvefur
acfde68f95 Merge 0.10->trunk 2016-01-26 14:15:38 +01:00
Kim Alvefur
ab4c6bee84 Merge 0.9->0.10 2016-01-26 14:15:00 +01:00
Kim Alvefur
1875b4a83d mod_c2s, mod_s2s: Lower priority of session shutdown to negative, so that plugins hooking at the default priority run first (fixes #601) 2016-01-26 00:28:07 +01:00
Kim Alvefur
539d817c67 Merge 0.10->trunk 2015-10-11 20:03:00 +02:00
Kim Alvefur
617cacab71 mod_s2s: Fire global event for stream features where the remote server has not sent the 'to' stream attribute 2015-10-11 14:03:53 +02:00
Kim Alvefur
9693f85d1b Merge 0.10->trunk 2015-09-25 18:03:44 +02:00
Kim Alvefur
d71ec76461 mod_s2s: Account for connections that time out in connection count measure 2015-09-25 15:16:25 +02:00
Kim Alvefur
b415f80bd6 Merge 0.10->trunk 2015-09-24 20:15:19 +02:00
Kim Alvefur
7dda205176 mod_c2s, mod_s2s: Close incoming connections if there are no features to offer on incomplete streams (fixes #285) 2015-09-24 20:05:23 +02:00
Kim Alvefur
068e6374d0 Merge 0.10->trunk 2015-05-13 22:33:40 +02:00
Kim Alvefur
cedc24858c Merge 0.9->0.10 2015-05-13 22:31:59 +02:00
Kim Alvefur
ecb35aa0e9 mod_s2s: Mark stream as opened directly after opening stream, prevents session.close opening it again 2015-05-13 21:56:22 +02:00
Kim Alvefur
5298b58b13 mod_s2s: Don't cache session.sends2s (or do it later), prevents sending data after session was closed 2015-05-13 21:55:08 +02:00
Matthew Wild
daec51c435 Merge 0.10->trunk 2015-05-06 19:26:53 +01:00
Kim Alvefur
80bafb7200 mod_s2s: Fire read timeout event on correct virtualhost for incoming connections 2015-05-06 13:35:34 +02:00
Kim Alvefur
43702241ec Merge 0.10->trunk 2015-04-26 00:07:36 +02:00
Kim Alvefur
48652fb9d3 mod_c2s, mod_s2s: Collect statistics on number of connections 2015-04-26 00:06:11 +02:00
Kim Alvefur
1be7952fe2 mod_s2s: Catch attempt to close dummy origin of s2s error replies (fixes a top level error) 2015-04-05 16:47:49 +02:00
Kim Alvefur
603d0df6e2 Merge 0.9->0.10 again 2015-03-27 00:27:29 +01:00
Matthew Wild
bfbcd081de mod_s2s: to/from attributes are required on s2s stream headers. Set them to '' when not available. Fixes #468. 2015-03-24 16:03:37 +00:00
Kim Alvefur
fd494572e7 mod_s2s: Capitalize log message 2014-10-10 00:56:53 +02:00
Matthew Wild
899b6d53ae net.http, net.http.server, mod_c2s, mod_s2s, mod_component, mod_admin_telnet, mod_net_multiplex: Add ondetach to release connection from 'sessions' table (or equivalent) 2014-08-29 11:54:34 +01:00
Kim Alvefur
4bc9e05c11 mod_s2s: Close offending s2s streams missing an 'id' attribute with a stream error instead of throwing an unhandled error 2014-09-02 17:24:25 +02:00