prosody.git
13 years agocerts/Makefile: Remove -c flag to chmod, which appears to be a GNUism (thanks Kev)
Matthew Wild [Wed, 8 Dec 2010 17:01:23 +0000 (17:01 +0000)]
certs/Makefile: Remove -c flag to chmod, which appears to be a GNUism (thanks Kev)

13 years agoprosody: Don't attempt to load core.xmlhandlers in the main file. It no longer exists.
Waqas Hussain [Tue, 7 Dec 2010 21:29:37 +0000 (02:29 +0500)]
prosody: Don't attempt to load core.xmlhandlers in the main file. It no longer exists.

13 years agoxmlhandlers: DELETED.
Matthew Wild [Tue, 7 Dec 2010 19:27:58 +0000 (19:27 +0000)]
xmlhandlers: DELETED.

13 years agoutil.prosodyctl: Prep JIDs before checking whether they exist (thanks tja)
Matthew Wild [Tue, 7 Dec 2010 19:26:38 +0000 (19:26 +0000)]
util.prosodyctl: Prep JIDs before checking whether they exist (thanks tja)

13 years agotools/xep227toprosody.lua: Rename ns_xep227 to xmlns_xep227 for consistency with...
Matthew Wild [Tue, 7 Dec 2010 19:22:08 +0000 (19:22 +0000)]
tools/xep227toprosody.lua: Rename ns_xep227 to xmlns_xep227 for consistency with main Prosody code

13 years agotools/xep227toprosody.lua: Convert to use util.xmppstream
Matthew Wild [Tue, 7 Dec 2010 19:20:33 +0000 (19:20 +0000)]
tools/xep227toprosody.lua: Convert to use util.xmppstream

13 years agoutil.xmppstream: Expose ns_separator and ns_pattern
Matthew Wild [Tue, 7 Dec 2010 19:19:05 +0000 (19:19 +0000)]
util.xmppstream: Expose ns_separator and ns_pattern

13 years agomod_bosh: Switch to util.xmppstream from xmlhandlers
Matthew Wild [Tue, 7 Dec 2010 18:38:22 +0000 (18:38 +0000)]
mod_bosh: Switch to util.xmppstream from xmlhandlers

13 years agoxmppcomponent_listener: Switch to util.xmppstream from xmlhandlers
Matthew Wild [Tue, 7 Dec 2010 18:18:11 +0000 (18:18 +0000)]
xmppcomponent_listener: Switch to util.xmppstream from xmlhandlers

13 years agoprosody: Added a stub implementation of core.componentmanager to the package.loaded...
Waqas Hussain [Tue, 7 Dec 2010 17:55:28 +0000 (22:55 +0500)]
prosody: Added a stub implementation of core.componentmanager to the package.loaded table (re-commiting, as this was accidentally removed).

13 years agocerts/openssl.cnf: Change countryName from UK to GB
Matthew Wild [Mon, 6 Dec 2010 18:51:45 +0000 (18:51 +0000)]
certs/openssl.cnf: Change countryName from UK to GB

13 years agocerts/Makefile: Add .PRECIOUS to stop make deleting the key as an intermediate file...
Matthew Wild [Mon, 6 Dec 2010 18:48:23 +0000 (18:48 +0000)]
certs/Makefile: Add .PRECIOUS to stop make deleting the key as an intermediate file (thanks deryni/Zash)

13 years agocerts: Add a default OpenSSL configuration file, and a Makefile.
Kim Alvefur [Fri, 3 Dec 2010 15:40:42 +0000 (16:40 +0100)]
certs: Add a default OpenSSL configuration file, and a Makefile.

13 years agomod_pubsub: Ensure <item> is in correct scope when broadcasting an event
Matthew Wild [Sun, 5 Dec 2010 19:54:48 +0000 (19:54 +0000)]
mod_pubsub: Ensure <item> is in correct scope when broadcasting an event

13 years agomod_pubsub: Support item retraction
Florian Zeitz [Sun, 5 Dec 2010 03:19:23 +0000 (04:19 +0100)]
mod_pubsub: Support item retraction

13 years agomod_pubsub, util.pubsub: Support for unsubscribing
Florian Zeitz [Sun, 5 Dec 2010 01:46:08 +0000 (02:46 +0100)]
mod_pubsub, util.pubsub: Support for unsubscribing

