From a05ee1ec387b93c10e944d4785260de062812500 Mon Sep 17 00:00:00 2001
From: str4d <str4d@mail.i2p>
Date: Mon, 3 Feb 2014 20:13:18 +0000
Subject: [PATCH] Dataspec format fixes

---
 i2p2www/pages/site/docs/spec/ssu.html | 84 ++++++++++++---------------
 1 file changed, 38 insertions(+), 46 deletions(-)

diff --git a/i2p2www/pages/site/docs/spec/ssu.html b/i2p2www/pages/site/docs/spec/ssu.html
index eb2adca9..9c80e925 100644
--- a/i2p2www/pages/site/docs/spec/ssu.html
+++ b/i2p2www/pages/site/docs/spec/ssu.html
@@ -254,17 +254,13 @@ This is the first message sent to establish a session.
 {% highlight lang='dataspec' %}
  +----+----+----+----+----+----+----+----+
  |         X, as calculated from DH      |
- |                                       |
-                 .   .   .               
+ ~                .  .  .                ~
  |                                       |
  +----+----+----+----+----+----+----+----+
  |size| that many byte IP address (4-16) |
  +----+----+----+----+----+----+----+----+
- |           arbitrary amount            |
- |        of uninterpreted data          |
-                 .   .   .               
- |                                       |
- +----+----+----+----+----+----+----+----+
+ | arbitrary amount of uninterpreted data|
+ ~                .  .  .                ~
 {% endhighlight %}
 
 <p>
@@ -317,8 +313,7 @@ This is the response to a Session Request.
 {% highlight lang='dataspec' %}
  +----+----+----+----+----+----+----+----+
  |         Y, as calculated from DH      |
- |                                       |
-                 .   .   .               
+ ~                .  .  .                ~
  |                                       |
  +----+----+----+----+----+----+----+----+
  |size| that many byte IP address (4-16) |
@@ -326,7 +321,7 @@ This is the response to a Session Request.
  | Port (A)| public relay tag  |  signed
  +----+----+----+----+----+----+----+----+
    on time |                             |
- +----+----+                             |
+ +----+----+                             +
  |              DSA signature            |
  +                                       +
  |                                       |
@@ -338,12 +333,10 @@ This is the response to a Session Request.
  |         |     (8 bytes of padding) 
  +----+----+----+----+----+----+----+----+
            |                             |
- +----+----+                             |
+ +----+----+                             +
  |           arbitrary amount            |
- |        of uninterpreted data          |
-                 .   .   .               
- |                                       |
- +----+----+----+----+----+----+----+----+
+ ~        of uninterpreted data          ~
+ ~                .  .  .                ~
 {% endhighlight %}
 
 <p>
@@ -413,15 +406,14 @@ bits 3-0: total identity fragments (F) 1-15</pre></li>
 {% highlight lang='dataspec' %}
  +----+----+----+----+----+----+----+----+
  |info| cursize |                        |
- +----+----+----+                        |
+ +----+----+----+                        +
  |      fragment of Alice's full         |
- |            Router Identity            |
-                 .   .   .               
+ ~            Router Identity            ~
+ ~                .  .  .                ~
  |                                       |
  +----+----+----+----+----+----+----+----+
- |  arbitrary amount of uninterpreted    |
- |              data                     |
- +----+----+----+----+----+----+----+----+
+ | arbitrary amount of uninterpreted data|
+ ~                .  .  .                ~
 {% endhighlight %}
  
 <p>
@@ -430,17 +422,17 @@ bits 3-0: total identity fragments (F) 1-15</pre></li>
 {% highlight lang='dataspec' %}
  +----+----+----+----+----+----+----+----+
  |info| cursize |                        |
- +----+----+----+                        |
+ +----+----+----+                        +
  |     last fragment of Alice's full     |
- |            Router Identity            |
-                 .   .   .               
+ ~            Router Identity            ~
+ ~                .  .  .                ~
  |                                       |
  +----+----+----+----+----+----+----+----+
  |  signed on time   |                   |
- +----+----+----+----+                   |
+ +----+----+----+----+                   +
  |  arbitrary amount of uninterpreted    |
- |      data, to 40 bytes prior to       |
- |       end of the current packet       |
+ ~      data, to 40 bytes prior to       ~
+ ~       end of the current packet       ~
  |  Packet length must be mult. of 16    |
  +----+----+----+----+----+----+----+----+
  | DSA signature                         |
