Commit graph

279 commits

Author SHA1 Message Date
Matthew Wild
e2772919dd s2smanager: Handle disallow_s2s for incoming streams as well as outgoing 2010-07-16 22:47:26 +01:00
Matthew Wild
56c310f30c s2smanager: Lower default DNS timeout to 15s (it's now a per-DNS-server timeout, rather than total timeout), use net.dns's new timeout system, and remove our custom timeout handlers 2010-07-05 12:17:09 +01:00
Matthew Wild
f654c43008 Merge 0.7->trunk 2010-07-02 17:44:14 +01:00
Matthew Wild
1309f761cb s2smanager: Register outgoing connection with the connection listener only after initializing filters (thanks darkrain, dersd) 2010-07-02 17:43:01 +01:00
Matthew Wild
e3fa34385a s2smanager: Don't attempt to connect to a nil host (for whatever reason... invalid DNS record perhaps?) (thanks dersd) 2010-07-02 17:22:23 +01:00
Matthew Wild
4a2bfd9051 s2smanager: Fix logging for outgoing sessions to also log pre-filtered data 2010-06-13 17:17:11 +01:00
Matthew Wild
816598f46e s2smanager: Move 'sending' debug log message so that it sees the pre-filtered stanzas 2010-06-10 02:07:48 +01:00
Matthew Wild
ef6c6f531d s2smanager: Remove potentially misleading log message (thanks albert) 2010-06-03 12:28:27 +01:00
Matthew Wild
1486d4fdae Merge 0.7->trunk 2010-06-03 12:29:27 +01:00
Matthew Wild
cb5b772427 s2smanager: Add filters for outgoing bytes and stanzas 2010-06-02 18:23:15 +01:00
Matthew Wild
ef919e1417 Merge 0.6->0.7 2010-03-30 19:45:56 +01:00
Matthew Wild
ad6a65efa1 stanza_router, s2smanager, modulemanager: Fix for handling of the default namespace on stanzas, causing sometimes jabber:client to be sent over s2s, and accepted 2010-03-30 19:40:16 +01:00
Matthew Wild
46c0b8c7f9 Merge 0.6->0.7 2010-03-22 17:24:55 +00:00
Matthew Wild
2bc0606453 Update copyright headers for 2010 2010-03-22 17:06:15 +00:00
Matthew Wild
6fc597e709 sessionmanager, s2smanager: Add type of ?2s_destroyed to resting sessions (fixes a logging traceback, thanks Flo) 2010-03-22 14:58:25 +00:00
Matthew Wild
fb803e1408 s2smanager: Remove the infamous 'as per RFC' log message entirely (it happens too often to be useful) 2010-03-18 01:15:25 +00:00
Matthew Wild
2283fae9c1 Merge 0.6->0.7 2010-03-18 01:25:50 +00:00
Matthew Wild
03734de797 s2smanager: Don't re-destroy destroyed sessions 2010-03-14 02:57:22 +00:00
Matthew Wild
82d5e5fd0c s2smanager: Add open_stream and close methods to resting sessions 2010-03-14 02:56:57 +00:00
Matthew Wild
8e4f70c4a2 sessionmanager, s2smanager: Close session on </stream:stream> 2010-03-11 01:04:19 +00:00
Matthew Wild
7b445486a0 sessionmanager, s2smanager: Destroyed sessions are now simply resting (not dead) until they are collected - prevents a whole class of tracebacks 2010-03-08 02:13:41 +00:00
Matthew Wild
8862e1b27e Merge 0.6.2/waqas with 0.6.2/MattJ 2010-03-03 22:05:05 +00:00
Matthew Wild
52d66e5267 Merge with 0.6 2010-02-25 18:03:15 +00:00
Matthew Wild
f713f78045 s2smanager: Log and fail gracefully when unable to create socket for outgoing s2s connection (thanks foucault) 2010-02-25 17:53:27 +00:00
Matthew Wild
1ac7b7a3b7 s2smanager: Fix for the logic SRV record priority comparison (thanks darkrain) 2010-02-25 17:52:33 +00:00
Matthew Wild
87ff54c752 s2smanager: Use s2smanager log() if session doesn't have a logger (thanks Flo) 2010-02-19 03:30:27 +00:00
Matthew Wild
9c1222b34e s2smanager: Use s2smanager log() if session doesn't have a logger (thanks Flo) 2010-02-19 03:30:27 +00:00
Matthew Wild
fee6a443f9 sessionmanager, s2smanager: Fix for syntax of null_data_handler() (thanks Nolan) 2010-02-12 17:27:53 +00:00
Matthew Wild
a76e149c1c sessionmanager, s2smanager: Give sessions dummy data handlers that log when data is received by a destroyed session 2010-02-12 17:14:54 +00:00
Waqas Hussain
1445574fd3 s2smanager, mod_compression, mod_tls: Changed event.session to event.origin for s2s-stream-features event for consistency. 2010-02-12 04:30:17 +05:00
Matthew Wild
9f2b093567 s2smanager: Update for new server SSL API (don't pass a sslctx) 2010-01-31 15:41:33 +00:00
Matthew Wild
5586351c7e s2smanager: Fix syntax error) 2010-01-30 18:45:46 +00:00
Matthew Wild
5ca850a51c s2smanager: require_s2s_encryption -> s2s_require_encryption 2010-01-30 17:00:47 +00:00
Matthew Wild
4a7e2575df s2smanager: Make require_s2s_encryption do what it says on the tin 2010-01-30 16:42:27 +00:00
Matthew Wild
74ceb83cca s2smanager: Whitespace 2010-01-28 13:39:23 +00:00
Matthew Wild
952317223d s2smanager: Log error and fail gracefully if we can't open a socket for an outgoing s2s connection (thanks foucault) 2010-01-19 19:58:02 +00:00
Matthew Wild
c29137a1b1 s2smanager: No-one noticed that Prosody stopped sending to/from on stream headers recently? :) 2010-01-19 04:35:10 +00:00
Matthew Wild
0b4f0121a1 s2smanager: Fix syntax error) 2010-01-30 18:45:46 +00:00
Matthew Wild
54f4000c5a s2smanager: require_s2s_encryption -> s2s_require_encryption 2010-01-30 17:00:47 +00:00
Matthew Wild
d169b18350 s2smanager: Make require_s2s_encryption do what it says on the tin 2010-01-30 16:42:27 +00:00
Matthew Wild
0d8ce51b78 s2smanager: Split sending of stream header into a :open_stream() method 2010-01-09 06:53:23 +00:00
Matthew Wild
801cc75c57 s2smanager: Allow new_outgoing() to create sessions without automatically connecting them (set 3rd parameters to false) 2010-01-04 17:32:26 +00:00
Paul Aurich
92b2d54b4b s2smanager: Stamp a 'to' on the reply stream:stream. This makes prosody happy. 2010-01-03 11:26:36 -08:00
Paul Aurich
b67695c401 s2smanager: Stamp a 'to' on the reply stream:stream. This makes prosody happy. 2010-01-03 11:26:36 -08:00
Matthew Wild
4b75f2857c s2smanager, hostmanager: Make dialback secrets per-host 2010-01-03 18:55:42 +00:00
Matthew Wild
cddb59f542 s2smanager: Trim trailing whitespace 2010-01-03 18:37:03 +00:00
Matthew Wild
5226f7e43a s2smanager: Give reasons to destroy_session in more cases, including when DNS lookup fails 2009-12-17 21:50:02 +00:00
Matthew Wild
90a4059638 s2smanager: Give reasons to destroy_session in more cases, including when DNS lookup fails 2009-12-17 21:50:02 +00:00
Matthew Wild
31d67aa507 Merge with backout branch 2009-12-17 21:38:16 +00:00
Matthew Wild
8c41e63005 s2smanager: Send reply stream header only after checking we serve this host (sorry darkrain... :) ) 2009-12-17 21:36:31 +00:00