ac87749d55
add find_s2s_bridge hook
2010-10-11 18:40:57 +10:00
1f2c9b7971
fixes typo in stop_connection/1
2010-09-28 14:20:02 +10:00
c8033833f9
When logging s2s out connection attempt or success, log if TLS is used
2010-07-23 00:25:43 +02:00
715cc5ea3b
New configure option: --enable-nif
2010-07-01 20:54:01 +10:00
84c4d75735
Remove warning for undefined print_state/1 function for p1_fsm processes (thanks Badlop).
...
Include a identity function as implementation of print_state/1.
2010-04-09 14:25:00 -03:00
31c3a78453
improved s2s connections clean up (EJAB-1202)
2010-03-04 12:36:57 +09:00
86794b1d23
Fix OTP version detection to work with old supported R10 and R11
...
SVN Revision: 2906
2010-01-16 12:24:11 +00:00
7b76fdcde7
Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159)
...
SVN Revision: 2891
2010-01-12 16:11:32 +00:00
d812975565
Provide more detailed log message when s2s stream start fails.
...
SVN Revision: 2831
2009-12-28 15:29:42 +00:00
798853abb6
Fix mistake that disallowed s2s_out connections when using Erlang R12 or older.
...
SVN Revision: 2694
2009-10-21 21:11:09 +00:00
257e4c34a8
Provide send_timeout_close option in TCP only in R13B or higher (EJAB-926)
...
SVN Revision: 2680
2009-10-19 14:47:05 +00:00
006515020a
Support gen_tcp send timeout: Close the connection if the other end has disconnected ungracefully or cannot keep up with the rate at which we are sending data (EJAB-926)
...
SVN Revision: 2671
2009-10-19 09:36:23 +00:00
355648dc7e
If s2s fails due to namespace mismatch, show differences to help debugging the problem.
...
SVN Revision: 2662
2009-10-12 22:51:19 +00:00
14232df14c
new option added: max_fsm_queue. removed hardcoded FSMLIMITS
...
SVN Revision: 2645
2009-10-07 14:24:09 +00:00
d678a21f21
Change some error messages.
...
SVN Revision: 2587
2009-09-07 14:28:08 +00:00
720fd7605d
Document the new option s2s_dns_options, expressed in seconds (EJAB-994)
...
SVN Revision: 2417
2009-08-03 15:03:50 +00:00
f4330e9ed3
EJAB-994: Implements DNS timeouts and retries.
...
SVN Revision: 2404
2009-07-30 12:34:59 +00:00
b5964c2a5f
Added API function to get current S2S connections with information
...
get_info_s2s_connections(Type) returns a list of incoming (or outgoing)
S2S connections with information for each one including IP address,
port number, TLS options... (thanks to Juan Pablo Carlino)
SVN Revision: 2088
2009-05-19 09:38:17 +00:00
f09509502e
* doc/guide.tex: Update copyright date 2008 to 2009 (EJAB-842)
...
* doc/guide.html: Likewise
* src/*/*.erl: Likewise
* src/*/*.erl: Remove unneeded blankspaces in license text
SVN Revision: 1804
2009-01-12 14:44:42 +00:00
f0af10e600
* src/ejabberd_listener.erl: Define send timeout option to avoid blocking on socket send (EJAB-746).
...
* src/ejabberd_s2s_out.erl: Likewise.
SVN Revision: 1784
2009-01-08 20:49:16 +00:00
1944aa097f
Use inet:gethostbyname instead of inet_res:getbyname
...
SVN Revision: 1758
2008-12-26 18:36:53 +00:00
682909e0fc
* src/ejabberd_config.erl: Option outgoing_s2s_options to define
...
s2s outgoing behaviour: IPv4, IPv6 and timeout (thanks to Stephan
Maka)(EJAB-665)
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_socket.erl: Likewise
* src/ejabberd.cfg.example: Likewise
* doc/guide.tex: Likewise
* doc/guide.html: Likewise
SVN Revision: 1756
2008-12-26 11:45:08 +00:00
10e3f2cf92
* src/ejabberd_s2s_out.erl: exports the DNS resolution function.
...
SVN Revision: 1674
2008-11-08 17:50:54 +00:00
c3bda4aaee
* doc/guide.tex: Update Process-one name to ProcessOne (EJAB-708)
...
* doc/guide.html: Likewise
* doc/api/overview.edoc: Likewise
* src/*/*.erl: Likewise
* src/*/*.hrl: Likewise
* src/*/*.c: Likewise
* src/odbc/*.sql: Likewise
SVN Revision: 1499
2008-07-31 11:18:49 +00:00
8dae53abda
* src/ejabberd_s2s_out.erl: Fix compilation error.
...
SVN Revision: 1332
2008-05-18 12:34:52 +00:00
8a8a02431f
* src/ejabberd_s2s_out.erl: Avoid an harmless error (function clause in logs)
...
SVN Revision: 1331
2008-05-18 12:28:58 +00:00
5bec1eedc1
Change FSMTIMEOUT to 30s
...
SVN Revision: 1328
2008-05-16 15:29:33 +00:00
ef531fb208
* src/ejabberd_s2s_out.erl: Improve confusing log message in s2s
...
connection: wait_for_validation connect timeout (EJAB-617)
SVN Revision: 1311
2008-04-29 16:59:03 +00:00
ee6aae8211
* src/ejabberd_s2s_out.erl: Fix long timeout when reconnecting s2s
...
after a remote server crash (EJAB-540)
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_s2s.erl: Likewise
* doc/guide.tex: Likewise
SVN Revision: 1296
2008-04-18 12:19:45 +00:00
320c266276
* src/ejabberd_s2s.erl: Only trigger s2s_connect_hook on successful connection (EJAB-566)
...
* src/ejabberd_s2s_out.erl: Likewise
SVN Revision: 1235
2008-03-17 10:16:21 +00:00
2d2fcc8210
* doc/guide.tex: Updated copyright dates to 2008
...
* src/*: Likewise
SVN Revision: 1153
2008-01-15 17:02:57 +00:00
e0fc360cf8
* src/ejabberd_s2s_out.erl: Fixed behavior when outgoing_s2s_port
...
option is not defined
SVN Revision: 1129
2007-12-29 14:22:38 +00:00
56fe3579bb
* Applied copyright update patch 1.
...
SVN Revision: 1110
2007-12-24 11:41:41 +00:00
b14c88aaaf
* src/ejabberd_s2s_out.erl: Bugfix
...
SVN Revision: 1069
2007-12-14 09:12:14 +00:00
5a3c80e380
* src/ejabberd_s2s_out.erl: Increase dialback timeout as dialback can
...
sometimes take longer than expected.
SVN Revision: 1052
2007-12-08 16:39:02 +00:00
6342c258a7
* src/cyrsasl.erl: Fix compilation warnings: Part 1 (EJAB-290)
...
* src/ejabberd_auth_odbc.erl: Likewise
* src/ejabberd_config.erl: Likewise
* src/ejabberd_hooks.erl: Likewise
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_sm.erl: Likewise
* src/idna.erl: Likewise
* src/jd2ejd.erl: Likewise
SVN Revision: 1045
2007-12-06 23:15:04 +00:00
950060cd3c
* src/ejabberd_s2s_out.erl: Bugfix
...
SVN Revision: 976
2007-11-25 16:14:32 +00:00
b53f2be7f2
* src/ejabberd_s2s_out.erl: Changed to actual p1_fsm behaviour. It was working
...
correctly as the API of p1_fsm and gen_fsm is strictly the same.
SVN Revision: 948
2007-09-14 14:21:25 +00:00
f6bf5973ef
* src/ejabberd_s2s_out.erl: Implements s2s negociation timeouts and s2s connection retrial interval (EJAB-357, EJAB-294).
...
SVN Revision: 936
2007-09-14 14:18:32 +00:00
0efaacb24e
open up to 3 s2s outgoing connection per domain pair
...
SVN Revision: 935
2007-09-14 14:18:17 +00:00
afec054544
* src/ejabberd_c2s.erl: Option to prevent the use of Erlang OTP supervisor for transient processes (EJAB-354).
...
* src/ejabberd_s2s_in.erl: Likewise.
* src/ejabberd_s2s_out.erl: Likewise.
* src/mod_muc/mod_muc_room.erl: Likewise.
* src/configure.ac: Likewise.
* src/configure: Likewise.
* src/Makefile.in: Likewise.
* src/mod_muc/Makefile.in: Likewise.
SVN Revision: 931
2007-09-14 14:16:36 +00:00
b78d8ee55f
* src/ejabberd_s2s_out.erl: Moved s2s connexion information from INFO level to DEBUG level and more human readable information explaining what is going on (EJAB-353).
...
SVN Revision: 930
2007-09-14 14:16:20 +00:00
9fc203ee6d
open up to 3 s2s outgoing connection per domain pair
...
SVN Revision: 928
2007-09-14 14:15:44 +00:00
f9221e2212
* src/ejabberd_s2s_out.erl: Avoid bouncing messages twice if terminate happens during open_connect.
...
SVN Revision: 854
2007-08-01 11:25:23 +00:00
dda2464b85
* src/ejabberd_s2s_out.erl: On terminate, bounce internal process queue and Erlang message queue.
...
SVN Revision: 853
2007-08-01 11:18:52 +00:00
6e24711099
* src/ejabberd_s2s_out.erl: Autodisconnect s2s connections which are overloaded (EJAB-287).
...
* src/p1_fsm.erl: Likewise.
SVN Revision: 821
2007-07-24 09:04:09 +00:00
abadd82c66
* src/ejabberd_s2s_out.erl: Make s2s connections more robust
...
* src/ejabberd_s2s.erl: Likewise
SVN Revision: 817
2007-07-18 16:26:50 +00:00
1b19d72e6f
* src/ejabberd_s2s_out.erl: Improved place of the INFO / DEBUG printout (EJAB-282).
...
SVN Revision: 814
2007-07-17 07:20:55 +00:00
2810c2b300
* src/ejabberd_s2s.erl: Added remove_connection/3
...
* src/ejabberd_s2s_out.erl: Bugfix: remove only own s2s record
SVN Revision: 812
2007-07-15 07:28:47 +00:00
907878081d
* src/ejabberd_s2s_out.erl: Bounce packets after unregistering s2s
...
connection, not before
SVN Revision: 811
2007-07-11 14:10:28 +00:00
56f01cfe6e
* src/ejabberd_s2s_out.erl: Bugfix
...
SVN Revision: 700
2006-12-31 00:38:11 +00:00
4d7cc9301a
* src/ejabberd_socket.erl: All XML socket operations moved here
...
* src/ejabberd_listener.erl: Updated
* src/ejabberd_receiver.erl: Likewise
* src/ejabberd_c2s.erl: Likewise
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_service.erl: Likewise
* src/mod_shared_roster.erl: Bugfix
* src/mod_roster_odbc.erl: Bugfix
SVN Revision: 599
2006-09-05 04:26:28 +00:00
9b8dcac5a7
* src/ejabberd_c2s.erl: Bugfix: added a missing catch and fixed
...
the error code used on unknown namespace.
* src/ejabberd_s2s_out.erl: Improved s2s connection negociation
(dialback namespace usage) when using tls.
* src/ejabberd_sm.erl: Fixed the error code used on unknown
namespace.
* src/mod_register.erl: ejabberd now sends iq result and stream
end on user remove.
SVN Revision: 590
2006-07-28 16:18:50 +00:00
d5137b0563
* src/xml_stream.erl: Added catching of gen_fsm:send_event errors
...
* src/ejabberd_s2s_out.erl: Better support for multiple SRV
records (thanks to Sergei Golovan)
* src/mod_muc/mod_muc_log.erl: Support for chatroom logging
(thanks to Badlop)
* src/mod_muc/mod_muc_room.erl: Likewise
* src/mod_muc/Makefile.in: Likewise
* src/mod_muc/Makefile.win32: Likewise
* src/gen_iq_handler.erl: Added support for {queues, N} IQ handler
type
SVN Revision: 517
2006-03-14 04:26:15 +00:00
0cc168a9aa
* src/mod_muc/mod_muc_room.erl: Kick non-members when room
...
reconfigured to be member-only or when membership is revoked in
member-only room, allowed "true" and "false" in x:data forms
(thanks to Sergei Golovan)
* src/mod_configure.erl: Added "Host" parameter to get_form and
set_form functions (thanks to Sergei Golovan)
* src/ejabberd_s2s_out.erl: Bugfix
* src/msgs/es.msg: Updated (thanks to Badlop)
* src/web/ejabberd_web.erl: Bugfix (thanks to Badlop)
* src/mod_irc/mod_irc.erl: Updated copyright dates
* src/mod_muc/mod_muc.erl: Likewise
* src/mod_pubsub/mod_pubsub.erl: Likewise
* src/mod_vcard.erl: Likewise
* src/mod_vcard_ldap.erl: Likewise
* src/mod_vcard_odbc.erl: Likewise
* src/web/ejabberd_web_admin.erl: Likewise
SVN Revision: 500
2006-02-06 05:12:54 +00:00
6bb510d99e
* src/ejabberd_service.erl: Bugfix
...
* src/ejabberd_receiver.erl: Rewritten to use {active, once} mode
for socket
* src/ejabberd_c2s.erl: Update
* src/ejabberd_listener.erl: Likewise
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_service.erl: Likewise
* src/shaper.erl: Likewise
* src/tls/tls.erl: Likewise
* src/web/ejabberd_http.erl: Likewise
SVN Revision: 483
2006-01-13 01:55:20 +00:00
bbfd58a822
* src/ejabberd_s2s_out.erl: Fixed invalid behaviour upon
...
connecting to host with invalid domain
* src/ejabberd_s2s.erl: Likewise
SVN Revision: 433
2005-11-12 03:42:12 +00:00
719cd49e59
* src/ejabberd_config.erl: Support for per host certificates
...
* src/ejabberd_c2s.erl: Likewise
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd.cfg.example: Updated
* src/ejabberd_s2s_in.erl: Fixed id-on-xmppAddr processing
SVN Revision: 432
2005-11-05 21:15:53 +00:00
f6343f01f7
* src/ejabberd_s2s_out.erl: Support for STARTTLS+SASL EXTERNAL
...
* src/ejabberd_s2s_in.erl: Likewise
* src/tls/tls.erl: Likewise
* src/tls/tls_drv.c: Likewise
* src/tls/XmppAddr.asn1: Likewise
* src/tls/Makefile.in: Likewise
SVN Revision: 430
2005-11-03 05:04:54 +00:00
1433dafe6b
* src/tls/tls_drv.c: Support for "connect" method
...
* src/tls/tls.erl: Likewise
* src/ejabberd_s2s_in.erl: Support for STARTTLS+Dialback
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_receiver.erl: Added a few hacks ({active,once} mode
should be used instead of recv/3 call to avoid them)
* src/ejabberd_config.erl: Added s2s_use_starttls and s2s_certfile
options
* src/ejabberd.cfg.example: Likewise
SVN Revision: 426
2005-10-25 01:08:37 +00:00
2f7f3d9b00
* src/aclocal.m4: Fixed headers detecting in AM_WITH_OPENSSL
...
(thanks to Leif Johansson)
* src/ejabberd_auth.erl: Added support for ldap_rootdn and
ldap_password options (thanks to Stefan de Konink)
* src/mod_vcard_ldap.erl: Likewise
* src/ejabberd_router.erl: Now possible to route packet via
function call instead of message sending
* src/ejabberd_sm.erl: Added function route/3, use it in route
table
* src/ejabberd_local.erl: Likewise
* src/ejabberd_s2s.erl: Likewise
* (all): Fixed spelling of word "authentication"
* src/*/Makefile.in: Replaced erlc with @ERLC@
SVN Revision: 285
2004-11-05 21:14:31 +00:00
379ba26e85
* src/ejabberd_s2s_out.erl: Fixed socket closing condition
...
SVN Revision: 273
2004-10-06 14:12:04 +00:00
6f600f1a37
* src/idna.erl: Support for IDNA (RFC3490)
...
* src/ejabberd_s2s_out.erl: Likewise
* src/xml.erl: element_to_string/1 and crypt/1 now returns deep
list
* src/mod_muc/mod_muc_room.erl (add_message_to_history): Replaced
string:len with lists:flatlength
SVN Revision: 222
2004-04-10 19:15:02 +00:00
bc672b44ea
* src/msgs/ru.msg: Updated (thanks to Sergei Golovan)
...
* src/mod_muc/mod_muc_room.erl: Now private conferences are
visible to admins and owners of this conference (thanks to Sergei
Golovan)
* src/mod_muc/mod_muc.erl: More xml:lang support (thanks to Sergei
Golovan)
* src/mod_vcard.erl: Better processing of EMAIL tag (thanks to
Sergei Golovan)
* src/ejabberd_s2s_out.erl: Added "catch" to "open_socket" (thanks
to Sergei Golovan)
SVN Revision: 211
2004-03-08 20:20:15 +00:00
91fe973361
* src/ejabberd_s2s_out.erl: Bugfix
...
SVN Revision: 183
2003-12-12 20:35:40 +00:00
6f9a3922ef
* src/ejabberd_s2s_in.erl: Changed timeout processing, bugfix
...
* src/ejabberd_s2s_out.erl: Changed timeout processing
* src/msgs/ru.msg: Updated (thanks to Sergei Golovan)
* src/mod_muc/mod_muc.erl: Better i18n support, added support for
<registered/> field in iq:register replies (thanks to Sergei
Golovan)
* src/mod_register.erl: More i18n support (thanks to Sergei
Golovan)
SVN Revision: 181
2003-12-06 19:58:49 +00:00
23b3779b20
* src/ejabberd_listener.erl: Fixed starting of SSL connection
...
* src/ejabberd_s2s_in.erl: Partially rewriten
* src/ejabberd_router.erl: More verbose error report
* src/ejabberd_local.erl: Likewise
* src/ejabberd_sm.erl: Likewise
* src/ejabberd_s2s_out.erl: Updated to be compatible with R9C
* src/ejabberd_c2s.erl: Minor fix
SVN Revision: 164
2003-10-29 20:09:09 +00:00
8106d5f9c1
* src/ejabberd_local.erl: Bugfix
...
* src/mod_register.erl: Added support for sending of "welcome"
message
* src/ejabberd.cfg.example: Updated
* src/ejabberd_s2s_out.erl: Replaced "_jabber-server" with
"_xmpp-server"
SVN Revision: 150
2003-10-14 19:34:17 +00:00
5c0ba6e337
* doc/guide.tex: Updated
...
* src/ejabberd_s2s_out.erl: Added support for IPv6 and
"_jabber-server.tcp" lookups
* src/jlib.erl (string_to_jid1): Bugfix
* src/ejabberd_config.erl: Now possible to specify path to config
file in command line
SVN Revision: 149
2003-10-12 18:21:16 +00:00
de6b2a2996
* src/ejabberd_s2s_in.erl: Fixed "id" attribute processing
...
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_c2s.erl: Added sending of empty <stream:features/>
element after opening of authentificated stream
SVN Revision: 135
2003-09-03 17:49:42 +00:00
dc80fa1562
* src/ejabberd_s2s_in.erl: Temporary hack for "id" attribute
...
processing
* src/ejabberd_s2s_out.erl: Likewise
SVN Revision: 134
2003-09-02 20:13:32 +00:00
ca5d88c368
* (all): Reorganized supervision tree
...
SVN Revision: 125
2003-07-20 20:35:35 +00:00
1834fb3a72
* src/ejabberd_s2s_out.erl: Close connection after key
...
verification
* src/ejabberd_c2s.erl: start replaced with start_link
* src/ejabberd_s2s_in.erl: Likewise
* src/ejabberd_s2s_out.erl: Likewise
* src/ejabberd_service.erl: Likewise
* src/ejabberd_listener.erl: Now uses proc_lib to spawn listeners,
removed 3rd parameter in listener configuration (assumed to equal
start_link)
* src/ejabberd.rel: Updated
* doc/guide.tex: Small changes
* doc/Makefile: Added implicit charset specification to hevea
SVN Revision: 124
2003-07-14 18:06:03 +00:00
481cc2d1f4
* src/ejabberd_s2s_out.erl: Fixed error replies, added timeouts
...
* src/ejabberd_s2s_in.erl: Likewise
SVN Revision: 107
2003-05-12 18:36:13 +00:00
86cd1729cb
* src/ejabberd_local.erl: Updated missed errors to new style
...
* src/mod_register.erl: Likewise
* src/mod_version.erl: Likewise
* src/mod_time.erl: Likewise
* src/mod_stats.erl: Likewise
* src/mod_register.erl: Likewise
* src/mod_private.erl: Likewise
* src/mod_configure.erl: Likewise
* src/ejabberd_sm.erl: Likewise
* src/ejabberd_service.erl: Likewise
* src/ejabberd_c2s.erl: Likewise
* src/ejabberd_s2s_out.erl: Likewise
* src/mod_vcard.erl: Likewise
* src/mod_roster.erl: Likewise
* src/mod_muc/mod_muc.erl: Added vcard to mod_muc module
* src/ejabberd_app.erl: Dump list of opened ports every hour
* src/ejabberd.hrl: Added INFO_MSG macros, ERROR_LOG_PATH renamed
to LOG_PATH
SVN Revision: 106
2003-05-09 19:32:59 +00:00
8b26ac9e97
* src/ejabberd_s2s_out.erl: Fixed ports leak
...
* src/ejabberd_listener.erl: Likewise
* src/ejabberd_c2s.erl: Fixes for SASL support
* src/cyrsasl.erl: Fixes
* src/cyrsasl_digest.erl: DIGEST-MD5 SASL mechanism support
SVN Revision: 87
2003-03-12 19:48:05 +00:00
79f496e0c4
*** empty log message ***
...
SVN Revision: 58
2003-02-04 20:45:23 +00:00
9a3a723f1b
*** empty log message ***
...
SVN Revision: 53
2003-01-29 17:12:23 +00:00
aed24c637f
*** empty log message ***
...
SVN Revision: 51
2003-01-26 20:16:53 +00:00
2aa3c1c720
*** empty log message ***
...
SVN Revision: 49
2003-01-24 20:18:33 +00:00
c4d76dec7d
*** empty log message ***
...
SVN Revision: 38
2003-01-13 20:51:17 +00:00
e23adaae38
*** empty log message ***
...
SVN Revision: 33
2003-01-08 20:42:03 +00:00
0a9a6261f8
*** empty log message ***
...
SVN Revision: 29
2003-01-05 20:24:59 +00:00
083e2b75d0
*** empty log message ***
...
SVN Revision: 28
2003-01-04 20:09:25 +00:00
496c041b28
*** empty log message ***
...
SVN Revision: 16
2002-12-13 20:58:27 +00:00
6c96829311
*** empty log message ***
...
SVN Revision: 13
2002-12-07 20:27:26 +00:00
e6c062fe40
*** empty log message ***
...
SVN Revision: 12
2002-12-06 20:59:19 +00:00
Evgeniy Khramtsov