moparisthebest/xeps
1
0
Fork 0
mirror of https://github.com/moparisthebest/xeps synced 2024-11-28 12:12:22 -05:00
Code Issues Releases Wiki Activity

corrected schema and several examples regarding sid attribute

Browse Source 
git-svn-id: file:///home/ksmith/gitmigration/svn/xmpp/trunk@2871 4b5297f7-1745-476d-ba37-a9c6900126ab
This commit is contained in:
Peter Saint-Andre 2009-03-11 17:37:49 +00:00
parent 853fc5d3f4
commit e7477bf8a0
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
xep-0065.xml
View File

@ -217,9 +217,7 @@
category='proxy' category='proxy'
type='bytestreams' type='bytestreams'
name='SOCKS5 Bytestreams Service'/> name='SOCKS5 Bytestreams Service'/>
...
<feature var='http://jabber.org/protocol/bytestreams'/> <feature var='http://jabber.org/protocol/bytestreams'/>
...
</query> </query>
</iq> </iq>
]]></example> ]]></example>
@ -241,9 +239,7 @@
to='initiator@example.com/foo' to='initiator@example.com/foo'
id='server_items'> id='server_items'>
<query xmlns='http://jabber.org/protocol/disco#items'> <query xmlns='http://jabber.org/protocol/disco#items'>
...
<item jid='streamhostproxy.example.net' name='Bytestreams Proxy'/> <item jid='streamhostproxy.example.net' name='Bytestreams Proxy'/>
...
</query> </query>
</iq> </iq>
]]></example> ]]></example>
@ -266,13 +262,10 @@
to='initiator@example.com/foo' to='initiator@example.com/foo'
id='proxy_info'> id='proxy_info'>
<query xmlns='http://jabber.org/protocol/disco#info'> <query xmlns='http://jabber.org/protocol/disco#info'>
...
<identity category='proxy' <identity category='proxy'
type='bytestreams' type='bytestreams'
name='SOCKS5 Bytestreams Service'/> name='SOCKS5 Bytestreams Service'/>
...
<feature var='http://jabber.org/protocol/bytestreams'/> <feature var='http://jabber.org/protocol/bytestreams'/>
...
</query> </query>
</iq> </iq>
]]></example> ]]></example>
@ -284,7 +277,8 @@
from='initiator@example.com/foo' from='initiator@example.com/foo'
to='streamhostproxy.example.net' to='streamhostproxy.example.net'
id='discover'> id='discover'>
<query xmlns='http://jabber.org/protocol/bytestreams'/> <query xmlns='http://jabber.org/protocol/bytestreams'
sid='vxf9n471bn46'/>
</iq> </iq>
]]></example> ]]></example>
<p>The &lt;streamhost/&gt; element specifying a network address MUST possess the following attributes:</p> <p>The &lt;streamhost/&gt; element specifying a network address MUST possess the following attributes:</p>
@ -308,6 +302,7 @@
to='initiator@example.com/foo' to='initiator@example.com/foo'
id='discover'> id='discover'>
<query xmlns='http://jabber.org/protocol/bytestreams'> <query xmlns='http://jabber.org/protocol/bytestreams'>
sid='vxf9n471bn46'>
<streamhost <streamhost
jid='streamhostproxy.example.net' jid='streamhostproxy.example.net'
host='24.24.24.1' host='24.24.24.1'
@ -321,7 +316,8 @@
from='initiator@example.com/foo' from='initiator@example.com/foo'
to='streamhostproxy.example.net' to='streamhostproxy.example.net'
id='discover'> id='discover'>
<query xmlns='http://jabber.org/protocol/bytestreams'/> <query xmlns='http://jabber.org/protocol/bytestreams'
sid='vxf9n471bn46'/>
<error code='403' type='auth'> <error code='403' type='auth'>
<forbidden xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> <forbidden xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
</error> </error>
@ -333,7 +329,8 @@
from='initiator@example.com/foo' from='initiator@example.com/foo'
to='streamhostproxy.example.net' to='streamhostproxy.example.net'
id='discover'> id='discover'>
<query xmlns='http://jabber.org/protocol/bytestreams'/> <query xmlns='http://jabber.org/protocol/bytestreams'
sid='vxf9n471bn46'/>
<error code='405' type='cancel'> <error code='405' type='cancel'>
<not-allowed xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/> <not-allowed xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
</error> </error>
@ -354,7 +351,7 @@
to='target@example.org/bar' to='target@example.org/bar'
id='initiate'> id='initiate'>
<query xmlns='http://jabber.org/protocol/bytestreams' <query xmlns='http://jabber.org/protocol/bytestreams'
sid='mySID' sid='vxf9n471bn46'
mode='tcp'> mode='tcp'>
<streamhost <streamhost
jid='initiator@example.com/foo' jid='initiator@example.com/foo'
@ -418,7 +415,8 @@ STATUS = X'00'
from='target@example.org/bar' from='target@example.org/bar'
to='initiator@example.com/foo' to='initiator@example.com/foo'
id='initiate'> id='initiate'>
<query xmlns='http://jabber.org/protocol/bytestreams'> <query xmlns='http://jabber.org/protocol/bytestreams'
sid='vxf9n471bn46'>
<streamhost-used jid='streamhostproxy.example.net'/> <streamhost-used jid='streamhostproxy.example.net'/>
</query> </query>
</iq> </iq>
@ -444,7 +442,8 @@ STATUS = X'00'
from='initiator@example.com/foo' from='initiator@example.com/foo'
to='streamhostproxy.example.net' to='streamhostproxy.example.net'
id='activate'> id='activate'>
<query xmlns='http://jabber.org/protocol/bytestreams' sid='mySID'> <query xmlns='http://jabber.org/protocol/bytestreams'
sid='vxf9n471bn46'>
<activate>target@example.org/bar</activate> <activate>target@example.org/bar</activate>
</query> </query>
</iq> </iq>
@ -609,10 +608,8 @@ STATUS = X'00'
category='proxy' category='proxy'
type='bytestreams' type='bytestreams'
name='SOCKS5 Bytestreams Service'/> name='SOCKS5 Bytestreams Service'/>
...
<feature var='http://jabber.org/protocol/bytestreams'/> <feature var='http://jabber.org/protocol/bytestreams'/>
<feature var='http://jabber.org/protocol/bytestreams#udp'/> <feature var='http://jabber.org/protocol/bytestreams#udp'/>
...
</query> </query>
</iq> </iq>
]]></example> ]]></example>
@ -783,7 +780,7 @@ DATA = (payload)
<xs:element ref='streamhost-used' minOccurs='0'/> <xs:element ref='streamhost-used' minOccurs='0'/>
<xs:element name='activate' type='empty' minOccurs='0'/> <xs:element name='activate' type='empty' minOccurs='0'/>
</xs:choice> </xs:choice>
<xs:attribute name='sid' type='xs:string' use='optional'/> <xs:attribute name='sid' type='xs:string' use='required'/>
<xs:attribute name='mode' use='optional' default='tcp'> <xs:attribute name='mode' use='optional' default='tcp'>
<xs:simpleType> <xs:simpleType>
<xs:restriction base='xs:NCName'> <xs:restriction base='xs:NCName'>