| Offset 1, 16 lines modified | Offset 1, 16 lines modified |
| 1 | <?xml·version="1.0"?> | 1 | <?xml·version="1.0"?> |
| 2 | <!DOCTYPE·html·PUBLIC·"-//W3C//DTD·XHTML·1.0·Transitional//EN"·"http://www.w3.org/TR/xhtml1/DTD/xhtml1-loose.dtd"> | 2 | <!DOCTYPE·html·PUBLIC·"-//W3C//DTD·XHTML·1.0·Transitional//EN"·"http://www.w3.org/TR/xhtml1/DTD/xhtml1-loose.dtd"> |
| 3 | <html·xmlns="http://www.w3.org/1999/xhtml"><head><meta·http-equiv="Content-Type"·content="text/html;·charset=UTF-8"·/><title>XEP-proto-olpc1.0:·OLPC-specific·properties,·version·1.0</title><link·rel="stylesheet"·type="text/css"·href="../xmpp.css"·/><link·href="../prettify.css"·type="text/css"·rel="stylesheet"·/><link·rel="shortcut·icon"·type="image/x-icon"·href="/favicon.ico"·/><script·type="text/javascript"·src="../prettify.js"></script><meta·name="DC.Title"·content="OLPC-specific·properties,·version·1.0"·/><meta·name="DC.Creator"·content="Simon·McVittie"·/><meta·name="DC.Description"·content="Properties·for·the·Activity·and·Buddy·abstractions·used·in·the ····One·Laptop·per·Child's·Sugar·environment."·/><meta·name="DC.Publisher"·content="XMPP·Standards·Foundation"·/><meta·name="DC.Contributor"·content="XMPP·Extensions·Editor"·/><meta·name="DC.Date"·content="2007-10-01"·/><meta·name="DC.Type"·content="XMPP·Extension·Protocol"·/><meta·name="DC.Format"·content="XHTML"·/><meta·name="DC.Identifier"·content="X·✂ | 3 | <html·xmlns="http://www.w3.org/1999/xhtml"><head><meta·http-equiv="Content-Type"·content="text/html;·charset=UTF-8"·/><title>XEP-proto-olpc1.0:·OLPC-specific·properties,·version·1.0</title><link·rel="stylesheet"·type="text/css"·href="../xmpp.css"·/><link·href="../prettify.css"·type="text/css"·rel="stylesheet"·/><link·rel="shortcut·icon"·type="image/x-icon"·href="/favicon.ico"·/><script·type="text/javascript"·src="../prettify.js"></script><meta·name="DC.Title"·content="OLPC-specific·properties,·version·1.0"·/><meta·name="DC.Creator"·content="Simon·McVittie"·/><meta·name="DC.Description"·content="Properties·for·the·Activity·and·Buddy·abstractions·used·in·the ····One·Laptop·per·Child's·Sugar·environment."·/><meta·name="DC.Publisher"·content="XMPP·Standards·Foundation"·/><meta·name="DC.Contributor"·content="XMPP·Extensions·Editor"·/><meta·name="DC.Date"·content="2007-10-01"·/><meta·name="DC.Type"·content="XMPP·Extension·Protocol"·/><meta·name="DC.Format"·content="XHTML"·/><meta·name="DC.Identifier"·content="X·✂ |
| 4 | ····One·Laptop·per·Child's·Sugar·environment.</td></tr><tr·valign="top"><td><strong>Author:</strong></td><td>Simon·McVittie</td></tr><tr·valign="top"><td><strong>Copyright:</strong></td><td>©·1999·-·2009·XMPP·Standards·Foundation.·<a·href="#appendix-legal">SEE·LEGAL·NOTICES</a>.</td></tr><tr·valign="top"><td><strong>Status:</strong></td><td>ProtoXEP</td></tr><tr·valign="top"><td><strong>Type:</strong></td><td>Extension</td></tr><tr·valign="top"><td><strong>Version:</strong></td><td>0.0.1</td></tr><tr·valign="top"><td><strong>Last Updated:</strong></td><td>2007-10-01</td></tr></table><hr·/><p·style="color:red">WARNING:·This·document·has·not·yet·been·accepted·for·consideration·or·approved·in·any·official·manner·by·the·XMPP·Standards·Foundation,·and·this·document·is·not·yet·an·XMPP·Extension·Protocol·(XEP).·If·this·document·is·accepted·as·a·XEP·by·the·XMPP·Council,·it·will·be·published·at·<<a·href="http://xmpp.org/extensions/">http://xmpp.org/extensions/</a>>·and·announced·on·the·<standards@xmpp.org>·✂ | 4 | ····One·Laptop·per·Child's·Sugar·environment.</td></tr><tr·valign="top"><td><strong>Author:</strong></td><td>Simon·McVittie</td></tr><tr·valign="top"><td><strong>Copyright:</strong></td><td>©·1999·-·2009·XMPP·Standards·Foundation.·<a·href="#appendix-legal">SEE·LEGAL·NOTICES</a>.</td></tr><tr·valign="top"><td><strong>Status:</strong></td><td>ProtoXEP</td></tr><tr·valign="top"><td><strong>Type:</strong></td><td>Extension</td></tr><tr·valign="top"><td><strong>Version:</strong></td><td>0.0.1</td></tr><tr·valign="top"><td><strong>Last Updated:</strong></td><td>2007-10-01</td></tr></table><hr·/><p·style="color:red">WARNING:·This·document·has·not·yet·been·accepted·for·consideration·or·approved·in·any·official·manner·by·the·XMPP·Standards·Foundation,·and·this·document·is·not·yet·an·XMPP·Extension·Protocol·(XEP).·If·this·document·is·accepted·as·a·XEP·by·the·XMPP·Council,·it·will·be·published·at·<<a·href="http://xmpp.org/extensions/">http://xmpp.org/extensions/</a>>·and·announced·on·the·<standards@xmpp.org>·✂ |
| 5 | ······3.1.··<a·href="#sect-idp29560120">Buddy·properties</a><br·/> | 5 | ······3.1.··<a·href="#sect-idp29560120">Buddy·properties</a><br·/> |
| 6 | ······3.1.1.··<a·href="#sect-idp29621816">Buddy·properties·in·link-local·XMPP</a><br·/> | 6 | ······3.1.1.··<a·href="#sect-idp29617720">Buddy·properties·in·link-local·XMPP</a><br·/> |
| 7 | ······3.2.··<a·href="#sect-idp29631416">Current·activity</a><br·/> | 7 | ······3.2.··<a·href="#sect-idp29627320">Current·activity</a><br·/> |
| 8 | ······3.2.1.··<a·href="#sect-idp29637304">Current·activity·in·link-local·XMPP</a><br·/> | 8 | ······3.2.1.··<a·href="#sect-idp29633208">Current·activity·in·link-local·XMPP</a><br·/> |
| 9 | ······3.3.··<a·href="#sect-idp29716152">Public·activity·properties</a><br·/> | 9 | ······3.3.··<a·href="#sect-idp29712056">Public·activity·properties</a><br·/> |
| 10 | ······3.3.1.··<a·href="#sect-idp29750200">Activity·properties·in·link-local·XMPP</a><br·/> | 10 | ······3.3.1.··<a·href="#sect-idp29750200">Activity·properties·in·link-local·XMPP</a><br·/> |
| 11 | ······3.4.··<a·href="#sect-idp29765304">Private·activities</a><br·/> | 11 | ······3.4.··<a·href="#sect-idp29765304">Private·activities</a><br·/> |
| 12 | ······3.4.1.··<a·href="#sect-idp29769016">Private·activities·in·link-local·XMPP</a><br·/> | 12 | ······3.4.1.··<a·href="#sect-idp29769016">Private·activities·in·link-local·XMPP</a><br·/> |
| 13 | ······3.5.··<a·href="#sect-idp29772600">Invitations</a><br·/>4.··<a·href="#rules">Business·Rules</a><br·/>5.··<a·href="#security">Security·Considerations</a><br·/>6.··<a·href="#iana">IANA·Considerations</a><br·/>7.··<a·href="#registrar">XMPP·Registrar·Considerations</a><br·/>8.··<a·href="#schema">XML·Schema</a></p><p><a·href="#appendices">Appendices</a><br·/> <a·href="#appendix-docinfo">A:·Document·Information</a><br·/> <a·href="#appendix-authorinfo">B:·Author·Information</a><br·/> <a·href="#appendix-legal">C:·Legal·Notices</a><br·/> <a·href="#appendix-xmpp">D:·Relation·to·XMPP</a><br·/> <a·href="#appendix-discuss">E:·Discussion·Venue</a><br·/> <a·href="#appendix-conformance">F:·Requirements·Conformance</a><br·/> <a·href="#appendix-notes">G:·Notes</a><br·/> <a·href="#appendix-revs">H:·Revision·History</a></p></div><hr·/><h2>1. | 13 | ······3.5.··<a·href="#sect-idp29772600">Invitations</a><br·/>4.··<a·href="#rules">Business·Rules</a><br·/>5.··<a·href="#security">Security·Considerations</a><br·/>6.··<a·href="#iana">IANA·Considerations</a><br·/>7.··<a·href="#registrar">XMPP·Registrar·Considerations</a><br·/>8.··<a·href="#schema">XML·Schema</a></p><p><a·href="#appendices">Appendices</a><br·/> <a·href="#appendix-docinfo">A:·Document·Information</a><br·/> <a·href="#appendix-authorinfo">B:·Author·Information</a><br·/> <a·href="#appendix-legal">C:·Legal·Notices</a><br·/> <a·href="#appendix-xmpp">D:·Relation·to·XMPP</a><br·/> <a·href="#appendix-discuss">E:·Discussion·Venue</a><br·/> <a·href="#appendix-conformance">F:·Requirements·Conformance</a><br·/> <a·href="#appendix-notes">G:·Notes</a><br·/> <a·href="#appendix-revs">H:·Revision·History</a></p></div><hr·/><h2>1. |
| 14 | ·······<a·name="intro"·id="intro">Introduction</a></h2> | 14 | ·······<a·name="intro"·id="intro">Introduction</a></h2> |
| 15 | ··<p>This·document·describes·the·protocol·used·to·transfer·OLPC-specific | 15 | ··<p>This·document·describes·the·protocol·used·to·transfer·OLPC-specific |
| 16 | ····buddy·(contact)·and·activity·(chat·room)·information.</p> | 16 | ····buddy·(contact)·and·activity·(chat·room)·information.</p> |
| Offset 73, 15 lines modified | Offset 73, 15 lines modified |
| 73 | ··········</item> | 73 | ··········</item> |
| 74 | ········</items> | 74 | ········</items> |
| 75 | ······</event> | 75 | ······</event> |
| 76 | ····</message> | 76 | ····</message> |
| 77 | ···· | 77 | ···· |
| 78 | ····</pre></div> | 78 | ····</pre></div> |
| | |
| 79 | ····<div·class="indent"><h3>3.1.1·<a·name="sect-idp29621816"·id="sect-idp29621816">Buddy·properties·in·link-local·XMPP</a></h3> | 79 | ····<div·class="indent"><h3>3.1.1·<a·name="sect-idp29617720"·id="sect-idp29617720">Buddy·properties·in·link-local·XMPP</a></h3> |
| 80 | ······<p>In·link-local·XMPP,·none·of·this·happens.·Instead,·the·ip4-address | 80 | ······<p>In·link-local·XMPP,·none·of·this·happens.·Instead,·the·ip4-address |
| 81 | ········property·is·implicitly·available,·and·the·key·and·color·properties | 81 | ········property·is·implicitly·available,·and·the·key·and·color·properties |
| 82 | ········are·encoded·in·the·_presence._tcp·TXT·record.</p> | 82 | ········are·encoded·in·the·_presence._tcp·TXT·record.</p> |
| | |
| 83 | ······<p>The·'color'·property·is·mapped·to·the·'olpc-color'·TXT·record·key:</p> | 83 | ······<p>The·'color'·property·is·mapped·to·the·'olpc-color'·TXT·record·key:</p> |
| | |
| 84 | ······<p·class="caption"></p><div·class="indent"><pre·class="prettyprint"> | 84 | ······<p·class="caption"></p><div·class="indent"><pre·class="prettyprint"> |
| Offset 110, 15 lines modified | Offset 110, 15 lines modified |
| 110 | ········in·the·TXT·record·for·the·key·segment·1·greater·than·the·last·one | 110 | ········in·the·TXT·record·for·the·key·segment·1·greater·than·the·last·one |
| 111 | ········they·need·(in·this·case,·olpc-key-part3·must·be·removed·if | 111 | ········they·need·(in·this·case,·olpc-key-part3·must·be·removed·if |
| 112 | ········present).</p> | 112 | ········present).</p> |
| 113 | ····</div> | 113 | ····</div> |
| | |
| 114 | ··</div> | 114 | ··</div> |
| | |
| 115 | ··<div·class="indent"><h3>3.2·<a·name="sect-idp29631416"·id="sect-idp29631416">Current·activity</a></h3> | 115 | ··<div·class="indent"><h3>3.2·<a·name="sect-idp29627320"·id="sect-idp29627320">Current·activity</a></h3> |
| | |
| 116 | ····<p>The·Neighbourhood·view·on·the·OLPC·groups·XO·icons·by·their | 116 | ····<p>The·Neighbourhood·view·on·the·OLPC·groups·XO·icons·by·their |
| 117 | ······current·activity,·so·XOs·must·notify·each·other·of·current-activity | 117 | ······current·activity,·so·XOs·must·notify·each·other·of·current-activity |
| 118 | ······changes.</p> | 118 | ······changes.</p> |
| | |
| 119 | ····<p>As·currently·implemented,·this·is·done·for·both·public·and·private | 119 | ····<p>As·currently·implemented,·this·is·done·for·both·public·and·private |
| 120 | ······activities,·which·represents·an·information·leak.·(FIXME)</p> | 120 | ······activities,·which·represents·an·information·leak.·(FIXME)</p> |
| Offset 139, 29 lines modified | Offset 139, 29 lines modified |
| 139 | ··········</item> | 139 | ··········</item> |
| 140 | ········</publish> | 140 | ········</publish> |
| 141 | ······</pubsub> | 141 | ······</pubsub> |
| 142 | ····</iq> | 142 | ····</iq> |
| 143 | ···· | 143 | ···· |
| 144 | ····</pre></div> | 144 | ····</pre></div> |
| | |
| 145 | ····<div·class="indent"><h3>3.2.1·<a·name="sect-idp29637304"·id="sect-idp29637304">Current·activity·in·link-local·XMPP</a></h3> | 145 | ····<div·class="indent"><h3>3.2.1·<a·name="sect-idp29633208"·id="sect-idp29633208">Current·activity·in·link-local·XMPP</a></h3> |
| 146 | ······<p>In·link-local·XMPP,·the·current·activity·is·mapped·to·a·pair·of | 146 | ······<p>In·link-local·XMPP,·the·current·activity·is·mapped·to·a·pair·of |
| 147 | ········keys·in·the·TXT·record:·olpc-current-activity·(the·activity·ID) | 147 | ········keys·in·the·TXT·record:·olpc-current-activity·(the·activity·ID) |
| 148 | ········and·olpc-current-activity-room·(the·Salut·rMulticast·chat·room | 148 | ········and·olpc-current-activity-room·(the·Salut·rMulticast·chat·room |
| 149 | ········name).</p> | 149 | ········name).</p> |
| | |
| 150 | ······<p·class="caption"></p><div·class="indent"><pre·class="prettyprint"> | 150 | ······<p·class="caption"></p><div·class="indent"><pre·class="prettyprint"> |
| 151 | ········11111@xo-12-34-56._presence._tcp.local.·IN·TXT·"olpc-current-activity=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" | 151 | ········11111@xo-12-34-56._presence._tcp.local.·IN·TXT·"olpc-current-activity=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" |
| 152 | ········11111@xo-12-34-56._presence._tcp.local.·IN·TXT·"olpc-current-activity-room=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" | 152 | ········11111@xo-12-34-56._presence._tcp.local.·IN·TXT·"olpc-current-activity-room=aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" |
| 153 | ······</pre></div> | 153 | ······</pre></div> |
| 154 | ····</div> | 154 | ····</div> |
| | |
| 155 | ··</div> | 155 | ··</div> |
| | |
| 156 | ··<div·class="indent"><h3>3.3·<a·name="sect-idp29716152"·id="sect-idp29716152">Public·activity·properties</a></h3> | 156 | ··<div·class="indent"><h3>3.3·<a·name="sect-idp29712056"·id="sect-idp29712056">Public·activity·properties</a></h3> |
| | |
| 157 | ····<p>For·activities·to·be·handled·by·the·Sugar·environment,·certain | 157 | ····<p>For·activities·to·be·handled·by·the·Sugar·environment,·certain |
| 158 | ······properties·are·needed.·Because·there·is·no·server-side·storage | 158 | ······properties·are·needed.·Because·there·is·no·server-side·storage |
| 159 | ······corresponding·to·a·chat·room·and·accessible·by·all·participants, | 159 | ······corresponding·to·a·chat·room·and·accessible·by·all·participants, |
| 160 | ······participants·each·publish·the·properties·of·all·their·activities.</p> | 160 | ······participants·each·publish·the·properties·of·all·their·activities.</p> |
| | |
| 161 | ····<p>To·keep·participants'·idea·of·the·activity·properties·in·sync, | 161 | ····<p>To·keep·participants'·idea·of·the·activity·properties·in·sync, |