diff --git a/i2p2www/pages/global/nav.html b/i2p2www/pages/global/nav.html index 6f965f29..fa384a81 100644 --- a/i2p2www/pages/global/nav.html +++ b/i2p2www/pages/global/nav.html @@ -53,6 +53,18 @@
- "info": a Properties (UTF-8 String/String Map), serialized as a Mapping: + "info": a Properties (UTF-8 String/String Map), serialized as a Mapping: "version": "2" "created": Java long time (ms) "upgraded": Java long time (ms) (as of database version 2) @@ -181,7 +181,7 @@ The maximum number of entries per span is 16.The skiplist keys are 4-byte Integers, the first 4 bytes of the hash of the Destination. - The skiplist values are each a Properties (a UTF-8 String/String Map) serialized as a Mapping + The skiplist values are each a Properties (a UTF-8 String/String Map) serialized as a Mapping There may be multiple entries in the properties, each one is a reverse mapping, as there may be more than one hostname for a given destination, or there could be collisions with the same first 4 bytes of the hash. @@ -197,8 +197,8 @@ The keys/values in these skiplists are as follows:key: a UTF-8 String (the hostname) - value: a DestEntry, which is a Properties (a UTF-8 String/String Map) serialized as a Mapping - followed by a binary Destination (serialized as usual). + value: a DestEntry, which is a Properties (a UTF-8 String/String Map) serialized as a Mapping + followed by a binary Destination (serialized as usual).diff --git a/www.i2p2/pages/common_structures_spec.html b/i2p2www/pages/site/docs/specs/common_structures.html similarity index 94% rename from www.i2p2/pages/common_structures_spec.html rename to i2p2www/pages/site/docs/specs/common_structures.html index 83e0352c..ca582871 100644 --- a/www.i2p2/pages/common_structures_spec.html +++ b/i2p2www/pages/site/docs/specs/common_structures.html @@ -1,4 +1,4 @@ -{% extends "_layout.html" %} +{% extends "global/layout.html" %} {% block title %}Common structure Specification{% endblock %} {% block content %} Updated March 2012, current as of router version 0.8.13 @@ -7,7 +7,7 @@ Updated March 2012, current as of router version 0.8.13 This document describes some data types common to all I2P protocols, like I2NP, I2CP, - SSU, + SSU, etc.
@@ -61,7 +61,7 @@ Deprecated - unusedDescription
This structure is used in ElGamal encryption, representing only the exponent, not the primes, which are constant and defined in - the cryptography specification. + the cryptography specification.
Contents
@@ -74,7 +74,7 @@ Deprecated - unused
Description
This structure is used in ElGamal decryption, representing only the exponent, not the primes which are constant and defined in - the cryptography specification. + the cryptography specification.
Contents
@@ -98,7 +98,7 @@ Deprecated - unused
SigningPublicKey
Description
- This structure is used for verifying DSA signatures. + This structure is used for verifying DSA signatures.
Contents
@@ -110,7 +110,7 @@ Deprecated - unused
SigningPrivateKey
Description
- This structure is used for creating DSA signatures. + This structure is used for creating DSA signatures.
Contents
@@ -122,7 +122,7 @@ Deprecated - unused
Signature
Description
- This structure represents the DSA signature of some data. + This structure represents the DSA signature of some data.
Contents
@@ -204,9 +204,9 @@ payload :: data
-See the plugin specification. +See the plugin specification.
-Datagrams, like streaming library packets, +Datagrams, like streaming library packets, are an application-level construct. -These protocols are independent of the low-level transports; +These protocols are independent of the low-level transports; the protocols are converted to I2NP messages by the router, and either protocol may be carried by either transport.
@@ -23,8 +23,8 @@ either protocol may be carried by either transport.Applications written in Java may use the datagram API, while applications in other languages -can use SAM's datagram support. -There is also limited support in i2ptunnel in the SOCKS proxy, +can use SAM's datagram support. +There is also limited support in i2ptunnel in the SOCKS proxy, the 'streamr' tunnel types, and udpTunnel classes.
@@ -37,7 +37,7 @@ by an intermediate hop. Messages larger than a few KB are not recommended.Also note that the various overheads added by lower layers, in particular asymmetric -ElGamal/AES, place a large burden on intermittent messages +ElGamal/AES, place a large burden on intermittent messages such as used by a Kademlia-over-UDP application. The implementations are currently tuned for frequent traffic using the streaming library. There are a high number of session tags delivered, and a short session tag lifetime, for example. @@ -78,11 +78,11 @@ There is no checksum field in the datagram protocol.
- 1 byte Integer specifying the type of this message, - followed by a 4 byte Integer specifying the message-id. - After that there is an expiration Date, - followed by a 2 byte Integer specifying - the length of the message payload, followed by a Hash, + 1 byte Integer specifying the type of this message, + followed by a 4 byte Integer specifying the message-id. + After that there is an expiration Date, + followed by a 2 byte Integer specifying + the length of the message payload, followed by a Hash, which is truncated to the first byte. After that the actual message data follows.
@@ -90,7 +90,7 @@ data :: Data
- TunnelId to receive messages on, followed by the Hash of our RouterIdentity. After that the TunnelId and the Hash of the next router's RouterIdentity follow. + TunnelId to receive messages on, followed by the Hash of our RouterIdentity. After that the TunnelId and the Hash of the next router's RouterIdentity follow.
@@ -272,7 +272,7 @@ total length: 528
unencrypted: -Delivery Instructions :: as defined here +Delivery Instructions :: as defined here Length varies but is typically 39, 43, or 47 bytes I2NP Message :: Any I2NP Message @@ -363,9 +363,9 @@ Certificate :: Always NULL in the current implementation (3 bytes total, all zer If 1, the clove is encrypted, and a 32 byte Session Key immediately follows the flag byte. Clove encryption is not fully implemented.
Standard .sud header prepended to the zip file, containing the following: - 40-byte DSA signature + 40-byte DSA signature 16-byte plugin version in UTF-8, padded with trailing zeroes if necessary Zip file containing the following: @@ -74,7 +74,7 @@ foo.xpi2p is a sud file containing the following: *name (will be installed in this directory name) For native plugins, you may want separate names in different packages - foo-windows and foo-linux, for example - *key (DSA public key as 172 B64 chars ending with '=') + *key (DSA public key as 172 B64 chars ending with '=') *signer (yourname@mail.i2p recommended) *version (must be in a format VersionComparator can parse, e.g. 1.2.3-4) diff --git a/www.i2p2/pages/tunnel_message_spec.html b/i2p2www/pages/site/docs/specs/tunnel_message.html similarity index 96% rename from www.i2p2/pages/tunnel_message_spec.html rename to i2p2www/pages/site/docs/specs/tunnel_message.html index 3dbc8881..85a31dce 100644 --- a/www.i2p2/pages/tunnel_message_spec.html +++ b/i2p2www/pages/site/docs/specs/tunnel_message.html @@ -1,4 +1,4 @@ -{% extends "_layout.html" %} +{% extends "global/layout.html" %} {% block title %}Tunnel Message Specification{% endblock %} {% block content %} @@ -166,11 +166,11 @@ set, this is a follow on fragment.Note that Delivery Instructions are also used inside -Garlic Cloves, +Garlic Cloves, where the format is slightly different. In a Garlic Clove, messages are not fragmented, and the fragment bit in the flag byte is redefined. See the -Garlic Clove documentation +Garlic Clove documentation for more details. @@ -238,7 +238,7 @@ Message ID: 4 bytes Optional, present if this message is the first of 2 or more fragments An ID that uniquely identifies all fragments as belonging to a single message - (the current implementation uses the I2NP Message ID) + (the current implementation uses the I2NP Message ID) Extended Options: 2 or more bytes