prosody.git
12 years agoMakefile: Use cp instead of install, and make sure the correct umask is set
Kim Alvefur [Tue, 20 Mar 2012 11:50:53 +0000 (12:50 +0100)]
Makefile: Use cp instead of install, and make sure the correct umask is set

12 years agologgingmanager, util.logger: Remove name sinks and the ability to filter logs by...
Matthew Wild [Thu, 15 Mar 2012 19:09:24 +0000 (19:09 +0000)]
loggingmanager, util.logger: Remove name sinks and the ability to filter logs by source name (lots of code, hardly used if at all, and possibly broken)

12 years agomod_c2s: Add missing multiplexed service discovery pattern.
Kim Alvefur [Thu, 15 Mar 2012 16:37:07 +0000 (17:37 +0100)]
mod_c2s: Add missing multiplexed service discovery pattern.

12 years agomod_c2s, mod_s2s: Drop default_port and default_mode from listener objects (default_p...
Matthew Wild [Thu, 15 Mar 2012 16:31:10 +0000 (16:31 +0000)]
mod_c2s, mod_s2s: Drop default_port and default_mode from listener objects (default_port is deprecated, and default_mode already defaults to *a)

12 years agoportmanager: Support 'default_port' in service options
Matthew Wild [Thu, 15 Mar 2012 16:29:30 +0000 (16:29 +0000)]
portmanager: Support 'default_port' in service options

12 years agomod_posix, mod_bosh, mod_admin_telnet: Use module:set_global()
Kim Alvefur [Thu, 15 Mar 2012 13:47:46 +0000 (14:47 +0100)]
mod_posix, mod_bosh, mod_admin_telnet: Use module:set_global()

12 years agoMerge with Zash
Matthew Wild [Thu, 15 Mar 2012 03:19:35 +0000 (03:19 +0000)]
Merge with Zash

12 years agomod_c2s, mod_s2s: Add multiplex support
Matthew Wild [Thu, 15 Mar 2012 03:05:24 +0000 (03:05 +0000)]
mod_c2s, mod_s2s: Add multiplex support

12 years agomod_net_multiplex: Port multiplexing (run multiple different services on a the same...
Matthew Wild [Thu, 15 Mar 2012 03:05:02 +0000 (03:05 +0000)]
mod_net_multiplex: Port multiplexing (run multiple different services on a the same port(s))... now pluggable for use with any net plugin

12 years agoportmanager: Add get_registered_services() to the public API
Matthew Wild [Thu, 15 Mar 2012 03:02:51 +0000 (03:02 +0000)]
portmanager: Add get_registered_services() to the public API

12 years agoportmanager: Remove check for service_info.multiplex (now implemented in mod_net_mult...
Matthew Wild [Thu, 15 Mar 2012 03:02:36 +0000 (03:02 +0000)]
portmanager: Remove check for service_info.multiplex (now implemented in mod_net_multiplex)

12 years agoportmanager: Fix pre-0.9 compatibility by taking default_interface and default_port...
Matthew Wild [Thu, 15 Mar 2012 03:02:09 +0000 (03:02 +0000)]
portmanager: Fix pre-0.9 compatibility by taking default_interface and default_port from the listener instead of service table

12 years agoportmanager: Allow services to specify their config option prefix
Matthew Wild [Thu, 15 Mar 2012 02:56:44 +0000 (02:56 +0000)]
portmanager: Allow services to specify their config option prefix

12 years agomoduleapi: Add module:send() as an alias for core_post_stanza() from the current...
Matthew Wild [Thu, 15 Mar 2012 02:53:05 +0000 (02:53 +0000)]
moduleapi: Add module:send() as an alias for core_post_stanza() from the current host's origin

12 years agomoduleapi: Add module:provides(), a shortcut to add an item with the current module...
Matthew Wild [Thu, 15 Mar 2012 02:52:31 +0000 (02:52 +0000)]
moduleapi: Add module:provides(), a shortcut to add an item with the current module's name

12 years agoportmanager: Fire service-removed on unregister
Matthew Wild [Wed, 14 Mar 2012 23:44:24 +0000 (23:44 +0000)]
portmanager: Fire service-removed on unregister

12 years agomod_s2s/s2sout.lib: Log message instead of traceback when s2s isn't configured for...
Matthew Wild [Wed, 14 Mar 2012 21:43:46 +0000 (21:43 +0000)]
mod_s2s/s2sout.lib: Log message instead of traceback when s2s isn't configured for any ports

12 years agomod_c2s: Use module:add_item() to add the net-provider for portmanager
Matthew Wild [Wed, 14 Mar 2012 21:42:08 +0000 (21:42 +0000)]
mod_c2s: Use module:add_item() to add the net-provider for portmanager

12 years agoportmanager: Fix log message when multiple services are configured to use the same...
Matthew Wild [Wed, 14 Mar 2012 21:40:14 +0000 (21:40 +0000)]
portmanager: Fix log message when multiple services are configured to use the same port

12 years agoportmanager: Support item-added/net-provider (global and shared modules only!)
Matthew Wild [Wed, 14 Mar 2012 21:39:45 +0000 (21:39 +0000)]
portmanager: Support item-added/net-provider (global and shared modules only!)

12 years agoportmanager: Add unregister_service(), and allow multiple services with the same...
Matthew Wild [Wed, 14 Mar 2012 21:39:02 +0000 (21:39 +0000)]
portmanager: Add unregister_service(), and allow multiple services with the same name (they get queued)

12 years agomodulemanager: Some refactoring. Deprecate module.host = "*", modules should call...
Matthew Wild [Wed, 14 Mar 2012 21:37:00 +0000 (21:37 +0000)]
modulemanager: Some refactoring. Deprecate module.host = "*", modules should call module:set_global() (which has been around since forever)

12 years agomoduleapi: Set module.global = true when module:set_global() is called
Matthew Wild [Wed, 14 Mar 2012 21:33:15 +0000 (21:33 +0000)]
moduleapi: Set module.global = true when module:set_global() is called

12 years agomodulemanager: Use appropriate events object for global modules when firing item...
Matthew Wild [Wed, 14 Mar 2012 17:03:48 +0000 (17:03 +0000)]
modulemanager: Use appropriate events object for global modules when firing item-removed on unload

12 years agomod_auth_internal_{plain,hashed}: Clarify log messages on initialization
Matthew Wild [Sun, 11 Mar 2012 20:56:09 +0000 (20:56 +0000)]
mod_auth_internal_{plain,hashed}: Clarify log messages on initialization

12 years agomod_s2s: Don't bounce sendq on failed connections since it's handled by s2smanager
Kim Alvefur [Sun, 11 Mar 2012 20:37:55 +0000 (21:37 +0100)]
mod_s2s: Don't bounce sendq on failed connections since it's handled by s2smanager

12 years agomod_s2s: Collect s2s sources from portmanager and get local address if necessary
Florian Zeitz [Sun, 11 Mar 2012 19:16:57 +0000 (20:16 +0100)]
mod_s2s: Collect s2s sources from portmanager and get local address if necessary

12 years agomod_s2s: Remove obsolete default_interface
Florian Zeitz [Sun, 11 Mar 2012 19:15:42 +0000 (20:15 +0100)]
mod_s2s: Remove obsolete default_interface

12 years agoMerge with Zash
Matthew Wild [Sun, 11 Mar 2012 19:13:29 +0000 (19:13 +0000)]
Merge with Zash

12 years agoportmanager: Add get_active_services()
Matthew Wild [Sun, 11 Mar 2012 18:35:27 +0000 (18:35 +0000)]
portmanager: Add get_active_services()

12 years agos2smanager, mod_s2s: Move import of dns_max_depth to mod_s2s
Kim Alvefur [Sun, 11 Mar 2012 18:14:28 +0000 (19:14 +0100)]
s2smanager, mod_s2s: Move import of dns_max_depth to mod_s2s

12 years agoportmanager: Add get_service()
Matthew Wild [Sun, 11 Mar 2012 12:40:32 +0000 (12:40 +0000)]
portmanager: Add get_service()

12 years agoMerge with Zash
Matthew Wild [Fri, 9 Mar 2012 18:39:09 +0000 (18:39 +0000)]
Merge with Zash

12 years agoMerge with Maranda
Matthew Wild [Thu, 8 Mar 2012 00:18:16 +0000 (00:18 +0000)]
Merge with Maranda

12 years agomod_admin_adhoc: Use module:depends()
Kim Alvefur [Wed, 7 Mar 2012 20:14:08 +0000 (21:14 +0100)]
mod_admin_adhoc: Use module:depends()

12 years agomod_admin_adhoc: Import util.iterators properly
Kim Alvefur [Wed, 7 Mar 2012 20:12:04 +0000 (21:12 +0100)]
mod_admin_adhoc: Import util.iterators properly

12 years agoMerge with Zash
Matthew Wild [Wed, 7 Mar 2012 20:11:01 +0000 (20:11 +0000)]
Merge with Zash

12 years agomod_s2s: remove conn sessions clearing redundancy and leave it only in listener.ondis...
Marco Cirillo [Mon, 5 Mar 2012 16:39:50 +0000 (16:39 +0000)]
mod_s2s: remove conn sessions clearing redundancy and leave it only in listener.ondisconnect

12 years agomod_s2s: streamopened(): Tighter validation around stream 'to' and 'from' attributes...
Matthew Wild [Mon, 5 Mar 2012 11:07:10 +0000 (11:07 +0000)]
mod_s2s: streamopened(): Tighter validation around stream 'to' and 'from' attributes, and only set to_host and from_host if they aren't set already and if the session hasn't already been authenticated

12 years agomod_s2s: Log the entire stream header.
Kim Alvefur [Sun, 4 Mar 2012 16:39:19 +0000 (17:39 +0100)]
mod_s2s: Log the entire stream header.

12 years agoMerge with Zash
Matthew Wild [Sat, 3 Mar 2012 18:27:32 +0000 (18:27 +0000)]
Merge with Zash

12 years agomod_dialback, mod_s2s: Log initiation of dialback in mod_dialback
Kim Alvefur [Sat, 3 Mar 2012 15:45:34 +0000 (16:45 +0100)]
mod_dialback, mod_s2s: Log initiation of dialback in mod_dialback

12 years agomod_s2s, mod_dialback: Rename event to s2s-authenticate-legacy
Kim Alvefur [Sat, 3 Mar 2012 12:28:33 +0000 (13:28 +0100)]
mod_s2s, mod_dialback: Rename event to s2s-authenticate-legacy

12 years agoMerge with Zash
Matthew Wild [Sat, 3 Mar 2012 01:12:16 +0000 (01:12 +0000)]
Merge with Zash

12 years agomod_s2s, mod_dialback: Event on pre-XMPP streams, so we can try dialback.
Kim Alvefur [Sat, 3 Mar 2012 00:35:39 +0000 (01:35 +0100)]
mod_s2s, mod_dialback: Event on pre-XMPP streams, so we can try dialback.

12 years agocore.portmanager: Make sure the private flag takes precedence over global interfaces
Kim Alvefur [Fri, 2 Mar 2012 23:54:19 +0000 (00:54 +0100)]
core.portmanager: Make sure the private flag takes precedence over global interfaces

12 years agomod_admin_telnet: Import util.iterators properly
Kim Alvefur [Fri, 2 Mar 2012 23:32:57 +0000 (00:32 +0100)]
mod_admin_telnet: Import util.iterators properly

12 years agomod_s2s: return true when we sent the stanza, or initiated a new s2sout
Kim Alvefur [Fri, 2 Mar 2012 23:14:48 +0000 (00:14 +0100)]
mod_s2s: return true when we sent the stanza, or initiated a new s2sout

12 years agomod_s2s: Split send_to_host() into two route/remote hooks, one for already exsisting...
Kim Alvefur [Fri, 2 Mar 2012 23:03:06 +0000 (00:03 +0100)]
mod_s2s: Split send_to_host() into two route/remote hooks, one for already exsisting sessions and one for non-existent.

12 years agomod_dialback: Remove unused import of s2smanager.send_to_host()
Kim Alvefur [Fri, 2 Mar 2012 23:01:10 +0000 (00:01 +0100)]
mod_dialback: Remove unused import of s2smanager.send_to_host()

12 years agoFix make install for mod_s2s.
Thijs Alkemade [Fri, 2 Mar 2012 18:56:10 +0000 (19:56 +0100)]
Fix make install for mod_s2s.

12 years agomod_s2s: Add missing local table.insert
Kim Alvefur [Wed, 29 Feb 2012 23:14:53 +0000 (00:14 +0100)]
mod_s2s: Add missing local table.insert

12 years agos2smanager, mod_s2s: clear up ip_hosts after s2s is marked as established, remove...
Marco Cirillo [Fri, 24 Feb 2012 18:03:27 +0000 (18:03 +0000)]
s2smanager, mod_s2s: clear up ip_hosts after s2s is marked as established, remove useless space from mod_s2s code

12 years agoMerge backout
Matthew Wild [Fri, 24 Feb 2012 16:25:45 +0000 (16:25 +0000)]
Merge backout

12 years agoBacked out changeset aba47e6dff43
Matthew Wild [Fri, 24 Feb 2012 16:25:38 +0000 (16:25 +0000)]
Backed out changeset aba47e6dff43

12 years agoMerge Zash with Florob and Maranda
Matthew Wild [Fri, 24 Feb 2012 16:23:46 +0000 (16:23 +0000)]
Merge Zash with Florob and Maranda

12 years agomod_s2s: prevent attempting to reconnect when the stream is gracefully closed and...
Marco Cirillo [Fri, 24 Feb 2012 15:36:36 +0000 (15:36 +0000)]
mod_s2s: prevent attempting to reconnect when the stream is gracefully closed and fix TB by checking session.conn is set (racy racy?)

12 years agomod_admin_telnet: make service private.
Marco Cirillo [Fri, 24 Feb 2012 15:35:04 +0000 (15:35 +0000)]
mod_admin_telnet: make service private.

12 years agomod_s2s, s2sout.lib: import cert verify and add another fallback method in case socke...
Marco Cirillo [Fri, 24 Feb 2012 15:34:25 +0000 (15:34 +0000)]
mod_s2s, s2sout.lib: import cert verify and add another fallback method in case socket.local_addresses isn't there.

12 years agos2sout.lib: import utils/functionality once in s2smanager.
Florian Zeitz [Fri, 24 Feb 2012 15:24:10 +0000 (15:24 +0000)]
s2sout.lib: import utils/functionality once in s2smanager.

12 years agomod_s2s: port functionality once in s2smanager.
Florian Zeitz [Fri, 24 Feb 2012 15:21:21 +0000 (15:21 +0000)]
mod_s2s: port functionality once in s2smanager.

12 years agomod_dialback: import util.hashes and functionality once in s2smanager.
Florian Zeitz [Fri, 24 Feb 2012 15:20:03 +0000 (15:20 +0000)]
mod_dialback: import util.hashes and functionality once in s2smanager.

12 years agos2smanager: remove send_to_host.
Florian Zeitz [Fri, 24 Feb 2012 15:15:43 +0000 (15:15 +0000)]
s2smanager: remove send_to_host.

12 years agomodulemanager: include mod_c2s and mod_s2s into autoloaded modules.
Florian Zeitz [Fri, 24 Feb 2012 15:14:07 +0000 (15:14 +0000)]
modulemanager: include mod_c2s and mod_s2s into autoloaded modules.

12 years agos2sout.lib: Fix wrong variable name
Kim Alvefur [Thu, 23 Feb 2012 22:12:24 +0000 (23:12 +0100)]
s2sout.lib: Fix wrong variable name

12 years agos2sout.lib: Add locals for source interfaces
Kim Alvefur [Thu, 23 Feb 2012 22:12:08 +0000 (23:12 +0100)]
s2sout.lib: Add locals for source interfaces

12 years agos2sout.lib: Import various util.*
Kim Alvefur [Thu, 23 Feb 2012 22:09:09 +0000 (23:09 +0100)]
s2sout.lib: Import various util.*

12 years agomod_s2s: Attach send function to session
Kim Alvefur [Thu, 23 Feb 2012 22:04:59 +0000 (23:04 +0100)]
mod_s2s: Attach send function to session

12 years agomod_s2s: Initiate connections
Kim Alvefur [Thu, 23 Feb 2012 22:03:28 +0000 (23:03 +0100)]
mod_s2s: Initiate connections

12 years agomod_s2s: Fix typo
Kim Alvefur [Wed, 22 Feb 2012 22:14:21 +0000 (23:14 +0100)]
mod_s2s: Fix typo

12 years agomod_s2s: Add some missing imports
Kim Alvefur [Wed, 22 Feb 2012 22:12:57 +0000 (23:12 +0100)]
mod_s2s: Add some missing imports

12 years agonet.http, httpclient_listener: Merge listener into net.http
Matthew Wild [Mon, 23 Jan 2012 17:19:16 +0000 (17:19 +0000)]
net.http, httpclient_listener: Merge listener into net.http

12 years agoxmppserver_listener: Remove
Matthew Wild [Mon, 23 Jan 2012 17:12:05 +0000 (17:12 +0000)]
xmppserver_listener: Remove

12 years agos2smanager, mod_s2s, mod_s2s/s2sout: Split connection handling out of s2smanager...
Matthew Wild [Mon, 23 Jan 2012 16:28:20 +0000 (16:28 +0000)]
s2smanager, mod_s2s, mod_s2s/s2sout: Split connection handling out of s2smanager into mod_s2s, and further split connection logic for s2sout to a module lib, s2sout.lib.lua

12 years agostanza_router: Replace s2s send logic with firing of a 'route/remote' event
Matthew Wild [Mon, 23 Jan 2012 16:25:21 +0000 (16:25 +0000)]
stanza_router: Replace s2s send logic with firing of a 'route/remote' event

12 years agostanza_router: Remove obsolete commented code
Matthew Wild [Mon, 23 Jan 2012 16:24:06 +0000 (16:24 +0000)]
stanza_router: Remove obsolete commented code

12 years agosessionmanager: Require uuid_generate()
Matthew Wild [Mon, 23 Jan 2012 02:23:23 +0000 (02:23 +0000)]
sessionmanager: Require uuid_generate()

12 years agomod_c2s: Code reduction
Matthew Wild [Mon, 23 Jan 2012 02:15:28 +0000 (02:15 +0000)]
mod_c2s: Code reduction

12 years agomod_admin_telnet: Port to portmanager
Matthew Wild [Mon, 23 Jan 2012 01:05:32 +0000 (01:05 +0000)]
mod_admin_telnet: Port to portmanager

12 years agoprosody: sandboxed require(): Point __index of _G at current env for modules that...
Matthew Wild [Mon, 23 Jan 2012 01:04:15 +0000 (01:04 +0000)]
prosody: sandboxed require(): Point __index of _G at current env for modules that need to reference globals they already set

12 years agosessionmanager, mod_c2s: Move timeout logic to mod_c2s
Matthew Wild [Mon, 23 Jan 2012 00:56:57 +0000 (00:56 +0000)]
sessionmanager, mod_c2s: Move timeout logic to mod_c2s

12 years agoprosody: Remove connlisteners, and net_activate_ports
Matthew Wild [Mon, 23 Jan 2012 00:11:01 +0000 (00:11 +0000)]
prosody: Remove connlisteners, and net_activate_ports

12 years agoportmanager: Pass port to friendly_error_message()
Matthew Wild [Mon, 23 Jan 2012 00:07:15 +0000 (00:07 +0000)]
portmanager: Pass port to friendly_error_message()

12 years agoutil.iterators: Make a standard library (no longer injects into global namespace)
Matthew Wild [Mon, 23 Jan 2012 00:00:10 +0000 (00:00 +0000)]
util.iterators: Make a standard library (no longer injects into global namespace)

12 years agoutil.set: Accept nil to add_list()
Matthew Wild [Sun, 22 Jan 2012 23:59:19 +0000 (23:59 +0000)]
util.set: Accept nil to add_list()

12 years agomod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic...
Matthew Wild [Sun, 22 Jan 2012 23:57:13 +0000 (23:57 +0000)]
mod_c2s, sessionmanager, xmppclient_listener: Move all c2s network and stream logic into a new module, mod_c2s

12 years agoportmanager: One manager to, in the darkness, bind them
Matthew Wild [Sun, 22 Jan 2012 23:55:48 +0000 (23:55 +0000)]
portmanager: One manager to, in the darkness, bind them

12 years agoMerge with trunk
Matthew Wild [Sun, 22 Jan 2012 22:55:49 +0000 (22:55 +0000)]
Merge with trunk

12 years agomod_admin_telnet: Use module:shared() to expose commands table and default console...
Matthew Wild [Sun, 22 Jan 2012 19:50:08 +0000 (19:50 +0000)]
mod_admin_telnet: Use module:shared() to expose commands table and default console environment

12 years agomoduleapi: Add module:shared(), a way to easily share data between multiple loaded...
Matthew Wild [Sun, 22 Jan 2012 19:48:53 +0000 (19:48 +0000)]
moduleapi: Add module:shared(), a way to easily share data between multiple loaded modules

12 years agomoduleapi: Add module:depends(), a way to safely depend upon another module at runtime
Matthew Wild [Sun, 22 Jan 2012 19:35:50 +0000 (19:35 +0000)]
moduleapi: Add module:depends(), a way to safely depend upon another module at runtime

12 years agomodulemanager: load(): Return and use the correct module object
Matthew Wild [Sun, 22 Jan 2012 19:27:06 +0000 (19:27 +0000)]
modulemanager: load(): Return and use the correct module object

12 years agoutil.helpers: After nearly 'fixing' this code, I conclude it instead only deserves...
Matthew Wild [Sun, 22 Jan 2012 19:10:13 +0000 (19:10 +0000)]
util.helpers: After nearly 'fixing' this code, I conclude it instead only deserves a bigger smile

12 years agomodulemanager: Cleanup some unused variables, imports, whitespace and add a comment.
Matthew Wild [Sun, 22 Jan 2012 18:49:49 +0000 (18:49 +0000)]
modulemanager: Cleanup some unused variables, imports, whitespace and add a comment.

12 years agomodulemanager, moduleapi: Replace hooks multitable with an event_handlers map stored...
Matthew Wild [Sun, 22 Jan 2012 18:49:11 +0000 (18:49 +0000)]
modulemanager, moduleapi: Replace hooks multitable with an event_handlers map stored in individual modules. Also adds module:hook_object_event() to hook events on any util.events compatible object.

12 years agomodulemanager: Drop unnecessary prosody_events local
Matthew Wild [Sun, 22 Jan 2012 18:47:33 +0000 (18:47 +0000)]
modulemanager: Drop unnecessary prosody_events local

12 years agomodulemanager: Some reorganisation. Only external change is (should be) that module...
Matthew Wild [Sun, 22 Jan 2012 18:46:17 +0000 (18:46 +0000)]
modulemanager: Some reorganisation. Only external change is (should be) that module-unloaded and module-loaded are no longer fired when reloading a module, the new event module-reloaded is fired instead.

12 years agomodulemanager: Move in-module API functions to core.moduleapi (half the file size...
Matthew Wild [Sun, 22 Jan 2012 18:41:55 +0000 (18:41 +0000)]
modulemanager: Move in-module API functions to core.moduleapi (half the file size, yay)

12 years agomod_compression: Change default compression level to 7
Kim Alvefur [Thu, 19 Jan 2012 15:47:12 +0000 (16:47 +0100)]
mod_compression: Change default compression level to 7

12 years agomod_compression: Use get_option_number
Kim Alvefur [Thu, 19 Jan 2012 15:38:04 +0000 (16:38 +0100)]
mod_compression: Use get_option_number