13 years agomod_pubsub: Use pubsub_error_reply everywhere
Florian Zeitz [Fri, 3 Dec 2010 15:36:13 +0000 (16:36 +0100)]
mod_pubsub: Use pubsub_error_reply everywhere

13 years agoutil.xmppstream: Fix logger name.
Waqas Hussain [Thu, 2 Dec 2010 20:03:52 +0000 (01:03 +0500)]
util.xmppstream: Fix logger name.

13 years agomod_disco: Don't add caps hash to stream features on unauthenticated connections.
Waqas Hussain [Thu, 2 Dec 2010 19:37:54 +0000 (00:37 +0500)]
mod_disco: Don't add caps hash to stream features on unauthenticated connections.

13 years agomod_proxy65: Add service discovery identity and feature, to help out mod_disco when...
Waqas Hussain [Thu, 2 Dec 2010 19:29:44 +0000 (00:29 +0500)]
mod_proxy65: Add service discovery identity and feature, to help out mod_disco when loaded on a normal host.

13 years agomod_proxy65: Cleaned up stanza processing a little.
Waqas Hussain [Thu, 2 Dec 2010 19:22:11 +0000 (00:22 +0500)]
mod_proxy65: Cleaned up stanza processing a little.

13 years agomod_proxy65: s:len() -> #s.
Waqas Hussain [Thu, 2 Dec 2010 19:21:49 +0000 (00:21 +0500)]
mod_proxy65: s:len() -> #s.

13 years agomod_proxy65: Make some globals local.
Waqas Hussain [Thu, 2 Dec 2010 19:13:30 +0000 (00:13 +0500)]
mod_proxy65: Make some globals local.

13 years agomod_proxy65: :sub(n):byte() -> :byte(n).
Waqas Hussain [Thu, 2 Dec 2010 19:12:55 +0000 (00:12 +0500)]
mod_proxy65: :sub(n):byte() -> :byte(n).

13 years agomod_proxy65: Allow loading on normal hosts.
Waqas Hussain [Thu, 2 Dec 2010 19:04:32 +0000 (00:04 +0500)]
mod_proxy65: Allow loading on normal hosts.

13 years agomod_proxy65: Updated to use sub-events. Now only hooks what it needs to.
Waqas Hussain [Thu, 2 Dec 2010 19:02:53 +0000 (00:02 +0500)]
mod_proxy65: Updated to use sub-events. Now only hooks what it needs to.

13 years agonet.server_select: Set select() timeout to 3600 by default.
Waqas Hussain [Thu, 2 Dec 2010 18:07:45 +0000 (23:07 +0500)]
net.server_select: Set select() timeout to 3600 by default.

13 years agonet.server_select: Made another global local.
Waqas Hussain [Thu, 2 Dec 2010 18:06:30 +0000 (23:06 +0500)]
net.server_select: Made another global local.

13 years agonet.server_select: Made some globals local.
Waqas Hussain [Thu, 2 Dec 2010 17:55:42 +0000 (22:55 +0500)]
net.server_select: Made some globals local.

13 years agomod_bosh: Use util.timer for timers instead of server.addtimer.
Waqas Hussain [Thu, 2 Dec 2010 17:47:29 +0000 (22:47 +0500)]
mod_bosh: Use util.timer for timers instead of server.addtimer.

13 years agoutil.timer: Activate higher timer precision.
Waqas Hussain [Thu, 2 Dec 2010 17:41:26 +0000 (22:41 +0500)]
util.timer: Activate higher timer precision.

13 years agonet.server_select: Make changes required for sub-second timer precision.
Waqas Hussain [Thu, 2 Dec 2010 17:40:42 +0000 (22:40 +0500)]
net.server_select: Make changes required for sub-second timer precision.

13 years agofallbacks/lxp.lua: Pure Lua pseudo-XML parser. Implements the same API as LuaExpat.
Waqas Hussain [Thu, 2 Dec 2010 12:11:51 +0000 (17:11 +0500)]
fallbacks/lxp.lua: Pure Lua pseudo-XML parser. Implements the same API as LuaExpat.

13 years agomod_iq: Fix an extra character in previous commit...
Waqas Hussain [Thu, 2 Dec 2010 11:58:24 +0000 (16:58 +0500)]
mod_iq: Fix an extra character in previous commit...

