Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-10-31 15:21:38 +01:00
Code Releases Activity
1,421 Commits 7 Branches 109 Tags 65 MiB
376ee2ed90
Commit Graph

60 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
98f51dc91f Adapt to new exmpp API where get_id/1, get_lang/1, get_initiating_entity/1, get_receiving_entity/1 and get_type/1 returns binary(). 
SVN Revision: 1791
 2009-01-09 19:18:46 +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
ab2b70f189 Merge from trunk (r1613 to 1649). 
PR:		EJABP-1

SVN Revision: 1650
 2008-10-13 10:11:19 +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
8c33e12616 Use the new clause of exmpp_stanza:reply_with_error/2, exmpp_iq:error/2, 
exmpp_iq:error_without_original/2 and the new exmpp_jid:make_bare_jid/1.

SVN Revision: 1394
 2008-07-01 08:01:06 +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
Jean-Sébastien Pédron
cc033b3b98 o Use the new functions from jlib. 
o  Use the new exmpp_xml:node_to_list/3.

SVN Revision: 1391
 2008-06-30 15:51:23 +00:00
Jean-Sébastien Pédron
264e72830b Convert to exmpp. 
SVN Revision: 1389
 2008-06-30 14:04:31 +00:00
Mickaël Rémond
5e9576ffa3 * src/ejabberd_s2s.erl: Added s2s_send_packet and s2s_receive_packet hooks (EJAB-635). 
* src/ejabberd_s2s_in.erl: Likewise.

SVN Revision: 1342
 2008-05-22 10:53:49 +00:00
Badlop
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
Christophe Romain
b2bd9759c8 Rewrite io:format calls to loglevel macros (EJAB-555) 
SVN Revision: 1239
 2008-03-21 14:44:16 +00:00
Mickaël Rémond
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
Mickaël Rémond
295da9cf02 * src/ejabberd_s2s.erl: API improvement: Added s2s_connect_hook (EJAB-566). 
SVN Revision: 1232
 2008-03-15 09:35:33 +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
Mickaël Rémond
2100ea63ca * Making sure SVN properties are correctly set. 
SVN Revision: 970
 2007-11-15 10:33:18 +00:00
Jérôme Sautret
96ded4535d * src/ejabberd_s2s.erl: don't use the resource of the sender to choose 
a s2s connection to ensure that a muc room always uses the same
connection

Merge branch 'ejabberd_s2s'

Conflicts:

.gitignore
src/configure
src/ejabberd_c2s.erl
src/ejabberd_s2s.erl

SVN Revision: 963
 2007-10-30 17:38:40 +00:00
Alexey Shchepin
f82b84158e * src/ejabberd_s2s.erl: Max number of connections and max number 
of connections per node now can be specified via
max_s2s_connections and max_s2s_connections_per_node acl rules

SVN Revision: 950
 2007-09-25 16:32:18 +00:00
Mickaël Rémond
31449bc720 * src/ejabberd_s2s.erl: open all missing connections if needed. 
SVN Revision: 945
 2007-09-14 14:20:43 +00:00
Mickaël Rémond
f6d376a4fc * src/ejabberd_s2s.erl: untabify 
SVN Revision: 944
 2007-09-14 14:20:30 +00:00
Mickaël Rémond
5a0b8288d4 * src/ejabberd_s2s.erl: don't check blacklist for services. 
SVN Revision: 943
 2007-09-14 14:20:15 +00:00
Mickaël Rémond
de63c622c2 * src/ejabberd_s2s.erl: Fixed merge conflict (duplicate functions). 
SVN Revision: 942
 2007-09-14 14:20:01 +00:00
Mickaël Rémond
b3fb9d9100 Try to open all s2s connections at the same time, to guarantee the right order of the packets. 
SVN Revision: 941
 2007-09-14 14:19:48 +00:00
Mickaël Rémond
653e6c1791 Comment. 
SVN Revision: 938
 2007-09-14 14:19:07 +00:00
Mickaël Rémond
78e6eb58d4 max_s2s_connexions_number local parameter added. 
SVN Revision: 937
 2007-09-14 14:18:51 +00:00
Mickaël Rémond
9fc203ee6d open up to 3 s2s outgoing connection per domain pair 
SVN Revision: 928
 2007-09-14 14:15:44 +00:00
Mickaël Rémond
799ff1d883 * src/ejabberd_s2s_in.erl: Add s2s whitelist / blacklist support on incoming s2s connections (EJAB-283) 
* src/ejabberd_s2s.erl: Likewise

SVN Revision: 820
 2007-07-19 21:17:13 +00:00
Mickaël Rémond
944ef9bbc2 * src/ejabberd_s2s.erl: Fixed typo. 
SVN Revision: 819
 2007-07-18 18:42:00 +00:00
Mickaël Rémond
9da2c78eb4 * src/ejabberd_s2s.erl: Implements s2s hosts whitelist / blacklist 
* src/ejabberd.cfg.example: Likewise

SVN Revision: 818
 2007-07-18 17:42:53 +00:00
Mickaël Rémond
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
Alexey Shchepin
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
Alexey Shchepin
77282b0e1a * src/ejabberd_s2s.erl: Don't bounce packets with "error" and 
"result" type

SVN Revision: 747
 2007-03-17 23:02:06 +00:00
Alexey Shchepin
3d7090f62c * src/ejabberd_s2s.erl: Fixed spelling 
SVN Revision: 746
 2007-03-17 22:53:42 +00:00
Alexey Shchepin
829f30e63b * src/ejabberd_s2s.erl: Don't start s2s process for existing 
connection in case of race condition

SVN Revision: 745
 2007-03-17 22:17:03 +00:00
Alexey Shchepin
0d5e433b91 * src/ejabberd_s2s.erl: Confirm to RFC3920 section 10.3 (thanks to 
Jerome Sautret)

SVN Revision: 726
 2007-02-18 17:58:47 +00:00
Mickaël Rémond
30371b2483 * src/ejabberd_s2s.erl: More precise message for the new s2s 
statistic command.

SVN Revision: 642
 2006-09-26 11:08:44 +00:00
Alexey Shchepin
3ab30f34fb * src/ejabberd_s2s.erl: Added incoming-s2s-number and 
outgoing-s2s-number ejabberdctl commands

SVN Revision: 633
 2006-09-25 13:36:41 +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
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
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
90e48213e0 * src/ejabberd_s2s.erl: More verbose error handling 
SVN Revision: 218
 2004-03-16 14:34:20 +00:00
Alexey Shchepin
4413036585 * src/ejabberd_s2s.erl: Partially rewrited 
* src/mod_roster.erl: Removed debugging code

SVN Revision: 184
 2003-12-13 21:36:53 +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
ca5d88c368 * (all): Reorganized supervision tree 
SVN Revision: 125
 2003-07-20 20:35:35 +00:00
Alexey Shchepin
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