From 3949be39a830a98a3f1097ada9e4eda2736e296c Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sun, 7 Aug 2016 21:39:24 +0100 Subject: [PATCH 1/7] XEP-0329: Make indentation consistent with other XEPs --- xep-0329.xml | 84 ++++++++++++++++++++++++++-------------------------- 1 file changed, 42 insertions(+), 42 deletions(-) diff --git a/xep-0329.xml b/xep-0329.xml index ffcc3c5f..d7bc7c14 100644 --- a/xep-0329.xml +++ b/xep-0329.xml @@ -77,7 +77,7 @@ from='juliet@capulet.com/chamber' to='romeo@montague.net/home' id='1234'> - + ]]> @@ -88,11 +88,11 @@ from='romeo@montague.net/home' to='juliet@capulet.com/chamber' id='1234'> - - - - - + + + + + ]]> @@ -103,7 +103,7 @@ from='romeo@montague.net/home' to='juliet@capulet.com/chamber' id='1234'> - + ]]> @@ -114,7 +114,7 @@ from='juliet@capulet.com/chamber' to='romeo@montague.net/home' id='1234'> - + ]]> @@ -126,20 +126,20 @@ from='romeo@montague.net/home' to='juliet@capulet.com/chamber' id='1234'> - - - test.txt - 1969-07-21T02:56:15Z - This is a test. If this were a real file... - - 1022 - 552da749930852c69ae5d2141d3766b1 - - - test2.txt - - - + + + test.txt + 1969-07-21T02:56:15Z + This is a test. If this were a real file... + + 1022 + 552da749930852c69ae5d2141d3766b1 + + + test2.txt + + + ]]> @@ -150,7 +150,7 @@ from='juliet@capulet.com/chamber' to='romeo@montague.net/home' id='1234'> - + ]]> @@ -160,12 +160,12 @@ from='romeo@montague.net/home' to='juliet@capulet.com/chamber' id='1234'> - - - test2.txt - 1000 - - + + + test2.txt + 1000 + + ]]> @@ -188,19 +188,19 @@

As it was previously discussed, when requesting detailed information about a file, only the "name" attribute is required, but it is strongly RECOMMENDED that the hash attribute be included, in order to reduce the chances of sending the wrong file. When requesting the file to be transferred using &xep0234;, the information that must be provided has to identify the file uniquely. It is then RECOMMENDED that when requesting a file, the full path of the file in the shared folder be included in the "name" attribute.

- - - - - pics/test4.png - 10740 - - - + + + + + + pics/test4.png + 10740 + + + ]]> From 3945c638c1f634af24d9a31cb67aa4778cffbe56 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sun, 7 Aug 2016 21:40:11 +0100 Subject: [PATCH 2/7] XEP-0329: Fix non-closed example stanza --- xep-0329.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xep-0329.xml b/xep-0329.xml index d7bc7c14..55ddba53 100644 --- a/xep-0329.xml +++ b/xep-0329.xml @@ -201,6 +201,8 @@ + + ]]> From 6b53252c7f79023d77a1002d00308b5b38d838ba Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sun, 7 Aug 2016 21:41:42 +0100 Subject: [PATCH 3/7] XEP-0329: Remove unnecessary whitespace around examples --- xep-0329.xml | 56 +++++++++++++++------------------------------------- 1 file changed, 16 insertions(+), 40 deletions(-) diff --git a/xep-0329.xml b/xep-0329.xml index 55ddba53..163361ee 100644 --- a/xep-0329.xml +++ b/xep-0329.xml @@ -71,19 +71,15 @@

If a requesting entity wishes to know what files are being shared by an offering entity, it can do so by sending the following query:

- - - -]]> - +]]>

If the offering entity wishes to share files with the requesting entity, it may respond with a list of shared folders. It MUST not include any files in this response.

- - - -]]> - +]]>

if the offering entity has no files to offer

- - - -]]> - +]]>

Requesting the list of files and directories within a directory.

- - - -]]> - +]]>

When replying with a list of files, the offering entity can choose to either reply with verbose information on the file using the file attributes defined by &xep0234; or it may reply only with the 'name' attribute, which is required and MUST be included in every response.

It is RECOMENDED, when the list files to be sent is small, that a verbose response be made (in order to avoid going back and forth requesting information), and that a non-verbose reponse be made otherwise. This recomendation is made to save bandwidth.

- - - -]]> - +]]>

If the requesting entity wants to get detailed information about a file. It can do so by providing its full path.

- - - -]]> - - -]]> + 1000 - -]]> - +]]> @@ -186,8 +165,7 @@

