changeset 4008:ec9011df2dc6

Merge
author JC Brand <jc@opkode.com>
date Fri, 01 May 2020 11:34:43 +0200
parents 845d13ab0dc0 (current diff) fcea7cf91702 (diff)
children 362997ededb1
files
diffstat 3 files changed, 52 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mod_csi_simple_compat/README.markdown	Fri May 01 11:34:43 2020 +0200
@@ -0,0 +1,31 @@
+# About
+
+This module allows using the [mod_csi_simple][doc:modules:mod_csi_simple]
+setting `csi_important_payloads` (added in trunk/0.12) in Prosody 0.11.x.
+
+# Config
+
+```
+modules_enabled = {
+    -- other modules etc
+    "csi_simple",
+    "csi_simple_compat",
+}
+
+csi_important_payloads = {
+    -- Anything in this namespace:
+    "{urn:example:important-namespace}",
+    -- Specific element name and namespace:
+    "{urn:example:xmpp:priority}super-important",
+}
+```
+
+# Example
+
+``` lua
+csi_important_payloads = {
+    -- XEP-0353: Jingle Message Initiation
+    "{urn:xmpp:jingle-message:0}",
+}
+```
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/mod_csi_simple_compat/mod_csi_simple_compat.lua	Fri May 01 11:34:43 2020 +0200
@@ -0,0 +1,14 @@
+local st = require "util.stanza";
+
+local important_payloads = module:get_option_set("csi_important_payloads", { });
+
+module:hook("csi-is-stanza-important", function (event)
+	local stanza = event.stanza;
+	if st.is_stanza(stanza) then
+		for important in important_payloads do
+			if stanza:find(important) then
+				return true;
+			end
+		end
+	end
+end);
--- a/mod_turncredentials/README.markdown	Fri May 01 11:34:09 2020 +0200
+++ b/mod_turncredentials/README.markdown	Fri May 01 11:34:43 2020 +0200
@@ -1,10 +1,9 @@
-Introduction
-============
+# Introduction
 
-[XEP-0215] implementation for time-limited TURN credentials.
+[XEP-0215] implementation for [time-limited TURN
+credentials](https://tools.ietf.org/html/draft-uberti-behave-turn-rest-00).
 
-Configuration
-=============
+# Configuration
 
   Option                    Type     Default
   ------------------------- -------- ------------
@@ -13,4 +12,7 @@
   turncredentials\_port     number   `3478`
   turncredentials\_ttl      number   `86400`
 
+# Compatible TURN / STUN servers.
 
+-   [coturn](https://github.com/coturn/coturn) - [setup guide][doc:coturn]
+-   [restund](http://www.creytiv.com/restund.html)