@@ -551,9 +543,9 @@ This is the first message sent from Alice to Bob to request an introduction to C
  |                                       |
  +----+----+----+----+----+----+----+----+
  |       nonce       |                   |
- +----+----+----+----+                   |
+ +----+----+----+----+                   +
  | arbitrary amount of uninterpreted data|
- +----+----+----+----+----+----+----+----+
+ ~                .  .  .                ~
 {% endhighlight %}
 
 <p>
@@ -610,9 +602,9 @@ This is the response to a Relay Request and is sent from Bob to Alice.
  |    Alice IP       | Port (A)|  nonce
  +----+----+----+----+----+----+----+----+
            |   arbitrary amount of       |
- +----+----+                             |
+ +----+----+                             +
  |          uninterpreted data           |
- +----+----+----+----+----+----+----+----+
+ ~                .  .  .                ~
 {% endhighlight %}
 
 <p>
@@ -664,11 +656,11 @@ This is the introduction for Alice, which is sent from Bob to Charlie.
  |size|     Alice IP      | Port (A)|size|
  +----+----+----+----+----+----+----+----+
  |      that many bytes of challenge     |
- +                                       |
+ +                                       +
  |        data relayed from Alice        |
  +----+----+----+----+----+----+----+----+
  | arbitrary amount of uninterpreted data|
- +----+----+----+----+----+----+----+----+
+ ~                .  .  .                ~
 {% endhighlight %}
 
 <p>
@@ -769,30 +761,30 @@ byte 1
 {% highlight lang='dataspec' %}
  +----+----+----+----+----+----+----+----+
  |flag| (additional headers, determined  |
- +----+                                  |
- | by the flags, such as ACKs or         |
+ +----+                                  +
+ ~ by the flags, such as ACKs or         ~
  | bitfields                             |
  +----+----+----+----+----+----+----+----+
  |#frg|     messageId     |   frag info  |
  +----+----+----+----+----+----+----+----+
  | that many bytes of fragment data      |
-                  .  .  .                                       
+ ~                .  .  .                ~
  |                                       |
  +----+----+----+----+----+----+----+----+
  |     messageId     |   frag info  |    |
- +----+----+----+----+----+----+----+    |
+ +----+----+----+----+----+----+----+    +
  | that many bytes of fragment data      |
-                  .  .  .                                       
+ ~                .  .  .                ~
  |                                       |
  +----+----+----+----+----+----+----+----+
  |     messageId     |   frag info  |    |
- +----+----+----+----+----+----+----+    |
+ +----+----+----+----+----+----+----+    +
  | that many bytes of fragment data      |
-                  .  .  .                                       
+ ~                .  .  .                ~
  |                                       |
  +----+----+----+----+----+----+----+----+
  | arbitrary amount of uninterpreted data|
- +----+----+----+----+----+----+----+----+
+ ~                .  .  .                ~
 {% endhighlight %}
 
 <h4>Notes</h4>
@@ -878,11 +870,11 @@ See <a href="{{ site_url('docs/transport/ssu') }}#peerTesting">the SSU overview
  | Bob and Charlie, while Charlie's is   |
  + sent to Alice)                        +
  |                                       |
- |              +----+----+----+----+----+
+ +              +----+----+----+----+----+
  |              | arbitrary amount of    |
  +----+----+----+                        |
  | uninterpreted data                    |
- +----+----+----+----+----+----+----+----+
+ ~                .  .  .                ~
 {% endhighlight %}
 
 <p>
@@ -933,7 +925,7 @@ It is sent from Charlie to Alice as a part of the Introduction sequence.
  |                                       |
  +----+----+----+----+----+----+----+----+
  |flag|        time       |flag|#frg|    |
- +----+----+----+----+----+----+----+    |
+ +----+----+----+----+----+----+----+    +
  |  padding to fit a full AES256 block   |
  +----+----+----+----+----+----+----+----+
 {% endhighlight %}
@@ -954,9 +946,9 @@ It is sent from Charlie to Alice as a part of the Introduction sequence.
  |flag|        time       |flag|#frg|
  +----+----+----+----+----+----+----+----+
    messageId    |   frag info  |         |
- +----+----+----+----+----+----+         |
+ +----+----+----+----+----+----+         +
  | that many bytes of fragment data      |
-                  .  .  .                                       
+ ~                .  .  .                ~
  |                                       |
  +----+----+----+----+----+----+----+----+
 {% endhighlight %}