diff --git a/i2p2www/pages/site/docs/spec/blockfile.html b/i2p2www/pages/site/docs/spec/blockfile.html index 5077195a..f9ed3958 100644 --- a/i2p2www/pages/site/docs/spec/blockfile.html +++ b/i2p2www/pages/site/docs/spec/blockfile.html @@ -50,7 +50,7 @@ The BlockfileNamingService provides synchronization.
{% trans -%} Superblock format: {%- endtrans %}
-+{% highlight %} Byte Contents 0-5 Magic number 0x3141de493250 ("1A" 0xde "I2P") 6 Major version 0x01 @@ -60,12 +60,12 @@ Byte Contents 20-21 Mounted flag 0x01 = yes 22-23 Span size max number of key/value pairs per span (16 for hostsdb) 24-1023 unused -+{% endhighlight %}
{% trans -%} Skip list block page format: {%- endtrans %}
-+{% highlight %} Byte Contents 0-7 Magic number 0x536b69704c697374 "SkipList" 8-11 First span page @@ -74,14 +74,14 @@ Byte Contents 20-23 Spans (total number of spans - may only be valid at startup) 24-27 Levels (total number of levels - may only be valid at startup) 28-1023 unused -+{% endhighlight %}
{% trans -%} Skip level block page format is as follows. All levels have a span. Not all spans have levels. {%- endtrans %}
-+{% highlight %} Byte Contents 0-7 Magic number 0x42534c6576656c73 "BSLevels" 8-9 Max height @@ -89,7 +89,7 @@ Byte Contents 12-15 Span page 16- Next level pages ('current height' entries, 4 bytes each, lowest first) remaining bytes unused -+{% endhighlight %}
{% trans -%} @@ -98,7 +98,7 @@ Key/value structures are sorted by key within each span and across all spans. Key/value structures are sorted by key within each span. Spans other than the first span may not be empty. {%- endtrans %}
-+{% highlight %} Byte Contents 0-3 Magic number 0x5370616e "Span" 4-7 First continuation page or 0 @@ -107,17 +107,17 @@ Byte Contents 16-17 Max keys (16 for hostsdb) 18-19 Size (current number of keys) 20-1023 key/value structures -+{% endhighlight %}
{% trans -%} Span Continuation block page format: {%- endtrans %}
-+{% highlight %} Byte Contents 0-3 Magic number 0x434f4e54 "CONT" 4-7 Next continuation page or 0 8-1023 key/value structures -+{% endhighlight %}
{% trans -%} @@ -128,34 +128,34 @@ be at offset 8 in the continuation page. Key and value data may be split across pages. Max key and value lengths are 65535 bytes. {%- endtrans %}
-+{% highlight %} Byte Contents 0-1 key length in bytes 2-3 value length in bytes 4- key data value data -+{% endhighlight %}
{% trans -%} Free list block page format: {%- endtrans %}
-+{% highlight %} Byte Contents 0-7 Magic number 0x2366724c69737423 "#frList#" 8-11 Next free list block or 0 if none 12-15 Number of valid free pages in this block (0 - 252) 16-1023 Free pages (4 bytes each), only the first (valid number) are valid -+{% endhighlight %}
{% trans -%} Free page block format: {%- endtrans %}
-+{% highlight %} Byte Contents 0-7 Magic number 0x7e2146524545217e "~!FREE!~" 8-1023 unused -+{% endhighlight %}
{% trans -%} The metaindex (located at page 2) is a mapping of US-ASCII strings to 4-byte integers. diff --git a/i2p2www/pages/site/docs/spec/common-structures.html b/i2p2www/pages/site/docs/spec/common-structures.html index 21b93321..0d25580f 100644 --- a/i2p2www/pages/site/docs/spec/common-structures.html +++ b/i2p2www/pages/site/docs/spec/common-structures.html @@ -179,8 +179,7 @@ A certificate is a container for various receipts or proof of works used through
{% trans -%} 1 byte Integer specifying certificate type, followed by a 2 Integer specifying the size of the certificate payload, then that many bytes. {% endtrans %}
--{% filter escape %} +{% highlight %} +----+----+----+----+----+--// |type| length | payload +----+----+----+----+----+--// @@ -199,8 +198,7 @@ length :: Integer payload :: data length -> $length bytes -{% endfilter %} -+{% endhighlight %}
{% trans -%} A 2-byte size Integer followed by a series of String=String; pairs {% endtrans %}
--{% filter escape %} +{% highlight %} +----+----+----+----+----+----+----+----+ | size |key string (len + data) | = | +----+----+----+----+----+----+----+----+ @@ -255,8 +252,7 @@ val string :: String ; :: A single byte containing ';' -{% endfilter %} -+{% endhighlight %}
{% trans -%} PublicKey followed by SigningPublicKey and then a Certificate {% endtrans %}
--{% filter escape %} +{% highlight %} +----+----+----+----+----+----+----+----+ | public_key | + + @@ -335,8 +330,7 @@ certificate :: Certificate length -> >= 3 bytes Total length: 387+ bytes -{% endfilter %} -+{% endhighlight %}
{% trans -%} @@ -354,8 +348,7 @@ A Destination defines a particular endpoint to which messages can be directed fo
{% trans -%} PublicKey followed by a SigningPublicKey and then a Certificate {% endtrans %}
--{% filter escape %} +{% highlight %} +----+----+----+----+----+----+----+----+ | public_key | + + @@ -386,8 +379,7 @@ certificate :: Certificate length -> >= 3 bytes Total length: 387+ bytes -{% endfilter %} -+{% endhighlight %}
-{% filter escape %} +{% highlight %} +----+----+----+----+----+----+----+----+ | tunnel_gw | + + @@ -425,8 +416,7 @@ tunnel_id :: TunnelId end_date :: Date length -> 8 bytes -{% endfilter %} -+{% endhighlight %}
-{% filter escape %} +{% highlight %} +----+----+----+----+----+----+----+----+ | destination | + + @@ -535,8 +524,7 @@ leases :: [Lease] signature :: Signature length -> 40 bytes -{% endfilter %} -+{% endhighlight %}
-{% filter escape %} +{% highlight %} +----+ |cost| +----+----+----+----+----+----+----+----+ @@ -602,8 +589,7 @@ transport_style :: String length -> 1-256 bytes options :: Mapping -{% endfilter %} -+{% endhighlight %}
{% trans -%} RouterIdentity followed by the Date, when the entry was published {% endtrans %}
--{% filter escape %} +{% highlight %} +----+----+----+----+----+----+----+----+ | router_ident | + + @@ -706,8 +691,7 @@ options :: Mapping signature :: Signature length -> 40 bytes -{% endfilter %} -+{% endhighlight %}
{% trans -%} diff --git a/i2p2www/pages/site/docs/spec/datagrams.html b/i2p2www/pages/site/docs/spec/datagrams.html index 0791808f..0cb82d5d 100644 --- a/i2p2www/pages/site/docs/spec/datagrams.html +++ b/i2p2www/pages/site/docs/spec/datagrams.html @@ -19,14 +19,14 @@ However, SAM and the I2PTunnel classes support "raw datagrams". {%- endtrans %}
+{% highlight %} +----+----+----+----+----// | payload... +----+----+----+----+----// Length: 0 - unlimited (see notes) -+{% endhighlight %}
{% trans tunnelmessage=site_url('docs/spec/tunnel-message'), diff --git a/i2p2www/pages/site/docs/spec/geoip.html b/i2p2www/pages/site/docs/spec/geoip.html index 4a233942..66655450 100644 --- a/i2p2www/pages/site/docs/spec/geoip.html +++ b/i2p2www/pages/site/docs/spec/geoip.html @@ -16,11 +16,11 @@ used by the router to look up a country for an IP. This format is easily generated from data files available from many public sources. For example: {%- endtrans %}
--# wget http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip -# unzip GeoIPCountryCSV.zip -# cut -d, -f5,6 < GeoIPCountryWhois.csv |sed 's/"//g' | sort | uniq > countries.txt -+{% highlight lang='bash' %} +$ wget http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip +$ unzip GeoIPCountryCSV.zip +$ cut -d, -f5,6 < GeoIPCountryWhois.csv |sed 's/"//g' | sort | uniq > countries.txt +{% endhighlight %}
-# wget http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip -# unzip GeoIPCountryCSV.zip -# cut -d, -f3-5 < GeoIPCountryWhois.csv|sed 's/"//g' > geoip.txt -# cut -d, -f5,6 < GeoIPCountryWhois.csv |sed 's/"//g' | sort | uniq > countries.txt -+{% highlight lang='bash' %} +$ wget http://geolite.maxmind.com/download/geoip/database/GeoIPCountryCSV.zip +$ unzip GeoIPCountryCSV.zip +$ cut -d, -f3-5 < GeoIPCountryWhois.csv|sed 's/"//g' > geoip.txt +$ cut -d, -f5,6 < GeoIPCountryWhois.csv |sed 's/"//g' | sort | uniq > countries.txt +{% endhighlight %}
+{% highlight %} Bytes 0-9: Magic number "I2PGeoIPv6" Bytes 10-11: Version (0x0001) Bytes 12-15 Options (0x00000000) (future use) @@ -67,7 +67,7 @@ The file is gzipped. Ungzipped format: 8 byte from (/64) 8 byte to (/64) 2 byte ISO country code LOWER case (ASCII) -+{% endhighlight %}
{% trans %}NOTES:{% endtrans %}
-{% filter escape %} +{% highlight %} Client Router ---------------------> Protocol Byte (0x2a) @@ -57,49 +56,41 @@ I2CP connection. Session Status Message <--------------------- Request LeaseSet Message <--------------------- ---------------------> Create LeaseSet Message -{% endfilter %} -+{% endhighlight %}
-{% filter escape %} +{% highlight %} Client Router ---------------------> Protocol Byte (0x2a) ---------------------> Get Bandwidth Limits Message Bandwidth Limits Message <--------------------- -{% endfilter %} -+{% endhighlight %}
-{% filter escape %} +{% highlight %} Client Router ---------------------> Protocol Byte (0x2a) ---------------------> Dest Lookup Message Dest Reply Message <--------------------- -{% endfilter %} -+{% endhighlight %}
Existing session, with i2cp.messageReliability=none
--{% filter escape %} +{% highlight %} Client Router ---------------------> Send Message Message -{% endfilter %} -+{% endhighlight %}
Existing session, with i2cp.messageReliability=BestEffort
--{% filter escape %} +{% highlight %} Client Router ---------------------> Send Message Message @@ -107,24 +98,20 @@ Bandwidth Limits Message <--------------------- (accepted) Message Status Message <--------------------- (succeeded) -{% endfilter %} -+{% endhighlight %}
Existing session, with i2cp.fastReceive=true (as of 0.9.4)
--{% filter escape %} +{% highlight %} Client Router Message Payload Message <--------------------- -{% endfilter %} -+{% endhighlight %}
Existing session, with i2cp.fastReceive=false
--{% filter escape %} +{% highlight %} Client Router Message Status Message <--------------------- @@ -132,8 +119,7 @@ Bandwidth Limits Message <--------------------- ---------------------> Receive Message Begin Message Message Payload Message <--------------------- ---------------------> Receive Message End Message -{% endfilter %} -+{% endhighlight %}
-{% filter escape %} +{% highlight %} Standard (16 bytes): +----+----+----+----+----+----+----+----+ @@ -46,12 +45,10 @@ Short (SSU, 5 bytes): |type| short expiration | +----+----+----+----+----+ -{% endfilter %} -+{% endhighlight %}
-{% filter escape %} +{% highlight %} type :: Integer length -> 1 byte @@ -85,8 +82,7 @@ data :: Data length -> $size bytes purpose -> actual message contents -{% endfilter %} -+{% endhighlight %}
-{% filter escape %} +{% highlight %} Cleartext: +----+----+----+----+----+----+----+----+ | receive_tunnel | our_ident | @@ -198,12 +193,10 @@ ElGamal and AES encrypted: ~ ~ | | +----+----+----+----+----+----+----+----+ -{% endfilter %} -+{% endhighlight %}
-{% filter escape %} +{% highlight %} unencrypted: receive_tunnel :: TunnelId @@ -264,8 +257,7 @@ encrypted_data :: ElGamal and AES encrypted data total length: 528 -{% endfilter %} -+{% endhighlight %}
-{% filter escape %} +{% highlight %} unencrypted: +----+----+----+----+----+----+----+----+ | random data... | @@ -290,11 +281,9 @@ unencrypted: + +----+ | |ret | +----+----+----+----+----+----+----+----+ -{% endfilter %} -+{% endhighlight %}
-{% filter escape %} +{% highlight %} unencrypted: bytes 0-526: random data byte 527 : reply @@ -304,8 +293,7 @@ bytes 0-527: AES-encrypted record(note: same size as BuildRequestRecord) total length: 528 -{% endfilter %} -+{% endhighlight %}
-{% filter escape %} +{% highlight %} unencrypted: +----+----+----+----+----+----+----+----+ | Delivery Instructions | @@ -335,8 +322,7 @@ unencrypted: +----+----+----+----+----+----+----+----+ | Certificate | +----+----+----+----+----+----+----+ -{% endfilter %} -+{% endhighlight %}
unencrypted: @@ -448,7 +434,7 @@ Defined in the TunAn uncompressed LeaseSet or a compressed RouterInfo
-+{% highlight %} with reply token: +----+----+----+----+----+----+----+----+ | SHA256 Hash as key | @@ -484,7 +470,7 @@ with reply token == 0: +----+----+----+----+----+----+----+----+ |type| 0 | data ... +----+-------------------+---------\\ -+{% endhighlight %}Definition
key: @@ -529,8 +515,7 @@ For security, the reply fields are ignored if the message is received down a tunDatabaseLookup
--{% filter escape %} +{% highlight %} +----+----+----+----+----+----+----+----+ | SHA256 hash as the key to look up | + + @@ -580,12 +565,10 @@ For security, the reply fields are ignored if the message is received down a tun + + | | +----+----+----+----+----+----+----+----+ -{% endfilter %} -+{% endhighlight %}Definition
--{% filter escape %} +{% highlight %} key: 32 bytes SHA256 hash of the object to lookup @@ -642,8 +625,7 @@ reply tags: One or more 32 byte SessionTags (typically one) Only included if encryptionFlag == 1 -{% endfilter %} -+{% endhighlight %}Notes
- @@ -665,8 +647,7 @@ The number of included tags could be greater than one if alternative DHT lookup
A list of router hashes closest to the requested key
--{% filter escape %} +{% highlight %} +----+----+----+----+----+----+----+----+ | SHA256 hash as query key | + + @@ -700,12 +681,10 @@ The number of included tags could be greater than one if alternative DHT lookup +----+ -{% endfilter %} -+{% endhighlight %}Definition
--{% filter escape %} +{% highlight %} key: 32 bytes SHA256 of the object being searched @@ -722,8 +701,7 @@ peer hash: from: 32 bytes SHA256 of the RouterInfo of the router this reply was sent from -{% endfilter %} -+{% endhighlight %}Notes
@@ -740,17 +718,14 @@ from:
The ID of the delivered message, and the creation or arrival time.
--{% filter escape %} +{% highlight %} +----+----+----+----+----+----+----+----+----+----+----+----+ |msg-id | time stamp | +----+----+----+----+----+----+----+----+----+----+----+----+ -{% endfilter %} -+{% endhighlight %}Definition
--{% filter escape %} +{% highlight %} msg-id: 4 bytes unique ID of the message we deliver the DeliveryStatus for (see common I2NP header for details) @@ -758,8 +733,7 @@ msg-id: time stamp: Date 8 bytes time the message was successfully created or delivered -{% endfilter %} -+{% endhighlight %}Notes
- @@ -781,8 +755,7 @@ time stamp: Date
When decrypted, a series of Garlic Cloves.
--{% filter escape %} +{% highlight %} encrypted: +----+----+----+----+----+----+----+----+ | length | data | @@ -812,12 +785,10 @@ unencrypted data: +----+----+----+----+----+----+----+----+ Expiration | +----+----+----+----+----+----+----+ -{% endfilter %} -+{% endhighlight %}Definition
--{% filter escape %} +{% highlight %} Encrypted: length: @@ -842,8 +813,7 @@ Message ID :: 4 byte Integer Expiration :: Date (8 bytes) -{% endfilter %} -+{% endhighlight %}Notes
@@ -873,8 +843,7 @@ Expiration :: Date (8 bytes)
TunnelData
--{% filter escape %} +{% highlight %} +----+----+----+----+----+----+----+----+ | tunnnelID | data | +----+----+----+----+ | @@ -885,12 +854,10 @@ Expiration :: Date (8 bytes) + +----+----+----+----+ | | +----+----+----+----+ -{% endfilter %} -+{% endhighlight %}Definition
--{% filter escape %} +{% highlight %} tunnelId: 4 byte Tunnel ID identifies the tunnel this message is directed at @@ -898,8 +865,7 @@ tunnelId: data: 1024 bytes payload data.. fixed to 1024 bytes -{% endfilter %} -+{% endhighlight %}Notes
@@ -909,17 +875,14 @@ data:
TunnelGateway
--{% filter escape %} +{% highlight %} +----+----+----+----+----+----+--\\----+ | tunnelId | length | data...| +----+----+----+----+----+----+--\\----+ -{% endfilter %} -+{% endhighlight %}Definition
--{% filter escape %} +{% highlight %} tunnelId: 4 byte Tunnel ID identifies the tunnel this message is directed at @@ -931,8 +894,7 @@ length: data: $length bytes actual payload of this message -{% endfilter %} -+{% endhighlight %}Notes
@@ -951,17 +913,14 @@ data:
A length Integer, followed by opaque data.
--{% filter escape %} +{% highlight %} +----+----+----+----+----+---//--+ | length | data... | +----+----+----+----+----+---//--+ -{% endfilter %} -+{% endhighlight %}Definition
--{% filter escape %} +{% highlight %} length: 4 bytes length of the payload @@ -969,12 +928,10 @@ length: data: $length bytes actual payload of this message -{% endfilter %} -+{% endhighlight %}TunnelBuild
--{% filter escape %} +{% highlight %} +----+----+----+----+----+----+----+----+ | Record 0 ... | @@ -988,17 +945,14 @@ data: | | +----+----+----+----+----+----+----+----+ -{% endfilter %} -+{% endhighlight %}Definition
--{% filter escape %} +{% highlight %} Just 8 Build Request Records attached together Record size: 528 bytes Total size: 8*528 = 4224 bytes -{% endfilter %} -+{% endhighlight %}Notes
@@ -1007,11 +961,9 @@ Total size: 8*528 = 4224 bytes
TunnelBuildReply
--{% filter escape %} +{% highlight %} same format as TunnelBuild message, with Build Response Records -{% endfilter %} -+{% endhighlight %}Notes
@@ -1019,17 +971,14 @@ same format as TunnelBuild message, with Build Response Records
VariableTunnelBuild
--{% filter escape %} +{% highlight %} +----+----+----+----+----+----+----+----+ |num | BuildRequestRecords... +----+----+----+----+----+----+----+----+ -{% endfilter %} -+{% endhighlight %}Definition
--{% filter escape %} +{% highlight %} Same format as TunnelBuildMessage, except for the addition of an "num" field in front and $num number of Build Request Records instead of 8 num: @@ -1038,8 +987,7 @@ num: Record size: 528 bytes Total size: 1 + $num*528 -{% endfilter %} -+{% endhighlight %}Notes
@@ -1050,13 +998,11 @@ Total size: 1 + $num*528
VariableTunnelBuildReply
--{% filter escape %} +{% highlight %} +----+----+----+----+----+----+----+----+ |num | BuildResponseRecords... +----+----+----+----+----+----+----+----+ -{% endfilter %} -+{% endhighlight %}Definition
Same format as VariableTunnelBuild message, with Build Response Records. diff --git a/i2p2www/pages/site/docs/spec/ssu.html b/i2p2www/pages/site/docs/spec/ssu.html index d4b1050d..ac291f3d 100644 --- a/i2p2www/pages/site/docs/spec/ssu.html +++ b/i2p2www/pages/site/docs/spec/ssu.html @@ -56,15 +56,15 @@ using this flag are. to the various messages - a one byte flag and a four byte sending timestamp (seconds since the unix epoch). The flag byte contains the following bitfields: -+{% highlight %} Bit order: 76543210 (bit 7 is MSB) bits 7-4: payload type bit 3: rekey? bit 2: extended options included bits 1-0: reserved --+{% endhighlight %} +{% highlight %} Header: 37+ bytes Encryption starts with the flag byte. +----+----+----+----+----+----+----+----+ @@ -81,7 +81,7 @@ the following bitfields: | this may have 64 byte keying material | | and/or a one+N byte extended options) | +---------------------------------------| -+{% endhighlight %}Rekeying
@@ -192,7 +192,7 @@ This is the first message sent to establish a session.introKey -+{% highlight %} +----+----+----+----+----+----+----+----+ | X, as calculated from DH | | | @@ -206,7 +206,7 @@ This is the first message sent to establish a session. . . . | | +----+----+----+----+----+----+----+----+ -+{% endhighlight %}Typical size including header, in current implementation: 304 (IPv4) or 320 (IPv6) bytes @@ -252,7 +252,7 @@ This is the response to a Session Request. signature and the following 8 bytes padding. -
+{% highlight %} +----+----+----+----+----+----+----+----+ | Y, as calculated from DH | | | @@ -282,7 +282,7 @@ This is the response to a Session Request. . . . | | +----+----+----+----+----+----+----+----+ -+{% endhighlight %}Typical size including header, in current implementation: 368 bytes (IPv4 or IPv6) @@ -343,7 +343,7 @@ bits 3-0: total identity fragments (F) 1-15
+{% highlight %} Fragment 0 through F-2 +----+----+----+----+----+----+----+----+ |info| cursize | | @@ -382,7 +382,7 @@ bits 3-0: total identity fragments (F) 1-15
Typical size including header, in current implementation: 480 bytes @@ -423,11 +423,11 @@ and is never sent. Transmission implemented as of release 0.8.9.
+{% highlight %} +----+----+----+----+----+----+----+----+ | no data | +----+----+----+----+----+----+----+----+ -+{% endhighlight %}
Typical size including header, in current implementation: 48 bytes @@ -457,7 +457,7 @@ This is the first message sent from Alice to Bob to request an introduction to C
+{% highlight %} +----+----+----+----+----+----+----+----+ | relay tag |size| Alice IP addr +----+----+----+----+----+--- +----+----| @@ -477,7 +477,7 @@ This is the first message sent from Alice to Bob to request an introduction to C +----+----+----+----+ | | arbitrary amount of uninterpreted data| +----+----+----+----+----+----+----+----+ -+{% endhighlight %}
Typical size including header, in current implementation: 96 bytes (no Alice IP included) or 112 bytes (4-byte Alice IP included) @@ -523,7 +523,7 @@ This is the response to a Relay Request and is sent from Bob to Alice.
+{% highlight %} +----+----+----+----+----+----+----+----+ |size| Charlie IP | Port (C)|size| +----+----+----+----+----+----+----+----+ @@ -533,7 +533,7 @@ This is the response to a Relay Request and is sent from Bob to Alice. +----+----+ | | uninterpreted data | +----+----+----+----+----+----+----+----+ -+{% endhighlight %}
Typical size including header, in current implementation: 64 (Alice IPv4) or 80 (Alice IPv6) bytes @@ -576,7 +576,7 @@ This is the introduction for Alice, which is sent from Bob to Charlie.
+{% highlight %} +----+----+----+----+----+----+----+----+ |size| Alice IP | Port (A)|size| +----+----+----+----+----+----+----+----+ @@ -586,7 +586,7 @@ This is the introduction for Alice, which is sent from Bob to Charlie. +----+----+----+----+----+----+----+----+ | arbitrary amount of uninterpreted data| +----+----+----+----+----+----+----+----+ -+{% endhighlight %}
Typical size including header, in current implementation: 48 bytes @@ -680,7 +680,7 @@ byte 1
+{% highlight %} +----+----+----+----+----+----+----+----+ |flag| (additional headers, determined | +----+ | @@ -707,7 +707,7 @@ byte 1 +----+----+----+----+----+----+----+----+ | arbitrary amount of uninterpreted data| +----+----+----+----+----+----+----+----+ -+{% endhighlight %}
+{% highlight %} +----+----+----+----+----+----+----+----+ | test nonce |size| Alice IP addr +----+----+----+----+----+----+----+----+ @@ -791,7 +791,7 @@ See the SSU overview |----+----+----+ | | uninterpreted data | +----+----+----+----+----+----+----+----+ -+{% endhighlight %}
Typical size including header, in current implementation: 80 bytes
@@ -829,7 +829,7 @@ It is sent from Charlie to Alice as a part of the Introduction sequence.
Minimal data message (no fragments, no ACKs, no NACKs, etc)
(Size: 39 bytes)
-
+{% highlight %} +----+----+----+----+----+----+----+----+ | MAC | + + @@ -843,12 +843,12 @@ It is sent from Charlie to Alice as a part of the Introduction sequence. +----+----+----+----+----+----+----+ | | padding to fit a full AES256 block | +----+----+----+----+----+----+----+----+ -+{% endhighlight %} Minimal data message with payload
+{% highlight %} +----+----+----+----+----+----+----+----+ | MAC | + + @@ -866,7 +866,7 @@ It is sent from Charlie to Alice as a part of the Introduction sequence. . . . | | +----+----+----+----+----+----+----+----+ -+{% endhighlight %} {% endblock %} diff --git a/i2p2www/pages/site/docs/spec/streaming.html b/i2p2www/pages/site/docs/spec/streaming.html index 41e49de9..4fd00950 100644 --- a/i2p2www/pages/site/docs/spec/streaming.html +++ b/i2p2www/pages/site/docs/spec/streaming.html @@ -12,7 +12,7 @@ See the Streaming page for an overview of the Streaming Library.
{% trans -%} The format of a single packet in the streaming protocol is: {%- endtrans %}
-+{% highlight %} +----+----+----+----+----+----+----+----+ | send Stream ID | rcv Stream ID | @@ -29,7 +29,7 @@ The format of a single packet in the streaming protocol is: +----+----+----+----// -+{% endhighlight %}
{{ _('Field') }} | {{ _('Length') }} | {{ _('Contents') }}
diff --git a/i2p2www/pages/site/docs/spec/tunnel-message.html b/i2p2www/pages/site/docs/spec/tunnel-message.html
index 35144221..9e5c2274 100644
--- a/i2p2www/pages/site/docs/spec/tunnel-message.html
+++ b/i2p2www/pages/site/docs/spec/tunnel-message.html
@@ -32,8 +32,7 @@ After the tunnel messages are created, they are encrypted as described in
Tunnel Message (Encrypted)These are the contents of a tunnel data message after encryption. --{% filter escape %} +{% highlight %} +----+----+----+----+----+----+----+----+ | Tunnel ID | IV | +----+----+----+----+ + @@ -48,12 +47,10 @@ These are the contents of a tunnel data message after encryption. + +-------------------+ | | +----+----+----+----+ -{% endfilter %} -+{% endhighlight %} Definition--{% filter escape %} +{% highlight %} Tunnel ID: 4 bytes The ID of the next hop @@ -68,14 +65,12 @@ Encrypted Data Total Size: 1028 Bytes -{% endfilter %} -+{% endhighlight %} Tunnel Message (Decrypted)These are the contents of a tunnel data message when decrypted. --{% filter escape %} +{% highlight %} +----+----+----+----+----+----+----+----+ | Tunnel ID | IV | +----+----+----+----+ + @@ -113,8 +108,7 @@ These are the contents of a tunnel data message when decrypted. + +-------------------+ | | +----+----+----+----+ -{% endfilter %} -+{% endhighlight %} Definition@@ -176,8 +170,7 @@ for more details. |
---|