Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-26 16:26:24 +01:00
Code Releases Activity
2,675 Commits 7 Branches 109 Tags 66 MiB
55986739c9
Commit Graph

70 Commits

Author SHA1 Message Date
Badlop
887a65aa18 exmpp in pubsub doc and retrocompatibility comments (thanks to Karim Gemayel) 
SVN Revision: 2934
 2010-01-27 18:53:56 +00:00
Badlop
1bcd481fdc Update year of ProcessOne copyright from 2009 to 2010 (EJAB-1159) 
SVN Revision: 2892
 2010-01-12 16:15:16 +00:00
Evgeniy Khramtsov
99a6f12026 fixes allow_host/2 on subdomains. added hook s2s_allow_host: the hook should return deny or allow 
SVN Revision: 2739
 2009-11-13 16:22:54 +00:00
Karim Gemayel
7eb395b87d API renaming : ldomain_as_list -> prep_domain_as_list 
SVN Revision: 2124
 2009-06-01 16:38:28 +00:00
Karim Gemayel
19d7d79229 API renaming : ldomain -> prep_domain 
SVN Revision: 2123
 2009-06-01 16:37:15 +00:00
Karim Gemayel
5dbc4f9954 API renaming : jid_to_bare_jid > bare 
SVN Revision: 2120
 2009-06-01 16:30:15 +00:00
Karim Gemayel
447d3818f5 API renaming : make_jid -> make 
SVN Revision: 2119
 2009-06-01 16:26:00 +00:00
Badlop
b473862da6 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: 2089
 2009-05-19 09:39:13 +00:00
Badlop
1d3947c0da Replace TYPE/1 with is_TYPE/1 (EJAB-922) 
SVN Revision: 2057
 2009-05-06 16:54:43 +00:00
Jean-Sébastien Pédron
842ebfcca0 A lot of bug fixes regarding attribute values type: 
o  Fix some bugs by getting attributes as list() instead of binary().
o  Instead creating #xmlattr directly, use the new ?XMLATTR macro; it'll
take care of the anything-to-binary() conversion.
o  Fix a bug where recipient and sender were used as binary() instead of
list(), which is required by the rest of the S2S code.
o  Fix a bug where binary_to_list/1 was called on a list().

Now concerning JIDs :
o  Now that #jid{} isn't part of the API of Exmppp anymore, replace
remaining direct usages by calls to exmpp_jid.
o  Replace exmpp_jid:make_bare_jid() by exmpp_jid:make_jid().
o  Replace exmpp_jid:*_to_jid/1 by exmpp_jid:parse_jid/1.

PR:		EJABP-1

SVN Revision: 1841
 2009-01-21 13:34:26 +00:00
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