25
1
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Commit Graph

43 Commits

Author SHA1 Message Date
Jean-Sébastien Pédron
ff500d8297 Merge from trunk (r1787 to r1804).
Included are fixes to src/mod_configure.erl and src/mod_caps.erl.

Note: this merge doesn't include the following revisions because it was
made by previous commits:
r1766, r1768, r1781, r1783, r1794, r1797, r1799, r1802.

Warning: Ejabberd may be broken until the merge is completly finished.

PR:		EJABP-1

SVN Revision: 1829
2009-01-19 14:47:33 +00:00
Pablo Polvorin
4827db4f56 Big #jid to binary() conversion.
Internal tables (ejabberd_router, ejabberd_sm, ejabberd_hooks, mod_last, mod_roster) use binary() as storage.
Basic test using the ODBC backend.

SVN Revision: 1770
2009-01-03 15:15:38 +00:00
Jean-Sébastien Pédron
e3100110f0 Replace jlib:nameprep/1 by exmpp_stringprep:nameprep/1 and change the
error handling.

PR:		EJABP-1

SVN Revision: 1623
2008-10-10 14:40:04 +00:00
Jean-Sébastien Pédron
4eaa8e19c9 Merge from trunk (r1457 to r1563).
SVN Revision: 1564
2008-09-16 14:39:57 +00:00
Jean-Sébastien Pédron
9f0d79da9a o Use the new functions from jlib.
o  Remove the compatibility code. It's becoming confusing to handle every
case every where. Also, in JIDs (normal and short), the atom "undefined'
is expected, not the empty string anymore!

SVN Revision: 1546
2008-08-26 13:38:49 +00:00
Jean-Sébastien Pédron
13b78b1ad2 Routing is now done with #xmlel. A warning is printed if those modules
have to route an old #xmlelement.

SVN Revision: 1406
2008-07-01 15:51:34 +00:00
Jean-Sébastien Pédron
5317dd64d7 Change warning message.
SVN Revision: 1404
2008-07-01 14:20:20 +00:00
Jean-Sébastien Pédron
6f7cf2e58b Use a function to convert to old structures instead of duplicating code
inside the module.

SVN Revision: 1400
2008-07-01 10:20:01 +00:00
Jean-Sébastien Pédron
06965000a5 Before doing any routing, the router print a warning if old structures
are used. Then it converts the structures to the old format and route
them. The router doesn't care about the structures format but the
conversion is necesary for code called from this module.

In C2S and S2S, no conversion is done before calling
ejabberd_router:route/3.