As it was previously discussed, when requesting detailed information about a file, only the "name" attribute is required, but it is strongly RECOMMENDED that the hash attribute be included, in order to reduce the chances of sending the wrong file. When requesting the file to be transferred using &xep0234;, the information that must be provided has to identify the file uniquely. It is then RECOMMENDED that when requesting a file, the full path of the file in the shared folder be included in the "name" attribute.

- - - -]]> - +]]>

For the most part, discovering files in a MUC is exactly the same as what has been described in this document. However, it is RECOMMENDED that a participant in a MUC should have a single shared folder associated with the entire room, as opposed to advertise different files to different participants of the room. This is to reduce the complexity of the client software. Also, due to volatile nature of the participants in a room, keeping track of permissions is more trouble than what it is worth.

From bbaec1433f66918f71d4e8083f2b5f7c73f22fda Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sun, 7 Aug 2016 21:46:30 +0100 Subject: [PATCH 4/7] XEP-0329: Update referenced XEP-0234 to version 0.16 --- xep-0329.xml | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/xep-0329.xml b/xep-0329.xml index 163361ee..2c7e5aa3 100644 --- a/xep-0329.xml +++ b/xep-0329.xml @@ -114,7 +114,7 @@ to='juliet@capulet.com/chamber' id='1234'> - + test.txt 1969-07-21T02:56:15Z This is a test. If this were a real file... @@ -122,7 +122,7 @@ 1022 552da749930852c69ae5d2141d3766b1 - + test2.txt @@ -142,7 +142,7 @@ to='juliet@capulet.com/chamber' id='1234'> - + test2.txt 1000 @@ -170,14 +170,12 @@ action='session-initiate' initiator='juliet@capulet.com/chamber' sid='uj3b2'> - - - - - pics/test4.png - 10740 - - + + + + pics/test4.png + 10740 + ]]> From 88660266b06b70f0fc177748c55b05a972f31a97 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sun, 7 Aug 2016 21:48:32 +0100 Subject: [PATCH 5/7] XEP-0329: Change example ids when they correspond to another request --- xep-0329.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xep-0329.xml b/xep-0329.xml index 2c7e5aa3..5fe53c7e 100644 --- a/xep-0329.xml +++ b/xep-0329.xml @@ -103,7 +103,7 @@ + id='1235'> ]]>

When replying with a list of files, the offering entity can choose to either reply with verbose information on the file using the file attributes defined by &xep0234; or it may reply only with the 'name' attribute, which is required and MUST be included in every response.

@@ -112,7 +112,7 @@ + id='1235'> test.txt @@ -133,14 +133,14 @@ + id='1236'> ]]> + id='1236'> test2.txt From d767706ab2053de56ff3b30c6e0f6f9cb1ab2b2a Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sun, 7 Aug 2016 21:49:32 +0100 Subject: [PATCH 6/7] XEP-0329: Add a wrapper iq around the Jingle session initiation example --- xep-0329.xml | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/xep-0329.xml b/xep-0329.xml index 5fe53c7e..2911b290 100644 --- a/xep-0329.xml +++ b/xep-0329.xml @@ -166,19 +166,24 @@

As it was previously discussed, when requesting detailed information about a file, only the "name" attribute is required, but it is strongly RECOMMENDED that the hash attribute be included, in order to reduce the chances of sending the wrong file. When requesting the file to be transferred using &xep0234;, the information that must be provided has to identify the file uniquely. It is then RECOMMENDED that when requesting a file, the full path of the file in the shared folder be included in the "name" attribute.

- - - - pics/test4.png - 10740 - - - -]]> + + + + + + pics/test4.png + 10740 + + + + +]]>

For the most part, discovering files in a MUC is exactly the same as what has been described in this document. However, it is RECOMMENDED that a participant in a MUC should have a single shared folder associated with the entire room, as opposed to advertise different files to different participants of the room. This is to reduce the complexity of the client software. Also, due to volatile nature of the participants in a room, keeping track of permissions is more trouble than what it is worth.

From d5d502087ef384af5febb57efe56603cbef41328 Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Sun, 7 Aug 2016 21:54:16 +0100 Subject: [PATCH 7/7] XEP-0329: Increase the version number --- xep-0329.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xep-0329.xml b/xep-0329.xml index 2911b290..fec49253 100644 --- a/xep-0329.xml +++ b/xep-0329.xml @@ -32,6 +32,12 @@ j.lagrange@gajim.org &lance; + + 0.3 + 2016-08-07 + egp +

Updated the &xep0234; referenced version to 0.16 or higher.

 + 0.2 2013-11-19