13 years agomod_iq: Don't hook 'iq/full' on components.
Waqas Hussain [Thu, 2 Dec 2010 11:56:30 +0000 (16:56 +0500)]
mod_iq: Don't hook 'iq/full' on components.

13 years agomodulemanager: Allow components to inherit mod_iq. This allows modules loaded on...
Waqas Hussain [Thu, 2 Dec 2010 11:32:42 +0000 (16:32 +0500)]
modulemanager: Allow components to inherit mod_iq. This allows modules loaded on components to hook IQ stanza sub-events ("iq-set/bare/xmlns:tag", etc).

13 years agomod_proxy65: Give the 'iq/host' stanza handler a negative priority, to allow mod_iq...
Waqas Hussain [Thu, 2 Dec 2010 11:17:44 +0000 (16:17 +0500)]
mod_proxy65: Give the 'iq/host' stanza handler a negative priority, to allow mod_iq to process the events first.

13 years agoMUC: Give stanza handlers a negative priority, to allow mod_iq to process them first.
Waqas Hussain [Thu, 2 Dec 2010 11:16:44 +0000 (16:16 +0500)]
MUC: Give stanza handlers a negative priority, to allow mod_iq to process them first.

13 years agomod_component: Give stanza handlers a negative priority, to allow mod_iq to process...
Waqas Hussain [Thu, 2 Dec 2010 11:15:50 +0000 (16:15 +0500)]
mod_component: Give stanza handlers a negative priority, to allow mod_iq to process them first.

13 years agomod_iq: Don't stop event dispatch for unhandled IQ errors and results (this lets...
Waqas Hussain [Thu, 2 Dec 2010 11:04:42 +0000 (16:04 +0500)]
mod_iq: Don't stop event dispatch for unhandled IQ errors and results (this lets negative priority handlers intercept the events).

13 years agomod_pubsub, util.pubsub: Support node creation
Florian Zeitz [Wed, 1 Dec 2010 22:38:47 +0000 (23:38 +0100)]
mod_pubsub, util.pubsub: Support node creation

13 years agomod_pep: Remove PEP subscriptions on getting a presence unsubscribe.
Waqas Hussain [Sun, 28 Nov 2010 10:02:56 +0000 (15:02 +0500)]
mod_pep: Remove PEP subscriptions on getting a presence unsubscribe.

13 years agomod_pep: Fixed regression where PEP messages were not correctly being broadcasted...
Waqas Hussain [Sun, 28 Nov 2010 08:11:42 +0000 (13:11 +0500)]
mod_pep: Fixed regression where PEP messages were not correctly being broadcasted on caps hash change.

13 years agomod_pep: Fixed a nil access (thanks Zash).
Waqas Hussain [Sun, 28 Nov 2010 07:58:54 +0000 (12:58 +0500)]
mod_pep: Fixed a nil access (thanks Zash).

