Andreas Köhler
cc76869da5
Use warning_msg event type for warning log level.
2010-10-15 13:10:39 +02:00
Andreas Köhler
6523258b53
Add warning message and report handlers to ejabberd_logger_h.erl.
2010-10-15 13:10:38 +02:00
Andreas Köhler
1cbe821145
Improve ejabberd_logger code generation
...
Split the monolithic function ejabberd_loglevel:ejabberd_logger_src/1
into separate functions returning deep lists.
log_src/2 now returns the code for any of *_msg/4. Its parameters are
the current loglevel (integer()) and a loglevel specification
(#loglevel{}), with added information in #loglevel:
- function: The api function enabled by this level, may be no_log
- event_type: The type of the event sent to the error_logger
- msg_prefix: One character used in the message (one of "DIWEC")
If the current loglevel is too low for logging, the api function is
optimized at compile time.
2010-10-15 13:10:36 +02:00
Andreas Köhler
61d8bf9440
Use records for encoding static loglevel information.
2010-10-15 13:10:34 +02:00
Badlop
d1f5fb4aa9
Speed up ejabberd_s2s:is_service/2, allow_host/2 (thanks to Andreas Köhler)(EJAB-1319)
...
Iterating through the list of possible parent domains of a given domain
and comparing with the list of hosts or routes is almost always faster
than doing it the other way around. It naturally returns the shortest or
longest parent domain satisfying a predicate, whereas the possibly long
list compared with would need to be sorted by length first.
2010-10-14 21:14:46 +02:00
Christophe Romain
a73d451576
make http-bind restartable (thanks to Andreas Köhler)(EJAB-1318)
2010-10-13 10:55:35 +02:00
Pablo Polvorin
ce9ce8293b
Merge branch 'master' of git+ssh://git@gitorious.process-one.net/ejabberd/mainline
2010-10-12 10:57:07 -03:00
Badlop
82a8dc7b3a
Cosmetic code changes to support emacs indentation
2010-10-07 17:38:18 +02:00
Badlop
404b9a4a11
Minor fix in http_bind detected by Dialyzer
2010-10-07 00:16:24 +02:00
Badlop
f4f2f46f50
Dirty fixes for Dialyzer warnings in mod_privacy
2010-10-07 00:14:28 +02:00
Badlop
6c74c67069
Fix Captcha library and MUC use for exmpp
2010-10-06 13:05:21 +02:00
Badlop
645ddcb749
Fix unused variables
2010-10-05 15:48:11 +02:00
Evgeniy Khramtsov
8647ca5f0b
use one_queue IQ discipline by default
2010-10-05 21:32:47 +10:00
Christophe Romain
ee861e650d
fix dializer warnings (thanks to Karim Gemayel)
2010-10-04 17:41:59 +02:00
Badlop
349c44fcc0
Fix Edoc errors (thanks to Karim Gemayel)
2010-09-30 13:44:16 +02:00
Christophe Romain
78b8307a1f
fix dializer warnings (thanks to Karim Gemayel)
2010-09-30 12:06:40 +02:00
Christophe Romain
7c580bbeed
Merge branch 'master' of git+ssh://gitorious.process-one.net/ejabberd/mainline
2010-09-29 11:48:40 +02:00
Christophe Romain
6b7d73dcd5
fix dializer errors, improve documentation (thanks to Karim Gemayel)(EJAB-1260)
2010-09-29 11:48:19 +02:00
Badlop
c57f726ecb
Fix some Dialyzer warnings
2010-09-28 16:06:37 +02:00
Badlop
56b66ab64f
Dialyzer fixes. Ensure all_table_hosts/1 returns only a list of binaries
2010-09-28 16:06:35 +02:00
Badlop
403690a498
Only install the guide.html files when it was compiled (EJAB-1311)
2010-09-28 16:06:32 +02:00
Christophe Romain
f7dc4df784
Allow use with binary() Host from exmpp (thanks to Karim Gemayel)
2010-09-28 10:06:16 +02:00
Badlop
819dbdbf59
Move the extract_translations code to the tools dir (EJAB-1311)
2010-09-27 13:39:15 +02:00
Badlop
73c992c5af
Delete compiled files from git; they are included in source package (EJAB-1311)
2010-09-27 13:31:50 +02:00
Badlop
a46f02a136
Fix typo in type
2010-09-22 00:14:47 +02:00
Badlop
62b3b31b8d
Allow webadmins to change roster of user (EJAB-72)
2010-09-21 17:05:50 +02:00
Evgeniy Khramtsov
d4480c1361
fixes default value for cache_life_time
2010-09-21 04:32:42 +10:00
Christophe Romain
2e75faefae
improve type specification
2010-09-20 16:54:37 +02:00
Badlop
9bde1dc9af
Add missing needdb, use bare jid to get roster; now group and subs blocking works again (thanks to Andreas Köhler)
2010-09-17 21:06:30 +02:00
Andreas Köhler
afac34de88
Discard unmatched INFO messages in ejabberd services.
...
This patch will stop services terminating with function clause messages,
but doesn't affect the message queue at all.
2010-09-17 19:28:35 +02:00
Christophe Romain
1cbfdce457
remove garbage configuration
2010-09-16 14:52:30 +02:00
Badlop
cb953f949f
Fix problems reported by Dialyzer
2010-09-15 20:04:35 +02:00
Christophe Romain
52deb16676
apply modification for the exmpp #jid{} record update
2010-09-15 12:16:03 +02:00
Badlop
89a98be605
Display priority, login time, pid and pid info in webadmin (EJAB-1300)
2010-09-13 17:49:55 +02:00
Badlop
813022aec1
Support timezone West of UTC (thanks to Edwin Fine)(EJAB-1301)
2010-09-13 12:07:35 +02:00
Pablo Polvorin
0d5f20cae1
Include roster pack patch from Geoff
...
Patch was already applied to 2.x branch, but not yet ported to master.
2010-09-10 15:32:19 -03:00
Christophe Romain
4b5b98b465
clean nodeid/nidx variables names (thanks to Karim)(EJAB-1000)
2010-09-10 19:45:28 +02:00
Evgeniy Khramtsov
556892aebf
cache lifetime should be converted in microseconds
2010-09-08 02:37:01 +10:00
Evgeniy Khramtsov
7a3aa8f97d
Implemented dirty (non-atomic) functions; added copyright notice
2010-08-31 18:07:24 +10:00
Evgeniy Khramtsov
1bd43bbd2d
implemented backend-independed key-value cacheing table; applied to mod_caps.erl first
2010-08-30 14:32:48 +10:00
Pablo Polvorin
77d5eabd00
Update rosteritem table definition for mysql (gen_storage)
...
Previous definition do not work with gen_storage.
gen_storage creates the table when they don't exists, but if
they exists it simple uses that definition.
Note that the column values also had changed in gen_storage,
so instead of "B" for a bidirectional subscription, it must be
"both". Keep this in mind when loading data into the DB
2010-08-27 14:17:04 -03:00
Badlop
9050aa1de0
Support exmpp's jid record, and require next exmpp release (EXMPP-41)
2010-08-27 15:36:29 +02:00
Evgeniy Khramtsov
445691bab1
fixes ampersand escaping (EJAB-1258)
2010-08-19 20:37:28 +10:00
Andreas Köhler
d6722e353f
Fix mod_offline:remove_old_messages/1.
2010-08-18 13:22:38 +02:00
Andreas Köhler
b2d96d0753
Fix gen_storage:matchrules_transform_conditions/2 for =/=, and, andalso, or and orelse.
2010-08-18 13:22:37 +02:00
Andreas Köhler
7f1759ab0a
Fix a ?DEBUG call in ejabberd_auth.
2010-08-18 13:22:34 +02:00
Badlop
3cb128963c
Fix ejabberd_auth:get_vh_registered_users/2 (thanks to Andreas Köhler)
2010-08-18 13:22:30 +02:00
Badlop
555a3113a1
Fix EDoc error
2010-08-16 12:02:45 +02:00
Badlop
dffb9cdaf9
Fix Dialyzer reports
2010-08-13 17:41:05 +02:00
Badlop
6e65f0694e
New API to update host config on the fly (thanks to Juan Pablo Carlino)
...
Adds ejabberd_hosts:update_host_conf/2 to update a host with a new
configuration on the fly. Typically this is useful to enable / disable
specific modules for a given host without restarting the whole app.
Also fixes a problem with mod_disco, after config refreshing to include
global services if there are not locally available.
2010-08-11 23:31:30 +02:00
Evgeniy Khramtsov
bee01cfd1e
fixes typo for table copy
2010-08-10 19:44:45 +10:00
Badlop
da866ed326
When user joins non-anonymous room, warn also in presence stanza (EJAB-310)
2010-08-07 21:26:22 +02:00
Badlop
b0b98e8c63
Update the 'configure' script
2010-08-07 19:54:04 +02:00
Evgeniy Khramtsov
83e17a7c65
Make MD2 autodetected (EJAB-1285)
2010-08-07 22:28:48 +10:00
Badlop
75d8d8a43e
Fix minor typo in log message
2010-08-06 11:08:19 +02:00
Badlop
fa9b8d63f9
Ensure the default virtual host "localhost" is defined and is the first
2010-08-05 22:19:41 +02:00
Badlop
d4316558de
When an obsolete ODBC module is starting, switch to the normal one
2010-08-05 00:49:58 +02:00
Christophe Romain
690857e0d4
enforce disco features results (thanks to Karim)(EJAB-1033, EJAB-1228, EJAB-1238)
2010-08-04 18:30:22 +02:00
Badlop
73705a3b2e
Explain better what's the problem with the option clusterid
2010-08-04 14:03:33 +02:00
Evgeniy Khramtsov
7510a54f81
Loading ASN.1 driver explicitly to avoid races in LDAP (EJAB-1284)
2010-08-04 19:25:18 +10:00
Badlop
8235c9eea1
Change record() to tuple() so Dialyzer can run
2010-08-02 23:47:11 +02:00
Badlop
8cd32f9706
Change syntax of type declarations so Dialyzer accepts them
2010-08-02 23:45:51 +02:00
Badlop
72b9d8b250
Remove unused and useless SVN keywords
2010-08-02 16:03:05 +02:00
Badlop
6abfea6d8d
Minor cosmetic change in clusterid description
2010-08-02 15:48:35 +02:00
Badlop
02f19c0c1d
Only start GSSAPI support when configured, and when esasl is found
2010-07-31 01:08:11 +02:00
Badlop
3181685158
Support parallel extauth script (thanks to Jesse Thompson)(EJAB-1280)
2010-07-30 20:34:01 +02:00
Badlop
f93c6c2b35
Copy translations from 2.1.x branch, and update
2010-07-30 16:50:03 +02:00
Badlop
a134626849
Fix some English strings
2010-07-30 16:49:31 +02:00
Badlop
92dc45ad76
Don't call modules that were obsoleted by GS
2010-07-30 13:22:03 +02:00
Badlop
8a5b08e3f0
New access option in mod_roster to disable changes (EJAB-72)
2010-07-30 13:21:58 +02:00
Badlop
1a368436b4
Use the term 'room' instead of 'chatroom' and 'conference'
2010-07-30 00:06:19 +02:00
Badlop
59a19ca87a
Don't offer SASL auth before doing TLS if TLS is required (thanks to Etan Reisner)
...
Originally reported in
http://yo.jabber.ru/bugzilla/show_bug.cgi?id=251
Implements:
http://tools.ietf.org/html/rfc3920#section-6.2
If Use of TLS (Section 5) needs to be
established before a particular authentication mechanism may be used, the
receiving entity MUST NOT provide that mechanism in the list of available SASL
authentication mechanisms prior to TLS negotiation.
2010-07-29 23:14:03 +02:00
Badlop
e653598cd0
Allow mod_caps and shared_roster to start, they don't really need to use GS
2010-07-29 20:35:30 +02:00
Badlop
891c9610e9
Remove support to migrate mod_muc from ejabberd 0.7.5 or older
2010-07-29 20:24:46 +02:00
Badlop
9265c23e1a
Don't say v1.2, because that number is never increased and is confusing
2010-07-28 20:00:47 +02:00
Badlop
11130806f9
Return Registered element when account exists (thanks to PioneerMike)
2010-07-28 19:48:06 +02:00
Badlop
0d065dd021
Fix Edoc comments
2010-07-23 13:36:35 +02:00
Badlop
07e459d577
Various fixes (EJAB-831)
2010-07-23 01:23:37 +02:00
Badlop
aa791ad0c4
Support SASL GSSAPI authentication (thanks to Mikael Magnusson)(EJAB-831)
2010-07-23 01:23:35 +02:00
Badlop
17fc992ba9
Recompile the guide and configure
2010-07-23 00:30:52 +02:00
Badlop
115392ff2d
Add MH and GS specific options to ejabberd.cfg.example
2010-07-23 00:30:45 +02:00
Badlop
9e2d614b41
Update ejabberd version from 3.0.0-prealpha to 3.0.0-alpha-x
2010-07-23 00:30:41 +02:00
Badlop
917c5edfe5
Mark as obsolete the modules that use odbc instead of GS
2010-07-23 00:30:37 +02:00
Badlop
1285bd52c9
Fix ejabberd_odbc code
2010-07-23 00:30:33 +02:00
Badlop
597c1c87d4
Fix ejabberd modules
2010-07-23 00:30:32 +02:00
Badlop
58bed2cbff
Fix core files
2010-07-23 00:30:31 +02:00
Badlop
13fad04d14
Fix GS
2010-07-23 00:30:29 +02:00
Badlop
eb2ad7e699
Patch modules for GS (thanks to Stephan Maka)
2010-07-23 00:29:40 +02:00
Badlop
511f73812d
Patch core for GS (thanks to Stephan Maka)
2010-07-23 00:29:36 +02:00
Badlop
a7d9fa7301
New files for GS (thanks to Stephan Maka)
2010-07-23 00:29:34 +02:00
Badlop
bb77c39553
Patch ODBC modules for MH (thanks to Alexey Shchepin and Geoff Cant)
2010-07-23 00:29:32 +02:00
Badlop
a1a6bd79ac
Patch mnesia modules for MH (thanks to Alexey Shchepin and Geoff Cant)
2010-07-23 00:29:30 +02:00
Badlop
cdb379a22c
Patch core for MH (thanks to Alexey Shchepin and Geoff Cant)
2010-07-23 00:29:28 +02:00
Badlop
9336356efd
New files for MH (thanks to Alexey Shchepin and Geoff Cant)
...
Thanks to:
Alexey Shchepin for planning and developing MH in late 2007
Geoff Cant for improving during 2008 and 2009
Christophe Romain and Badlop for merging into master in 2010
2010-07-23 00:29:26 +02:00
Badlop
8e9888c411
When logging s2s out connection attempt or success, log if TLS is used
2010-07-23 00:27:26 +02:00
Badlop
027418aba5
The command Update now returns meaningful message and exit-status (EJAB-1237)
2010-07-22 16:38:04 +02:00
Christophe Romain
f36da63a3a
Allow roster change from external component (TECH-1001)
2010-07-22 11:06:51 +02:00
Christophe Romain
5bc9860f5d
add ejabberdctl ability to check epmd names (TECH-1121)
2010-07-20 14:05:18 +02:00
Badlop
0dcbe10a22
Only compile etop_tr.erl when running: make debugtools=true
2010-07-19 12:12:30 +02:00
Badlop
581f011b28
Fix warning about unused variable
2010-07-19 12:11:10 +02:00
Christophe Romain
fb2c74c4aa
add missing hrl
2010-07-16 18:55:58 +02:00
Christophe Romain
8dbd6007ed
Add etop command to ejabberdctl
2010-07-16 16:24:55 +02:00
Evgeniy Khramtsov
c9faa5bde7
correct handling of SQL boolean types (EJAB-1275)
2010-07-14 21:57:32 +10:00
Christophe Romain
de6675a433
Added catches to reset_stream calls to avoid errors during a race condition (thanks to Aleksey Shchepin)
2010-07-13 22:13:38 +02:00
Christophe Romain
81d364a97a
Make chat room destroy and create being sync_dirty to limit mnesia overload. (thanks to Mickael Remond)
2010-07-13 22:09:48 +02:00
Christophe Romain
02b7ba50fe
Try forcing usage of cache for all MySQL sessions, and add correct timeout on odbc driver query. (thanks to Mickael Remond)
2010-07-13 22:08:16 +02:00
Christophe Romain
e64d69350f
Add rate limit command to ejabberd_listener. You can now limit the max number of TCP connects per second on a given port. (thanks to Mickael Remond)
2010-07-13 22:07:43 +02:00
Badlop
2b48732de4
Fix my flock change from last friday
2010-07-12 18:53:28 +02:00
Badlop
29e626bf80
Remove ejabberd_debug because p1_prof provides similar and better features
2010-07-12 16:03:47 +02:00
Badlop
2e13a56ca9
Only compile and install p1_prof when: make debugtools=true
2010-07-12 16:03:44 +02:00
Badlop
f8412d7c5d
When using OTP R14, use public_key library instead of old ssl (EJAB-953)
2010-07-12 13:58:10 +02:00
Badlop
fe70217703
Some systems delete the lock dir; in such case don't use flock at all
2010-07-09 22:40:32 +02:00
Evgeniy Khramtsov
20f6e4714e
Added functions to collect statistics about queues, memory, reductions etc. Several cleanups
2010-07-10 01:37:28 +10:00
Evgeniy Khramtsov
b76eba62ea
New ejabberd profiler
2010-07-05 13:46:49 +10:00
Badlop
5b6351577a
Fix print of command result that contains ~ (thanks to Tsukasa Hamano)
2010-07-03 00:45:46 +02:00
Badlop
894f0abdfa
Prevent Dialyzer warnings about case inside macro
2010-07-02 23:40:51 +02:00
Badlop
c89944fe12
Don't handle useless case of Affiliation none
2010-07-02 23:40:51 +02:00
Badlop
fe1a4908b5
Move deeply nested cases to functions, and fix affiliation changes.
2010-07-02 23:40:51 +02:00
Evgeniy Khramtsov
d60ef4c212
Use ets insead of asking supervisor in ejabberd_odbc_sup:get_pids/1 (Thanks to Alexey Shchepin)
2010-07-03 00:35:34 +10:00
Badlop
5161a9d4e8
Show some more room options in the log file
2010-07-02 15:21:05 +02:00
Badlop
6b9a523dc9
Recompile the Guide and Configure
2010-07-01 17:08:17 +02:00
Badlop
69d10702ee
Fix typo in --enable-transient_supervisors
2010-07-01 17:05:24 +02:00
Christophe Romain
455107ff5f
fix some dialyzer warnings on pubsub (EJAB-1260)
2010-07-01 11:19:48 +02:00
Badlop
5ca3f221cc
Fix privacy check when serving local Last (thanks to Brian Acton)(EJAB-1271)
2010-06-29 11:59:16 +02:00
Badlop
7ffe06c77f
Fix binary Host argument
2010-06-28 13:54:43 +02:00
Badlop
bdea5d3598
Fix problem when FIREWALL_WINDOW options for erl kernel were used
2010-06-28 13:18:48 +02:00
Badlop
a07eb3e023
Fix missing closing right parenthesis in define
2010-06-28 12:23:18 +02:00
Badlop
c3ef12debb
Inform client that SSL session caching is disabled (thanks to Pawel Chmielowski)
2010-06-25 18:33:59 +02:00
Badlop
739412119e
Don't ask for client certificate when using tls (EJAB-1267)
2010-06-25 18:33:56 +02:00
Badlop
7d96d831c1
Fix Edoc typo
2010-06-25 00:03:38 +02:00
Badlop
b2eb9bc512
Fix some binary variables
2010-06-24 00:22:26 +02:00
Badlop
71fc696f81
When account is deleted, delete also member of stored shared rosters.
2010-06-24 00:04:02 +02:00
Evgeniy Khramtsov
234280ddc7
now admins are able to see private rooms in disco (EJAB-1269)
2010-06-23 17:51:05 +10:00
Badlop
7a76cabe26
Varied fixes in mod_muc_room
2010-06-22 00:11:41 +02:00
Badlop
a610d8b699
Several fixes about binary in mod_muc_room
2010-06-22 00:11:41 +02:00
Badlop
98a78b7955
Several fixes about binary in mod_muc
2010-06-22 00:11:41 +02:00
Badlop
493d3bc7aa
Fix language string
2010-06-22 00:11:41 +02:00
Badlop
ac6ae9e8dd
Fix xmlcdata binary content
2010-06-22 00:11:41 +02:00
Badlop
a6c0a3d59b
Fix exmpp parser options
2010-06-22 00:11:41 +02:00
Badlop
0b5bcaf74a
Remove some unused cases clauses
2010-06-22 00:11:41 +02:00
Badlop
3ee28ef7cc
Throw a meaningful error when the URL can't be parsed
2010-06-22 00:11:41 +02:00
Badlop
3f68689367
Handle when username in shared roster members is undefined
2010-06-22 00:11:41 +02:00
Badlop
6fc578f2ee
Use string instead of binary for body content
2010-06-22 00:11:41 +02:00
Badlop
cd4c730b9c
Fix pattern match
2010-06-22 00:11:41 +02:00
Evgeniy Khramtsov
b0b66be747
Added md2/1 support
2010-06-22 02:57:58 +10:00
Evgeniy Khramtsov
e04a690303
New OpenSSL functions wrapper: sha224/1, sha256/1, sha384/1, sha512/1
2010-06-22 02:34:27 +10:00
Badlop
bc44a3584f
Fix detection of push roster item unsubscribed
2010-06-18 21:24:52 +02:00
Badlop
5e986442a2
Remove duplicate function from mod_roster
2010-06-18 21:24:52 +02:00
Badlop
19ad0eb238
Fid mod_roster_odbc binary arguments
2010-06-18 21:24:52 +02:00
Badlop
fe4944e031
Provide iq instead of xmlel in roster webadmin changes
2010-06-18 21:24:51 +02:00