From c040cb56b577ec4d22a2e4ee42e077e7e12aaa31 Mon Sep 17 00:00:00 2001 From: str4d Date: Sat, 27 Jun 2015 13:40:17 +0000 Subject: [PATCH] Disambiguate TMDI and GCDI (for ctags) --- i2p2www/pages/site/docs/how/elgamal-aes.html | 2 +- i2p2www/pages/site/docs/how/garlic-routing.html | 15 ++++++--------- .../pages/site/docs/spec/common-structures.html | 4 ++-- i2p2www/pages/site/docs/spec/i2np.html | 4 ++-- i2p2www/pages/site/docs/spec/tunnel-message.html | 6 +++--- 5 files changed, 14 insertions(+), 17 deletions(-) diff --git a/i2p2www/pages/site/docs/how/elgamal-aes.html b/i2p2www/pages/site/docs/how/elgamal-aes.html index 21833f8c..571b07ad 100644 --- a/i2p2www/pages/site/docs/how/elgamal-aes.html +++ b/i2p2www/pages/site/docs/how/elgamal-aes.html @@ -394,7 +394,7 @@ Change from Session Tags to
  • {% trans tunnelmessage=site_url('docs/spec/tunnel-message') -%} Several of these ideas may require a new I2NP message type, or set a flag in the -Delivery Instructions, +Delivery Instructions, or set a magic number in the first few bytes of the Session Key field and accept a small risk of the random Session Key matching the magic number. {%- endtrans %}
    • diff --git a/i2p2www/pages/site/docs/how/garlic-routing.html b/i2p2www/pages/site/docs/how/garlic-routing.html index e89c091d..d5dede13 100644 --- a/i2p2www/pages/site/docs/how/garlic-routing.html +++ b/i2p2www/pages/site/docs/how/garlic-routing.html @@ -153,8 +153,7 @@ the tunnel encryption is sufficient.

    {% trans commonstructures=site_url('docs/spec/common-structures'), elgamalaes=site_url('docs/how/elgamal-aes'), i2cp=site_url('docs/protocol/i2cp'), -i2npspec=site_url('docs/spec/i2np'), -tunnelmessage=site_url('docs/spec/tunnel-message') -%} +i2npspec=site_url('docs/spec/i2np') -%} At the layer above tunnels, I2P delivers end-to-end messages between Destinations. Just as within a single tunnel, we use @@ -163,7 +162,7 @@ Each client message as delivered to the router through the I2CP interface becomes a single Garlic Clove with its own -Delivery Instructions, +Delivery Instructions, inside a Garlic Message. Delivery Instructions may specify a Destination, Router, or Tunnel. @@ -177,12 +176,11 @@ cloves in the Garlic Message: {{ _('Garlic Message Cloves') }}

      -
    1. {% trans i2npspec=site_url('docs/spec/i2np'), -tunnelmessage=site_url('docs/spec/tunnel-message') -%} +
    2. {% trans i2npspec=site_url('docs/spec/i2np') -%} A Delivery Status Message, with -Delivery Instructions +Delivery Instructions specifying that it be sent back to the originating router as an acknowledgment. This is similar to the "reply block" or "reply onion" described in the references. @@ -193,14 +191,13 @@ or take other actions. {%- endtrans %}
    3. {% trans i2npspec=site_url('docs/spec/i2np'), commonstructures=site_url('docs/spec/common-structures'), -tunnelmessage=site_url('docs/spec/tunnel-message'), netdb=site_url('docs/how/network-database') -%} A Database Store Message, containing a LeaseSet for the originating Destination, with -Delivery Instructions +Delivery Instructions specifying the far-end destination's router. By periodically bundling a LeaseSet, the router ensures that the far-end will be able to maintain communications. @@ -256,7 +253,7 @@ so it is not visible to the tunnel's outbound gateway. The Garlic Message mechanism is very flexible and provides a structure for implementing many types of mixnet delivery methods. Together with the unused delay option in the -tunnel message Delivery Instructions, +tunnel message Delivery Instructions, a wide spectrum of batching, delay, mixing, and routing strategies are possible. {%- endtrans %}

      diff --git a/i2p2www/pages/site/docs/spec/common-structures.html b/i2p2www/pages/site/docs/spec/common-structures.html index e8441b16..4d52efac 100644 --- a/i2p2www/pages/site/docs/spec/common-structures.html +++ b/i2p2www/pages/site/docs/spec/common-structures.html @@ -1009,9 +1009,9 @@ for standard options that are expected to be present in all router infos.

      Delivery Instructions

      {% trans tunnelmessage=site_url('docs/spec/tunnel-message') -%} -Tunnel Message Delivery Instructions are defined in the Tunnel Message Specification. +Tunnel Message Delivery Instructions are defined in the Tunnel Message Specification. {% endtrans %}

      {% trans i2npmessage=site_url('docs/spec/i2np') -%} -Garlic Message Delivery Instructions are defined in the I2NP Message Specification. +Garlic Message Delivery Instructions are defined in the I2NP Message Specification. {% endtrans %}

      {% endblock %} diff --git a/i2p2www/pages/site/docs/spec/i2np.html b/i2p2www/pages/site/docs/spec/i2np.html index 3dd52bc2..bb9a435b 100644 --- a/i2p2www/pages/site/docs/spec/i2np.html +++ b/i2p2www/pages/site/docs/spec/i2np.html @@ -450,7 +450,7 @@ Certificate :: Always NULL in the current implementation (3 bytes total, all zer -

      Garlic Clove Delivery Instructions

      +

      Garlic Clove Delivery Instructions

      This specification is for Delivery Instructions inside Garlic Cloves only. @@ -458,7 +458,7 @@ Note that "Delivery Instructions" are also used inside Tunnel Messages, where the format is significantly different. See the -Tunnel Message documentation +Tunnel Message documentation for details. Do NOT use the following specification for Tunnel Message Delivery Instructions! diff --git a/i2p2www/pages/site/docs/spec/tunnel-message.html b/i2p2www/pages/site/docs/spec/tunnel-message.html index 34b4790f..5622b1d3 100644 --- a/i2p2www/pages/site/docs/spec/tunnel-message.html +++ b/i2p2www/pages/site/docs/spec/tunnel-message.html @@ -136,7 +136,7 @@ Zero :: Delivery Instructions :: length varies but is typically 7, 39, 43, or 47 bytes Indicates the fragment and the routing for the fragment - See below for specification + See below for specification Message Fragment :: 1 to 996 bytes, actual maximum depends on delivery instruction size @@ -157,7 +157,7 @@ and take the Hash of that.

      4. -

      Tunnel Message Delivery Instructions

      +

      Tunnel Message Delivery Instructions

      The instructions are encoded with a single control byte, followed by any necessary additional information. The first bit (MSB) in that control byte determines @@ -171,7 +171,7 @@ Note that "Delivery Instructions" are also used inside Garlic Cloves, where the format is significantly different. See the -I2NP documentation +I2NP documentation for details. Do NOT use the following specification for Garlic Clove Delivery Instructions!