13 years agomod_disco: Fixed: Service discovery features were not being removed on module unload...
Waqas Hussain [Sun, 28 Nov 2010 02:56:08 +0000 (07:56 +0500)]
mod_disco: Fixed: Service discovery features were not being removed on module unload (issue #205).

13 years agomod_pep: Optimised PEP requests for disco info on caps change (issue #150).
Waqas Hussain [Sun, 28 Nov 2010 02:43:19 +0000 (07:43 +0500)]
mod_pep: Optimised PEP requests for disco info on caps change (issue #150).

13 years agostoragemanager: Only show fallback warning if storage was configured to use another...
Matthew Wild [Sat, 27 Nov 2010 22:02:30 +0000 (22:02 +0000)]
storagemanager: Only show fallback warning if storage was configured to use another backend and it failed

13 years agostoragemanager: Return driver from load_driver() if successful
Matthew Wild [Sat, 27 Nov 2010 21:57:20 +0000 (21:57 +0000)]
storagemanager: Return driver from load_driver() if successful

13 years agomod_iq: Optimized a bit more (fewer table accesses).
Waqas Hussain [Sat, 27 Nov 2010 21:42:02 +0000 (02:42 +0500)]
mod_iq: Optimized a bit more (fewer table accesses).

13 years agomod_iq: Optimized a bit (fewer table accesses).
Waqas Hussain [Sat, 27 Nov 2010 21:37:18 +0000 (02:37 +0500)]
mod_iq: Optimized a bit (fewer table accesses).

13 years agomod_iq: Extra IQ get and set sub-events are now fired: "iq-{get,set}/{host,self,bare...
Waqas Hussain [Sat, 27 Nov 2010 21:24:26 +0000 (02:24 +0500)]
mod_iq: Extra IQ get and set sub-events are now fired: "iq-{get,set}/{host,self,bare}/xmlns:tag" (when "iq/{host,self,bare}/xmlns:tag" is unhandled).

13 years agostoragemanager: Import type()
Matthew Wild [Sat, 27 Nov 2010 21:52:30 +0000 (21:52 +0000)]
storagemanager: Import type()

13 years agostoragemanager: Import util.multitable again
Matthew Wild [Sat, 27 Nov 2010 21:16:32 +0000 (21:16 +0000)]
storagemanager: Import util.multitable again

13 years agostoragemanager: Fix syntax error
Matthew Wild [Sat, 27 Nov 2010 21:15:23 +0000 (21:15 +0000)]
storagemanager: Fix syntax error

13 years agomod_pep: Updated disco#info result handler to use new event name format.
Waqas Hussain [Sat, 27 Nov 2010 21:05:52 +0000 (02:05 +0500)]
mod_pep: Updated disco#info result handler to use new event name format.

13 years agomod_iq: IQ error and result sub-events are now "iq-{error,result}/{host,self,bare...
Waqas Hussain [Sat, 27 Nov 2010 21:03:59 +0000 (02:03 +0500)]
mod_iq: IQ error and result sub-events are now "iq-{error,result}/{host,self,bare}/id" (previously "iq/{host,self,bare}/id").

13 years agoconfigmanager: Switch back to returning 'ok' to signal config load success - fixes...
Matthew Wild [Sat, 18 Dec 2010 23:15:58 +0000 (23:15 +0000)]
configmanager: Switch back to returning 'ok' to signal config load success - fixes config errors not being displayed

13 years agoMerge with Florob
Matthew Wild [Sat, 18 Dec 2010 23:08:21 +0000 (23:08 +0000)]
Merge with Florob

13 years agomod_admin_adhoc: Support unloading multiple modules
Florian Zeitz [Sat, 18 Dec 2010 20:35:42 +0000 (21:35 +0100)]
mod_admin_adhoc: Support unloading multiple modules

13 years agomod_admin_adhoc: Support for reloading multiple modules
Florian Zeitz [Sat, 18 Dec 2010 20:04:45 +0000 (21:04 +0100)]
mod_admin_adhoc: Support for reloading multiple modules

13 years agoutil.events: Remove an event's table when it has no more handlers.
Waqas Hussain [Sat, 18 Dec 2010 19:53:19 +0000 (00:53 +0500)]
util.events: Remove an event's table when it has no more handlers.

13 years agonet/server_select.lua: Reduce select() timeout back to 1s
Matthew Wild [Sat, 18 Dec 2010 14:46:28 +0000 (14:46 +0000)]
net/server_select.lua: Reduce select() timeout back to 1s

13 years agostoragemanager: Don't always show fallback warning when using per-store config
Matthew Wild [Sat, 18 Dec 2010 14:44:45 +0000 (14:44 +0000)]
storagemanager: Don't always show fallback warning when using per-store config

13 years agoprosodyctl: Add dummy lock/unlock_globals() until util.startup comes along
Matthew Wild [Sat, 18 Dec 2010 04:02:28 +0000 (04:02 +0000)]
prosodyctl: Add dummy lock/unlock_globals() until util.startup comes along

13 years agomod_storage_sql: Fix a couple of bugs in "JSON" decoding
Matthew Wild [Sat, 18 Dec 2010 03:25:31 +0000 (03:25 +0000)]
mod_storage_sql: Fix a couple of bugs in "JSON" decoding

13 years agoutil.prosodyctl: Initialize storagemanager on hosts we modify
Matthew Wild [Sat, 18 Dec 2010 02:33:47 +0000 (02:33 +0000)]
util.prosodyctl: Initialize storagemanager on hosts we modify

13 years agostoragemanager: Log warning when loading the storage provider plugin fails
Matthew Wild [Sat, 18 Dec 2010 02:29:33 +0000 (02:29 +0000)]
storagemanager: Log warning when loading the storage provider plugin fails

13 years agoutil-src/Makefile, util-src/encodings.c{,pp}: Port ICU code to C, rename encodings...
Matthew Wild [Fri, 17 Dec 2010 22:32:21 +0000 (22:32 +0000)]
util-src/Makefile, util-src/encodings.c{,pp}: Port ICU code to C, rename encodings.cpp back to .c and amend the Makefile accordingly

13 years agousermanager: Fixed a possible traceback when is_admin() was used on a component.
Waqas Hussain [Fri, 17 Dec 2010 17:54:34 +0000 (22:54 +0500)]
usermanager: Fixed a possible traceback when is_admin() was used on a component.

13 years agoprosody.cfg.lua.dist: Update to reflect new mod_admin_* modules
Matthew Wild [Fri, 17 Dec 2010 17:11:04 +0000 (17:11 +0000)]
prosody.cfg.lua.dist: Update to reflect new mod_admin_* modules

13 years agoutil.stanza: Iterate on childtags instead of all childs.
Kim Alvefur [Fri, 17 Dec 2010 16:28:05 +0000 (17:28 +0100)]
util.stanza: Iterate on childtags instead of all childs.

13 years agoMerge Tobias->trunk
Matthew Wild [Fri, 17 Dec 2010 13:50:33 +0000 (13:50 +0000)]
Merge Tobias->trunk

13 years agomod_pubsub: Preserve service object on module reload
Matthew Wild [Fri, 17 Dec 2010 13:35:21 +0000 (13:35 +0000)]
mod_pubsub: Preserve service object on module reload

13 years agomod_pubsub: Handle disco#info and disco#items
Matthew Wild [Fri, 17 Dec 2010 13:23:29 +0000 (13:23 +0000)]
mod_pubsub: Handle disco#info and disco#items

13 years agoutil.pubsub: Add service:get_nodes()
Matthew Wild [Fri, 17 Dec 2010 13:23:01 +0000 (13:23 +0000)]
util.pubsub: Add service:get_nodes()

13 years agomodulemanager, mod_console: Rename mod_console -> mod_admin_telnet - add compatibilit...
Matthew Wild [Fri, 17 Dec 2010 12:44:24 +0000 (12:44 +0000)]
modulemanager, mod_console: Rename mod_console -> mod_admin_telnet - add compatibility code to modulemanager for existing configs

13 years agonet.httpserver: Default 'ports' = {5280}
Matthew Wild [Fri, 17 Dec 2010 01:24:59 +0000 (01:24 +0000)]
net.httpserver: Default 'ports' = {5280}

13 years agonet.xmppclient_listener: Imports and global cleanup.
Waqas Hussain [Tue, 14 Dec 2010 23:05:49 +0000 (04:05 +0500)]
net.xmppclient_listener: Imports and global cleanup.

13 years agonet.xmppserver_listener: Removed unnecessary import of lxp.
Waqas Hussain [Tue, 14 Dec 2010 22:59:48 +0000 (03:59 +0500)]
net.xmppserver_listener: Removed unnecessary import of lxp.

13 years agonet.xmppserver_listener: Removed unused variables and imports.
Waqas Hussain [Tue, 14 Dec 2010 22:53:44 +0000 (03:53 +0500)]
net.xmppserver_listener: Removed unused variables and imports.

13 years agonet.xmppserver_listener: Made some globals local.
Waqas Hussain [Tue, 14 Dec 2010 22:52:56 +0000 (03:52 +0500)]
net.xmppserver_listener: Made some globals local.

13 years agonet.xmppcomponent_listener: Move session creation from listener.onincoming to listene...
Waqas Hussain [Tue, 14 Dec 2010 22:33:00 +0000 (03:33 +0500)]
net.xmppcomponent_listener: Move session creation from listener.onincoming to listener.onconnect.

13 years agonet.xmppcomponent_listener: Made some globals local.
Waqas Hussain [Tue, 14 Dec 2010 22:14:15 +0000 (03:14 +0500)]
net.xmppcomponent_listener: Made some globals local.

13 years agocore.loggingmanager: Updated to use termcolours.getstyle instead of termcolours.getst...
Waqas Hussain [Tue, 14 Dec 2010 20:57:10 +0000 (01:57 +0500)]
core.loggingmanager: Updated to use termcolours.getstyle instead of termcolours.getstring for console logging.

13 years agoutil.termcolours: Added setstyle(str), which works on Windows too.
Waqas Hussain [Tue, 14 Dec 2010 20:55:13 +0000 (01:55 +0500)]
util.termcolours: Added setstyle(str), which works on Windows too.

13 years agoutil-src/windows.c: Added get_consolecolor, set_consolecolor.
Waqas Hussain [Tue, 14 Dec 2010 20:53:33 +0000 (01:53 +0500)]
util-src/windows.c: Added get_consolecolor, set_consolecolor.

13 years agonet.dns: Clean up tostring() of returned records, as a result PTR records can now...
Matthew Wild [Tue, 14 Dec 2010 18:29:40 +0000 (18:29 +0000)]
net.dns: Clean up tostring() of returned records, as a result PTR records can now be tostring()'d

13 years agonet.dns: Add resolver:tohostname() and dns.tohostname()
Matthew Wild [Tue, 14 Dec 2010 18:28:42 +0000 (18:28 +0000)]
net.dns: Add resolver:tohostname() and dns.tohostname()

13 years agoMake libidn default when not specifiying a IDN lib.
Tobias Markmann [Tue, 14 Dec 2010 17:54:55 +0000 (18:54 +0100)]
Make libidn default when not specifiying a IDN lib.

13 years agoFix lua lib name in LDFLAGS.
Tobias Markmann [Tue, 14 Dec 2010 17:35:05 +0000 (18:35 +0100)]
Fix lua lib name in LDFLAGS.

13 years agoutil.encodings: Support for ICU for IDNA operations.
Tobias Markmann [Tue, 14 Dec 2010 14:03:37 +0000 (15:03 +0100)]
util.encodings: Support for ICU for IDNA operations.

13 years agoutil.serialization: Proper serialization of Infinity, -Infinity and NaN.
Waqas Hussain [Mon, 13 Dec 2010 15:45:08 +0000 (20:45 +0500)]
util.serialization: Proper serialization of Infinity, -Infinity and NaN.

13 years agomod_storage_sql: Use 'IS' for comparison instead of '=', to avoid SQL's NULL insanity.
Waqas Hussain [Mon, 13 Dec 2010 14:28:57 +0000 (19:28 +0500)]
mod_storage_sql: Use 'IS' for comparison instead of '=', to avoid SQL's NULL insanity.

13 years agomod_storage_sql: Fixed the deserialization of string-typed values.
Waqas Hussain [Mon, 13 Dec 2010 14:27:14 +0000 (19:27 +0500)]
mod_storage_sql: Fixed the deserialization of string-typed values.

13 years agoprosodyctl: Added and updated some comments and some semicolons, to match main prosod...
Waqas Hussain [Sun, 12 Dec 2010 12:18:16 +0000 (17:18 +0500)]
prosodyctl: Added and updated some comments and some semicolons, to match main prosody executable.

13 years agoprosodyctl: Read PROSODY_SRCDIR and PROSODY_PLUGINDIR environment variables, to match...
Waqas Hussain [Sun, 12 Dec 2010 12:17:20 +0000 (17:17 +0500)]
prosodyctl: Read PROSODY_SRCDIR and PROSODY_PLUGINDIR environment variables, to match main prosody executable.

13 years agoprosody: Added a comment, to match prosodyctl.
Waqas Hussain [Sun, 12 Dec 2010 12:15:57 +0000 (17:15 +0500)]
prosody: Added a comment, to match prosodyctl.

13 years agoprosodyctl: Added support for --config command line argument, and multiple config...
Waqas Hussain [Sun, 12 Dec 2010 12:10:24 +0000 (17:10 +0500)]
prosodyctl: Added support for --config command line argument, and multiple config parsers (to match the main prosody executable).

13 years agomod_pep: Fixed a traceback when non-local users send presence.
Waqas Hussain [Sun, 12 Dec 2010 10:42:00 +0000 (15:42 +0500)]
mod_pep: Fixed a traceback when non-local users send presence.

13 years agomod_pep: Handle the case where local contacts send directed presence with caps hash.
Waqas Hussain [Sun, 12 Dec 2010 01:35:53 +0000 (06:35 +0500)]
mod_pep: Handle the case where local contacts send directed presence with caps hash.