SVN Revision: 1392
2008-06-30 16:55:03 +00:00
Badlop
2d2fcc8210 * doc/guide.tex: Updated copyright dates to 2008
* src/*: Likewise

SVN Revision: 1153
2008-01-15 17:02:57 +00:00
Mickaël Rémond
56fe3579bb * Applied copyright update patch 1.
SVN Revision: 1110
2007-12-24 11:41:41 +00:00
Badlop
d625fc80fc * src/acl.erl and other 64 files: Remove Erlang module attribute
'vsn' because it doesn't provide any worth feature, and it
difficults hot code update (EJAB-440)

SVN Revision: 1044
2007-12-06 22:12:27 +00:00
Alexey Shchepin
a487652fe9 * src/ejabberd_router.erl: Bugfix
SVN Revision: 977
2007-11-25 16:39:56 +00:00
Alexey Shchepin
efab31848e * src/mod_muc/mod_muc.erl: Now mod_muc can be distributed on
several nodes
* src/mod_muc/mod_muc_room.erl: Likewise

* src/ejabberd_router.erl: Added bare_source and bare_destination
service balancing options and domain_balancing_component_number
option for specifying the number of connected components for the
domain
* src/ejabberd_config.erl: Likewise

SVN Revision: 706
2007-01-19 04:46:44 +00:00
Alexey Shchepin
091d2bcb00 * src/ejabberd_node_groups.erl: Support for node tagging
* src/ejabberd_sup.erl: Likewise
* src/ejabberd_frontend_socket.erl: Use node tags to determine
backend nodes
* src/ejabberd_config.erl: Added node_type and cluster_nodes
options
* src/ejabberd_app.erl: Establish connections to the nodes from
the cluster_nodes option

* src/ejabberd_router.erl: Added balancing method option
* src/ejabberd_config.erl: Likewise

SVN Revision: 676
2006-11-07 02:08:51 +00:00
Alexey Shchepin
66561c3602 * src/ejabberd_router.erl: Now filter_packet hook works in
'global' context

SVN Revision: 594
2006-08-14 19:46:14 +00:00
Alexey Shchepin
50f44530d2 * src/odbc/pg.sql: Fixed syntax error
* src/ejabberd_router.erl: Updated to use gen_server behaviour
* src/ejabberd_sm.erl: Likewise
* src/ejabberd_s2s.erl: Likewise
* src/gen_iq_handler.erl: Likewise

* src/ejabberd_sup.erl: Added supervisor for ejabberd_receiver
* src/ejabberd_receiver.erl: Updated

SVN Revision: 495
2006-01-29 04:38:31 +00:00
Alexey Shchepin
9da4594fd0 Renamed route_packet hook to filter_packet
SVN Revision: 381
2005-07-27 00:59:35 +00:00
Alexey Shchepin
e9e1893b01 * src/ejabberd_router.erl: Added route_packet hook
SVN Revision: 380
2005-07-27 00:54:53 +00:00
tmallard
374446f847 Merged the Process One contributions ( Virtual Hosting )
SVN Revision: 307
2005-04-17 18:08:34 +00:00
Alexey Shchepin
301cc280aa * src/ejabberd_router.erl: Bugfix
SVN Revision: 297
2005-03-11 23:39:56 +00:00
Alexey Shchepin
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
Alexey Shchepin
41cc38aa6f * src/ejabberd_router.erl: Added monitoring of processess that
serve domains

SVN Revision: 197
2004-01-06 20:37:14 +00:00
Alexey Shchepin
5d7f5c3a79 * src/ejabberd_router.erl (do_route/3): Slightly changed behaviour
SVN Revision: 195
2004-01-03 17:25:21 +00:00
Alexey Shchepin
4768cd2f26 * src/ejabberd_local.erl: Replaced register_local_route to
register_route
* src/ejabberd_service.erl: Likewise
* src/mod_echo.erl: Likewise
* src/mod_vcard.erl: Likewise

* src/ejabberd_router.erl: Partially rewrited
* src/ejabberd_sm.erl: Likewise

SVN Revision: 185
2003-12-14 20:51:01 +00:00
Alexey Shchepin
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
Alexey Shchepin
61875f80b3 * (all): Changed JID storage format, added support for stringprep
* src/stringprep/: Added support for Unicode normalization form KC

* src/stringprep/: Added support for case convertion to multiple
characters

* src/cyrsasl_digest.erl: Temporary removed "auth-int" QOP

SVN Revision: 144
2003-10-07 20:31:44 +00:00
Alexey Shchepin
a28f723243 * src/mod_irc/: New IRC transport (not completed yet)
SVN Revision: 74
2003-02-16 20:07:21 +00:00
Alexey Shchepin
6599d1ecc5 *** empty log message ***
SVN Revision: 55
2003-02-01 20:21:28 +00:00
Alexey Shchepin
275b31b0cf *** empty log message ***
SVN Revision: 52
2003-01-28 19:45:13 +00:00
Alexey Shchepin
f0427ecab5 *** empty log message ***
SVN Revision: 46
2003-01-21 20:36:55 +00:00
Alexey Shchepin
942fbb9fae *** empty log message ***
SVN Revision: 43
2003-01-18 19:42:48 +00:00
Alexey Shchepin
c060093e84 *** empty log message ***
SVN Revision: 42
2003-01-17 19:58:42 +00:00
Alexey Shchepin
23e1914e94 *** empty log message ***
SVN Revision: 41
2003-01-16 20:24:53 +00:00
Alexey Shchepin
5645292526 *** empty log message ***
SVN Revision: 40
2003-01-15 19:54:44 +00:00
Alexey Shchepin
2617433ae3 *** empty log message ***
SVN Revision: 32
2003-01-07 19:10:35 +00:00
Alexey Shchepin
083e2b75d0 *** empty log message ***
SVN Revision: 28
2003-01-04 20:09:25 +00:00
Alexey Shchepin
44797c9524 *** empty log message ***
SVN Revision: 25
2003-01-02 21:01:12 +00:00
Alexey Shchepin
ae30798efd *** empty log message ***
SVN Revision: 20
2002-12-20 20:42:08 +00:00
Alexey Shchepin
6c96829311 *** empty log message ***
SVN Revision: 13
2002-12-07 20:27:26 +00:00
Alexey Shchepin
206b5cd2fb *** empty log message ***
SVN Revision: 10
2002-11-30 18:46:16 +00:00
Alexey Shchepin
9fdf316aab *** empty log message ***
SVN Revision: 9
2002-11-29 20:55:12 +00:00
Alexey Shchepin
b2229bffcc *** empty log message ***
SVN Revision: 8
2002-11-27 20:46:29 +00:00