aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Claessens <xclaesse@src.gnome.org>2008-11-22 00:22:23 +0800
committerXavier Claessens <xclaesse@src.gnome.org>2008-11-22 00:22:23 +0800
commit29d8e1cf2da8ccff18ef27d91bedcae08cdd8107 (patch)
tree07dc0a8cc2aa7ba07c089254d2fa1b1c0cf5e277
parentfce99b854de5850841c8001f48530b9854e0d24e (diff)
downloadgsoc2013-empathy-29d8e1cf2da8ccff18ef27d91bedcae08cdd8107.tar
gsoc2013-empathy-29d8e1cf2da8ccff18ef27d91bedcae08cdd8107.tar.gz
gsoc2013-empathy-29d8e1cf2da8ccff18ef27d91bedcae08cdd8107.tar.bz2
gsoc2013-empathy-29d8e1cf2da8ccff18ef27d91bedcae08cdd8107.tar.lz
gsoc2013-empathy-29d8e1cf2da8ccff18ef27d91bedcae08cdd8107.tar.xz
gsoc2013-empathy-29d8e1cf2da8ccff18ef27d91bedcae08cdd8107.tar.zst
gsoc2013-empathy-29d8e1cf2da8ccff18ef27d91bedcae08cdd8107.zip
sync with latest FT spec DRAFT
svn path=/trunk/; revision=1871
-rw-r--r--extensions/Channel_Type_File_Transfer.xml18
1 files changed, 7 insertions, 11 deletions
diff --git a/extensions/Channel_Type_File_Transfer.xml b/extensions/Channel_Type_File_Transfer.xml
index deb88f5de..a2432f4be 100644
--- a/extensions/Channel_Type_File_Transfer.xml
+++ b/extensions/Channel_Type_File_Transfer.xml
@@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
tp:causes-havoc="experimental">
<tp:requires interface="org.freedesktop.Telepathy.Channel"/>
<tp:docstring xmlns="http://www.w3.org/1999/xhtml">
- <p>A channel type for files offered for transferring. The
+ <p>A channel type for transferring files. The
transmission of data between contacts is achieved by reading from
or writing to a socket. The type of the socket (local Unix, IPv4,
etc.) is decided on when the file transfer is offered or accepted.</p>
@@ -35,14 +35,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
passes a stream from which the connection manager reads, requiring no
further connection to the share. It also allows connection managers to
be more restricted in their access to the system, allowing tighter
- security policies with eg SElinux, or more flexible deployments which
+ security policies with eg SELinux, or more flexible deployments which
cross user or system boundaries.</p>
- <p>If the connection manager relies on a library using file path only for
- file transfers, it can use the Socket_Address_Type_Local_Path
- <tp:type>Socket_Address_Type</tp:type>. In that case the file will be
- read and written directly by the CM.</p>
-
<p>The Telepathy client should connect to the socket or address that
the connection manager has set up and provided back to the clients
through the two methods.</p>
@@ -204,16 +199,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</
that the connection manager supports for sockets with that
address type. For simplicity, if a CM supports offering a
particular type of file transfer, it is assumed to support accepting
- it.</p>
+ it. Connection Managers MUST support at least Socket_Address_Type_IPv4.</p>
- <p>A typical value for a host that supports only Unix sockets:</p>
+ <p>A typical value for a host without IPv6 support:</p>
<pre>
{
+ Socket_Address_Type_IPv4:
+ [Socket_Access_Control_Localhost, Socket_Access_Control_Port,
+ Socket_Access_Control_Netmask],
Socket_Address_Type_Unix:
[Socket_Access_Control_Localhost, Socket_Access_Control_Credentials]
- Socket_Address_Type_Abstract_Unix:
- [Socket_Access_Control_Localhost, Socket_Access_Control_Credentials]
}
</pre>
</tp:docstring>