diff options
-rw-r--r-- | extensions/Channel_Type_File.xml | 96 | ||||
-rw-r--r-- | extensions/all.xml | 6 |
2 files changed, 6 insertions, 96 deletions
diff --git a/extensions/Channel_Type_File.xml b/extensions/Channel_Type_File.xml index 1377a9b9..294551f9 100644 --- a/extensions/Channel_Type_File.xml +++ b/extensions/Channel_Type_File.xml @@ -218,102 +218,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.</ </tp:enumvalue> </tp:enum> - <!-- Taken from org.freedesktop.Telepathy.Channel.Type.Tubes --> - <tp:enum name="Socket_Address_Type" type="u"> - <tp:enumvalue suffix="Unix" value="0"> - <tp:docstring> - A Unix socket. The variant contains a byte-array, signature 'ay', - containing the path of the socket. - </tp:docstring> - </tp:enumvalue> - - <tp:enumvalue suffix="Abstract_Unix" value="1"> - <tp:docstring> - An abstract Unix socket. The variant contains a byte-array, - signature 'ay', containing the path of the socket including the - leading null byte. - </tp:docstring> - </tp:enumvalue> - - <tp:enumvalue suffix="IPv4" value="2"> - <tp:docstring> - An IPv4 socket. The variant contains a Socket_Address_IPv4, - i.e. a structure with signature (sq) - in which the string is an IPv4 dotted-quad address literal - (and must not be a DNS name), while the 16-bit unsigned integer is - the port number. - </tp:docstring> - </tp:enumvalue> - - <tp:enumvalue suffix="IPv6" value="3"> - <tp:docstring> - An IPv6 socket. The variant contains a Socket_Address_IPv6, - i.e. a structure with signature (sq) - in which the string is an IPv6 address literal as specified in - RFC2373 (and must not be a DNS name), while the 16-bit unsigned - integer is the port number. - </tp:docstring> - </tp:enumvalue> - - </tp:enum> - - <!-- Taken from org.freedesktop.Telepathy.Channel.Type.Tubes --> - <tp:enum name="Socket_Access_Control" type="u"> - <tp:enumvalue suffix="Localhost" value="0"> - <tp:docstring> - The IP or Unix socket can be accessed by any local user (e.g. - a Unix socket that accepts all local connections, or an IP socket - listening on 127.0.0.1 (or ::1) or rejecting connections not from - that address). The associated variant must be ignored. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="Port" value="1"> - <tp:docstring> - May only be used on IP sockets. The associated variant must contain - a struct Socket_Address_IPv4 (or Socket_Address_IPv6) - containing the string form of an IP address of the appropriate - version, and a port number. The socket can only be accessed if the - connecting process has that address and port number; all other - connections will be rejected. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="Netmask" value="2"> - <tp:docstring> - May only be used on IP sockets. The associated variant must contain - a struct Socket_Netmask_IPv4 (or Socket_Netmask_IPv6) with - signature (sy), containing the string form of an - IP address of the appropriate version, and a prefix length "n". - The socket can only be accessed if the first n bits of the - connecting address match the first n bits of the given address. - </tp:docstring> - </tp:enumvalue> - <tp:enumvalue suffix="Credentials" value="3"> - <tp:docstring xmlns="http://www.w3.org/1999/xhtml"> - <p>The connecting process must send a single zero (NUL) byte when - it first connects, which is not considered to be part of the data - stream. If the operating system uses sendmsg() with SCM_CREDS or - SCM_CREDENTIALS to pass credentials over sockets, the connecting - process must do so if possible; if not, it must still send the - byte.</p> - - <p>The listening process will disconnect the connection unless it - can determine by OS-specific means that the connecting process - has the same user ID as the listening process.</p> - - <p>The associated variant must be ignored.</p> - </tp:docstring> - </tp:enumvalue> - </tp:enum> - - <!-- Taken from org.freedesktop.Telepathy.Channel.Type.Tubes --> - <tp:mapping name="Supported_Socket_Map"> - <tp:docstring>The supported socket address and access-control types - for tubes. See GetAvailableStreamTubeTypes.</tp:docstring> - <tp:member name="Address_Type" type="u" tp:type="Socket_Address_Type"/> - <tp:member name="Access_Control" type="au" - tp:type="Socket_Access_Control[]"/> - </tp:mapping> - <method name="AcceptFile"> <tp:docstring> Accept a file transfer that's in the "local pending" state. The file diff --git a/extensions/all.xml b/extensions/all.xml index 2af12f12..e0dec8f2 100644 --- a/extensions/all.xml +++ b/extensions/all.xml @@ -28,12 +28,18 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA</p> <tp:generic-types> <tp:external-type name="Contact_Handle" type="u" from="Telepathy specification"/> + <tp:external-type name="Socket_Address_Type" type="u" + from="Telepathy specification"/> <tp:external-type name="DBus_Interface" type="s" from="Telepathy specification"/> + <tp:external-type name="Socket_Access_Control" type="u" + from="Telepathy specification"/> <tp:external-type name="DBus_Qualified_Member" type="s" from="Telepathy specification"/> <tp:external-type name="Qualified_Property_Value_Map" type="a{sv}" from="Telepathy specification"/> + <tp:external-type name="Supported_Socket_Map" type="a{uau}" + from="Telepathy specification"/> </tp:generic-types> </tp:spec> |