diff --git a/docs/CONTRIBUTING.html b/docs/CONTRIBUTING.html
index f85bf51..50eb8f3 100644
--- a/docs/CONTRIBUTING.html
+++ b/docs/CONTRIBUTING.html
@@ -128,7 +128,7 @@ github.com/go-i2p/go-i2p
     </main>
     
     <footer class="page-footer">
-      <p>Generated on 2025-06-11 21:20:19 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
+      <p>Generated on 2025-06-11 22:20:01 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
     </footer>
   </div>
 </body>
diff --git a/docs/ROADMAP.html b/docs/ROADMAP.html
index 0e65c23..c566784 100644
--- a/docs/ROADMAP.html
+++ b/docs/ROADMAP.html
@@ -127,7 +127,7 @@
     </main>
     
     <footer class="page-footer">
-      <p>Generated on 2025-06-11 21:20:19 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
+      <p>Generated on 2025-06-11 22:20:01 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
     </footer>
   </div>
 </body>
diff --git a/docs/template.html b/docs/template.html
index 7735f76..2986816 100644
--- a/docs/template.html
+++ b/docs/template.html
@@ -65,7 +65,7 @@
     </main>
     
     <footer class="page-footer">
-      <p>Generated on 2025-06-11 21:20:19 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
+      <p>Generated on 2025-06-11 22:20:01 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
     </footer>
   </div>
 </body>
diff --git a/images/exportable.svg b/images/exportable.svg
index f4ea53a..5126871 100644
--- a/images/exportable.svg
+++ b/images/exportable.svg
@@ -4,68 +4,41 @@
 <!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Title: gocallvis Pages: 1 -->
-<svg width="293pt" height="184pt"
- viewBox="0.00 0.00 293.42 184.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(0 184)">
+<svg width="318pt" height="98pt"
+ viewBox="0.00 0.00 317.50 98.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(0 98)">
 <title>gocallvis</title>
-<polygon fill="#d3d3d3" stroke="transparent" points="0,0 0,-184 293.4152,-184 293.4152,0 0,0"/>
+<polygon fill="#d3d3d3" stroke="transparent" points="0,0 0,-98 317.505,-98 317.505,0 0,0"/>
 <g id="clust1" class="cluster">
 <title>cluster_focus</title>
-<polygon fill="#e6ecfa" stroke="#000000" stroke-width=".5" points="8,-8 8,-176 285.4152,-176 285.4152,-8 8,-8"/>
-<text text-anchor="middle" x="146.7076" y="-155.8" font-family="Arial" font-size="18.00" fill="#000000">exportable</text>
+<polygon fill="#e6ecfa" stroke="#000000" stroke-width=".5" points="8,-8 8,-90 309.505,-90 309.505,-8 8,-8"/>
+<text text-anchor="middle" x="158.7525" y="-69.8" font-family="Arial" font-size="18.00" fill="#000000">exportable</text>
 </g>
-<g id="clust2" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/common/keys_and_cert.KeysAndCert</title>
-<g id="a_clust2"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/common/keys_and_cert.KeysAndCert">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M161.7805,-60C161.7805,-60 258.6347,-60 258.6347,-60 264.6347,-60 270.6347,-66 270.6347,-72 270.6347,-72 270.6347,-126 270.6347,-126 270.6347,-132 264.6347,-138 258.6347,-138 258.6347,-138 161.7805,-138 161.7805,-138 155.7805,-138 149.7805,-132 149.7805,-126 149.7805,-126 149.7805,-72 149.7805,-72 149.7805,-66 155.7805,-60 161.7805,-60"/>
-<text text-anchor="middle" x="210.2076" y="-68.5" font-family="Arial" font-size="15.00" fill="#222222">(*KeysAndCert)</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_identity.Fuzz -->
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/i2np/fuzz/header.Fuzz -->
 <g id="node1" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_identity.Fuzz</title>
-<g id="a_node1"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_identity.Fuzz | defined in fuzz.go:5&#10;at fuzz.go:7: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/common/keys_and_cert.KeysAndCert).Certificate]&#10;at fuzz.go:6: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/router_identity.ReadRouterIdentity]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M58,-65C58,-65 28,-65 28,-65 22,-65 16,-59 16,-53 16,-53 16,-41 16,-41 16,-35 22,-29 28,-29 28,-29 58,-29 58,-29 64,-29 70,-35 70,-41 70,-41 70,-53 70,-53 70,-59 64,-65 58,-65"/>
-<text text-anchor="middle" x="43" y="-42.8" font-family="Verdana" font-size="14.00" fill="#000000">Fuzz</text>
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/i2np/fuzz/header.Fuzz</title>
+<g id="a_node1"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/i2np/fuzz/header.Fuzz | defined in fuzz.go:5&#10;at fuzz.go:6: calling [github.com/go&#45;i2p/go&#45;i2p/lib/i2np.ReadI2NPNTCPHeader]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M58,-52C58,-52 28,-52 28,-52 22,-52 16,-46 16,-40 16,-40 16,-28 16,-28 16,-22 22,-16 28,-16 28,-16 58,-16 58,-16 64,-16 70,-22 70,-28 70,-28 70,-40 70,-40 70,-46 64,-52 58,-52"/>
+<text text-anchor="middle" x="43" y="-29.8" font-family="Verdana" font-size="14.00" fill="#000000">Fuzz</text>
 </a>
 </g>
 </g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/router_identity.ReadRouterIdentity -->
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/i2np.ReadI2NPNTCPHeader -->
 <g id="node2" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/router_identity.ReadRouterIdentity</title>
-<g id="a_node2"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/common/router_identity.ReadRouterIdentity | defined in router_identity.go:37">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M265.6234,-52C265.6234,-52 154.7918,-52 154.7918,-52 148.7918,-52 142.7918,-46 142.7918,-40 142.7918,-40 142.7918,-28 142.7918,-28 142.7918,-22 148.7918,-16 154.7918,-16 154.7918,-16 265.6234,-16 265.6234,-16 271.6234,-16 277.6234,-22 277.6234,-28 277.6234,-28 277.6234,-40 277.6234,-40 277.6234,-46 271.6234,-52 265.6234,-52"/>
-<text text-anchor="middle" x="210.2076" y="-38.2" font-family="Verdana" font-size="14.00" fill="#000000">router_identity</text>
-<text text-anchor="middle" x="210.2076" y="-21.4" font-family="Verdana" font-size="14.00" fill="#000000">ReadRouterIdentity</text>
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/i2np.ReadI2NPNTCPHeader</title>
+<g id="a_node2"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/i2np.ReadI2NPNTCPHeader | defined in header.go:97">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M289.2583,-52C289.2583,-52 155.2467,-52 155.2467,-52 149.2467,-52 143.2467,-46 143.2467,-40 143.2467,-40 143.2467,-28 143.2467,-28 143.2467,-22 149.2467,-16 155.2467,-16 155.2467,-16 289.2583,-16 289.2583,-16 295.2583,-16 301.2583,-22 301.2583,-28 301.2583,-28 301.2583,-40 301.2583,-40 301.2583,-46 295.2583,-52 289.2583,-52"/>
+<text text-anchor="middle" x="222.2525" y="-38.2" font-family="Verdana" font-size="14.00" fill="#000000">i2np</text>
+<text text-anchor="middle" x="222.2525" y="-21.4" font-family="Verdana" font-size="14.00" fill="#000000">ReadI2NPNTCPHeader</text>
 </a>
 </g>
 </g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_identity.Fuzz&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/router_identity.ReadRouterIdentity -->
-<g id="edge2" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_identity.Fuzz&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/router_identity.ReadRouterIdentity</title>
-<g id="a_edge2"><a xlink:title="at fuzz.go:6: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/router_identity.ReadRouterIdentity]">
-<path fill="none" stroke="#8b4513" d="M70.2369,-44.8824C87.33,-43.5534 110.3072,-41.767 132.6983,-40.0262"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="133.223,-43.496 142.9216,-39.2313 132.6803,-36.5171 133.223,-43.496"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/common/keys_and_cert.KeysAndCert).Certificate -->
-<g id="node3" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/common/keys_and_cert.KeysAndCert).Certificate</title>
-<g id="a_node3"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/common/keys_and_cert.KeysAndCert).Certificate | defined in keys_and_cert.go:139">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M250.5619,-130C250.5619,-130 169.8533,-130 169.8533,-130 163.8533,-130 157.8533,-124 157.8533,-118 157.8533,-118 157.8533,-106 157.8533,-106 157.8533,-100 163.8533,-94 169.8533,-94 169.8533,-94 250.5619,-94 250.5619,-94 256.5619,-94 262.5619,-100 262.5619,-106 262.5619,-106 262.5619,-118 262.5619,-118 262.5619,-124 256.5619,-130 250.5619,-130"/>
-<text text-anchor="middle" x="210.2076" y="-116.2" font-family="Verdana" font-size="14.00" fill="#000000">keys_and_cert</text>
-<text text-anchor="middle" x="210.2076" y="-99.4" font-family="Verdana" font-size="14.00" fill="#000000">Certificate</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_identity.Fuzz&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/common/keys_and_cert.KeysAndCert).Certificate -->
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/i2np/fuzz/header.Fuzz&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/i2np.ReadI2NPNTCPHeader -->
 <g id="edge1" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/fuzz/router_identity.Fuzz&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/common/keys_and_cert.KeysAndCert).Certificate</title>
-<g id="a_edge1"><a xlink:title="at fuzz.go:7: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/common/keys_and_cert.KeysAndCert).Certificate]">
-<path fill="none" stroke="#8b4513" d="M70.3186,-59.5347C90.2689,-68.4946 118.0733,-80.5827 143,-90 144.6187,-90.6115 146.2628,-91.2224 147.9247,-91.8308"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="146.9887,-95.2129 157.5834,-95.2765 149.3408,-88.6199 146.9887,-95.2129"/>
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/i2np/fuzz/header.Fuzz&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/i2np.ReadI2NPNTCPHeader</title>
+<g id="a_edge1"><a xlink:title="at fuzz.go:6: calling [github.com/go&#45;i2p/go&#45;i2p/lib/i2np.ReadI2NPNTCPHeader]">
+<path fill="none" stroke="#8b4513" d="M70.2246,-34C87.2023,-34 110.1106,-34 132.9875,-34"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="133.1223,-37.5001 143.1222,-34 133.1222,-30.5001 133.1223,-37.5001"/>
 </a>
 </g>
 </g>
diff --git a/images/handshake.svg b/images/handshake.svg
index baeec92..52fc991 100644
--- a/images/handshake.svg
+++ b/images/handshake.svg
@@ -4,425 +4,131 @@
 <!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Title: gocallvis Pages: 1 -->
-<svg width="637pt" height="960pt"
- viewBox="0.00 0.00 637.35 960.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(0 960)">
+<svg width="374pt" height="306pt"
+ viewBox="0.00 0.00 374.02 306.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(0 306)">
 <title>gocallvis</title>
-<polygon fill="#d3d3d3" stroke="transparent" points="0,0 0,-960 637.3474,-960 637.3474,0 0,0"/>
+<polygon fill="#d3d3d3" stroke="transparent" points="0,0 0,-306 374.0184,-306 374.0184,0 0,0"/>
 <g id="clust1" class="cluster">
 <title>cluster_focus</title>
-<polygon fill="#e6ecfa" stroke="#000000" stroke-width=".5" points="7.0274,-8 7.0274,-952 629.3474,-952 629.3474,-8 7.0274,-8"/>
-<text text-anchor="middle" x="318.1874" y="-931.8" font-family="Arial" font-size="18.00" fill="#000000">handshake</text>
-</g>
-<g id="clust5" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF</title>
-<g id="a_clust5"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M482.1748,-338C482.1748,-338 609.3474,-338 609.3474,-338 615.3474,-338 621.3474,-344 621.3474,-350 621.3474,-350 621.3474,-587 621.3474,-587 621.3474,-593 615.3474,-599 609.3474,-599 609.3474,-599 482.1748,-599 482.1748,-599 476.1748,-599 470.1748,-593 470.1748,-587 470.1748,-587 470.1748,-350 470.1748,-350 470.1748,-344 476.1748,-338 482.1748,-338"/>
-<text text-anchor="middle" x="545.7611" y="-346.5" font-family="Arial" font-size="15.00" fill="#222222">(*NoiseKDF)</text>
-</a>
-</g>
-</g>
-<g id="clust4" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState</title>
-<g id="a_clust4"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState">
-<path fill="#b0c4de" stroke="#000000" stroke-width=".5" d="M28,-155C28,-155 401.1748,-155 401.1748,-155 407.1748,-155 413.1748,-161 413.1748,-167 413.1748,-167 413.1748,-587 413.1748,-587 413.1748,-593 407.1748,-599 401.1748,-599 401.1748,-599 28,-599 28,-599 22,-599 16,-593 16,-587 16,-587 16,-167 16,-167 16,-161 22,-155 28,-155"/>
-<text text-anchor="middle" x="214.5874" y="-163.5" font-family="Arial" font-size="15.00" fill="#222222">(*NoiseHandshakeState)</text>
-</a>
-</g>
-</g>
-<g id="clust3" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.HandshakeBuilder</title>
-<g id="a_clust3"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.HandshakeBuilder">
-<path fill="#b0c4de" stroke="#000000" stroke-width=".5" d="M27.0274,-16C27.0274,-16 157.1452,-16 157.1452,-16 163.1452,-16 169.1452,-22 169.1452,-28 169.1452,-28 169.1452,-82 169.1452,-82 169.1452,-88 163.1452,-94 157.1452,-94 157.1452,-94 27.0274,-94 27.0274,-94 21.0274,-94 15.0274,-88 15.0274,-82 15.0274,-82 15.0274,-28 15.0274,-28 15.0274,-22 21.0274,-16 27.0274,-16"/>
-<text text-anchor="middle" x="92.0863" y="-24.5" font-family="Arial" font-size="15.00" fill="#222222">(*HandshakeBuilder)</text>
-</a>
-</g>
+<polygon fill="#e6ecfa" stroke="#000000" stroke-width=".5" points="8,-8 8,-298 366.0184,-298 366.0184,-8 8,-8"/>
+<text text-anchor="middle" x="187.0092" y="-277.8" font-family="Arial" font-size="18.00" fill="#000000">handshake</text>
 </g>
 <g id="clust2" class="cluster">
-<title>cluster_*github.com/flynn/noise.HandshakeState</title>
-<g id="a_clust2"><a xlink:title="type: *github.com/flynn/noise.HandshakeState">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M269.7792,-607C269.7792,-607 388.2898,-607 388.2898,-607 394.2898,-607 400.2898,-613 400.2898,-619 400.2898,-619 400.2898,-795 400.2898,-795 400.2898,-801 394.2898,-807 388.2898,-807 388.2898,-807 269.7792,-807 269.7792,-807 263.7792,-807 257.7792,-801 257.7792,-795 257.7792,-795 257.7792,-619 257.7792,-619 257.7792,-613 263.7792,-607 269.7792,-607"/>
-<text text-anchor="middle" x="329.0345" y="-615.5" font-family="Arial" font-size="15.00" fill="#222222">(*HandshakeState)</text>
-</a>
-</g>
-</g>
-<!-- github.com/flynn/noise.NewCipherSuite -->
-<g id="node1" class="node">
-<title>github.com/flynn/noise.NewCipherSuite</title>
-<g id="a_node1"><a xlink:title="github.com/flynn/noise.NewCipherSuite | defined in cipher_suite.go:84">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M375.8435,-137C375.8435,-137 282.2255,-137 282.2255,-137 276.2255,-137 270.2255,-131 270.2255,-125 270.2255,-125 270.2255,-113 270.2255,-113 270.2255,-107 276.2255,-101 282.2255,-101 282.2255,-101 375.8435,-101 375.8435,-101 381.8435,-101 387.8435,-107 387.8435,-113 387.8435,-113 387.8435,-125 387.8435,-125 387.8435,-131 381.8435,-137 375.8435,-137"/>
-<text text-anchor="middle" x="329.0345" y="-123.2" font-family="Verdana" font-size="14.00" fill="#000000">noise</text>
-<text text-anchor="middle" x="329.0345" y="-106.4" font-family="Verdana" font-size="14.00" fill="#000000">NewCipherSuite</text>
-</a>
-</g>
-</g>
-<!-- github.com/flynn/noise.NewHandshakeState -->
-<g id="node2" class="node">
-<title>github.com/flynn/noise.NewHandshakeState</title>
-<g id="a_node2"><a xlink:title="github.com/flynn/noise.NewHandshakeState | defined in state.go:317">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M387.1508,-71C387.1508,-71 270.9182,-71 270.9182,-71 264.9182,-71 258.9182,-65 258.9182,-59 258.9182,-59 258.9182,-47 258.9182,-47 258.9182,-41 264.9182,-35 270.9182,-35 270.9182,-35 387.1508,-35 387.1508,-35 393.1508,-35 399.1508,-41 399.1508,-47 399.1508,-47 399.1508,-59 399.1508,-59 399.1508,-65 393.1508,-71 387.1508,-71"/>
-<text text-anchor="middle" x="329.0345" y="-57.2" font-family="Verdana" font-size="14.00" fill="#000000">noise</text>
-<text text-anchor="middle" x="329.0345" y="-40.4" font-family="Verdana" font-size="14.00" fill="#000000">NewHandshakeState</text>
+<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState</title>
+<g id="a_clust2"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState">
+<path fill="#b0c4de" stroke="#000000" stroke-width=".5" d="M28,-60C28,-60 160.6326,-60 160.6326,-60 166.6326,-60 172.6326,-66 172.6326,-72 172.6326,-72 172.6326,-248 172.6326,-248 172.6326,-254 166.6326,-260 160.6326,-260 160.6326,-260 28,-260 28,-260 22,-260 16,-254 16,-248 16,-248 16,-72 16,-72 16,-66 22,-60 28,-60"/>
+<text text-anchor="middle" x="94.3163" y="-68.5" font-family="Arial" font-size="15.00" fill="#222222">(*HandshakeState)</text>
 </a>
 </g>
 </g>
 <!-- github.com/samber/oops.Errorf -->
-<g id="node3" class="node">
+<g id="node1" class="node">
 <title>github.com/samber/oops.Errorf</title>
-<g id="a_node3"><a xlink:title="github.com/samber/oops.Errorf | defined in oops.go:34">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M346.2298,-887C346.2298,-887 311.8392,-887 311.8392,-887 305.8392,-887 299.8392,-881 299.8392,-875 299.8392,-875 299.8392,-863 299.8392,-863 299.8392,-857 305.8392,-851 311.8392,-851 311.8392,-851 346.2298,-851 346.2298,-851 352.2298,-851 358.2298,-857 358.2298,-863 358.2298,-863 358.2298,-875 358.2298,-875 358.2298,-881 352.2298,-887 346.2298,-887"/>
-<text text-anchor="middle" x="329.0345" y="-873.2" font-family="Verdana" font-size="14.00" fill="#000000">oops</text>
-<text text-anchor="middle" x="329.0345" y="-856.4" font-family="Verdana" font-size="14.00" fill="#000000">Errorf</text>
+<g id="a_node1"><a xlink:title="github.com/samber/oops.Errorf | defined in oops.go:34">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M315.0208,-167C315.0208,-167 280.6302,-167 280.6302,-167 274.6302,-167 268.6302,-161 268.6302,-155 268.6302,-155 268.6302,-143 268.6302,-143 268.6302,-137 274.6302,-131 280.6302,-131 280.6302,-131 315.0208,-131 315.0208,-131 321.0208,-131 327.0208,-137 327.0208,-143 327.0208,-143 327.0208,-155 327.0208,-155 327.0208,-161 321.0208,-167 315.0208,-167"/>
+<text text-anchor="middle" x="297.8255" y="-153.2" font-family="Verdana" font-size="14.00" fill="#000000">oops</text>
+<text text-anchor="middle" x="297.8255" y="-136.4" font-family="Verdana" font-size="14.00" fill="#000000">Errorf</text>
 </a>
 </g>
 </g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF -->
-<g id="node4" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF</title>
-<g id="a_node4"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF | defined in kdf.go:17">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M589.3411,-286C589.3411,-286 502.1811,-286 502.1811,-286 496.1811,-286 490.1811,-280 490.1811,-274 490.1811,-274 490.1811,-262 490.1811,-262 490.1811,-256 496.1811,-250 502.1811,-250 502.1811,-250 589.3411,-250 589.3411,-250 595.3411,-250 601.3411,-256 601.3411,-262 601.3411,-262 601.3411,-274 601.3411,-274 601.3411,-280 595.3411,-286 589.3411,-286"/>
-<text text-anchor="middle" x="545.7611" y="-272.2" font-family="Verdana" font-size="14.00" fill="#000000">kdf</text>
-<text text-anchor="middle" x="545.7611" y="-255.4" font-family="Verdana" font-size="14.00" fill="#000000">NewNoiseKDF</text>
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState -->
+<g id="node2" class="node">
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState</title>
+<g id="a_node2"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState | defined in handshake.go:78&#10;at handshake.go:98: calling [github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair]&#10;at handshake.go:101: calling [github.com/samber/oops.Errorf]&#10;at handshake.go:107: calling [github.com/samber/oops.Errorf]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M152.4326,-52C152.4326,-52 36.2,-52 36.2,-52 30.2,-52 24.2,-46 24.2,-40 24.2,-40 24.2,-28 24.2,-28 24.2,-22 30.2,-16 36.2,-16 36.2,-16 152.4326,-16 152.4326,-16 158.4326,-16 164.4326,-22 164.4326,-28 164.4326,-28 164.4326,-40 164.4326,-40 164.4326,-46 158.4326,-52 152.4326,-52"/>
+<text text-anchor="middle" x="94.3163" y="-29.8" font-family="Verdana" font-size="14.00" fill="#000000">NewHandshakeState</text>
 </a>
 </g>
 </g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NewHandshakeState -->
-<g id="node5" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NewHandshakeState</title>
-<g id="a_node5"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NewHandshakeState | defined in handshake.go:23&#10;at handshake.go:29: calling [github.com/flynn/noise.NewCipherSuite]&#10;at handshake.go:35: calling [github.com/flynn/noise.NewHandshakeState]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M149.7026,-147C149.7026,-147 33.47,-147 33.47,-147 27.47,-147 21.47,-141 21.47,-135 21.47,-135 21.47,-123 21.47,-123 21.47,-117 27.47,-111 33.47,-111 33.47,-111 149.7026,-111 149.7026,-111 155.7026,-111 161.7026,-117 161.7026,-123 161.7026,-123 161.7026,-135 161.7026,-135 161.7026,-141 155.7026,-147 149.7026,-147"/>
-<text text-anchor="middle" x="91.5863" y="-124.8" font-family="Verdana" font-size="14.00" fill="#000000">NewHandshakeState</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NewHandshakeState&#45;&gt;github.com/flynn/noise.NewCipherSuite -->
-<g id="edge10" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NewHandshakeState&#45;&gt;github.com/flynn/noise.NewCipherSuite</title>
-<g id="a_edge10"><a xlink:title="at handshake.go:29: calling [github.com/flynn/noise.NewCipherSuite]">
-<path fill="none" stroke="#8b4513" d="M161.8648,-126.0403C192.8266,-124.7363 229.0943,-123.2089 259.921,-121.9107"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="260.3074,-125.3976 270.1512,-121.4798 260.0127,-118.4038 260.3074,-125.3976"/>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NewHandshakeState&#45;&gt;github.com/flynn/noise.NewHandshakeState -->
-<g id="edge11" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NewHandshakeState&#45;&gt;github.com/flynn/noise.NewHandshakeState</title>
-<g id="a_edge11"><a xlink:title="at handshake.go:35: calling [github.com/flynn/noise.NewHandshakeState]">
-<path fill="none" stroke="#8b4513" d="M147.8582,-110.9891C182.3312,-99.9553 226.6246,-85.7783 262.7866,-74.204"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="264.2984,-77.395 272.7555,-71.0132 262.1645,-70.7282 264.2984,-77.395"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/flynn/noise.HandshakeState).ReadMessage -->
-<g id="node6" class="node">
-<title>(*github.com/flynn/noise.HandshakeState).ReadMessage</title>
-<g id="a_node6"><a xlink:title="(*github.com/flynn/noise.HandshakeState).ReadMessage | defined in state.go:503">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M367.7782,-799C367.7782,-799 290.2908,-799 290.2908,-799 284.2908,-799 278.2908,-793 278.2908,-787 278.2908,-787 278.2908,-775 278.2908,-775 278.2908,-769 284.2908,-763 290.2908,-763 290.2908,-763 367.7782,-763 367.7782,-763 373.7782,-763 379.7782,-769 379.7782,-775 379.7782,-775 379.7782,-787 379.7782,-787 379.7782,-793 373.7782,-799 367.7782,-799"/>
-<text text-anchor="middle" x="329.0345" y="-785.2" font-family="Verdana" font-size="14.00" fill="#000000">noise</text>
-<text text-anchor="middle" x="329.0345" y="-768.4" font-family="Verdana" font-size="14.00" fill="#000000">ReadMessage</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/flynn/noise.HandshakeState).WriteMessage -->
-<g id="node7" class="node">
-<title>(*github.com/flynn/noise.HandshakeState).WriteMessage</title>
-<g id="a_node7"><a xlink:title="(*github.com/flynn/noise.HandshakeState).WriteMessage | defined in state.go:391">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M369.3832,-677C369.3832,-677 288.6858,-677 288.6858,-677 282.6858,-677 276.6858,-671 276.6858,-665 276.6858,-665 276.6858,-653 276.6858,-653 276.6858,-647 282.6858,-641 288.6858,-641 288.6858,-641 369.3832,-641 369.3832,-641 375.3832,-641 381.3832,-647 381.3832,-653 381.3832,-653 381.3832,-665 381.3832,-665 381.3832,-671 375.3832,-677 369.3832,-677"/>
-<text text-anchor="middle" x="329.0345" y="-663.2" font-family="Verdana" font-size="14.00" fill="#000000">noise</text>
-<text text-anchor="middle" x="329.0345" y="-646.4" font-family="Verdana" font-size="14.00" fill="#000000">WriteMessage</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/flynn/noise.HandshakeState).LocalEphemeral -->
-<g id="node8" class="node">
-<title>(*github.com/flynn/noise.HandshakeState).LocalEphemeral</title>
-<g id="a_node8"><a xlink:title="(*github.com/flynn/noise.HandshakeState).LocalEphemeral | defined in state.go:642">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M375.0461,-738C375.0461,-738 283.0229,-738 283.0229,-738 277.0229,-738 271.0229,-732 271.0229,-726 271.0229,-726 271.0229,-714 271.0229,-714 271.0229,-708 277.0229,-702 283.0229,-702 283.0229,-702 375.0461,-702 375.0461,-702 381.0461,-702 387.0461,-708 387.0461,-714 387.0461,-714 387.0461,-726 387.0461,-726 387.0461,-732 381.0461,-738 375.0461,-738"/>
-<text text-anchor="middle" x="329.0345" y="-724.2" font-family="Verdana" font-size="14.00" fill="#000000">noise</text>
-<text text-anchor="middle" x="329.0345" y="-707.4" font-family="Verdana" font-size="14.00" fill="#000000">LocalEphemeral</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.HandshakeBuilder).Build -->
-<g id="node9" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.HandshakeBuilder).Build</title>
-<g id="a_node9"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.HandshakeBuilder).Build | defined in handshake_builder.go:68&#10;at handshake_builder.go:80: calling [github.com/flynn/noise.NewHandshakeState]&#10;at handshake_builder.go:71: calling [github.com/flynn/noise.NewCipherSuite]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M107.2042,-86C107.2042,-86 75.9684,-86 75.9684,-86 69.9684,-86 63.9684,-80 63.9684,-74 63.9684,-74 63.9684,-62 63.9684,-62 63.9684,-56 69.9684,-50 75.9684,-50 75.9684,-50 107.2042,-50 107.2042,-50 113.2042,-50 119.2042,-56 119.2042,-62 119.2042,-62 119.2042,-74 119.2042,-74 119.2042,-80 113.2042,-86 107.2042,-86"/>
-<text text-anchor="middle" x="91.5863" y="-63.8" font-family="Verdana" font-size="14.00" fill="#000000">Build</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.HandshakeBuilder).Build&#45;&gt;github.com/flynn/noise.NewCipherSuite -->
-<g id="edge8" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.HandshakeBuilder).Build&#45;&gt;github.com/flynn/noise.NewCipherSuite</title>
-<g id="a_edge8"><a xlink:title="at handshake_builder.go:71: calling [github.com/flynn/noise.NewCipherSuite]">
-<path fill="none" stroke="#8b4513" d="M119.2893,-73.9502C153.6673,-81.334 213.4916,-94.1833 260.4738,-104.2743"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="259.7786,-107.7047 270.2906,-106.3828 261.2486,-100.8608 259.7786,-107.7047"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.HandshakeBuilder).Build&#45;&gt;github.com/flynn/noise.NewHandshakeState -->
-<g id="edge4" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.HandshakeBuilder).Build&#45;&gt;github.com/flynn/noise.NewHandshakeState</title>
-<g id="a_edge4"><a xlink:title="at handshake_builder.go:80: calling [github.com/flynn/noise.NewHandshakeState]">
-<path fill="none" stroke="#8b4513" d="M119.2893,-66.25C150.8507,-64.2562 203.8595,-60.9075 248.6884,-58.0756"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="248.9471,-61.5663 258.7065,-57.4427 248.5057,-54.5803 248.9471,-61.5663"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).ReadMessage -->
-<g id="node10" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).ReadMessage</title>
-<g id="a_node10"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).ReadMessage | defined in handshake.go:103&#10;at handshake.go:110: calling [github.com/samber/oops.Errorf]&#10;at handshake.go:108: calling [(*github.com/flynn/noise.HandshakeState).ReadMessage]&#10;at handshake.go:117: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M130.33,-530C130.33,-530 52.8426,-530 52.8426,-530 46.8426,-530 40.8426,-524 40.8426,-518 40.8426,-518 40.8426,-506 40.8426,-506 40.8426,-500 46.8426,-494 52.8426,-494 52.8426,-494 130.33,-494 130.33,-494 136.33,-494 142.33,-500 142.33,-506 142.33,-506 142.33,-518 142.33,-518 142.33,-524 136.33,-530 130.33,-530"/>
-<text text-anchor="middle" x="91.5863" y="-507.8" font-family="Verdana" font-size="14.00" fill="#000000">ReadMessage</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).ReadMessage&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge5" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).ReadMessage&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge5"><a xlink:title="at handshake.go:110: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M142.4863,-523.662C152.6284,-528.166 162.2608,-534.3942 169.1452,-543 245.9073,-638.9554 138.4507,-718.2349 212.8942,-816 231.5042,-840.4402 264.0068,-853.9517 289.9035,-861.2043"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="289.2611,-864.6533 299.8193,-863.7725 291.0163,-857.8769 289.2611,-864.6533"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).ReadMessage&#45;&gt;(*github.com/flynn/noise.HandshakeState).ReadMessage -->
-<g id="edge14" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).ReadMessage&#45;&gt;(*github.com/flynn/noise.HandshakeState).ReadMessage</title>
-<g id="a_edge14"><a xlink:title="at handshake.go:108: calling [(*github.com/flynn/noise.HandshakeState).ReadMessage]">
-<path fill="none" stroke="#8b4513" d="M142.639,-524.0426C152.6481,-528.5206 162.1864,-534.6421 169.1452,-543 232.3755,-618.9437 142.0626,-692.0913 212.8942,-761 227.447,-775.1578 248.1688,-781.3447 268.0902,-783.6129"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="267.8289,-787.1032 278.0852,-784.4465 268.4107,-780.1274 267.8289,-787.1032"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash -->
-<g id="node11" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash</title>
-<g id="a_node11"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash | defined in handshake.go:205&#10;at handshake.go:253: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).SetHash]&#10;at handshake.go:214: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF]&#10;at handshake.go:230: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF]&#10;at handshake.go:246: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF]">
-<path fill="#add8e6" stroke="#000000" stroke-width=".5" d="M393.3154,-408C393.3154,-408 264.7536,-408 264.7536,-408 258.7536,-408 252.7536,-402 252.7536,-396 252.7536,-396 252.7536,-384 252.7536,-384 252.7536,-378 258.7536,-372 264.7536,-372 264.7536,-372 393.3154,-372 393.3154,-372 399.3154,-372 405.3154,-378 405.3154,-384 405.3154,-384 405.3154,-396 405.3154,-396 405.3154,-402 399.3154,-408 393.3154,-408"/>
-<text text-anchor="middle" x="329.0345" y="-385.8" font-family="Verdana" font-size="14.00" fill="#000000">updateHandshakeHash</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).ReadMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash -->
-<g id="edge16" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).ReadMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash</title>
-<g id="a_edge16"><a xlink:title="at handshake.go:117: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash]">
-<path fill="none" stroke="#000000" d="M141.7159,-493.9063C150.9446,-490.2108 160.4168,-486.1691 169.1452,-482 212.5978,-461.245 260.1659,-433.1323 292.0244,-413.4653"/>
-<polygon fill="#000000" stroke="#000000" points="293.9274,-416.4035 300.577,-408.1553 290.2351,-410.4565 293.9274,-416.4035"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF -->
-<g id="edge15" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF</title>
-<g id="a_edge15"><a xlink:title="at handshake.go:214: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF]&#10;at handshake.go:230: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF]&#10;at handshake.go:246: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF]">
-<path fill="none" stroke="#8b4513" d="M404.3549,-371.9134C407.3693,-370.6852 410.3211,-369.3819 413.1748,-368 434.6728,-357.5895 483.885,-318.7633 515.93,-292.666"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="518.5515,-295.0436 524.0776,-286.0041 514.1205,-289.6246 518.5515,-295.0436"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).SetHash -->
-<g id="node18" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).SetHash</title>
-<g id="a_node18"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).SetHash | defined in kdf.go:106">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M568.9155,-408C568.9155,-408 522.6067,-408 522.6067,-408 516.6067,-408 510.6067,-402 510.6067,-396 510.6067,-396 510.6067,-384 510.6067,-384 510.6067,-378 516.6067,-372 522.6067,-372 522.6067,-372 568.9155,-372 568.9155,-372 574.9155,-372 580.9155,-378 580.9155,-384 580.9155,-384 580.9155,-396 580.9155,-396 580.9155,-402 574.9155,-408 568.9155,-408"/>
-<text text-anchor="middle" x="545.7611" y="-394.2" font-family="Verdana" font-size="14.00" fill="#000000">kdf</text>
-<text text-anchor="middle" x="545.7611" y="-377.4" font-family="Verdana" font-size="14.00" fill="#000000">SetHash</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).SetHash -->
-<g id="edge2" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).SetHash</title>
-<g id="a_edge2"><a xlink:title="at handshake.go:253: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).SetHash]">
-<path fill="none" stroke="#8b4513" d="M405.4442,-390C437.2148,-390 473.0099,-390 500.4945,-390"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="500.5957,-393.5001 510.5957,-390 500.5956,-386.5001 500.5957,-393.5001"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).GetHandshakeHash -->
-<g id="node12" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).GetHandshakeHash</title>
-<g id="a_node12"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).GetHandshakeHash | defined in handshake.go:146&#10;at handshake.go:151: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).GetHandshakeHash]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M147.259,-347C147.259,-347 35.9136,-347 35.9136,-347 29.9136,-347 23.9136,-341 23.9136,-335 23.9136,-335 23.9136,-323 23.9136,-323 23.9136,-317 29.9136,-311 35.9136,-311 35.9136,-311 147.259,-311 147.259,-311 153.259,-311 159.259,-317 159.259,-323 159.259,-323 159.259,-335 159.259,-335 159.259,-341 153.259,-347 147.259,-347"/>
-<text text-anchor="middle" x="91.5863" y="-324.8" font-family="Verdana" font-size="14.00" fill="#000000">GetHandshakeHash</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).GetHandshakeHash -->
-<g id="node19" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).GetHandshakeHash</title>
-<g id="a_node19"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).GetHandshakeHash | defined in kdf.go:68">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M601.4338,-530C601.4338,-530 490.0884,-530 490.0884,-530 484.0884,-530 478.0884,-524 478.0884,-518 478.0884,-518 478.0884,-506 478.0884,-506 478.0884,-500 484.0884,-494 490.0884,-494 490.0884,-494 601.4338,-494 601.4338,-494 607.4338,-494 613.4338,-500 613.4338,-506 613.4338,-506 613.4338,-518 613.4338,-518 613.4338,-524 607.4338,-530 601.4338,-530"/>
-<text text-anchor="middle" x="545.7611" y="-516.2" font-family="Verdana" font-size="14.00" fill="#000000">kdf</text>
-<text text-anchor="middle" x="545.7611" y="-499.4" font-family="Verdana" font-size="14.00" fill="#000000">GetHandshakeHash</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).GetHandshakeHash&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).GetHandshakeHash -->
-<g id="edge9" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).GetHandshakeHash&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).GetHandshakeHash</title>
-<g id="a_edge9"><a xlink:title="at handshake.go:151: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).GetHandshakeHash]">
-<path fill="none" stroke="#8b4513" d="M150.8224,-347.0007C157.4798,-350.6122 163.7834,-354.9065 169.1452,-360 202.847,-392.0152 176.0134,-426.7053 212.8942,-455 285.9784,-511.0696 394.7292,-519.7867 467.8419,-518.1546"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="468.0213,-521.651 477.9144,-517.8595 467.8162,-514.654 468.0213,-521.651"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).WriteMessage -->
-<g id="node13" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).WriteMessage</title>
-<g id="a_node13"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).WriteMessage | defined in handshake.go:73&#10;at handshake.go:87: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash]&#10;at handshake.go:78: calling [(*github.com/flynn/noise.HandshakeState).WriteMessage]&#10;at handshake.go:80: calling [github.com/samber/oops.Errorf]&#10;at handshake.go:94: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M131.935,-408C131.935,-408 51.2376,-408 51.2376,-408 45.2376,-408 39.2376,-402 39.2376,-396 39.2376,-396 39.2376,-384 39.2376,-384 39.2376,-378 45.2376,-372 51.2376,-372 51.2376,-372 131.935,-372 131.935,-372 137.935,-372 143.935,-378 143.935,-384 143.935,-384 143.935,-396 143.935,-396 143.935,-402 137.935,-408 131.935,-408"/>
-<text text-anchor="middle" x="91.5863" y="-385.8" font-family="Verdana" font-size="14.00" fill="#000000">WriteMessage</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).WriteMessage&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge18" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).WriteMessage&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge18"><a xlink:title="at handshake.go:80: calling [github.com/samber/oops.Errorf]&#10;at handshake.go:94: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M144.2102,-402.287C153.7525,-406.7349 162.7051,-412.7823 169.1452,-421 255.7877,-531.5579 176.3498,-598.3738 212.8942,-734 225.1336,-779.4239 220.7244,-797.6745 252.8942,-832 263.0841,-842.8727 277.1458,-850.9368 290.4142,-856.7116"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="289.2851,-860.03 299.8686,-860.5194 291.9002,-853.5369 289.2851,-860.03"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).WriteMessage&#45;&gt;(*github.com/flynn/noise.HandshakeState).WriteMessage -->
-<g id="edge17" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).WriteMessage&#45;&gt;(*github.com/flynn/noise.HandshakeState).WriteMessage</title>
-<g id="a_edge17"><a xlink:title="at handshake.go:78: calling [(*github.com/flynn/noise.HandshakeState).WriteMessage]">
-<path fill="none" stroke="#8b4513" d="M144.0932,-404.5869C153.1948,-408.8148 162.0112,-414.1929 169.1452,-421 234.1509,-483.0268 195.665,-535.7333 252.8942,-605 262.5389,-616.6734 275.2864,-627.0192 287.5869,-635.4514"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="285.7093,-638.4056 295.9876,-640.9762 289.5557,-632.5571 285.7093,-638.4056"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).WriteMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash -->
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState&#45;&gt;github.com/samber/oops.Errorf -->
 <g id="edge6" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).WriteMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash</title>
-<g id="a_edge6"><a xlink:title="at handshake.go:87: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).updateHandshakeHash]">
-<path fill="none" stroke="#000000" d="M143.9893,-390C172.9515,-390 209.6666,-390 242.7439,-390"/>
-<polygon fill="#000000" stroke="#000000" points="242.8799,-393.5001 252.8799,-390 242.8799,-386.5001 242.8799,-393.5001"/>
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState&#45;&gt;github.com/samber/oops.Errorf</title>
+<g id="a_edge6"><a xlink:title="at handshake.go:101: calling [github.com/samber/oops.Errorf]&#10;at handshake.go:107: calling [github.com/samber/oops.Errorf]">
+<path fill="none" stroke="#8b4513" d="M164.0061,-52.1084C166.9555,-53.3343 169.8436,-54.6307 172.6326,-56 192.2937,-65.6526 237.1068,-100.2496 267.4276,-124.4066"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="265.5671,-127.4003 275.5624,-130.9138 269.9397,-121.934 265.5671,-127.4003"/>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).GenerateEphemeral -->
-<g id="node14" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).GenerateEphemeral</title>
-<g id="a_node14"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).GenerateEphemeral | defined in handshake.go:57&#10;at handshake.go:64: calling [(*github.com/flynn/noise.HandshakeState).LocalEphemeral]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M147.2408,-469C147.2408,-469 35.9318,-469 35.9318,-469 29.9318,-469 23.9318,-463 23.9318,-457 23.9318,-457 23.9318,-445 23.9318,-445 23.9318,-439 29.9318,-433 35.9318,-433 35.9318,-433 147.2408,-433 147.2408,-433 153.2408,-433 159.2408,-439 159.2408,-445 159.2408,-445 159.2408,-457 159.2408,-457 159.2408,-463 153.2408,-469 147.2408,-469"/>
-<text text-anchor="middle" x="91.5863" y="-446.8" font-family="Verdana" font-size="14.00" fill="#000000">GenerateEphemeral</text>
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair -->
+<g id="node3" class="node">
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair</title>
+<g id="a_node3"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair | defined in curve25519.go:24">
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M346.2119,-86C346.2119,-86 249.4391,-86 249.4391,-86 243.4391,-86 237.4391,-80 237.4391,-74 237.4391,-74 237.4391,-62 237.4391,-62 237.4391,-56 243.4391,-50 249.4391,-50 249.4391,-50 346.2119,-50 346.2119,-50 352.2119,-50 358.2119,-56 358.2119,-62 358.2119,-62 358.2119,-74 358.2119,-74 358.2119,-80 352.2119,-86 346.2119,-86"/>
+<text text-anchor="middle" x="297.8255" y="-72.2" font-family="Verdana" font-size="14.00" fill="#000000">curve25519</text>
+<text text-anchor="middle" x="297.8255" y="-55.4" font-family="Verdana" font-size="14.00" fill="#000000">GenerateKeyPair</text>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).GenerateEphemeral&#45;&gt;(*github.com/flynn/noise.HandshakeState).LocalEphemeral -->
-<g id="edge19" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).GenerateEphemeral&#45;&gt;(*github.com/flynn/noise.HandshakeState).LocalEphemeral</title>
-<g id="a_edge19"><a xlink:title="at handshake.go:64: calling [(*github.com/flynn/noise.HandshakeState).LocalEphemeral]">
-<path fill="none" stroke="#8b4513" d="M151.8411,-469.1851C158.1682,-472.7494 164.1146,-476.9821 169.1452,-482 239.7023,-552.3785 182.1644,-619.7951 252.8942,-690 255.7066,-692.7916 258.81,-695.331 262.1076,-697.64"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="260.3023,-700.6387 270.6491,-702.9175 263.9817,-694.6837 260.3023,-700.6387"/>
+<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair -->
+<g id="edge5" class="edge">
+<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.NewHandshakeState&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair</title>
+<g id="a_edge5"><a xlink:title="at handshake.go:98: calling [github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair]">
+<path fill="none" stroke="#8b4513" d="M164.6376,-45.7485C184.8842,-49.1311 206.9719,-52.8212 227.2347,-56.2065"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="226.8909,-59.6975 237.331,-57.8933 228.0445,-52.7932 226.8909,-59.6975"/>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixKey -->
-<g id="node15" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixKey</title>
-<g id="a_node15"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixKey | defined in handshake.go:191&#10;at handshake.go:198: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF]&#10;at handshake.go:201: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M114.7435,-225C114.7435,-225 68.4291,-225 68.4291,-225 62.4291,-225 56.4291,-219 56.4291,-213 56.4291,-213 56.4291,-201 56.4291,-201 56.4291,-195 62.4291,-189 68.4291,-189 68.4291,-189 114.7435,-189 114.7435,-189 120.7435,-189 126.7435,-195 126.7435,-201 126.7435,-201 126.7435,-213 126.7435,-213 126.7435,-219 120.7435,-225 114.7435,-225"/>
-<text text-anchor="middle" x="91.5863" y="-202.8" font-family="Verdana" font-size="14.00" fill="#000000">MixKey</text>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).WriteMessage -->
+<g id="node4" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).WriteMessage</title>
+<g id="a_node4"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).WriteMessage | defined in methods.go:66&#10;at methods.go:67: calling [github.com/samber/oops.Errorf]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M134.665,-191C134.665,-191 53.9676,-191 53.9676,-191 47.9676,-191 41.9676,-185 41.9676,-179 41.9676,-179 41.9676,-167 41.9676,-167 41.9676,-161 47.9676,-155 53.9676,-155 53.9676,-155 134.665,-155 134.665,-155 140.665,-155 146.665,-161 146.665,-167 146.665,-167 146.665,-179 146.665,-179 146.665,-185 140.665,-191 134.665,-191"/>
+<text text-anchor="middle" x="94.3163" y="-168.8" font-family="Verdana" font-size="14.00" fill="#000000">WriteMessage</text>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixKey&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF -->
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).WriteMessage&#45;&gt;github.com/samber/oops.Errorf -->
 <g id="edge3" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixKey&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF</title>
-<g id="a_edge3"><a xlink:title="at handshake.go:198: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF]">
-<path fill="none" stroke="#8b4513" d="M126.8467,-211.7358C202.7349,-221.9283 382.5514,-246.0794 480.0964,-259.1806"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="479.7582,-262.6665 490.1352,-260.5289 480.6901,-255.7288 479.7582,-262.6665"/>
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).WriteMessage&#45;&gt;github.com/samber/oops.Errorf</title>
+<g id="a_edge3"><a xlink:title="at methods.go:67: calling [github.com/samber/oops.Errorf]">
+<path fill="none" stroke="#8b4513" d="M146.725,-166.8194C181.5362,-162.7141 226.5141,-157.4098 258.3176,-153.6592"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="259.0431,-157.098 268.5644,-152.4508 258.2233,-150.1462 259.0431,-157.098"/>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey -->
-<g id="node20" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey</title>
-<g id="a_node20"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey | defined in kdf.go:29">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M568.9183,-469C568.9183,-469 522.6039,-469 522.6039,-469 516.6039,-469 510.6039,-463 510.6039,-457 510.6039,-457 510.6039,-445 510.6039,-445 510.6039,-439 516.6039,-433 522.6039,-433 522.6039,-433 568.9183,-433 568.9183,-433 574.9183,-433 580.9183,-439 580.9183,-445 580.9183,-445 580.9183,-457 580.9183,-457 580.9183,-463 574.9183,-469 568.9183,-469"/>
-<text text-anchor="middle" x="545.7611" y="-455.2" font-family="Verdana" font-size="14.00" fill="#000000">kdf</text>
-<text text-anchor="middle" x="545.7611" y="-438.4" font-family="Verdana" font-size="14.00" fill="#000000">MixKey</text>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).CompleteHandshake -->
+<g id="node5" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).CompleteHandshake</title>
+<g id="a_node5"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).CompleteHandshake | defined in methods.go:10&#10;at methods.go:13: calling [github.com/samber/oops.Errorf]&#10;at methods.go:17: calling [github.com/samber/oops.Errorf]&#10;at methods.go:21: calling [github.com/samber/oops.Errorf]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M152.4494,-252C152.4494,-252 36.1832,-252 36.1832,-252 30.1832,-252 24.1832,-246 24.1832,-240 24.1832,-240 24.1832,-228 24.1832,-228 24.1832,-222 30.1832,-216 36.1832,-216 36.1832,-216 152.4494,-216 152.4494,-216 158.4494,-216 164.4494,-222 164.4494,-228 164.4494,-228 164.4494,-240 164.4494,-240 164.4494,-246 158.4494,-252 152.4494,-252"/>
+<text text-anchor="middle" x="94.3163" y="-229.8" font-family="Verdana" font-size="14.00" fill="#000000">CompleteHandshake</text>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey -->
-<g id="edge20" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey</title>
-<g id="a_edge20"><a xlink:title="at handshake.go:201: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey]">
-<path fill="none" stroke="#8b4513" d="M126.868,-213.3664C141.945,-217.8309 158.4906,-225.3607 169.1452,-238 229.1911,-309.2306 141.1785,-383.5344 212.8942,-443 255.321,-478.1796 419.2307,-465.389 500.1035,-456.5729"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="500.9264,-460.0028 510.4759,-455.4141 500.1492,-453.0461 500.9264,-460.0028"/>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).CompleteHandshake&#45;&gt;github.com/samber/oops.Errorf -->
+<g id="edge4" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).CompleteHandshake&#45;&gt;github.com/samber/oops.Errorf</title>
+<g id="a_edge4"><a xlink:title="at methods.go:13: calling [github.com/samber/oops.Errorf]&#10;at methods.go:17: calling [github.com/samber/oops.Errorf]&#10;at methods.go:21: calling [github.com/samber/oops.Errorf]">
+<path fill="none" stroke="#8b4513" d="M142.5048,-215.9594C152.499,-212.1007 162.9361,-207.9844 172.6326,-204 201.904,-191.972 234.6371,-177.5571 259.2897,-166.5026"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="260.9686,-169.5853 268.653,-162.2915 258.0973,-163.2013 260.9686,-169.5853"/>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).SetPrologue -->
-<g id="node16" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).SetPrologue</title>
-<g id="a_node16"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).SetPrologue | defined in handshake.go:159&#10;at handshake.go:167: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash]&#10;at handshake.go:173: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M126.0235,-591C126.0235,-591 57.1491,-591 57.1491,-591 51.1491,-591 45.1491,-585 45.1491,-579 45.1491,-579 45.1491,-567 45.1491,-567 45.1491,-561 51.1491,-555 57.1491,-555 57.1491,-555 126.0235,-555 126.0235,-555 132.0235,-555 138.0235,-561 138.0235,-567 138.0235,-567 138.0235,-579 138.0235,-579 138.0235,-585 132.0235,-591 126.0235,-591"/>
-<text text-anchor="middle" x="91.5863" y="-568.8" font-family="Verdana" font-size="14.00" fill="#000000">SetPrologue</text>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral -->
+<g id="node6" class="node">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral</title>
+<g id="a_node6"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral | defined in methods.go:27&#10;at methods.go:31: calling [github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair]&#10;at methods.go:33: calling [github.com/samber/oops.Errorf]&#10;at methods.go:40: calling [github.com/samber/oops.Errorf]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M149.9708,-130C149.9708,-130 38.6618,-130 38.6618,-130 32.6618,-130 26.6618,-124 26.6618,-118 26.6618,-118 26.6618,-106 26.6618,-106 26.6618,-100 32.6618,-94 38.6618,-94 38.6618,-94 149.9708,-94 149.9708,-94 155.9708,-94 161.9708,-100 161.9708,-106 161.9708,-106 161.9708,-118 161.9708,-118 161.9708,-124 155.9708,-130 149.9708,-130"/>
+<text text-anchor="middle" x="94.3163" y="-107.8" font-family="Verdana" font-size="14.00" fill="#000000">GenerateEphemeral</text>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).SetPrologue&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge13" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).SetPrologue&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge13"><a xlink:title="at handshake.go:173: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M93.9977,-591.3471C101.5233,-640.8158 129.3027,-777.7433 212.8942,-845 234.3698,-862.279 265.1457,-868.0494 289.6216,-869.6225"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="289.5371,-873.1221 299.6801,-870.0611 289.8421,-866.1287 289.5371,-873.1221"/>
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral&#45;&gt;github.com/samber/oops.Errorf -->
+<g id="edge2" class="edge">
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral&#45;&gt;github.com/samber/oops.Errorf</title>
+<g id="a_edge2"><a xlink:title="at methods.go:33: calling [github.com/samber/oops.Errorf]&#10;at methods.go:40: calling [github.com/samber/oops.Errorf]">
+<path fill="none" stroke="#8b4513" d="M162.0819,-124.3205C194.1733,-130.155 231.3605,-136.916 258.689,-141.8846"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="258.1842,-145.3501 268.649,-143.6954 259.4364,-138.463 258.1842,-145.3501"/>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash -->
-<g id="node21" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash</title>
-<g id="a_node21"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash | defined in kdf.go:55">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M571.8622,-591C571.8622,-591 519.66,-591 519.66,-591 513.66,-591 507.66,-585 507.66,-579 507.66,-579 507.66,-567 507.66,-567 507.66,-561 513.66,-555 519.66,-555 519.66,-555 571.8622,-555 571.8622,-555 577.8622,-555 583.8622,-561 583.8622,-567 583.8622,-567 583.8622,-579 583.8622,-579 583.8622,-585 577.8622,-591 571.8622,-591"/>
-<text text-anchor="middle" x="545.7611" y="-577.2" font-family="Verdana" font-size="14.00" fill="#000000">kdf</text>
-<text text-anchor="middle" x="545.7611" y="-560.4" font-family="Verdana" font-size="14.00" fill="#000000">MixHash</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).SetPrologue&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash -->
-<g id="edge12" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).SetPrologue&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash</title>
-<g id="a_edge12"><a xlink:title="at handshake.go:167: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash]">
-<path fill="none" stroke="#8b4513" d="M95.3491,-591.2724C108.9911,-655.5529 157.9499,-869.4604 212.8942,-908 285.768,-959.1159 339.5566,-958.0378 413.1748,-908 518.0412,-836.7231 539.9658,-668.2717 544.5495,-601.235"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="548.0574,-601.2088 545.1651,-591.0164 541.07,-600.7878 548.0574,-601.2088"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixHash -->
-<g id="node17" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixHash</title>
-<g id="a_node17"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixHash | defined in handshake.go:177&#10;at handshake.go:184: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF]&#10;at handshake.go:187: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M117.6874,-286C117.6874,-286 65.4852,-286 65.4852,-286 59.4852,-286 53.4852,-280 53.4852,-274 53.4852,-274 53.4852,-262 53.4852,-262 53.4852,-256 59.4852,-250 65.4852,-250 65.4852,-250 117.6874,-250 117.6874,-250 123.6874,-250 129.6874,-256 129.6874,-262 129.6874,-262 129.6874,-274 129.6874,-274 129.6874,-280 123.6874,-286 117.6874,-286"/>
-<text text-anchor="middle" x="91.5863" y="-263.8" font-family="Verdana" font-size="14.00" fill="#000000">MixHash</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixHash&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF -->
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair -->
 <g id="edge1" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixHash&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF</title>
-<g id="a_edge1"><a xlink:title="at handshake.go:184: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NewNoiseKDF]">
-<path fill="none" stroke="#8b4513" d="M129.9176,-268C207.3982,-268 383.4466,-268 479.7708,-268"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="479.974,-271.5001 489.9739,-268 479.9739,-264.5001 479.974,-271.5001"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixHash&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash -->
-<g id="edge7" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/handshake.NoiseHandshakeState).MixHash&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash</title>
-<g id="a_edge7"><a xlink:title="at handshake.go:187: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixHash]">
-<path fill="none" stroke="#8b4513" d="M129.9571,-274.9799C144.2947,-279.4953 159.4368,-286.8967 169.1452,-299 241.557,-389.2752 164.7271,-738.0358 252.8942,-813 280.0295,-836.0718 382.4983,-831.0994 413.1748,-813 492.1874,-766.382 527.3773,-653.936 539.9461,-601.1961"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="543.4176,-601.7149 542.2287,-591.187 536.5928,-600.1585 543.4176,-601.7149"/>
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/handshake.HandshakeState).GenerateEphemeral&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair</title>
+<g id="a_edge1"><a xlink:title="at methods.go:31: calling [github.com/go&#45;i2p/go&#45;i2p/lib/crypto/curve25519.GenerateKeyPair]">
+<path fill="none" stroke="#8b4513" d="M162.0819,-97.3486C183.1436,-92.795 206.4003,-87.7667 227.6243,-83.178"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="228.5039,-86.5687 237.5384,-81.0345 227.0245,-79.7268 228.5039,-86.5687"/>
 </a>
 </g>
 </g>
diff --git a/images/kdf.svg b/images/kdf.svg
index e76bdfe..aa90c1f 100644
--- a/images/kdf.svg
+++ b/images/kdf.svg
@@ -4,21 +4,21 @@
 <!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Title: gocallvis Pages: 1 -->
-<svg width="368pt" height="445pt"
- viewBox="0.00 0.00 367.78 445.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(0 445)">
+<svg width="305pt" height="201pt"
+ viewBox="0.00 0.00 304.82 201.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(0 201)">
 <title>gocallvis</title>
-<polygon fill="#d3d3d3" stroke="transparent" points="0,0 0,-445 367.7758,-445 367.7758,0 0,0"/>
+<polygon fill="#d3d3d3" stroke="transparent" points="0,0 0,-201 304.8248,-201 304.8248,0 0,0"/>
 <g id="clust1" class="cluster">
 <title>cluster_focus</title>
-<polygon fill="#e6ecfa" stroke="#000000" stroke-width=".5" points="8,-8 8,-437 359.7758,-437 359.7758,-8 8,-8"/>
-<text text-anchor="middle" x="183.8879" y="-416.8" font-family="Arial" font-size="18.00" fill="#000000">kdf</text>
+<polygon fill="#e6ecfa" stroke="#000000" stroke-width=".5" points="8,-8 8,-193 296.8248,-193 296.8248,-8 8,-8"/>
+<text text-anchor="middle" x="152.4124" y="-172.8" font-family="Arial" font-size="18.00" fill="#000000">kdf</text>
 </g>
 <g id="clust2" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF</title>
-<g id="a_clust2"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF">
-<path fill="#b0c4de" stroke="#000000" stroke-width=".5" d="M28,-16C28,-16 216.5808,-16 216.5808,-16 222.5808,-16 228.5808,-22 228.5808,-28 228.5808,-28 228.5808,-387 228.5808,-387 228.5808,-393 222.5808,-399 216.5808,-399 216.5808,-399 28,-399 28,-399 22,-399 16,-393 16,-387 16,-387 16,-28 16,-28 16,-22 22,-16 28,-16"/>
-<text text-anchor="middle" x="122.2904" y="-24.5" font-family="Arial" font-size="15.00" fill="#222222">(*NTCP2KDF)</text>
+<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF</title>
+<g id="a_clust2"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF">
+<path fill="#b0c4de" stroke="#000000" stroke-width=".5" d="M28,-16C28,-16 153.6298,-16 153.6298,-16 159.6298,-16 165.6298,-22 165.6298,-28 165.6298,-28 165.6298,-143 165.6298,-143 165.6298,-149 159.6298,-155 153.6298,-155 153.6298,-155 28,-155 28,-155 22,-155 16,-149 16,-143 16,-143 16,-28 16,-28 16,-22 22,-16 28,-16"/>
+<text text-anchor="middle" x="90.8149" y="-24.5" font-family="Arial" font-size="15.00" fill="#222222">(*NoiseKDF)</text>
 </a>
 </g>
 </g>
@@ -26,117 +26,45 @@
 <g id="node1" class="node">
 <title>github.com/samber/oops.Errorf</title>
 <g id="a_node1"><a xlink:title="github.com/samber/oops.Errorf | defined in oops.go:34">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M339.8736,-238C339.8736,-238 305.483,-238 305.483,-238 299.483,-238 293.483,-232 293.483,-226 293.483,-226 293.483,-214 293.483,-214 293.483,-208 299.483,-202 305.483,-202 305.483,-202 339.8736,-202 339.8736,-202 345.8736,-202 351.8736,-208 351.8736,-214 351.8736,-214 351.8736,-226 351.8736,-226 351.8736,-232 345.8736,-238 339.8736,-238"/>
-<text text-anchor="middle" x="322.6783" y="-224.2" font-family="Verdana" font-size="14.00" fill="#000000">oops</text>
-<text text-anchor="middle" x="322.6783" y="-207.4" font-family="Verdana" font-size="14.00" fill="#000000">Errorf</text>
+<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M276.9226,-107C276.9226,-107 242.532,-107 242.532,-107 236.532,-107 230.532,-101 230.532,-95 230.532,-95 230.532,-83 230.532,-83 230.532,-77 236.532,-71 242.532,-71 242.532,-71 276.9226,-71 276.9226,-71 282.9226,-71 288.9226,-77 288.9226,-83 288.9226,-83 288.9226,-95 288.9226,-95 288.9226,-101 282.9226,-107 276.9226,-107"/>
+<text text-anchor="middle" x="259.7273" y="-93.2" font-family="Verdana" font-size="14.00" fill="#000000">oops</text>
+<text text-anchor="middle" x="259.7273" y="-76.4" font-family="Verdana" font-size="14.00" fill="#000000">Errorf</text>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveSipHashKey -->
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey -->
 <g id="node2" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveSipHashKey</title>
-<g id="a_node2"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveSipHashKey | defined in kdf.go:112&#10;at kdf.go:116: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:119: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:126: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:129: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:135: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M176.6377,-86C176.6377,-86 67.9431,-86 67.9431,-86 61.9431,-86 55.9431,-80 55.9431,-74 55.9431,-74 55.9431,-62 55.9431,-62 55.9431,-56 61.9431,-50 67.9431,-50 67.9431,-50 176.6377,-50 176.6377,-50 182.6377,-50 188.6377,-56 188.6377,-62 188.6377,-62 188.6377,-74 188.6377,-74 188.6377,-80 182.6377,-86 176.6377,-86"/>
-<text text-anchor="middle" x="122.2904" y="-63.8" font-family="Verdana" font-size="14.00" fill="#000000">DeriveSipHashKey</text>
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey</title>
+<g id="a_node2"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey | defined in kdf.go:29&#10;at kdf.go:31: calling [github.com/samber/oops.Errorf]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M113.9721,-86C113.9721,-86 67.6577,-86 67.6577,-86 61.6577,-86 55.6577,-80 55.6577,-74 55.6577,-74 55.6577,-62 55.6577,-62 55.6577,-56 61.6577,-50 67.6577,-50 67.6577,-50 113.9721,-50 113.9721,-50 119.9721,-50 125.9721,-56 125.9721,-62 125.9721,-62 125.9721,-74 125.9721,-74 125.9721,-80 119.9721,-86 113.9721,-86"/>
+<text text-anchor="middle" x="90.8149" y="-63.8" font-family="Verdana" font-size="14.00" fill="#000000">MixKey</text>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveSipHashKey&#45;&gt;github.com/samber/oops.Errorf -->
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey&#45;&gt;github.com/samber/oops.Errorf -->
 <g id="edge1" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveSipHashKey&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge1"><a xlink:title="at kdf.go:116: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:119: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:126: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:129: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:135: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M188.6745,-80.4262C202.5959,-84.8824 216.6564,-90.8979 228.5808,-99 264.375,-123.3205 292.6637,-165.5676 308.539,-193.1531"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="305.4981,-194.8862 313.4398,-201.899 311.6047,-191.4643 305.4981,-194.8862"/>
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).MixKey&#45;&gt;github.com/samber/oops.Errorf</title>
+<g id="a_edge1"><a xlink:title="at kdf.go:31: calling [github.com/samber/oops.Errorf]">
+<path fill="none" stroke="#8b4513" d="M126.2245,-72.4023C153.7952,-75.83 192.0376,-80.5845 220.5284,-84.1266"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="220.1905,-87.6115 230.546,-85.372 221.0542,-80.6649 220.1905,-87.6115"/>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey -->
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).DeriveSessionKeys -->
 <g id="node3" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey</title>
-<g id="a_node3"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey | defined in kdf.go:37&#10;at kdf.go:39: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:45: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:52: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:59: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M145.4476,-147C145.4476,-147 99.1332,-147 99.1332,-147 93.1332,-147 87.1332,-141 87.1332,-135 87.1332,-135 87.1332,-123 87.1332,-123 87.1332,-117 93.1332,-111 99.1332,-111 99.1332,-111 145.4476,-111 145.4476,-111 151.4476,-111 157.4476,-117 157.4476,-123 157.4476,-123 157.4476,-135 157.4476,-135 157.4476,-141 151.4476,-147 145.4476,-147"/>
-<text text-anchor="middle" x="122.2904" y="-124.8" font-family="Verdana" font-size="14.00" fill="#000000">MixKey</text>
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).DeriveSessionKeys</title>
+<g id="a_node3"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).DeriveSessionKeys | defined in kdf.go:73&#10;at kdf.go:77: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:100: calling [github.com/samber/oops.Errorf]">
+<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M145.4452,-147C145.4452,-147 36.1846,-147 36.1846,-147 30.1846,-147 24.1846,-141 24.1846,-135 24.1846,-135 24.1846,-123 24.1846,-123 24.1846,-117 30.1846,-111 36.1846,-111 36.1846,-111 145.4452,-111 145.4452,-111 151.4452,-111 157.4452,-117 157.4452,-123 157.4452,-123 157.4452,-135 157.4452,-135 157.4452,-141 151.4452,-147 145.4452,-147"/>
+<text text-anchor="middle" x="90.8149" y="-124.8" font-family="Verdana" font-size="14.00" fill="#000000">DeriveSessionKeys</text>
 </a>
 </g>
 </g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey&#45;&gt;github.com/samber/oops.Errorf -->
+<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).DeriveSessionKeys&#45;&gt;github.com/samber/oops.Errorf -->
 <g id="edge2" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge2"><a xlink:title="at kdf.go:39: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:45: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:52: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:59: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M157.6506,-136.6371C178.7686,-141.8477 205.8225,-149.6805 228.5808,-160 250.2655,-169.8327 272.8149,-184.0515 290.4018,-196.1797"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="288.4143,-199.0607 298.6112,-201.9371 292.4337,-193.3297 288.4143,-199.0607"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveFramingKey -->
-<g id="node4" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveFramingKey</title>
-<g id="a_node4"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveFramingKey | defined in kdf.go:144&#10;at kdf.go:148: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M176.6377,-208C176.6377,-208 67.9431,-208 67.9431,-208 61.9431,-208 55.9431,-202 55.9431,-196 55.9431,-196 55.9431,-184 55.9431,-184 55.9431,-178 61.9431,-172 67.9431,-172 67.9431,-172 176.6377,-172 176.6377,-172 182.6377,-172 188.6377,-178 188.6377,-184 188.6377,-184 188.6377,-196 188.6377,-196 188.6377,-202 182.6377,-208 176.6377,-208"/>
-<text text-anchor="middle" x="122.2904" y="-185.8" font-family="Verdana" font-size="14.00" fill="#000000">DeriveFramingKey</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveFramingKey&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge3" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveFramingKey&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge3"><a xlink:title="at kdf.go:148: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M188.7383,-199.9479C220.0178,-204.6307 256.2655,-210.0574 283.1586,-214.0835"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="282.9322,-217.5886 293.3403,-215.6078 283.9687,-210.6657 282.9322,-217.5886"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveKeys -->
-<g id="node5" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveKeys</title>
-<g id="a_node5"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveKeys | defined in kdf.go:82&#10;at kdf.go:86: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:93: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M155.6433,-269C155.6433,-269 88.9375,-269 88.9375,-269 82.9375,-269 76.9375,-263 76.9375,-257 76.9375,-257 76.9375,-245 76.9375,-245 76.9375,-239 82.9375,-233 88.9375,-233 88.9375,-233 155.6433,-233 155.6433,-233 161.6433,-233 167.6433,-239 167.6433,-245 167.6433,-245 167.6433,-257 167.6433,-257 167.6433,-263 161.6433,-269 155.6433,-269"/>
-<text text-anchor="middle" x="122.2904" y="-246.8" font-family="Verdana" font-size="14.00" fill="#000000">DeriveKeys</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveKeys&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge4" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveKeys&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge4"><a xlink:title="at kdf.go:86: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:93: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M167.7615,-243.9656C202.5635,-238.5818 250.0718,-231.2322 283.2689,-226.0966"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="284.1627,-229.5001 293.51,-224.5123 283.0925,-222.5824 284.1627,-229.5001"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveHandshakeMessageKey -->
-<g id="node6" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveHandshakeMessageKey</title>
-<g id="a_node6"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveHandshakeMessageKey | defined in kdf.go:102&#10;at kdf.go:105: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M208.3716,-330C208.3716,-330 36.2092,-330 36.2092,-330 30.2092,-330 24.2092,-324 24.2092,-318 24.2092,-318 24.2092,-306 24.2092,-306 24.2092,-300 30.2092,-294 36.2092,-294 36.2092,-294 208.3716,-294 208.3716,-294 214.3716,-294 220.3716,-300 220.3716,-306 220.3716,-306 220.3716,-318 220.3716,-318 220.3716,-324 214.3716,-330 208.3716,-330"/>
-<text text-anchor="middle" x="122.2904" y="-307.8" font-family="Verdana" font-size="14.00" fill="#000000">DeriveHandshakeMessageKey</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveHandshakeMessageKey&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge5" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).DeriveHandshakeMessageKey&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge5"><a xlink:title="at kdf.go:105: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M197.3838,-293.9461C208.0475,-290.4824 218.7284,-286.5047 228.5808,-282 250.7515,-271.863 273.6334,-256.9048 291.2812,-244.2206"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="293.495,-246.9377 299.4981,-238.2076 289.3611,-241.2886 293.495,-246.9377"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixHash -->
-<g id="node7" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixHash</title>
-<g id="a_node7"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixHash | defined in kdf.go:68&#10;at kdf.go:71: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:74: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M148.3915,-391C148.3915,-391 96.1893,-391 96.1893,-391 90.1893,-391 84.1893,-385 84.1893,-379 84.1893,-379 84.1893,-367 84.1893,-367 84.1893,-361 90.1893,-355 96.1893,-355 96.1893,-355 148.3915,-355 148.3915,-355 154.3915,-355 160.3915,-361 160.3915,-367 160.3915,-367 160.3915,-379 160.3915,-379 160.3915,-385 154.3915,-391 148.3915,-391"/>
-<text text-anchor="middle" x="122.2904" y="-368.8" font-family="Verdana" font-size="14.00" fill="#000000">MixHash</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixHash&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge6" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixHash&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge6"><a xlink:title="at kdf.go:71: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:74: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M160.4585,-368.2914C181.9101,-364.2267 208.3545,-356.7315 228.5808,-343 264.954,-318.3064 293.2516,-274.9765 308.9503,-246.8921"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="312.0825,-248.4584 313.7847,-238.0012 305.9328,-245.1145 312.0825,-248.4584"/>
+<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise/kdf.NoiseKDF).DeriveSessionKeys&#45;&gt;github.com/samber/oops.Errorf</title>
+<g id="a_edge2"><a xlink:title="at kdf.go:77: calling [github.com/samber/oops.Errorf]&#10;at kdf.go:100: calling [github.com/samber/oops.Errorf]">
+<path fill="none" stroke="#8b4513" d="M157.5736,-113.1909C178.8924,-108.1424 201.7865,-102.7209 220.4867,-98.2925"/>
+<polygon fill="#8b4513" stroke="#8b4513" points="221.4832,-101.6534 230.4075,-95.9432 219.8701,-94.8418 221.4832,-101.6534"/>
 </a>
 </g>
 </g>
diff --git a/images/ntcp.svg b/images/ntcp.svg
index 0c4e71b..947c327 100644
--- a/images/ntcp.svg
+++ b/images/ntcp.svg
@@ -4,2243 +4,10 @@
 <!-- Generated by graphviz version 2.40.1 (20161225.0304)
  -->
 <!-- Title: gocallvis Pages: 1 -->
-<svg width="1426pt" height="2970pt"
- viewBox="0.00 0.00 1425.57 2969.75" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(0 2969.7537)">
+<svg width="0pt" height="0pt"
+ viewBox="0.00 0.00 0.00 0.00" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(0 0)">
 <title>gocallvis</title>
-<polygon fill="#d3d3d3" stroke="transparent" points="0,0 0,-2969.7537 1425.5693,-2969.7537 1425.5693,0 0,0"/>
-<g id="clust1" class="cluster">
-<title>cluster_focus</title>
-<polygon fill="#e6ecfa" stroke="#000000" stroke-width=".5" points="8,-8 8,-2954 1417.5693,-2954 1417.5693,-8 8,-8"/>
-<text text-anchor="middle" x="712.7846" y="-2933.8" font-family="Arial" font-size="18.00" fill="#000000">ntcp</text>
-</g>
-<g id="clust19" class="cluster">
-<title>cluster_github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.RequestOptions</title>
-<g id="a_clust19"><a xlink:title="type: github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.RequestOptions">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M260.336,-2508C260.336,-2508 369.2042,-2508 369.2042,-2508 375.2042,-2508 381.2042,-2514 381.2042,-2520 381.2042,-2520 381.2042,-2574 381.2042,-2574 381.2042,-2580 375.2042,-2586 369.2042,-2586 369.2042,-2586 260.336,-2586 260.336,-2586 254.336,-2586 248.336,-2580 248.336,-2574 248.336,-2574 248.336,-2520 248.336,-2520 248.336,-2514 254.336,-2508 260.336,-2508"/>
-<text text-anchor="middle" x="314.7701" y="-2516.5" font-family="Arial" font-size="15.00" fill="#222222">(RequestOptions)</text>
-</a>
-</g>
-</g>
-<g id="clust18" class="cluster">
-<title>cluster_github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo</title>
-<g id="a_clust18"><a xlink:title="type: github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M825.4183,-125C825.4183,-125 904.3959,-125 904.3959,-125 910.3959,-125 916.3959,-131 916.3959,-137 916.3959,-137 916.3959,-191 916.3959,-191 916.3959,-197 910.3959,-203 904.3959,-203 904.3959,-203 825.4183,-203 825.4183,-203 819.4183,-203 813.4183,-197 813.4183,-191 813.4183,-191 813.4183,-137 813.4183,-137 813.4183,-131 819.4183,-125 825.4183,-125"/>
-<text text-anchor="middle" x="864.9071" y="-133.5" font-family="Arial" font-size="15.00" fill="#222222">(RouterInfo)</text>
-</a>
-</g>
-</g>
-<g id="clust17" class="cluster">
-<title>cluster_github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress</title>
-<g id="a_clust17"><a xlink:title="type: github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M1055.1968,-426C1055.1968,-426 1180.8224,-426 1180.8224,-426 1186.8224,-426 1192.8224,-432 1192.8224,-438 1192.8224,-438 1192.8224,-675 1192.8224,-675 1192.8224,-681 1186.8224,-687 1180.8224,-687 1180.8224,-687 1055.1968,-687 1055.1968,-687 1049.1968,-687 1043.1968,-681 1043.1968,-675 1043.1968,-675 1043.1968,-438 1043.1968,-438 1043.1968,-432 1049.1968,-426 1055.1968,-426"/>
-<text text-anchor="middle" x="1118.0096" y="-434.5" font-family="Arial" font-size="15.00" fill="#222222">(RouterAddress)</text>
-</a>
-</g>
-</g>
-<g id="clust16" class="cluster">
-<title>cluster_github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer</title>
-<g id="a_clust16"><a xlink:title="type: github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M840.9071,-2668C840.9071,-2668 888.9071,-2668 888.9071,-2668 894.9071,-2668 900.9071,-2674 900.9071,-2680 900.9071,-2680 900.9071,-2734 900.9071,-2734 900.9071,-2740 894.9071,-2746 888.9071,-2746 888.9071,-2746 840.9071,-2746 840.9071,-2746 834.9071,-2746 828.9071,-2740 828.9071,-2734 828.9071,-2734 828.9071,-2680 828.9071,-2680 828.9071,-2674 834.9071,-2668 840.9071,-2668"/>
-<text text-anchor="middle" x="864.9071" y="-2676.5" font-family="Arial" font-size="15.00" fill="#222222">(Integer)</text>
-</a>
-</g>
-</g>
-<g id="clust15" class="cluster">
-<title>cluster_github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString</title>
-<g id="a_clust15"><a xlink:title="type: github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M1310.753,-218C1310.753,-218 1373.753,-218 1373.753,-218 1379.753,-218 1385.753,-224 1385.753,-230 1385.753,-230 1385.753,-284 1385.753,-284 1385.753,-290 1379.753,-296 1373.753,-296 1373.753,-296 1310.753,-296 1310.753,-296 1304.753,-296 1298.753,-290 1298.753,-284 1298.753,-284 1298.753,-230 1298.753,-230 1298.753,-224 1304.753,-218 1310.753,-218"/>
-<text text-anchor="middle" x="1342.253" y="-226.5" font-family="Arial" font-size="15.00" fill="#222222">(I2PString)</text>
-</a>
-</g>
-</g>
-<g id="clust14" class="cluster">
-<title>cluster_github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Date</title>
-<g id="a_clust14"><a xlink:title="type: github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Date">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M577.374,-2704C577.374,-2704 623.374,-2704 623.374,-2704 629.374,-2704 635.374,-2710 635.374,-2716 635.374,-2716 635.374,-2770 635.374,-2770 635.374,-2776 629.374,-2782 623.374,-2782 623.374,-2782 577.374,-2782 577.374,-2782 571.374,-2782 565.374,-2776 565.374,-2770 565.374,-2770 565.374,-2716 565.374,-2716 565.374,-2710 571.374,-2704 577.374,-2704"/>
-<text text-anchor="middle" x="600.374" y="-2712.5" font-family="Arial" font-size="15.00" fill="#222222">(Date)</text>
-</a>
-</g>
-</g>
-<g id="clust13" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/logger.Logger</title>
-<g id="a_clust13"><a xlink:title="type: *github.com/go&#45;i2p/logger.Logger">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M573.4911,-1330C573.4911,-1330 627.2569,-1330 627.2569,-1330 633.2569,-1330 639.2569,-1336 639.2569,-1342 639.2569,-1342 639.2569,-1396 639.2569,-1396 639.2569,-1402 633.2569,-1408 627.2569,-1408 627.2569,-1408 573.4911,-1408 573.4911,-1408 567.4911,-1408 561.4911,-1402 561.4911,-1396 561.4911,-1396 561.4911,-1342 561.4911,-1342 561.4911,-1336 567.4911,-1330 573.4911,-1330"/>
-<text text-anchor="middle" x="600.374" y="-1338.5" font-family="Arial" font-size="15.00" fill="#222222">(*Logger)</text>
-</a>
-</g>
-</g>
-<g id="clust12" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper</title>
-<g id="a_clust12"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M795.6455,-2286C795.6455,-2286 935.1687,-2286 935.1687,-2286 941.1687,-2286 947.1687,-2292 947.1687,-2298 947.1687,-2298 947.1687,-2352 947.1687,-2352 947.1687,-2358 941.1687,-2364 935.1687,-2364 935.1687,-2364 795.6455,-2364 795.6455,-2364 789.6455,-2364 783.6455,-2358 783.6455,-2352 783.6455,-2352 783.6455,-2298 783.6455,-2298 783.6455,-2292 789.6455,-2286 795.6455,-2286"/>
-<text text-anchor="middle" x="865.4071" y="-2294.5" font-family="Arial" font-size="15.00" fill="#222222">(*RouterTimestamper)</text>
-</a>
-</g>
-</g>
-<g id="clust11" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.CreatedOptions</title>
-<g id="a_clust11"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.CreatedOptions">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M544.9399,-2315C544.9399,-2315 656.8081,-2315 656.8081,-2315 662.8081,-2315 668.8081,-2321 668.8081,-2327 668.8081,-2327 668.8081,-2381 668.8081,-2381 668.8081,-2387 662.8081,-2393 656.8081,-2393 656.8081,-2393 544.9399,-2393 544.9399,-2393 538.9399,-2393 532.9399,-2387 532.9399,-2381 532.9399,-2381 532.9399,-2327 532.9399,-2327 532.9399,-2321 538.9399,-2315 544.9399,-2315"/>
-<text text-anchor="middle" x="600.874" y="-2323.5" font-family="Arial" font-size="15.00" fill="#222222">(*CreatedOptions)</text>
-</a>
-</g>
-</g>
-<g id="clust10" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.ConfirmedOptions</title>
-<g id="a_clust10"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.ConfirmedOptions">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M536.9399,-87C536.9399,-87 664.8081,-87 664.8081,-87 670.8081,-87 676.8081,-93 676.8081,-99 676.8081,-99 676.8081,-153 676.8081,-153 676.8081,-159 670.8081,-165 664.8081,-165 664.8081,-165 536.9399,-165 536.9399,-165 530.9399,-165 524.9399,-159 524.9399,-153 524.9399,-153 524.9399,-99 524.9399,-99 524.9399,-93 530.9399,-87 536.9399,-87"/>
-<text text-anchor="middle" x="600.874" y="-95.5" font-family="Arial" font-size="15.00" fill="#222222">(*ConfirmedOptions)</text>
-</a>
-</g>
-</g>
-<g id="clust9" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF</title>
-<g id="a_clust9"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M1298.7025,-2164C1298.7025,-2164 1384.8035,-2164 1384.8035,-2164 1390.8035,-2164 1396.8035,-2170 1396.8035,-2176 1396.8035,-2176 1396.8035,-2291 1396.8035,-2291 1396.8035,-2297 1390.8035,-2303 1384.8035,-2303 1384.8035,-2303 1298.7025,-2303 1298.7025,-2303 1292.7025,-2303 1286.7025,-2297 1286.7025,-2291 1286.7025,-2291 1286.7025,-2176 1286.7025,-2176 1286.7025,-2170 1292.7025,-2164 1298.7025,-2164"/>
-<text text-anchor="middle" x="1341.753" y="-2172.5" font-family="Arial" font-size="15.00" fill="#222222">(*NTCP2KDF)</text>
-</a>
-</g>
-</g>
-<g id="clust8" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor</title>
-<g id="a_clust8"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor">
-<path fill="#b0c4de" stroke="#000000" stroke-width=".5" d="M28,-2594C28,-2594 382.6467,-2594 382.6467,-2594 388.6467,-2594 394.6467,-2600 394.6467,-2606 394.6467,-2606 394.6467,-2904 394.6467,-2904 394.6467,-2910 388.6467,-2916 382.6467,-2916 382.6467,-2916 28,-2916 28,-2916 22,-2916 16,-2910 16,-2904 16,-2904 16,-2606 16,-2606 16,-2600 22,-2594 28,-2594"/>
-<text text-anchor="middle" x="205.3233" y="-2602.5" font-family="Arial" font-size="15.00" fill="#222222">(*SessionRequestProcessor)</text>
-</a>
-</g>
-</g>
-<g id="clust7" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor</title>
-<g id="a_clust7"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor">
-<path fill="#b0c4de" stroke="#000000" stroke-width=".5" d="M224.0597,-2105C224.0597,-2105 405.4805,-2105 405.4805,-2105 411.4805,-2105 417.4805,-2111 417.4805,-2117 417.4805,-2117 417.4805,-2293 417.4805,-2293 417.4805,-2299 411.4805,-2305 405.4805,-2305 405.4805,-2305 224.0597,-2305 224.0597,-2305 218.0597,-2305 212.0597,-2299 212.0597,-2293 212.0597,-2293 212.0597,-2117 212.0597,-2117 212.0597,-2111 218.0597,-2105 224.0597,-2105"/>
-<text text-anchor="middle" x="314.7701" y="-2113.5" font-family="Arial" font-size="15.00" fill="#222222">(*SessionCreatedProcessor)</text>
-</a>
-</g>
-</g>
-<g id="clust6" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor</title>
-<g id="a_clust6"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor">
-<path fill="#b0c4de" stroke="#000000" stroke-width=".5" d="M260.9005,-173C260.9005,-173 676.0192,-173 676.0192,-173 682.0192,-173 688.0192,-179 688.0192,-185 688.0192,-185 688.0192,-483 688.0192,-483 688.0192,-489 682.0192,-495 676.0192,-495 676.0192,-495 260.9005,-495 260.9005,-495 254.9005,-495 248.9005,-489 248.9005,-483 248.9005,-483 248.9005,-185 248.9005,-185 248.9005,-179 254.9005,-173 260.9005,-173"/>
-<text text-anchor="middle" x="468.4599" y="-181.5" font-family="Arial" font-size="15.00" fill="#222222">(*SessionConfirmedProcessor)</text>
-</a>
-</g>
-</g>
-<g id="clust5" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport</title>
-<g id="a_clust5"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport">
-<path fill="#b0c4de" stroke="#000000" stroke-width=".5" d="M548.8354,-547C548.8354,-547 905.5712,-547 905.5712,-547 911.5712,-547 917.5712,-553 917.5712,-559 917.5712,-559 917.5712,-857 917.5712,-857 917.5712,-863 911.5712,-869 905.5712,-869 905.5712,-869 548.8354,-869 548.8354,-869 542.8354,-869 536.8354,-863 536.8354,-857 536.8354,-857 536.8354,-559 536.8354,-559 536.8354,-553 542.8354,-547 548.8354,-547"/>
-<text text-anchor="middle" x="727.2033" y="-555.5" font-family="Arial" font-size="15.00" fill="#222222">(*NTCP2Transport)</text>
-</a>
-</g>
-</g>
-<g id="clust4" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session</title>
-<g id="a_clust4"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session">
-<path fill="#b0c4de" stroke="#000000" stroke-width=".5" d="M224.7392,-1499C224.7392,-1499 1183.1506,-1499 1183.1506,-1499 1189.1506,-1499 1195.1506,-1505 1195.1506,-1511 1195.1506,-1511 1195.1506,-2053 1195.1506,-2053 1195.1506,-2059 1189.1506,-2065 1183.1506,-2065 1183.1506,-2065 224.7392,-2065 224.7392,-2065 218.7392,-2065 212.7392,-2059 212.7392,-2053 212.7392,-2053 212.7392,-1511 212.7392,-1511 212.7392,-1505 218.7392,-1499 224.7392,-1499"/>
-<text text-anchor="middle" x="703.9449" y="-1507.5" font-family="Arial" font-size="15.00" fill="#222222">(*NTCP2Session)</text>
-</a>
-</g>
-</g>
-<g id="clust3" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NoiseTransport</title>
-<g id="a_clust3"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NoiseTransport">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M809.8096,-877C809.8096,-877 920.0046,-877 920.0046,-877 926.0046,-877 932.0046,-883 932.0046,-889 932.0046,-889 932.0046,-1004 932.0046,-1004 932.0046,-1010 926.0046,-1016 920.0046,-1016 920.0046,-1016 809.8096,-1016 809.8096,-1016 803.8096,-1016 797.8096,-1010 797.8096,-1004 797.8096,-1004 797.8096,-889 797.8096,-889 797.8096,-883 803.8096,-877 809.8096,-877"/>
-<text text-anchor="middle" x="864.9071" y="-885.5" font-family="Arial" font-size="15.00" fill="#222222">(*NoiseTransport)</text>
-</a>
-</g>
-</g>
-<g id="clust2" class="cluster">
-<title>cluster_*github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo</title>
-<g id="a_clust2"><a xlink:title="type: *github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo">
-<path fill="#eed8ae" stroke="#000000" stroke-width=".5" d="M1285.9367,-352C1285.9367,-352 1397.5693,-352 1397.5693,-352 1403.5693,-352 1409.5693,-358 1409.5693,-364 1409.5693,-364 1409.5693,-418 1409.5693,-418 1409.5693,-424 1403.5693,-430 1397.5693,-430 1397.5693,-430 1285.9367,-430 1285.9367,-430 1279.9367,-430 1273.9367,-424 1273.9367,-418 1273.9367,-418 1273.9367,-364 1273.9367,-364 1273.9367,-358 1279.9367,-352 1285.9367,-352"/>
-<text text-anchor="middle" x="1341.753" y="-360.5" font-family="Arial" font-size="15.00" fill="#222222">(*RouterInfo)</text>
-</a>
-</g>
-</g>
-<!-- github.com/samber/oops.Errorf -->
-<g id="node1" class="node">
-<title>github.com/samber/oops.Errorf</title>
-<g id="a_node1"><a xlink:title="github.com/samber/oops.Errorf | defined in oops.go:34">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M1135.2049,-1103C1135.2049,-1103 1100.8143,-1103 1100.8143,-1103 1094.8143,-1103 1088.8143,-1097 1088.8143,-1091 1088.8143,-1091 1088.8143,-1079 1088.8143,-1079 1088.8143,-1073 1094.8143,-1067 1100.8143,-1067 1100.8143,-1067 1135.2049,-1067 1135.2049,-1067 1141.2049,-1067 1147.2049,-1073 1147.2049,-1079 1147.2049,-1079 1147.2049,-1091 1147.2049,-1091 1147.2049,-1097 1141.2049,-1103 1135.2049,-1103"/>
-<text text-anchor="middle" x="1118.0096" y="-1089.2" font-family="Verdana" font-size="14.00" fill="#000000">oops</text>
-<text text-anchor="middle" x="1118.0096" y="-1072.4" font-family="Verdana" font-size="14.00" fill="#000000">Errorf</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Session -->
-<g id="node2" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Session</title>
-<g id="a_node2"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Session | defined in session.go:50&#10;at session.go:54: calling [github.com/samber/oops.Errorf]&#10;at session.go:52: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NewNoiseTransportSession]&#10;at session.go:59: calling [github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.NewRouterTimestamper]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M920.8903,-539C920.8903,-539 808.9239,-539 808.9239,-539 802.9239,-539 796.9239,-533 796.9239,-527 796.9239,-527 796.9239,-515 796.9239,-515 796.9239,-509 802.9239,-503 808.9239,-503 808.9239,-503 920.8903,-503 920.8903,-503 926.8903,-503 932.8903,-509 932.8903,-515 932.8903,-515 932.8903,-527 932.8903,-527 932.8903,-533 926.8903,-539 920.8903,-539"/>
-<text text-anchor="middle" x="864.9071" y="-516.8" font-family="Verdana" font-size="14.00" fill="#000000">NewNTCP2Session</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Session&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge10" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Session&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge10"><a xlink:title="at session.go:54: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M932.9187,-529.7927C940.6359,-533.0127 947.8682,-537.303 953.8672,-543 956.3249,-545.334 1076.468,-946.2317 1109.6174,-1056.9577"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1106.3261,-1058.1679 1112.5469,-1066.7441 1113.0321,-1056.1604 1106.3261,-1058.1679"/>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NewNoiseTransportSession -->
-<g id="node3" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NewNoiseTransportSession</title>
-<g id="a_node3"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NewNoiseTransportSession | defined in session.go:113">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M1196.2946,-337C1196.2946,-337 1039.7246,-337 1039.7246,-337 1033.7246,-337 1027.7246,-331 1027.7246,-325 1027.7246,-325 1027.7246,-313 1027.7246,-313 1027.7246,-307 1033.7246,-301 1039.7246,-301 1039.7246,-301 1196.2946,-301 1196.2946,-301 1202.2946,-301 1208.2946,-307 1208.2946,-313 1208.2946,-313 1208.2946,-325 1208.2946,-325 1208.2946,-331 1202.2946,-337 1196.2946,-337"/>
-<text text-anchor="middle" x="1118.0096" y="-323.2" font-family="Verdana" font-size="14.00" fill="#000000">noise</text>
-<text text-anchor="middle" x="1118.0096" y="-306.4" font-family="Verdana" font-size="14.00" fill="#000000">NewNoiseTransportSession</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Session&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NewNoiseTransportSession -->
-<g id="edge36" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Session&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NewNoiseTransportSession</title>
-<g id="a_edge36"><a xlink:title="at session.go:52: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NewNoiseTransportSession]">
-<path fill="none" stroke="#8b4513" d="M897.9863,-502.7504C916.658,-490.9792 939.1318,-474.1237 953.8672,-454 983.0991,-414.0789 954.0579,-382.0647 990.8672,-349 998.8761,-341.8058 1008.2864,-336.2481 1018.303,-331.9673"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1019.5647,-335.2321 1027.6495,-328.3847 1017.0592,-328.6958 1019.5647,-335.2321"/>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.NewRouterTimestamper -->
-<g id="node4" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.NewRouterTimestamper</title>
-<g id="a_node4"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.NewRouterTimestamper | defined in router_timestamper.go:55">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M1187.4043,-160C1187.4043,-160 1048.6149,-160 1048.6149,-160 1042.6149,-160 1036.6149,-154 1036.6149,-148 1036.6149,-148 1036.6149,-136 1036.6149,-136 1036.6149,-130 1042.6149,-124 1048.6149,-124 1048.6149,-124 1187.4043,-124 1187.4043,-124 1193.4043,-124 1199.4043,-130 1199.4043,-136 1199.4043,-136 1199.4043,-148 1199.4043,-148 1199.4043,-154 1193.4043,-160 1187.4043,-160"/>
-<text text-anchor="middle" x="1118.0096" y="-146.2" font-family="Verdana" font-size="14.00" fill="#000000">sntp</text>
-<text text-anchor="middle" x="1118.0096" y="-129.4" font-family="Verdana" font-size="14.00" fill="#000000">NewRouterTimestamper</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Session&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.NewRouterTimestamper -->
-<g id="edge118" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Session&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.NewRouterTimestamper</title>
-<g id="a_edge118"><a xlink:title="at session.go:59: calling [github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.NewRouterTimestamper]">
-<path fill="none" stroke="#8b4513" d="M876.9445,-502.975C917.8324,-441.7487 1051.5387,-241.5346 1100.1431,-168.7537"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1103.2555,-170.3952 1105.8985,-160.1353 1097.4342,-166.5077 1103.2555,-170.3952"/>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/obfs.ObfuscateEphemeralKey -->
-<g id="node5" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/obfs.ObfuscateEphemeralKey</title>
-<g id="a_node5"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/transport/obfs.ObfuscateEphemeralKey | defined in obfs.go:9">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M935.113,-2224C935.113,-2224 794.7012,-2224 794.7012,-2224 788.7012,-2224 782.7012,-2218 782.7012,-2212 782.7012,-2212 782.7012,-2200 782.7012,-2200 782.7012,-2194 788.7012,-2188 794.7012,-2188 794.7012,-2188 935.113,-2188 935.113,-2188 941.113,-2188 947.113,-2194 947.113,-2200 947.113,-2200 947.113,-2212 947.113,-2212 947.113,-2218 941.113,-2224 935.113,-2224"/>
-<text text-anchor="middle" x="864.9071" y="-2210.2" font-family="Verdana" font-size="14.00" fill="#000000">obfs</text>
-<text text-anchor="middle" x="864.9071" y="-2193.4" font-family="Verdana" font-size="14.00" fill="#000000">ObfuscateEphemeralKey</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Transport -->
-<g id="node6" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Transport</title>
-<g id="a_node6"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Transport | defined in new.go:12&#10;at new.go:14: calling [github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.NewRouterTimestamper]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M926.5374,-56C926.5374,-56 803.2768,-56 803.2768,-56 797.2768,-56 791.2768,-50 791.2768,-44 791.2768,-44 791.2768,-32 791.2768,-32 791.2768,-26 797.2768,-20 803.2768,-20 803.2768,-20 926.5374,-20 926.5374,-20 932.5374,-20 938.5374,-26 938.5374,-32 938.5374,-32 938.5374,-44 938.5374,-44 938.5374,-50 932.5374,-56 926.5374,-56"/>
-<text text-anchor="middle" x="864.9071" y="-33.8" font-family="Verdana" font-size="14.00" fill="#000000">NewNTCP2Transport</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Transport&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.NewRouterTimestamper -->
-<g id="edge121" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Transport&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.NewRouterTimestamper</title>
-<g id="a_edge121"><a xlink:title="at new.go:14: calling [github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.NewRouterTimestamper]">
-<path fill="none" stroke="#8b4513" d="M921.2074,-56.0528C932.1125,-59.8119 943.3999,-63.8871 953.8672,-68 994.1165,-83.8152 1038.7997,-104.148 1071.3703,-119.497"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1070.1097,-122.7726 1080.6457,-123.8876 1073.1046,-116.4456 1070.1097,-122.7726"/>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.Intn -->
-<g id="node7" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.Intn</title>
-<g id="a_node7"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.Intn | defined in utils.go:92">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M879.9071,-117C879.9071,-117 849.9071,-117 849.9071,-117 843.9071,-117 837.9071,-111 837.9071,-105 837.9071,-105 837.9071,-93 837.9071,-93 837.9071,-87 843.9071,-81 849.9071,-81 849.9071,-81 879.9071,-81 879.9071,-81 885.9071,-81 891.9071,-87 891.9071,-93 891.9071,-93 891.9071,-105 891.9071,-105 891.9071,-111 885.9071,-117 879.9071,-117"/>
-<text text-anchor="middle" x="864.9071" y="-94.8" font-family="Verdana" font-size="14.00" fill="#000000">Intn</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewIntegerFromInt -->
-<g id="node8" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewIntegerFromInt</title>
-<g id="a_node8"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewIntegerFromInt | defined in integer.go:68">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M656.3278,-2307C656.3278,-2307 544.4202,-2307 544.4202,-2307 538.4202,-2307 532.4202,-2301 532.4202,-2295 532.4202,-2295 532.4202,-2283 532.4202,-2283 532.4202,-2277 538.4202,-2271 544.4202,-2271 544.4202,-2271 656.3278,-2271 656.3278,-2271 662.3278,-2271 668.3278,-2277 668.3278,-2283 668.3278,-2283 668.3278,-2295 668.3278,-2295 668.3278,-2301 662.3278,-2307 656.3278,-2307"/>
-<text text-anchor="middle" x="600.374" y="-2293.2" font-family="Verdana" font-size="14.00" fill="#000000">data</text>
-<text text-anchor="middle" x="600.374" y="-2276.4" font-family="Verdana" font-size="14.00" fill="#000000">NewIntegerFromInt</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NewNTCP2KDF -->
-<g id="node9" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NewNTCP2KDF</title>
-<g id="a_node9"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NewNTCP2KDF | defined in kdf.go:22">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M1390.4552,-1516C1390.4552,-1516 1293.0508,-1516 1293.0508,-1516 1287.0508,-1516 1281.0508,-1510 1281.0508,-1504 1281.0508,-1504 1281.0508,-1492 1281.0508,-1492 1281.0508,-1486 1287.0508,-1480 1293.0508,-1480 1293.0508,-1480 1390.4552,-1480 1390.4552,-1480 1396.4552,-1480 1402.4552,-1486 1402.4552,-1492 1402.4552,-1492 1402.4552,-1504 1402.4552,-1504 1402.4552,-1510 1396.4552,-1516 1390.4552,-1516"/>
-<text text-anchor="middle" x="1341.753" y="-1502.2" font-family="Verdana" font-size="14.00" fill="#000000">kdf</text>
-<text text-anchor="middle" x="1341.753" y="-1485.4" font-family="Verdana" font-size="14.00" fill="#000000">NewNTCP2KDF</text>
-</a>
-</g>
-</g>
-<!-- golang.org/x/crypto/chacha20poly1305.New -->
-<g id="node10" class="node">
-<title>golang.org/x/crypto/chacha20poly1305.New</title>
-<g id="a_node10"><a xlink:title="golang.org/x/crypto/chacha20poly1305.New | defined in chacha20poly1305.go:40">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M1170.7588,-1444C1170.7588,-1444 1065.2604,-1444 1065.2604,-1444 1059.2604,-1444 1053.2604,-1438 1053.2604,-1432 1053.2604,-1432 1053.2604,-1420 1053.2604,-1420 1053.2604,-1414 1059.2604,-1408 1065.2604,-1408 1065.2604,-1408 1170.7588,-1408 1170.7588,-1408 1176.7588,-1408 1182.7588,-1414 1182.7588,-1420 1182.7588,-1420 1182.7588,-1432 1182.7588,-1432 1182.7588,-1438 1176.7588,-1444 1170.7588,-1444"/>
-<text text-anchor="middle" x="1118.0096" y="-1430.2" font-family="Verdana" font-size="14.00" fill="#000000">chacha20poly1305</text>
-<text text-anchor="middle" x="1118.0096" y="-1413.4" font-family="Verdana" font-size="14.00" fill="#000000">New</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.NewRouterAddress -->
-<g id="node11" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.NewRouterAddress</title>
-<g id="a_node11"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.NewRouterAddress | defined in router_address.go:387">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M920.3089,-1096C920.3089,-1096 809.5053,-1096 809.5053,-1096 803.5053,-1096 797.5053,-1090 797.5053,-1084 797.5053,-1084 797.5053,-1072 797.5053,-1072 797.5053,-1066 803.5053,-1060 809.5053,-1060 809.5053,-1060 920.3089,-1060 920.3089,-1060 926.3089,-1060 932.3089,-1066 932.3089,-1072 932.3089,-1072 932.3089,-1084 932.3089,-1084 932.3089,-1090 926.3089,-1096 920.3089,-1096"/>
-<text text-anchor="middle" x="864.9071" y="-1082.2" font-family="Verdana" font-size="14.00" fill="#000000">router_address</text>
-<text text-anchor="middle" x="864.9071" y="-1065.4" font-family="Verdana" font-size="14.00" fill="#000000">NewRouterAddress</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.ReadAndValidatePadding -->
-<g id="node12" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.ReadAndValidatePadding</title>
-<g id="a_node12"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.ReadAndValidatePadding | defined in padding.go:34&#10;at padding.go:37: calling [github.com/samber/oops.Errorf]&#10;at padding.go:48: calling [github.com/samber/oops.Errorf]&#10;at padding.go:50: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M938.0896,-1157C938.0896,-1157 791.7246,-1157 791.7246,-1157 785.7246,-1157 779.7246,-1151 779.7246,-1145 779.7246,-1145 779.7246,-1133 779.7246,-1133 779.7246,-1127 785.7246,-1121 791.7246,-1121 791.7246,-1121 938.0896,-1121 938.0896,-1121 944.0896,-1121 950.0896,-1127 950.0896,-1133 950.0896,-1133 950.0896,-1145 950.0896,-1145 950.0896,-1151 944.0896,-1157 938.0896,-1157"/>
-<text text-anchor="middle" x="864.9071" y="-1134.8" font-family="Verdana" font-size="14.00" fill="#000000">ReadAndValidatePadding</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.ReadAndValidatePadding&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge129" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.ReadAndValidatePadding&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge129"><a xlink:title="at padding.go:37: calling [github.com/samber/oops.Errorf]&#10;at padding.go:48: calling [github.com/samber/oops.Errorf]&#10;at padding.go:50: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M940.9206,-1120.7302C945.7749,-1117.4418 950.1825,-1113.5664 953.8672,-1109 999.9292,-1051.9151 936.1703,-829.8737 990.8672,-781 1082.2807,-699.3186 1109.742,-967.3896 1116.264,-1056.9135"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1112.7738,-1057.177 1116.9584,-1066.9104 1119.7569,-1056.6919 1112.7738,-1057.177"/>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.init -->
-<g id="node13" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.init</title>
-<g id="a_node13"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.init | defined in .:0&#10;at new.go:10: calling [github.com/go&#45;i2p/logger.GetGoI2PLogger]">
-<path fill="#add8e6" stroke="#000000" stroke-width=".5" d="M96.8696,-109C96.8696,-109 66.8696,-109 66.8696,-109 60.8696,-109 54.8696,-103 54.8696,-97 54.8696,-97 54.8696,-85 54.8696,-85 54.8696,-79 60.8696,-73 66.8696,-73 66.8696,-73 96.8696,-73 96.8696,-73 102.8696,-73 108.8696,-79 108.8696,-85 108.8696,-85 108.8696,-97 108.8696,-97 108.8696,-103 102.8696,-109 96.8696,-109"/>
-<text text-anchor="middle" x="81.8696" y="-86.8" font-family="Verdana" font-size="14.00" fill="#000000">init</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/logger.GetGoI2PLogger -->
-<g id="node14" class="node">
-<title>github.com/go&#45;i2p/logger.GetGoI2PLogger</title>
-<g id="a_node14"><a xlink:title="github.com/go&#45;i2p/logger.GetGoI2PLogger | defined in log.go:120">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M363.4596,-109C363.4596,-109 266.0806,-109 266.0806,-109 260.0806,-109 254.0806,-103 254.0806,-97 254.0806,-97 254.0806,-85 254.0806,-85 254.0806,-79 260.0806,-73 266.0806,-73 266.0806,-73 363.4596,-73 363.4596,-73 369.4596,-73 375.4596,-79 375.4596,-85 375.4596,-85 375.4596,-97 375.4596,-97 375.4596,-103 369.4596,-109 363.4596,-109"/>
-<text text-anchor="middle" x="314.7701" y="-95.2" font-family="Verdana" font-size="14.00" fill="#000000">logger</text>
-<text text-anchor="middle" x="314.7701" y="-78.4" font-family="Verdana" font-size="14.00" fill="#000000">GetGoI2PLogger</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.init&#45;&gt;github.com/go&#45;i2p/logger.GetGoI2PLogger -->
-<g id="edge78" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.init&#45;&gt;github.com/go&#45;i2p/logger.GetGoI2PLogger</title>
-<g id="a_edge78"><a xlink:title="at new.go:10: calling [github.com/go&#45;i2p/logger.GetGoI2PLogger]">
-<path fill="none" stroke="#8b4513" d="M109.0421,-91C141.8396,-91 198.2499,-91 243.715,-91"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="243.8279,-94.5001 253.8278,-91 243.8278,-87.5001 243.8279,-94.5001"/>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewInteger -->
-<g id="node15" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewInteger</title>
-<g id="a_node15"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewInteger | defined in integer.go:61">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M633.4428,-2862C633.4428,-2862 567.3052,-2862 567.3052,-2862 561.3052,-2862 555.3052,-2856 555.3052,-2850 555.3052,-2850 555.3052,-2838 555.3052,-2838 555.3052,-2832 561.3052,-2826 567.3052,-2826 567.3052,-2826 633.4428,-2826 633.4428,-2826 639.4428,-2826 645.4428,-2832 645.4428,-2838 645.4428,-2838 645.4428,-2850 645.4428,-2850 645.4428,-2856 639.4428,-2862 633.4428,-2862"/>
-<text text-anchor="middle" x="600.374" y="-2848.2" font-family="Verdana" font-size="14.00" fill="#000000">data</text>
-<text text-anchor="middle" x="600.374" y="-2831.4" font-family="Verdana" font-size="14.00" fill="#000000">NewInteger</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/data.DateFromTime -->
-<g id="node16" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/data.DateFromTime</title>
-<g id="a_node16"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/common/data.DateFromTime | defined in date.go:90">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M643.683,-2500C643.683,-2500 557.065,-2500 557.065,-2500 551.065,-2500 545.065,-2494 545.065,-2488 545.065,-2488 545.065,-2476 545.065,-2476 545.065,-2470 551.065,-2464 557.065,-2464 557.065,-2464 643.683,-2464 643.683,-2464 649.683,-2464 655.683,-2470 655.683,-2476 655.683,-2476 655.683,-2488 655.683,-2488 655.683,-2494 649.683,-2500 643.683,-2500"/>
-<text text-anchor="middle" x="600.374" y="-2486.2" font-family="Verdana" font-size="14.00" fill="#000000">data</text>
-<text text-anchor="middle" x="600.374" y="-2469.4" font-family="Verdana" font-size="14.00" fill="#000000">DateFromTime</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/obfs.DeobfuscateEphemeralKey -->
-<g id="node17" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/obfs.DeobfuscateEphemeralKey</title>
-<g id="a_node17"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/transport/obfs.DeobfuscateEphemeralKey | defined in obfs.go:36">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M941.8273,-2109C941.8273,-2109 787.9869,-2109 787.9869,-2109 781.9869,-2109 775.9869,-2103 775.9869,-2097 775.9869,-2097 775.9869,-2085 775.9869,-2085 775.9869,-2079 781.9869,-2073 787.9869,-2073 787.9869,-2073 941.8273,-2073 941.8273,-2073 947.8273,-2073 953.8273,-2079 953.8273,-2085 953.8273,-2085 953.8273,-2097 953.8273,-2097 953.8273,-2103 947.8273,-2109 941.8273,-2109"/>
-<text text-anchor="middle" x="864.9071" y="-2095.2" font-family="Verdana" font-size="14.00" fill="#000000">obfs</text>
-<text text-anchor="middle" x="864.9071" y="-2078.4" font-family="Verdana" font-size="14.00" fill="#000000">DeobfuscateEphemeralKey</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.ReadRouterInfo -->
-<g id="node18" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.ReadRouterInfo</title>
-<g id="a_node18"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.ReadRouterInfo | defined in router_info.go:235">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M645.5636,-539C645.5636,-539 555.1844,-539 555.1844,-539 549.1844,-539 543.1844,-533 543.1844,-527 543.1844,-527 543.1844,-515 543.1844,-515 543.1844,-509 549.1844,-503 555.1844,-503 555.1844,-503 645.5636,-503 645.5636,-503 651.5636,-503 657.5636,-509 657.5636,-515 657.5636,-515 657.5636,-527 657.5636,-527 657.5636,-533 651.5636,-539 645.5636,-539"/>
-<text text-anchor="middle" x="600.374" y="-525.2" font-family="Verdana" font-size="14.00" fill="#000000">router_info</text>
-<text text-anchor="middle" x="600.374" y="-508.4" font-family="Verdana" font-size="14.00" fill="#000000">ReadRouterInfo</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewDate -->
-<g id="node19" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewDate</title>
-<g id="a_node19"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewDate | defined in date.go:74">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M626.7283,-2696C626.7283,-2696 574.0197,-2696 574.0197,-2696 568.0197,-2696 562.0197,-2690 562.0197,-2684 562.0197,-2684 562.0197,-2672 562.0197,-2672 562.0197,-2666 568.0197,-2660 574.0197,-2660 574.0197,-2660 626.7283,-2660 626.7283,-2660 632.7283,-2660 638.7283,-2666 638.7283,-2672 638.7283,-2672 638.7283,-2684 638.7283,-2684 638.7283,-2690 632.7283,-2696 626.7283,-2696"/>
-<text text-anchor="middle" x="600.374" y="-2682.2" font-family="Verdana" font-size="14.00" fill="#000000">data</text>
-<text text-anchor="middle" x="600.374" y="-2665.4" font-family="Verdana" font-size="14.00" fill="#000000">NewDate</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.CalculatePaddingLength -->
-<g id="node20" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.CalculatePaddingLength</title>
-<g id="a_node20"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.CalculatePaddingLength | defined in padding.go:57&#10;at padding.go:75: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.Intn]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M669.7869,-52C669.7869,-52 530.9611,-52 530.9611,-52 524.9611,-52 518.9611,-46 518.9611,-40 518.9611,-40 518.9611,-28 518.9611,-28 518.9611,-22 524.9611,-16 530.9611,-16 530.9611,-16 669.7869,-16 669.7869,-16 675.7869,-16 681.7869,-22 681.7869,-28 681.7869,-28 681.7869,-40 681.7869,-40 681.7869,-46 675.7869,-52 669.7869,-52"/>
-<text text-anchor="middle" x="600.374" y="-29.8" font-family="Verdana" font-size="14.00" fill="#000000">CalculatePaddingLength</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.CalculatePaddingLength&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.Intn -->
-<g id="edge39" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.CalculatePaddingLength&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.Intn</title>
-<g id="a_edge39"><a xlink:title="at padding.go:75: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.Intn]">
-<path fill="none" stroke="#000000" d="M673.7099,-52.0198C723.785,-64.3241 788.0253,-80.1089 827.8225,-89.8877"/>
-<polygon fill="#000000" stroke="#000000" points="827.088,-93.3113 837.6343,-92.2986 828.7584,-86.5135 827.088,-93.3113"/>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.GenerateRandomPadding -->
-<g id="node21" class="node">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.GenerateRandomPadding</title>
-<g id="a_node21"><a xlink:title="github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.GenerateRandomPadding | defined in padding.go:20&#10;at padding.go:27: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M936.753,-2417C936.753,-2417 793.0612,-2417 793.0612,-2417 787.0612,-2417 781.0612,-2411 781.0612,-2405 781.0612,-2405 781.0612,-2393 781.0612,-2393 781.0612,-2387 787.0612,-2381 793.0612,-2381 793.0612,-2381 936.753,-2381 936.753,-2381 942.753,-2381 948.753,-2387 948.753,-2393 948.753,-2393 948.753,-2405 948.753,-2405 948.753,-2411 942.753,-2417 936.753,-2417"/>
-<text text-anchor="middle" x="864.9071" y="-2394.8" font-family="Verdana" font-size="14.00" fill="#000000">GenerateRandomPadding</text>
-</a>
-</g>
-</g>
-<!-- github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.GenerateRandomPadding&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge62" class="edge">
-<title>github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.GenerateRandomPadding&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge62"><a xlink:title="at padding.go:27: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M942.8622,-2380.7837C947.0048,-2377.7199 950.7401,-2374.1524 953.8672,-2370 1024.027,-2276.8351 960.3542,-1433.5658 990.8672,-1321 1013.2043,-1238.5959 1068.8183,-1153.1026 1098.5457,-1111.2641"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1101.4801,-1113.1784 1104.475,-1103.0157 1095.7962,-1109.0926 1101.4801,-1113.1784"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).RouterAddresses -->
-<g id="node22" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).RouterAddresses</title>
-<g id="a_node22"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).RouterAddresses | defined in router_info.go:201">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M1389.3862,-422C1389.3862,-422 1294.1198,-422 1294.1198,-422 1288.1198,-422 1282.1198,-416 1282.1198,-410 1282.1198,-410 1282.1198,-398 1282.1198,-398 1282.1198,-392 1288.1198,-386 1294.1198,-386 1294.1198,-386 1389.3862,-386 1389.3862,-386 1395.3862,-386 1401.3862,-392 1401.3862,-398 1401.3862,-398 1401.3862,-410 1401.3862,-410 1401.3862,-416 1395.3862,-422 1389.3862,-422"/>
-<text text-anchor="middle" x="1341.753" y="-408.2" font-family="Verdana" font-size="14.00" fill="#000000">router_info</text>
-<text text-anchor="middle" x="1341.753" y="-391.4" font-family="Verdana" font-size="14.00" fill="#000000">RouterAddresses</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NoiseTransport).Handshake -->
-<g id="node23" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NoiseTransport).Handshake</title>
-<g id="a_node23"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NoiseTransport).Handshake | defined in handshake.go:12">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M896.1023,-947C896.1023,-947 833.7119,-947 833.7119,-947 827.7119,-947 821.7119,-941 821.7119,-935 821.7119,-935 821.7119,-923 821.7119,-923 821.7119,-917 827.7119,-911 833.7119,-911 833.7119,-911 896.1023,-911 896.1023,-911 902.1023,-911 908.1023,-917 908.1023,-923 908.1023,-923 908.1023,-935 908.1023,-935 908.1023,-941 902.1023,-947 896.1023,-947"/>
-<text text-anchor="middle" x="864.9071" y="-933.2" font-family="Verdana" font-size="14.00" fill="#000000">noise</text>
-<text text-anchor="middle" x="864.9071" y="-916.4" font-family="Verdana" font-size="14.00" fill="#000000">Handshake</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NoiseTransport).Accept -->
-<g id="node24" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NoiseTransport).Accept</title>
-<g id="a_node24"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NoiseTransport).Accept | defined in transport.go:66">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M884.5491,-1008C884.5491,-1008 845.2651,-1008 845.2651,-1008 839.2651,-1008 833.2651,-1002 833.2651,-996 833.2651,-996 833.2651,-984 833.2651,-984 833.2651,-978 839.2651,-972 845.2651,-972 845.2651,-972 884.5491,-972 884.5491,-972 890.5491,-972 896.5491,-978 896.5491,-984 896.5491,-984 896.5491,-996 896.5491,-996 896.5491,-1002 890.5491,-1008 884.5491,-1008"/>
-<text text-anchor="middle" x="864.9071" y="-994.2" font-family="Verdana" font-size="14.00" fill="#000000">noise</text>
-<text text-anchor="middle" x="864.9071" y="-977.4" font-family="Verdana" font-size="14.00" fill="#000000">Accept</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor -->
-<g id="node25" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor</title>
-<g id="a_node25"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor | defined in handshake.go:19&#10;at handshake.go:22: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M637.5087,-1813C637.5087,-1813 563.2393,-1813 563.2393,-1813 557.2393,-1813 551.2393,-1807 551.2393,-1801 551.2393,-1801 551.2393,-1789 551.2393,-1789 551.2393,-1783 557.2393,-1777 563.2393,-1777 563.2393,-1777 637.5087,-1777 637.5087,-1777 643.5087,-1777 649.5087,-1783 649.5087,-1789 649.5087,-1789 649.5087,-1801 649.5087,-1801 649.5087,-1807 643.5087,-1813 637.5087,-1813"/>
-<text text-anchor="middle" x="600.374" y="-1790.8" font-family="Verdana" font-size="14.00" fill="#000000">GetProcessor</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge68" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge68"><a xlink:title="at handshake.go:22: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M649.7108,-1799.4948C668.6946,-1803.6369 689.1121,-1811.4306 702.947,-1826 749.5983,-1875.1277 722.6136,-2080.2218 775.947,-2122 807.0722,-2146.3816 925.3118,-2149.3464 953.8672,-2122 1022.5433,-2056.2315 960.3683,-1357.0651 990.8672,-1267 1012.1549,-1204.1361 1062.3293,-1143.4971 1092.8984,-1110.5321"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1095.5413,-1112.8308 1099.8474,-1103.1505 1090.4445,-1108.0326 1095.5413,-1112.8308"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address -->
-<g id="node26" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address</title>
-<g id="a_node26"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address | defined in session.go:79&#10;at session.go:81: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle]&#10;at session.go:89: calling [github.com/samber/oops.Errorf]&#10;at session.go:81: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data]&#10;at session.go:80: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).RouterAddresses]">
-<path fill="#add8e6" stroke="#000000" stroke-width=".5" d="M1173.7103,-1569C1173.7103,-1569 1062.3089,-1569 1062.3089,-1569 1056.3089,-1569 1050.3089,-1563 1050.3089,-1557 1050.3089,-1557 1050.3089,-1545 1050.3089,-1545 1050.3089,-1539 1056.3089,-1533 1062.3089,-1533 1062.3089,-1533 1173.7103,-1533 1173.7103,-1533 1179.7103,-1533 1185.7103,-1539 1185.7103,-1545 1185.7103,-1545 1185.7103,-1557 1185.7103,-1557 1185.7103,-1563 1179.7103,-1569 1173.7103,-1569"/>
-<text text-anchor="middle" x="1118.0096" y="-1546.8" font-family="Verdana" font-size="14.00" fill="#000000">findNTCP2Address</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge80" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge80"><a xlink:title="at session.go:89: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M1050.3687,-1545.9517C1033.5434,-1540.947 1017.9961,-1532.0417 1009.8672,-1516.5 987.6208,-1473.9665 1002.1581,-1455.8769 1009.8672,-1408.5 1028.3563,-1294.874 1081.1256,-1167.2707 1105.4502,-1112.4409"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1108.754,-1113.6268 1109.6464,-1103.0696 1102.3652,-1110.766 1108.754,-1113.6268"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).RouterAddresses -->
-<g id="edge119" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).RouterAddresses</title>
-<g id="a_edge119"><a xlink:title="at session.go:80: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).RouterAddresses]">
-<path fill="none" stroke="#8b4513" d="M1185.6234,-1544.7492C1194.2641,-1541.2253 1202.1652,-1536.1732 1208.152,-1529 1365.4897,-1340.4847 1123.7108,-620.2301 1273.9367,-426 1274.1568,-425.7155 1274.3806,-425.4345 1274.6081,-425.1572"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1277.2436,-427.4827 1282.1194,-418.0765 1272.442,-422.3891 1277.2436,-427.4827"/>
-</a>
-</g>
-</g>
-<!-- (github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data -->
-<g id="node81" class="node">
-<title>(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data</title>
-<g id="a_node81"><a xlink:title="(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data | defined in string.go:73">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M1356.753,-288C1356.753,-288 1326.753,-288 1326.753,-288 1320.753,-288 1314.753,-282 1314.753,-276 1314.753,-276 1314.753,-264 1314.753,-264 1314.753,-258 1320.753,-252 1326.753,-252 1326.753,-252 1356.753,-252 1356.753,-252 1362.753,-252 1368.753,-258 1368.753,-264 1368.753,-264 1368.753,-276 1368.753,-276 1368.753,-282 1362.753,-288 1356.753,-288"/>
-<text text-anchor="middle" x="1341.753" y="-274.2" font-family="Verdana" font-size="14.00" fill="#000000">data</text>
-<text text-anchor="middle" x="1341.753" y="-257.4" font-family="Verdana" font-size="14.00" fill="#000000">Data</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data -->
-<g id="edge108" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data</title>
-<g id="a_edge108"><a xlink:title="at session.go:81: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data]">
-<path fill="none" stroke="#8b4513" d="M1185.7877,-1544.8846C1194.4057,-1541.342 1202.2567,-1536.2486 1208.152,-1529 1245.085,-1483.5885 1236.5814,-534.0425 1244.152,-476 1251.8184,-417.223 1246.7284,-398.6613 1273.9367,-346 1283.7305,-327.0441 1299.3569,-309.0742 1313.1423,-295.3716"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1315.792,-297.6789 1320.5628,-288.219 1310.934,-292.639 1315.792,-297.6789"/>
-</a>
-</g>
-</g>
-<!-- (github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle -->
-<g id="node83" class="node">
-<title>(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle</title>
-<g id="a_node83"><a xlink:title="(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle | defined in router_address.go:173">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M1159.7118,-557C1159.7118,-557 1076.3074,-557 1076.3074,-557 1070.3074,-557 1064.3074,-551 1064.3074,-545 1064.3074,-545 1064.3074,-533 1064.3074,-533 1064.3074,-527 1070.3074,-521 1076.3074,-521 1076.3074,-521 1159.7118,-521 1159.7118,-521 1165.7118,-521 1171.7118,-527 1171.7118,-533 1171.7118,-533 1171.7118,-545 1171.7118,-545 1171.7118,-551 1165.7118,-557 1159.7118,-557"/>
-<text text-anchor="middle" x="1118.0096" y="-543.2" font-family="Verdana" font-size="14.00" fill="#000000">router_address</text>
-<text text-anchor="middle" x="1118.0096" y="-526.4" font-family="Verdana" font-size="14.00" fill="#000000">TransportStyle</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle -->
-<g id="edge79" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle</title>
-<g id="a_edge79"><a xlink:title="at session.go:81: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle]">
-<path fill="none" stroke="#8b4513" d="M1050.3687,-1545.9517C1033.5434,-1540.947 1017.9961,-1532.0417 1009.8672,-1516.5 997.8428,-1493.5103 997.8428,-605.4897 1009.8672,-582.5 1018.8923,-565.2446 1036.412,-554.8152 1054.7652,-548.5183"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1055.8497,-551.8468 1064.3981,-545.5878 1053.8123,-545.1498 1055.8497,-551.8468"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).buildAesStaticKey -->
-<g id="node27" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).buildAesStaticKey</title>
-<g id="a_node27"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).buildAesStaticKey | defined in session.go:109&#10;at session.go:110: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address]&#10;at session.go:120: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).InitializationVector]&#10;at session.go:115: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).StaticKey]">
-<path fill="#add8e6" stroke="#000000" stroke-width=".5" d="M917.6591,-1623C917.6591,-1623 812.1551,-1623 812.1551,-1623 806.1551,-1623 800.1551,-1617 800.1551,-1611 800.1551,-1611 800.1551,-1599 800.1551,-1599 800.1551,-1593 806.1551,-1587 812.1551,-1587 812.1551,-1587 917.6591,-1587 917.6591,-1587 923.6591,-1587 929.6591,-1593 929.6591,-1599 929.6591,-1599 929.6591,-1611 929.6591,-1611 929.6591,-1617 923.6591,-1623 917.6591,-1623"/>
-<text text-anchor="middle" x="864.9071" y="-1600.8" font-family="Verdana" font-size="14.00" fill="#000000">buildAesStaticKey</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).buildAesStaticKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address -->
-<g id="edge5" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).buildAesStaticKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address</title>
-<g id="a_edge5"><a xlink:title="at session.go:110: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address]">
-<path fill="none" stroke="#000000" d="M929.7586,-1591.1638C963.4962,-1583.9658 1004.9796,-1575.1152 1040.4107,-1567.5559"/>
-<polygon fill="#000000" stroke="#000000" points="1041.1826,-1570.9701 1050.2322,-1565.4605 1039.7219,-1564.1242 1041.1826,-1570.9701"/>
-</a>
-</g>
-</g>
-<!-- (github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).InitializationVector -->
-<g id="node84" class="node">
-<title>(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).InitializationVector</title>
-<g id="a_node84"><a xlink:title="(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).InitializationVector | defined in router_address.go:310">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M1172.6357,-679C1172.6357,-679 1063.3835,-679 1063.3835,-679 1057.3835,-679 1051.3835,-673 1051.3835,-667 1051.3835,-667 1051.3835,-655 1051.3835,-655 1051.3835,-649 1057.3835,-643 1063.3835,-643 1063.3835,-643 1172.6357,-643 1172.6357,-643 1178.6357,-643 1184.6357,-649 1184.6357,-655 1184.6357,-655 1184.6357,-667 1184.6357,-667 1184.6357,-673 1178.6357,-679 1172.6357,-679"/>
-<text text-anchor="middle" x="1118.0096" y="-665.2" font-family="Verdana" font-size="14.00" fill="#000000">router_address</text>
-<text text-anchor="middle" x="1118.0096" y="-648.4" font-family="Verdana" font-size="14.00" fill="#000000">InitializationVector</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).buildAesStaticKey&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).InitializationVector -->
-<g id="edge46" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).buildAesStaticKey&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).InitializationVector</title>
-<g id="a_edge46"><a xlink:title="at session.go:120: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).InitializationVector]">
-<path fill="none" stroke="#8b4513" d="M929.7255,-1599.1869C938.9588,-1595.6747 947.4735,-1590.5113 953.8672,-1583 1018.9044,-1506.5947 962.7132,-759.3057 1027.8672,-683 1031.8209,-678.3696 1036.5721,-674.6269 1041.7992,-671.6107"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1043.4928,-674.6801 1050.9883,-667.1922 1040.4593,-668.3714 1043.4928,-674.6801"/>
-</a>
-</g>
-</g>
-<!-- (github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).StaticKey -->
-<g id="node85" class="node">
-<title>(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).StaticKey</title>
-<g id="a_node85"><a xlink:title="(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).StaticKey | defined in router_address.go:294">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M1159.4158,-618C1159.4158,-618 1076.6034,-618 1076.6034,-618 1070.6034,-618 1064.6034,-612 1064.6034,-606 1064.6034,-606 1064.6034,-594 1064.6034,-594 1064.6034,-588 1070.6034,-582 1076.6034,-582 1076.6034,-582 1159.4158,-582 1159.4158,-582 1165.4158,-582 1171.4158,-588 1171.4158,-594 1171.4158,-594 1171.4158,-606 1171.4158,-606 1171.4158,-612 1165.4158,-618 1159.4158,-618"/>
-<text text-anchor="middle" x="1118.0096" y="-604.2" font-family="Verdana" font-size="14.00" fill="#000000">router_address</text>
-<text text-anchor="middle" x="1118.0096" y="-587.4" font-family="Verdana" font-size="14.00" fill="#000000">StaticKey</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).buildAesStaticKey&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).StaticKey -->
-<g id="edge103" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).buildAesStaticKey&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).StaticKey</title>
-<g id="a_edge103"><a xlink:title="at session.go:115: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).StaticKey]">
-<path fill="none" stroke="#8b4513" d="M930.0176,-1599.43C939.2157,-1595.8885 947.643,-1590.6524 953.8672,-1583 1023.3955,-1497.518 911.5125,-668.4472 990.8672,-592 1009.4285,-574.1188 1037.4364,-574.1743 1062.4447,-579.5421"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1061.6709,-582.9559 1072.216,-581.9309 1063.3333,-576.1562 1061.6709,-582.9559"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ObfuscateEphemeral -->
-<g id="node28" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ObfuscateEphemeral</title>
-<g id="a_node28"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ObfuscateEphemeral | defined in obfs.go:6&#10;at obfs.go:7: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).buildAesStaticKey]&#10;at obfs.go:12: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/obfs.ObfuscateEphemeralKey]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M659.2589,-1935C659.2589,-1935 541.4891,-1935 541.4891,-1935 535.4891,-1935 529.4891,-1929 529.4891,-1923 529.4891,-1923 529.4891,-1911 529.4891,-1911 529.4891,-1905 535.4891,-1899 541.4891,-1899 541.4891,-1899 659.2589,-1899 659.2589,-1899 665.2589,-1899 671.2589,-1905 671.2589,-1911 671.2589,-1911 671.2589,-1923 671.2589,-1923 671.2589,-1929 665.2589,-1935 659.2589,-1935"/>
-<text text-anchor="middle" x="600.374" y="-1912.8" font-family="Verdana" font-size="14.00" fill="#000000">ObfuscateEphemeral</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ObfuscateEphemeral&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/obfs.ObfuscateEphemeralKey -->
-<g id="edge120" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ObfuscateEphemeral&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/obfs.ObfuscateEphemeralKey</title>
-<g id="a_edge120"><a xlink:title="at obfs.go:12: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/obfs.ObfuscateEphemeralKey]">
-<path fill="none" stroke="#8b4513" d="M671.2918,-1928.5391C682.9785,-1933.0544 694.1342,-1939.3177 702.947,-1948 740.4952,-1984.992 722.4045,-2010.9539 738.947,-2061 754.8711,-2109.1751 741.2372,-2131.9912 775.947,-2169 780.9818,-2174.3683 786.9139,-2178.9843 793.2861,-2182.9479"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="791.7724,-2186.1121 802.2052,-2187.958 795.2007,-2180.009 791.7724,-2186.1121"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ObfuscateEphemeral&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).buildAesStaticKey -->
-<g id="edge115" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ObfuscateEphemeral&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).buildAesStaticKey</title>
-<g id="a_edge115"><a xlink:title="at obfs.go:7: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).buildAesStaticKey]">
-<path fill="none" stroke="#000000" d="M671.1844,-1906.4733C682.9518,-1902.0438 694.1635,-1895.7967 702.947,-1887 785.0351,-1804.7879 695.9722,-1720.2693 775.947,-1636 780.3062,-1631.4067 785.3818,-1627.4937 790.8573,-1624.1602"/>
-<polygon fill="#000000" stroke="#000000" points="792.5931,-1627.2009 799.7454,-1619.3846 789.2799,-1621.0346 792.5931,-1627.2009"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).deriveChacha20Key -->
-<g id="node29" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).deriveChacha20Key</title>
-<g id="a_node29"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).deriveChacha20Key | defined in aead.go:152&#10;at aead.go:154: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NewNTCP2KDF]&#10;at aead.go:157: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey]">
-<path fill="#add8e6" stroke="#000000" stroke-width=".5" d="M1175.2919,-1848C1175.2919,-1848 1060.7273,-1848 1060.7273,-1848 1054.7273,-1848 1048.7273,-1842 1048.7273,-1836 1048.7273,-1836 1048.7273,-1824 1048.7273,-1824 1048.7273,-1818 1054.7273,-1812 1060.7273,-1812 1060.7273,-1812 1175.2919,-1812 1175.2919,-1812 1181.2919,-1812 1187.2919,-1818 1187.2919,-1824 1187.2919,-1824 1187.2919,-1836 1187.2919,-1836 1187.2919,-1842 1181.2919,-1848 1175.2919,-1848"/>
-<text text-anchor="middle" x="1118.0096" y="-1825.8" font-family="Verdana" font-size="14.00" fill="#000000">deriveChacha20Key</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).deriveChacha20Key&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NewNTCP2KDF -->
-<g id="edge30" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).deriveChacha20Key&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NewNTCP2KDF</title>
-<g id="a_edge30"><a xlink:title="at aead.go:154: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NewNTCP2KDF]">
-<path fill="none" stroke="#8b4513" d="M1130.3577,-1811.6773C1167.7188,-1756.2394 1279.6807,-1590.1055 1323.6978,-1524.7911"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1326.7568,-1526.5147 1329.443,-1516.266 1320.952,-1522.6026 1326.7568,-1526.5147"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey -->
-<g id="node74" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey</title>
-<g id="a_node74"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey | defined in kdf.go:37">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M1364.9102,-2234C1364.9102,-2234 1318.5958,-2234 1318.5958,-2234 1312.5958,-2234 1306.5958,-2228 1306.5958,-2222 1306.5958,-2222 1306.5958,-2210 1306.5958,-2210 1306.5958,-2204 1312.5958,-2198 1318.5958,-2198 1318.5958,-2198 1364.9102,-2198 1364.9102,-2198 1370.9102,-2198 1376.9102,-2204 1376.9102,-2210 1376.9102,-2210 1376.9102,-2222 1376.9102,-2222 1376.9102,-2228 1370.9102,-2234 1364.9102,-2234"/>
-<text text-anchor="middle" x="1341.753" y="-2220.2" font-family="Verdana" font-size="14.00" fill="#000000">kdf</text>
-<text text-anchor="middle" x="1341.753" y="-2203.4" font-family="Verdana" font-size="14.00" fill="#000000">MixKey</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).deriveChacha20Key&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey -->
-<g id="edge63" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).deriveChacha20Key&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey</title>
-<g id="a_edge63"><a xlink:title="at aead.go:157: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey]">
-<path fill="none" stroke="#8b4513" d="M1120.4495,-1848.1684C1129.3233,-1907.0932 1165.2803,-2094.8101 1273.9367,-2194 1280.3757,-2199.8781 1288.4055,-2204.187 1296.6631,-2207.3453"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1295.7868,-2210.7416 1306.3799,-2210.5493 1297.979,-2204.0937 1295.7868,-2210.7416"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation -->
-<g id="node30" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation</title>
-<g id="a_node30"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation | defined in aead.go:30&#10;at aead.go:44: calling [golang.org/x/crypto/chacha20poly1305.New]&#10;at aead.go:38: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).deriveChacha20Key]&#10;at aead.go:40: calling [github.com/samber/oops.Errorf]&#10;at aead.go:46: calling [github.com/samber/oops.Errorf]&#10;at aead.go:64: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M935.1269,-1806C935.1269,-1806 794.6873,-1806 794.6873,-1806 788.6873,-1806 782.6873,-1800 782.6873,-1794 782.6873,-1794 782.6873,-1782 782.6873,-1782 782.6873,-1776 788.6873,-1770 794.6873,-1770 794.6873,-1770 935.1269,-1770 935.1269,-1770 941.1269,-1770 947.1269,-1776 947.1269,-1782 947.1269,-1782 947.1269,-1794 947.1269,-1794 947.1269,-1800 941.1269,-1806 935.1269,-1806"/>
-<text text-anchor="middle" x="864.9071" y="-1783.8" font-family="Verdana" font-size="14.00" fill="#000000">PerformAEADOperation</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge135" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge135"><a xlink:title="at aead.go:40: calling [github.com/samber/oops.Errorf]&#10;at aead.go:46: calling [github.com/samber/oops.Errorf]&#10;at aead.go:64: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M941.1298,-1769.8955C945.9372,-1766.5701 950.277,-1762.6411 953.8672,-1758 1024.4799,-1666.7201 948.1531,-1347.2086 990.8672,-1240 1011.9755,-1187.0201 1058.1509,-1138.3602 1088.6563,-1110.1953"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1091.3725,-1112.4571 1096.4299,-1103.1472 1086.6706,-1107.2712 1091.3725,-1112.4571"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation&#45;&gt;golang.org/x/crypto/chacha20poly1305.New -->
-<g id="edge1" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation&#45;&gt;golang.org/x/crypto/chacha20poly1305.New</title>
-<g id="a_edge1"><a xlink:title="at aead.go:44: calling [golang.org/x/crypto/chacha20poly1305.New]">
-<path fill="none" stroke="#8b4513" d="M938.8734,-1769.8185C944.3868,-1766.5154 949.4929,-1762.6122 953.8672,-1758 1038.0158,-1669.274 958.6227,-1593.7893 1027.8672,-1493 1039.9026,-1475.4819 1058.0309,-1460.7351 1074.8819,-1449.5756"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1076.9779,-1452.3905 1083.5383,-1444.0712 1073.2218,-1446.4836 1076.9779,-1452.3905"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).deriveChacha20Key -->
-<g id="edge122" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).deriveChacha20Key</title>
-<g id="a_edge122"><a xlink:title="at aead.go:38: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).deriveChacha20Key]">
-<path fill="none" stroke="#000000" d="M947.4321,-1801.6943C976.725,-1806.5551 1009.6131,-1812.0126 1038.6371,-1816.8289"/>
-<polygon fill="#000000" stroke="#000000" points="1038.2918,-1820.3194 1048.7299,-1818.5037 1039.4378,-1813.4138 1038.2918,-1820.3194"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptWithAssociatedData -->
-<g id="node31" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptWithAssociatedData</title>
-<g id="a_node31"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptWithAssociatedData | defined in aead.go:82&#10;at aead.go:88: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M680.804,-1569C680.804,-1569 519.944,-1569 519.944,-1569 513.944,-1569 507.944,-1563 507.944,-1557 507.944,-1557 507.944,-1545 507.944,-1545 507.944,-1539 513.944,-1533 519.944,-1533 519.944,-1533 680.804,-1533 680.804,-1533 686.804,-1533 692.804,-1539 692.804,-1545 692.804,-1545 692.804,-1557 692.804,-1557 692.804,-1563 686.804,-1569 680.804,-1569"/>
-<text text-anchor="middle" x="600.374" y="-1546.8" font-family="Verdana" font-size="14.00" fill="#000000">DecryptWithAssociatedData</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptWithAssociatedData&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation -->
-<g id="edge23" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptWithAssociatedData&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation</title>
-<g id="a_edge23"><a xlink:title="at aead.go:88: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation]">
-<path fill="none" stroke="#000000" d="M683.9299,-1569.0396C690.8168,-1572.6083 697.2916,-1576.882 702.947,-1582 765.7364,-1638.823 714.0677,-1700.1872 775.947,-1758 778.5262,-1760.4097 781.3057,-1762.6264 784.2331,-1764.6656"/>
-<polygon fill="#000000" stroke="#000000" points="782.4798,-1767.6962 792.8311,-1769.9547 786.1476,-1761.734 782.4798,-1767.6962"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ReadAndValidatePadding -->
-<g id="node32" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ReadAndValidatePadding</title>
-<g id="a_node32"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ReadAndValidatePadding | defined in utils.go:69&#10;at utils.go:72: calling [github.com/samber/oops.Errorf]&#10;at utils.go:79: calling [github.com/samber/oops.Errorf]&#10;at utils.go:81: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M387.9526,-1630C387.9526,-1630 241.5876,-1630 241.5876,-1630 235.5876,-1630 229.5876,-1624 229.5876,-1618 229.5876,-1618 229.5876,-1606 229.5876,-1606 229.5876,-1600 235.5876,-1594 241.5876,-1594 241.5876,-1594 387.9526,-1594 387.9526,-1594 393.9526,-1594 399.9526,-1600 399.9526,-1606 399.9526,-1606 399.9526,-1618 399.9526,-1618 399.9526,-1624 393.9526,-1630 387.9526,-1630"/>
-<text text-anchor="middle" x="314.7701" y="-1607.8" font-family="Verdana" font-size="14.00" fill="#000000">ReadAndValidatePadding</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ReadAndValidatePadding&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge50" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ReadAndValidatePadding&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge50"><a xlink:title="at utils.go:72: calling [github.com/samber/oops.Errorf]&#10;at utils.go:79: calling [github.com/samber/oops.Errorf]&#10;at utils.go:81: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M400.3222,-1595.9391C406.7405,-1592.1908 412.602,-1587.605 417.4805,-1582 504.4824,-1482.0425 360.5208,-1373.6297 460.801,-1287 505.2902,-1248.5669 453.7826,-1375.0286 497.801,-1414 532.3467,-1444.5848 657.4894,-1438.0981 702.947,-1446 735.4946,-1451.6577 743.0594,-1456.8749 775.947,-1460 854.668,-1467.4804 895.1255,-1512.9375 953.8672,-1460 1012.7876,-1406.9015 936.2642,-1162.5289 990.8672,-1105 1012.9244,-1081.7608 1050.1612,-1078.2804 1078.6527,-1079.7151"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1078.4841,-1083.212 1088.7095,-1080.4386 1078.9865,-1076.23 1078.4841,-1083.212"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithAssociatedData -->
-<g id="node33" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithAssociatedData</title>
-<g id="a_node33"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithAssociatedData | defined in aead.go:72&#10;at aead.go:78: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M680.5355,-1691C680.5355,-1691 520.2125,-1691 520.2125,-1691 514.2125,-1691 508.2125,-1685 508.2125,-1679 508.2125,-1679 508.2125,-1667 508.2125,-1667 508.2125,-1661 514.2125,-1655 520.2125,-1655 520.2125,-1655 680.5355,-1655 680.5355,-1655 686.5355,-1655 692.5355,-1661 692.5355,-1667 692.5355,-1667 692.5355,-1679 692.5355,-1679 692.5355,-1685 686.5355,-1691 680.5355,-1691"/>
-<text text-anchor="middle" x="600.374" y="-1668.8" font-family="Verdana" font-size="14.00" fill="#000000">EncryptWithAssociatedData</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithAssociatedData&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation -->
-<g id="edge105" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithAssociatedData&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation</title>
-<g id="a_edge105"><a xlink:title="at aead.go:78: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation]">
-<path fill="none" stroke="#000000" d="M671.6865,-1691.0719C682.4012,-1694.7754 693.1374,-1699.0762 702.947,-1704 739.0149,-1722.1038 740.1711,-1739.3258 775.947,-1758 781.5415,-1760.9202 787.4787,-1763.6433 793.5269,-1766.1622"/>
-<polygon fill="#000000" stroke="#000000" points="792.5033,-1769.5213 803.0894,-1769.9512 795.082,-1763.0135 792.5033,-1769.5213"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformIncomingHandshake -->
-<g id="node34" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformIncomingHandshake</title>
-<g id="a_node34"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformIncomingHandshake | defined in incoming_handshake.go:17&#10;at incoming_handshake.go:27: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor]&#10;at incoming_handshake.go:44: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor]&#10;at incoming_handshake.go:82: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor]&#10;at incoming_handshake.go:29: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:35: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:40: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:46: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:52: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:58: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:68: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:78: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:84: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:90: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:95: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:72: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).writeMessageToConn]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M395.4913,-1813C395.4913,-1813 234.0489,-1813 234.0489,-1813 228.0489,-1813 222.0489,-1807 222.0489,-1801 222.0489,-1801 222.0489,-1789 222.0489,-1789 222.0489,-1783 228.0489,-1777 234.0489,-1777 234.0489,-1777 395.4913,-1777 395.4913,-1777 401.4913,-1777 407.4913,-1783 407.4913,-1789 407.4913,-1789 407.4913,-1801 407.4913,-1801 407.4913,-1807 401.4913,-1813 395.4913,-1813"/>
-<text text-anchor="middle" x="314.7701" y="-1790.8" font-family="Verdana" font-size="14.00" fill="#000000">PerformIncomingHandshake</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformIncomingHandshake&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge32" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformIncomingHandshake&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge32"><a xlink:title="at incoming_handshake.go:29: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:35: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:40: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:46: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:52: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:58: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:68: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:78: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:84: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:90: calling [github.com/samber/oops.Errorf]&#10;at incoming_handshake.go:95: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M404.3316,-1776.7828C409.22,-1773.464 413.6773,-1769.5687 417.4805,-1765 478.0762,-1692.2081 413.6492,-1423.1414 460.801,-1341 513.5311,-1249.1409 682.1778,-1304.5332 702.947,-1314 747.9535,-1334.5143 730.9405,-1377.4857 775.947,-1398 847.9005,-1430.797 895.0627,-1450.8676 953.8672,-1398 1011.5359,-1346.1535 933.1985,-1102.8465 990.8672,-1051 1016.7787,-1027.7045 1056.9356,-1044.2274 1085.1717,-1061.3963"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1083.5718,-1064.5267 1093.8873,-1066.9436 1087.3305,-1058.6214 1083.5718,-1064.5267"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformIncomingHandshake&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor -->
-<g id="edge19" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformIncomingHandshake&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor</title>
-<g id="a_edge19"><a xlink:title="at incoming_handshake.go:27: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor]&#10;at incoming_handshake.go:44: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor]&#10;at incoming_handshake.go:82: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor]">
-<path fill="none" stroke="#000000" d="M407.4975,-1795C451.3065,-1795 502.3146,-1795 540.8685,-1795"/>
-<polygon fill="#000000" stroke="#000000" points="540.8919,-1798.5001 550.8918,-1795 540.8918,-1791.5001 540.8919,-1798.5001"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).writeMessageToConn -->
-<g id="node35" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).writeMessageToConn</title>
-<g id="a_node35"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).writeMessageToConn | defined in outgoing_handshake.go:114">
-<path fill="#add8e6" stroke="#000000" stroke-width=".5" d="M662.0043,-1752C662.0043,-1752 538.7437,-1752 538.7437,-1752 532.7437,-1752 526.7437,-1746 526.7437,-1740 526.7437,-1740 526.7437,-1728 526.7437,-1728 526.7437,-1722 532.7437,-1716 538.7437,-1716 538.7437,-1716 662.0043,-1716 662.0043,-1716 668.0043,-1716 674.0043,-1722 674.0043,-1728 674.0043,-1728 674.0043,-1740 674.0043,-1740 674.0043,-1746 668.0043,-1752 662.0043,-1752"/>
-<text text-anchor="middle" x="600.374" y="-1729.8" font-family="Verdana" font-size="14.00" fill="#000000">writeMessageToConn</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformIncomingHandshake&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).writeMessageToConn -->
-<g id="edge85" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformIncomingHandshake&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).writeMessageToConn</title>
-<g id="a_edge85"><a xlink:title="at incoming_handshake.go:72: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).writeMessageToConn]">
-<path fill="none" stroke="#000000" d="M399.3015,-1776.9456C436.288,-1769.0459 479.5696,-1759.8017 516.4831,-1751.9176"/>
-<polygon fill="#000000" stroke="#000000" points="517.6668,-1755.2438 526.7151,-1749.7322 516.2046,-1748.3982 517.6668,-1755.2438"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ReadEphemeralKey -->
-<g id="node36" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ReadEphemeralKey</title>
-<g id="a_node36"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ReadEphemeralKey | defined in utils.go:35&#10;at utils.go:39: calling [github.com/samber/oops.Errorf]&#10;at utils.go:41: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M370.9956,-1691C370.9956,-1691 258.5446,-1691 258.5446,-1691 252.5446,-1691 246.5446,-1685 246.5446,-1679 246.5446,-1679 246.5446,-1667 246.5446,-1667 246.5446,-1661 252.5446,-1655 258.5446,-1655 258.5446,-1655 370.9956,-1655 370.9956,-1655 376.9956,-1655 382.9956,-1661 382.9956,-1667 382.9956,-1667 382.9956,-1679 382.9956,-1679 382.9956,-1685 376.9956,-1691 370.9956,-1691"/>
-<text text-anchor="middle" x="314.7701" y="-1668.8" font-family="Verdana" font-size="14.00" fill="#000000">ReadEphemeralKey</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ReadEphemeralKey&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge75" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ReadEphemeralKey&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge75"><a xlink:title="at utils.go:39: calling [github.com/samber/oops.Errorf]&#10;at utils.go:41: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M383.2299,-1662.5502C395.7319,-1658.1352 407.8484,-1651.8738 417.4805,-1643 478.9391,-1586.3799 424.3673,-1512.8808 497.801,-1473 606.4601,-1413.9888 652.4017,-1473.9313 775.947,-1479 854.9562,-1482.2415 894.553,-1531.2951 953.8672,-1479 1003.0946,-1435.5981 958.6829,-1243.1947 990.8672,-1186 1011.2888,-1149.7087 1050.4761,-1121.6706 1079.9728,-1104.4446"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1081.8117,-1107.4255 1088.7844,-1099.4485 1078.3591,-1101.3361 1081.8117,-1107.4255"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeobfuscateEphemeral -->
-<g id="node37" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeobfuscateEphemeral</title>
-<g id="a_node37"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeobfuscateEphemeral | defined in obfs.go:16&#10;at obfs.go:17: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).buildAesStaticKey]&#10;at obfs.go:22: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/obfs.DeobfuscateEphemeralKey]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M665.4735,-1630C665.4735,-1630 535.2745,-1630 535.2745,-1630 529.2745,-1630 523.2745,-1624 523.2745,-1618 523.2745,-1618 523.2745,-1606 523.2745,-1606 523.2745,-1600 529.2745,-1594 535.2745,-1594 535.2745,-1594 665.4735,-1594 665.4735,-1594 671.4735,-1594 677.4735,-1600 677.4735,-1606 677.4735,-1606 677.4735,-1618 677.4735,-1618 677.4735,-1624 671.4735,-1630 665.4735,-1630"/>
-<text text-anchor="middle" x="600.374" y="-1607.8" font-family="Verdana" font-size="14.00" fill="#000000">DeobfuscateEphemeral</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeobfuscateEphemeral&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/obfs.DeobfuscateEphemeralKey -->
-<g id="edge66" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeobfuscateEphemeral&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/obfs.DeobfuscateEphemeralKey</title>
-<g id="a_edge66"><a xlink:title="at obfs.go:22: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/obfs.DeobfuscateEphemeralKey]">
-<path fill="none" stroke="#8b4513" d="M677.4859,-1624.7839C687.1054,-1629.2117 695.9886,-1635.1222 702.947,-1643 827.8805,-1784.4409 651.5509,-1923.3513 773.2366,-2065.327"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="770.7817,-2067.8324 780.0581,-2072.951 775.9984,-2063.1648 770.7817,-2067.8324"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeobfuscateEphemeral&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).buildAesStaticKey -->
-<g id="edge12" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeobfuscateEphemeral&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).buildAesStaticKey</title>
-<g id="a_edge12"><a xlink:title="at obfs.go:17: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).buildAesStaticKey]">
-<path fill="none" stroke="#000000" d="M677.599,-1609.9565C712.993,-1609.0199 754.7871,-1607.914 789.9061,-1606.9847"/>
-<polygon fill="#000000" stroke="#000000" points="790.1946,-1610.4783 800.0985,-1606.7149 790.0093,-1603.4808 790.1946,-1610.4783"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformOutboundHandshake -->
-<g id="node38" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformOutboundHandshake</title>
-<g id="a_node38"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformOutboundHandshake | defined in outgoing_handshake.go:17&#10;at outgoing_handshake.go:84: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey]&#10;at outgoing_handshake.go:27: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor]&#10;at outgoing_handshake.go:56: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor]&#10;at outgoing_handshake.go:73: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor]&#10;at outgoing_handshake.go:29: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:35: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:41: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:47: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:52: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:58: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:64: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:69: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:75: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:81: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:86: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:96: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:106: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:51: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).writeMessageToConn]&#10;at outgoing_handshake.go:100: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).writeMessageToConn]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M396.8319,-1569C396.8319,-1569 232.7083,-1569 232.7083,-1569 226.7083,-1569 220.7083,-1563 220.7083,-1557 220.7083,-1557 220.7083,-1545 220.7083,-1545 220.7083,-1539 226.7083,-1533 232.7083,-1533 232.7083,-1533 396.8319,-1533 396.8319,-1533 402.8319,-1533 408.8319,-1539 408.8319,-1545 408.8319,-1545 408.8319,-1557 408.8319,-1557 408.8319,-1563 402.8319,-1569 396.8319,-1569"/>
-<text text-anchor="middle" x="314.7701" y="-1546.8" font-family="Verdana" font-size="14.00" fill="#000000">PerformOutboundHandshake</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformOutboundHandshake&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge57" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformOutboundHandshake&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge57"><a xlink:title="at outgoing_handshake.go:29: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:35: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:41: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:47: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:52: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:58: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:64: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:69: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:75: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:81: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:86: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:96: calling [github.com/samber/oops.Errorf]&#10;at outgoing_handshake.go:106: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M408.9033,-1536.4866C411.9837,-1534.2802 414.863,-1531.7954 417.4805,-1529 508.3575,-1431.9488 360.2091,-1319.9416 460.801,-1233 501.5124,-1197.8131 656.5874,-1205.681 702.947,-1233 731.3983,-1249.7659 721.5944,-1269.9027 738.947,-1298 754.2343,-1322.7532 750.2095,-1338.4354 775.947,-1352 845.9017,-1388.8686 895.1255,-1404.9375 953.8672,-1352 1012.7876,-1298.9015 931.9468,-1050.0985 990.8672,-997 1027.0521,-964.3904 1075.8175,-1022.2194 1101.1499,-1058.664"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1098.2644,-1060.6451 1106.7721,-1066.9593 1104.0589,-1056.7177 1098.2644,-1060.6451"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformOutboundHandshake&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor -->
-<g id="edge38" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformOutboundHandshake&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor</title>
-<g id="a_edge38"><a xlink:title="at outgoing_handshake.go:27: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor]&#10;at outgoing_handshake.go:56: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor]&#10;at outgoing_handshake.go:73: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).GetProcessor]">
-<path fill="none" stroke="#000000" d="M398.0739,-1569.022C405.087,-1572.5938 411.6956,-1576.8731 417.4805,-1582 483.9545,-1640.9123 431.0747,-1706.3736 497.801,-1765 509.9207,-1775.6485 525.641,-1782.5243 541.1177,-1786.9618"/>
-<polygon fill="#000000" stroke="#000000" points="540.6575,-1790.4566 551.2127,-1789.5409 542.3903,-1783.6745 540.6575,-1790.4566"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformOutboundHandshake&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).writeMessageToConn -->
-<g id="edge130" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformOutboundHandshake&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).writeMessageToConn</title>
-<g id="a_edge130"><a xlink:title="at outgoing_handshake.go:51: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).writeMessageToConn]&#10;at outgoing_handshake.go:100: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).writeMessageToConn]">
-<path fill="none" stroke="#000000" d="M394.8587,-1569.0158C402.8963,-1572.5948 410.6124,-1576.8774 417.4805,-1582 469.5185,-1620.8129 445.5968,-1665.4109 497.801,-1704 503.7504,-1708.3978 510.335,-1712.1534 517.2126,-1715.3602"/>
-<polygon fill="#000000" stroke="#000000" points="516.1678,-1718.7188 526.7406,-1719.4017 518.9013,-1712.2746 516.1678,-1718.7188"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey -->
-<g id="node51" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey</title>
-<g id="a_node51"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey | defined in transport.go:98&#10;at transport.go:101: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data]&#10;at transport.go:100: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).RouterAddresses]&#10;at transport.go:109: calling [github.com/samber/oops.Errorf]&#10;at transport.go:106: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).StaticKey]&#10;at transport.go:101: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M643.9512,-617C643.9512,-617 556.7968,-617 556.7968,-617 550.7968,-617 544.7968,-611 544.7968,-605 544.7968,-605 544.7968,-593 544.7968,-593 544.7968,-587 550.7968,-581 556.7968,-581 556.7968,-581 643.9512,-581 643.9512,-581 649.9512,-581 655.9512,-587 655.9512,-593 655.9512,-593 655.9512,-605 655.9512,-605 655.9512,-611 649.9512,-617 643.9512,-617"/>
-<text text-anchor="middle" x="600.374" y="-594.8" font-family="Verdana" font-size="14.00" fill="#000000">LocalStaticKey</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformOutboundHandshake&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey -->
-<g id="edge33" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformOutboundHandshake&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey</title>
-<g id="a_edge33"><a xlink:title="at outgoing_handshake.go:84: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey]">
-<path fill="none" stroke="#000000" d="M315.8951,-1532.6904C323.4542,-1415.4415 370.4713,-770.3662 497.801,-630 507.6011,-619.1965 521.0199,-612.1028 534.9215,-607.4598"/>
-<polygon fill="#000000" stroke="#000000" points="535.9761,-610.798 544.5843,-604.6215 534.0032,-604.0817 535.9761,-610.798"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ProcessEphemeralKey -->
-<g id="node39" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ProcessEphemeralKey</title>
-<g id="a_node39"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ProcessEphemeralKey | defined in utils.go:47&#10;at utils.go:51: calling [github.com/samber/oops.Errorf]&#10;at utils.go:58: calling [github.com/samber/oops.Errorf]&#10;at utils.go:56: calling [(*github.com/go&#45;i2p/logger.Logger).Warnf]&#10;at utils.go:48: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeobfuscateEphemeral]&#10;at utils.go:50: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).AddDelayForSecurity]&#10;at utils.go:57: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).AddDelayForSecurity]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M377.9914,-1752C377.9914,-1752 251.5488,-1752 251.5488,-1752 245.5488,-1752 239.5488,-1746 239.5488,-1740 239.5488,-1740 239.5488,-1728 239.5488,-1728 239.5488,-1722 245.5488,-1716 251.5488,-1716 251.5488,-1716 377.9914,-1716 377.9914,-1716 383.9914,-1716 389.9914,-1722 389.9914,-1728 389.9914,-1728 389.9914,-1740 389.9914,-1740 389.9914,-1746 383.9914,-1752 377.9914,-1752"/>
-<text text-anchor="middle" x="314.7701" y="-1729.8" font-family="Verdana" font-size="14.00" fill="#000000">ProcessEphemeralKey</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ProcessEphemeralKey&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge20" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ProcessEphemeralKey&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge20"><a xlink:title="at utils.go:51: calling [github.com/samber/oops.Errorf]&#10;at utils.go:58: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M390.0784,-1723.402C400.5457,-1718.9224 410.1923,-1712.6771 417.4805,-1704 538.871,-1559.4762 318.3594,-1345.5108 497.801,-1287 584.4851,-1258.7348 620.4223,-1248.2348 702.947,-1287 748.9418,-1308.6056 729.9522,-1353.3944 775.947,-1375 847.5195,-1408.6205 895.0945,-1427.903 953.8672,-1375 1012.1617,-1322.5275 932.5727,-1076.4725 990.8672,-1024 1021.804,-996.1529 1067.7265,-1032.1983 1095.085,-1059.5534"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1092.8084,-1062.2334 1102.2814,-1066.9782 1097.8349,-1057.3616 1092.8084,-1062.2334"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ProcessEphemeralKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeobfuscateEphemeral -->
-<g id="edge67" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ProcessEphemeralKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeobfuscateEphemeral</title>
-<g id="a_edge67"><a xlink:title="at utils.go:48: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeobfuscateEphemeral]">
-<path fill="none" stroke="#000000" d="M388.6936,-1715.9693C398.593,-1712.533 408.4396,-1708.5567 417.4805,-1704 457.5095,-1683.8249 457.8664,-1663.3614 497.801,-1643 504.6181,-1639.5242 511.8926,-1636.365 519.3015,-1633.5104"/>
-<polygon fill="#000000" stroke="#000000" points="520.5469,-1636.7818 528.7337,-1630.0567 518.14,-1630.2086 520.5469,-1636.7818"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).AddDelayForSecurity -->
-<g id="node40" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).AddDelayForSecurity</title>
-<g id="a_node40"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).AddDelayForSecurity | defined in utils.go:27">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M662.0043,-1996C662.0043,-1996 538.7437,-1996 538.7437,-1996 532.7437,-1996 526.7437,-1990 526.7437,-1984 526.7437,-1984 526.7437,-1972 526.7437,-1972 526.7437,-1966 532.7437,-1960 538.7437,-1960 538.7437,-1960 662.0043,-1960 662.0043,-1960 668.0043,-1960 674.0043,-1966 674.0043,-1972 674.0043,-1972 674.0043,-1984 674.0043,-1984 674.0043,-1990 668.0043,-1996 662.0043,-1996"/>
-<text text-anchor="middle" x="600.374" y="-1973.8" font-family="Verdana" font-size="14.00" fill="#000000">AddDelayForSecurity</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ProcessEphemeralKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).AddDelayForSecurity -->
-<g id="edge70" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ProcessEphemeralKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).AddDelayForSecurity</title>
-<g id="a_edge70"><a xlink:title="at utils.go:50: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).AddDelayForSecurity]&#10;at utils.go:57: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).AddDelayForSecurity]">
-<path fill="none" stroke="#000000" d="M390.0685,-1748.3086C400.0356,-1752.5154 409.5349,-1757.9582 417.4805,-1765 483.9545,-1823.9123 431.0747,-1889.3736 497.801,-1948 503.6322,-1953.1233 510.2969,-1957.3733 517.3669,-1960.8986"/>
-<polygon fill="#000000" stroke="#000000" points="515.9493,-1964.0987 526.5068,-1964.9876 518.808,-1957.709 515.9493,-1964.0987"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/logger.Logger).Warnf -->
-<g id="node79" class="node">
-<title>(*github.com/go&#45;i2p/logger.Logger).Warnf</title>
-<g id="a_node79"><a xlink:title="(*github.com/go&#45;i2p/logger.Logger).Warnf | defined in log.go:36">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M618.1403,-1400C618.1403,-1400 582.6077,-1400 582.6077,-1400 576.6077,-1400 570.6077,-1394 570.6077,-1388 570.6077,-1388 570.6077,-1376 570.6077,-1376 570.6077,-1370 576.6077,-1364 582.6077,-1364 582.6077,-1364 618.1403,-1364 618.1403,-1364 624.1403,-1364 630.1403,-1370 630.1403,-1376 630.1403,-1376 630.1403,-1388 630.1403,-1388 630.1403,-1394 624.1403,-1400 618.1403,-1400"/>
-<text text-anchor="middle" x="600.374" y="-1386.2" font-family="Verdana" font-size="14.00" fill="#000000">logger</text>
-<text text-anchor="middle" x="600.374" y="-1369.4" font-family="Verdana" font-size="14.00" fill="#000000">Warnf</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ProcessEphemeralKey&#45;&gt;(*github.com/go&#45;i2p/logger.Logger).Warnf -->
-<g id="edge60" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ProcessEphemeralKey&#45;&gt;(*github.com/go&#45;i2p/logger.Logger).Warnf</title>
-<g id="a_edge60"><a xlink:title="at utils.go:56: calling [(*github.com/go&#45;i2p/logger.Logger).Warnf]">
-<path fill="none" stroke="#8b4513" d="M390.0123,-1722.3236C400.2919,-1717.9669 409.8981,-1712.0424 417.4805,-1704 476.5982,-1641.296 437.5212,-1597.9744 460.801,-1515 474.8486,-1464.9314 459.0562,-1438.6848 497.801,-1404 514.6333,-1388.9315 539.2359,-1383.3005 560.1269,-1381.499"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="560.5695,-1384.9789 570.3422,-1380.8868 560.1507,-1377.9914 560.5695,-1384.9789"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptOptionsBlock -->
-<g id="node41" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptOptionsBlock</title>
-<g id="a_node41"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptOptionsBlock | defined in utils.go:16&#10;at utils.go:17: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M661.7353,-2057C661.7353,-2057 539.0127,-2057 539.0127,-2057 533.0127,-2057 527.0127,-2051 527.0127,-2045 527.0127,-2045 527.0127,-2033 527.0127,-2033 527.0127,-2027 533.0127,-2021 539.0127,-2021 539.0127,-2021 661.7353,-2021 661.7353,-2021 667.7353,-2021 673.7353,-2027 673.7353,-2033 673.7353,-2033 673.7353,-2045 673.7353,-2045 673.7353,-2051 667.7353,-2057 661.7353,-2057"/>
-<text text-anchor="middle" x="600.374" y="-2034.8" font-family="Verdana" font-size="14.00" fill="#000000">DecryptOptionsBlock</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptOptionsBlock&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation -->
-<g id="edge25" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptOptionsBlock&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation</title>
-<g id="a_edge25"><a xlink:title="at utils.go:17: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation]">
-<path fill="none" stroke="#000000" d="M673.8614,-2026.7537C684.5293,-2022.4798 694.6803,-2016.7302 702.947,-2009 769.3382,-1946.9177 710.2688,-1877.9192 774.7816,-1812.1745"/>
-<polygon fill="#000000" stroke="#000000" points="777.495,-1814.4246 782.3379,-1805.0013 772.6756,-1809.3478 777.495,-1814.4246"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeriveSessionKeys -->
-<g id="node42" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeriveSessionKeys</title>
-<g id="a_node42"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeriveSessionKeys | defined in aead.go:133&#10;at aead.go:137: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey]&#10;at aead.go:139: calling [github.com/samber/oops.Errorf]&#10;at aead.go:146: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixHash]&#10;at aead.go:134: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NewNTCP2KDF]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M369.4004,-1874C369.4004,-1874 260.1398,-1874 260.1398,-1874 254.1398,-1874 248.1398,-1868 248.1398,-1862 248.1398,-1862 248.1398,-1850 248.1398,-1850 248.1398,-1844 254.1398,-1838 260.1398,-1838 260.1398,-1838 369.4004,-1838 369.4004,-1838 375.4004,-1838 381.4004,-1844 381.4004,-1850 381.4004,-1850 381.4004,-1862 381.4004,-1862 381.4004,-1868 375.4004,-1874 369.4004,-1874"/>
-<text text-anchor="middle" x="314.7701" y="-1851.8" font-family="Verdana" font-size="14.00" fill="#000000">DeriveSessionKeys</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeriveSessionKeys&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge44" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeriveSessionKeys&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge44"><a xlink:title="at aead.go:139: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M381.4236,-1848.3381C395.0592,-1843.8058 408.092,-1836.7918 417.4805,-1826 491.3432,-1741.0967 411.4171,-1398.1255 497.801,-1326 515.298,-1311.391 682.5002,-1315.9255 702.947,-1326 750.7119,-1349.5346 728.1821,-1397.4654 775.947,-1421 846.8798,-1455.9499 894.8562,-1473.6371 953.8672,-1421 1061.6975,-1324.8166 888.0749,-1199.5498 990.8672,-1098 1013.4307,-1075.7093 1050.4377,-1074.2587 1078.7232,-1077.3248"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1078.3377,-1080.8041 1088.7067,-1078.6285 1079.2441,-1073.863 1078.3377,-1080.8041"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeriveSessionKeys&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NewNTCP2KDF -->
-<g id="edge112" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeriveSessionKeys&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NewNTCP2KDF</title>
-<g id="a_edge112"><a xlink:title="at aead.go:134: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NewNTCP2KDF]">
-<path fill="none" stroke="#8b4513" d="M381.6227,-1847.1863C394.9208,-1842.6906 407.761,-1835.9823 417.4805,-1826 515.2698,-1725.5664 389.0623,-1609.4621 497.801,-1521 655.2546,-1392.9069 775.3049,-1593.5143 953.8672,-1497 1002.8217,-1470.5397 978.2341,-1421.1644 1027.8672,-1396 1099.3331,-1359.7662 1132.2464,-1370.3365 1208.152,-1396 1252.746,-1411.0771 1294.1879,-1447.6534 1318.7436,-1472.6479"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1316.3538,-1475.2122 1325.807,-1479.9963 1321.4004,-1470.3613 1316.3538,-1475.2122"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeriveSessionKeys&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey -->
-<g id="edge21" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeriveSessionKeys&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey</title>
-<g id="a_edge21"><a xlink:title="at aead.go:137: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixKey]">
-<path fill="none" stroke="#8b4513" d="M381.5885,-1867.0502C394.5803,-1871.5858 407.3046,-1877.9816 417.4805,-1887 483.9545,-1945.9123 427.542,-2015.6573 497.801,-2070 570.8487,-2126.4997 617.0792,-2069.0161 702.947,-2103 721.4006,-2110.3034 728.134,-2112.0522 739.947,-2128 772.3305,-2171.7185 732.5614,-2212.1718 775.947,-2245 814.1318,-2273.893 943.4832,-2250 991.3672,-2250 991.3672,-2250 991.3672,-2250 1118.0096,-2250 1180.3407,-2250 1251.342,-2236.9431 1296.331,-2227.012"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1297.3671,-2230.3665 1306.3543,-2224.7558 1295.8298,-2223.5374 1297.3671,-2230.3665"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixHash -->
-<g id="node75" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixHash</title>
-<g id="a_node75"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixHash | defined in kdf.go:68">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M1367.8541,-2295C1367.8541,-2295 1315.6519,-2295 1315.6519,-2295 1309.6519,-2295 1303.6519,-2289 1303.6519,-2283 1303.6519,-2283 1303.6519,-2271 1303.6519,-2271 1303.6519,-2265 1309.6519,-2259 1315.6519,-2259 1315.6519,-2259 1367.8541,-2259 1367.8541,-2259 1373.8541,-2259 1379.8541,-2265 1379.8541,-2271 1379.8541,-2271 1379.8541,-2283 1379.8541,-2283 1379.8541,-2289 1373.8541,-2295 1367.8541,-2295"/>
-<text text-anchor="middle" x="1341.753" y="-2281.2" font-family="Verdana" font-size="14.00" fill="#000000">kdf</text>
-<text text-anchor="middle" x="1341.753" y="-2264.4" font-family="Verdana" font-size="14.00" fill="#000000">MixHash</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeriveSessionKeys&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixHash -->
-<g id="edge93" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeriveSessionKeys&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixHash</title>
-<g id="a_edge93"><a xlink:title="at aead.go:146: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/kdf.NTCP2KDF).MixHash]">
-<path fill="none" stroke="#8b4513" d="M381.5231,-1865.9846C394.7482,-1870.5828 407.5834,-1877.2735 417.4805,-1887 487.5685,-1955.8799 416.6193,-2037.6259 497.801,-2093 573.5551,-2144.6719 622.0044,-2071.9075 702.947,-2115 725.5006,-2127.0072 727.1987,-2136.8568 739.947,-2159 763.5152,-2199.9371 738.4659,-2230.2515 775.947,-2259 814.0638,-2288.2362 943.3292,-2277 991.3672,-2277 991.3672,-2277 991.3672,-2277 1118.0096,-2277 1178.372,-2277 1247.8945,-2277 1293.2151,-2277"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1293.3495,-2280.5001 1303.3495,-2277 1293.3494,-2273.5001 1293.3495,-2280.5001"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ValidateTimestamp -->
-<g id="node43" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ValidateTimestamp</title>
-<g id="a_node43"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ValidateTimestamp | defined in timestamp.go:11&#10;at timestamp.go:13: calling [github.com/samber/oops.Errorf]&#10;at timestamp.go:23: calling [github.com/samber/oops.Errorf]&#10;at timestamp.go:18: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper).GetCurrentTime]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M370.1817,-2057C370.1817,-2057 259.3585,-2057 259.3585,-2057 253.3585,-2057 247.3585,-2051 247.3585,-2045 247.3585,-2045 247.3585,-2033 247.3585,-2033 247.3585,-2027 253.3585,-2021 259.3585,-2021 259.3585,-2021 370.1817,-2021 370.1817,-2021 376.1817,-2021 382.1817,-2027 382.1817,-2033 382.1817,-2033 382.1817,-2045 382.1817,-2045 382.1817,-2051 376.1817,-2057 370.1817,-2057"/>
-<text text-anchor="middle" x="314.7701" y="-2034.8" font-family="Verdana" font-size="14.00" fill="#000000">ValidateTimestamp</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ValidateTimestamp&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge7" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ValidateTimestamp&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge7"><a xlink:title="at timestamp.go:13: calling [github.com/samber/oops.Errorf]&#10;at timestamp.go:23: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M382.0798,-2030.9476C395.4332,-2026.4149 408.1811,-2019.4992 417.4805,-2009 563.2215,-1844.4561 334.0242,-1667.6026 497.801,-1521 649.0375,-1385.6227 804.2223,-1634.1346 953.8672,-1497 997.3798,-1457.1251 966.6349,-1287.8159 990.8672,-1234 1013.5527,-1183.6192 1058.6586,-1137.169 1088.5864,-1109.9549"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1091.0969,-1112.4052 1096.2192,-1103.1309 1086.4314,-1107.1867 1091.0969,-1112.4052"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper).GetCurrentTime -->
-<g id="node78" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper).GetCurrentTime</title>
-<g id="a_node78"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper).GetCurrentTime | defined in router_timestamper.go:397">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M910.9313,-2356C910.9313,-2356 818.8829,-2356 818.8829,-2356 812.8829,-2356 806.8829,-2350 806.8829,-2344 806.8829,-2344 806.8829,-2332 806.8829,-2332 806.8829,-2326 812.8829,-2320 818.8829,-2320 818.8829,-2320 910.9313,-2320 910.9313,-2320 916.9313,-2320 922.9313,-2326 922.9313,-2332 922.9313,-2332 922.9313,-2344 922.9313,-2344 922.9313,-2350 916.9313,-2356 910.9313,-2356"/>
-<text text-anchor="middle" x="864.9071" y="-2342.2" font-family="Verdana" font-size="14.00" fill="#000000">sntp</text>
-<text text-anchor="middle" x="864.9071" y="-2325.4" font-family="Verdana" font-size="14.00" fill="#000000">GetCurrentTime</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ValidateTimestamp&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper).GetCurrentTime -->
-<g id="edge124" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ValidateTimestamp&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper).GetCurrentTime</title>
-<g id="a_edge124"><a xlink:title="at timestamp.go:18: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper).GetCurrentTime]">
-<path fill="none" stroke="#8b4513" d="M349.1532,-2057.1311C385.1793,-2075.2876 443.9213,-2102.548 497.801,-2117 586.5156,-2140.7957 616.9115,-2109.8378 702.947,-2142 721.5369,-2148.9494 728.134,-2151.0522 739.947,-2167 772.3305,-2210.7185 742.5096,-2241.0821 775.947,-2284 785.6933,-2296.5096 799.2141,-2306.7891 812.7753,-2314.8971"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="811.2254,-2318.0414 821.6536,-2319.9132 814.6688,-2311.9468 811.2254,-2318.0414"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADWithDerivedKey -->
-<g id="node44" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADWithDerivedKey</title>
-<g id="a_node44"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADWithDerivedKey | defined in aead.go:92&#10;at aead.go:100: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).deriveChacha20Key]&#10;at aead.go:102: calling [github.com/samber/oops.Errorf]&#10;at aead.go:106: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M691.0201,-1874C691.0201,-1874 509.7279,-1874 509.7279,-1874 503.7279,-1874 497.7279,-1868 497.7279,-1862 497.7279,-1862 497.7279,-1850 497.7279,-1850 497.7279,-1844 503.7279,-1838 509.7279,-1838 509.7279,-1838 691.0201,-1838 691.0201,-1838 697.0201,-1838 703.0201,-1844 703.0201,-1850 703.0201,-1850 703.0201,-1862 703.0201,-1862 703.0201,-1868 697.0201,-1874 691.0201,-1874"/>
-<text text-anchor="middle" x="600.374" y="-1851.8" font-family="Verdana" font-size="14.00" fill="#000000">PerformAEADWithDerivedKey</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADWithDerivedKey&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge94" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADWithDerivedKey&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge94"><a xlink:title="at aead.go:102: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M686.0202,-1874.2223C692.2182,-1877.7591 697.9745,-1881.9752 702.947,-1887 743.8065,-1928.2895 729.4892,-2103.1289 775.947,-2138 807.5682,-2161.7348 925.2888,-2165.3224 953.8672,-2138 1020.031,-2074.7439 966.0145,-1403.0984 990.8672,-1315 1013.4766,-1234.8536 1068.4747,-1152.0779 1098.1853,-1111.1614"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1101.0211,-1113.2129 1104.1206,-1103.0816 1095.3796,-1109.0688 1101.0211,-1113.2129"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADWithDerivedKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).deriveChacha20Key -->
-<g id="edge27" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADWithDerivedKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).deriveChacha20Key</title>
-<g id="a_edge27"><a xlink:title="at aead.go:100: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).deriveChacha20Key]">
-<path fill="none" stroke="#000000" d="M702.9514,-1850.8477C801.5727,-1845.8941 948.5601,-1838.5112 1038.5761,-1833.9898"/>
-<polygon fill="#000000" stroke="#000000" points="1038.912,-1837.4775 1048.7238,-1833.4801 1038.5607,-1830.4863 1038.912,-1837.4775"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADWithDerivedKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation -->
-<g id="edge125" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADWithDerivedKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation</title>
-<g id="a_edge125"><a xlink:title="at aead.go:106: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADOperation]">
-<path fill="none" stroke="#000000" d="M670.5695,-1837.9558C705.6871,-1828.9286 748.3546,-1817.9606 784.7541,-1808.6039"/>
-<polygon fill="#000000" stroke="#000000" points="786.0292,-1811.89 794.843,-1806.0105 784.2864,-1805.1104 786.0292,-1811.89"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithDerivedKey -->
-<g id="node45" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithDerivedKey</title>
-<g id="a_node45"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithDerivedKey | defined in aead.go:110&#10;at aead.go:116: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADWithDerivedKey]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M384.9927,-1996C384.9927,-1996 244.5475,-1996 244.5475,-1996 238.5475,-1996 232.5475,-1990 232.5475,-1984 232.5475,-1984 232.5475,-1972 232.5475,-1972 232.5475,-1966 238.5475,-1960 244.5475,-1960 244.5475,-1960 384.9927,-1960 384.9927,-1960 390.9927,-1960 396.9927,-1966 396.9927,-1972 396.9927,-1972 396.9927,-1984 396.9927,-1984 396.9927,-1990 390.9927,-1996 384.9927,-1996"/>
-<text text-anchor="middle" x="314.7701" y="-1973.8" font-family="Verdana" font-size="14.00" fill="#000000">EncryptWithDerivedKey</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithDerivedKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADWithDerivedKey -->
-<g id="edge58" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithDerivedKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADWithDerivedKey</title>
-<g id="a_edge58"><a xlink:title="at aead.go:116: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADWithDerivedKey]">
-<path fill="none" stroke="#000000" d="M388.6936,-1959.9693C398.593,-1956.533 408.4396,-1952.5567 417.4805,-1948 457.5095,-1927.8249 457.8664,-1907.3614 497.801,-1887 504.6181,-1883.5242 511.8926,-1880.365 519.3015,-1877.5104"/>
-<polygon fill="#000000" stroke="#000000" points="520.5469,-1880.7818 528.7337,-1874.0567 518.14,-1874.2086 520.5469,-1880.7818"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptWithDerivedKey -->
-<g id="node46" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptWithDerivedKey</title>
-<g id="a_node46"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptWithDerivedKey | defined in aead.go:120&#10;at aead.go:126: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADWithDerivedKey]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M385.7618,-1935C385.7618,-1935 243.7784,-1935 243.7784,-1935 237.7784,-1935 231.7784,-1929 231.7784,-1923 231.7784,-1923 231.7784,-1911 231.7784,-1911 231.7784,-1905 237.7784,-1899 243.7784,-1899 243.7784,-1899 385.7618,-1899 385.7618,-1899 391.7618,-1899 397.7618,-1905 397.7618,-1911 397.7618,-1911 397.7618,-1923 397.7618,-1923 397.7618,-1929 391.7618,-1935 385.7618,-1935"/>
-<text text-anchor="middle" x="314.7701" y="-1912.8" font-family="Verdana" font-size="14.00" fill="#000000">DecryptWithDerivedKey</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptWithDerivedKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADWithDerivedKey -->
-<g id="edge14" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptWithDerivedKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADWithDerivedKey</title>
-<g id="a_edge14"><a xlink:title="at aead.go:126: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).PerformAEADWithDerivedKey]">
-<path fill="none" stroke="#000000" d="M397.7622,-1899.2743C431.4899,-1892.0707 470.6506,-1883.7067 505.5025,-1876.2629"/>
-<polygon fill="#000000" stroke="#000000" points="506.6398,-1879.599 515.6882,-1874.0874 505.1777,-1872.7534 506.6398,-1879.599"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).peerStaticKey -->
-<g id="node47" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).peerStaticKey</title>
-<g id="a_node47"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).peerStaticKey | defined in session.go:93&#10;at session.go:94: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address]&#10;at session.go:98: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).StaticKey]">
-<path fill="#add8e6" stroke="#000000" stroke-width=".5" d="M904.7021,-1684C904.7021,-1684 825.1121,-1684 825.1121,-1684 819.1121,-1684 813.1121,-1678 813.1121,-1672 813.1121,-1672 813.1121,-1660 813.1121,-1660 813.1121,-1654 819.1121,-1648 825.1121,-1648 825.1121,-1648 904.7021,-1648 904.7021,-1648 910.7021,-1648 916.7021,-1654 916.7021,-1660 916.7021,-1660 916.7021,-1672 916.7021,-1672 916.7021,-1678 910.7021,-1684 904.7021,-1684"/>
-<text text-anchor="middle" x="864.9071" y="-1661.8" font-family="Verdana" font-size="14.00" fill="#000000">peerStaticKey</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).peerStaticKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address -->
-<g id="edge72" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).peerStaticKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address</title>
-<g id="a_edge72"><a xlink:title="at session.go:94: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address]">
-<path fill="none" stroke="#000000" d="M916.6834,-1650.0247C929.0063,-1645.8158 942.0151,-1641.0325 953.8672,-1636 997.3375,-1617.5422 1045.0723,-1592.2163 1077.8032,-1574.0183"/>
-<polygon fill="#000000" stroke="#000000" points="1079.6021,-1577.0225 1086.6211,-1569.0862 1076.185,-1570.9132 1079.6021,-1577.0225"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).peerStaticKey&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).StaticKey -->
-<g id="edge82" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).peerStaticKey&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).StaticKey</title>
-<g id="a_edge82"><a xlink:title="at session.go:98: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).StaticKey]">
-<path fill="none" stroke="#8b4513" d="M916.81,-1659.2854C930.9111,-1654.9006 944.779,-1647.7216 953.8672,-1636 1022.4749,-1547.5125 959.5243,-719.6921 1027.8672,-631 1034.8205,-621.9764 1044.5519,-615.5641 1055.0647,-611.0113"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1056.3326,-614.2738 1064.4542,-607.4701 1053.8624,-607.7241 1056.3326,-614.2738"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).peerStaticIV -->
-<g id="node48" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).peerStaticIV</title>
-<g id="a_node48"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).peerStaticIV | defined in session.go:101&#10;at session.go:106: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).InitializationVector]&#10;at session.go:102: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address]">
-<path fill="#add8e6" stroke="#000000" stroke-width=".5" d="M900.1481,-1745C900.1481,-1745 829.6661,-1745 829.6661,-1745 823.6661,-1745 817.6661,-1739 817.6661,-1733 817.6661,-1733 817.6661,-1721 817.6661,-1721 817.6661,-1715 823.6661,-1709 829.6661,-1709 829.6661,-1709 900.1481,-1709 900.1481,-1709 906.1481,-1709 912.1481,-1715 912.1481,-1721 912.1481,-1721 912.1481,-1733 912.1481,-1733 912.1481,-1739 906.1481,-1745 900.1481,-1745"/>
-<text text-anchor="middle" x="864.9071" y="-1722.8" font-family="Verdana" font-size="14.00" fill="#000000">peerStaticIV</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).peerStaticIV&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address -->
-<g id="edge40" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).peerStaticIV&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address</title>
-<g id="a_edge40"><a xlink:title="at session.go:102: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).findNTCP2Address]">
-<path fill="none" stroke="#000000" d="M912.1513,-1714.9598C926.0925,-1710.3921 941.0409,-1704.4483 953.8672,-1697 1010.7234,-1663.9833 1065.439,-1609.2271 1095.1145,-1576.9823"/>
-<polygon fill="#000000" stroke="#000000" points="1097.9659,-1579.049 1102.1057,-1569.2964 1092.7877,-1574.3388 1097.9659,-1579.049"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).peerStaticIV&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).InitializationVector -->
-<g id="edge29" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).peerStaticIV&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).InitializationVector</title>
-<g id="a_edge29"><a xlink:title="at session.go:106: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).InitializationVector]">
-<path fill="none" stroke="#8b4513" d="M912.1823,-1721.6502C927.8313,-1717.4435 943.8016,-1710.0262 953.8672,-1697 988.4035,-1652.3056 991.3268,-726.0714 1027.8672,-683 1031.8062,-678.357 1036.547,-674.6055 1041.767,-671.5834"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1043.4596,-674.653 1050.9474,-667.1574 1040.4196,-668.3475 1043.4596,-674.653"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).localStaticIV -->
-<g id="node49" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).localStaticIV</title>
-<g id="a_node49"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).localStaticIV | defined in transport.go:112&#10;at transport.go:113: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).RouterAddresses]&#10;at transport.go:114: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle]&#10;at transport.go:114: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data]&#10;at transport.go:122: calling [github.com/samber/oops.Errorf]&#10;at transport.go:119: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).InitializationVector]">
-<path fill="#add8e6" stroke="#000000" stroke-width=".5" d="M637.2353,-678C637.2353,-678 563.5127,-678 563.5127,-678 557.5127,-678 551.5127,-672 551.5127,-666 551.5127,-666 551.5127,-654 551.5127,-654 551.5127,-648 557.5127,-642 563.5127,-642 563.5127,-642 637.2353,-642 637.2353,-642 643.2353,-642 649.2353,-648 649.2353,-654 649.2353,-654 649.2353,-666 649.2353,-666 649.2353,-672 643.2353,-678 637.2353,-678"/>
-<text text-anchor="middle" x="600.374" y="-655.8" font-family="Verdana" font-size="14.00" fill="#000000">localStaticIV</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).localStaticIV&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge54" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).localStaticIV&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge54"><a xlink:title="at transport.go:122: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M649.3648,-664.211C668.5259,-668.2961 689.1668,-676.1242 702.947,-691 754.1348,-746.2575 717.2295,-974.8212 775.947,-1022 806.7684,-1046.7646 923.9104,-1047.8036 953.8672,-1022 1038.0217,-949.5127 899.7097,-713.0049 991.8672,-775 1088.4851,-839.9956 1111.1352,-993.2077 1116.4162,-1056.6866"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1112.934,-1057.0567 1117.1693,-1066.7682 1119.9146,-1056.5352 1112.934,-1057.0567"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).localStaticIV&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).RouterAddresses -->
-<g id="edge4" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).localStaticIV&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).RouterAddresses</title>
-<g id="a_edge4"><a xlink:title="at transport.go:113: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).RouterAddresses]">
-<path fill="none" stroke="#8b4513" d="M649.464,-656.4184C668.641,-652.5445 689.2671,-644.8949 702.947,-630 757.5437,-570.5545 692.0469,-517.6883 738.947,-452 803.2865,-361.8861 859.0805,-383.2326 953.8672,-326 987.0182,-305.9833 990.6295,-290.6306 1027.8672,-280 1104.9156,-258.0042 1133.5664,-250.721 1208.152,-280 1257.7515,-299.4706 1299.9018,-346.9719 1322.9449,-377.2075"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1320.4216,-379.6795 1329.199,-385.6131 1326.0376,-375.5009 1320.4216,-379.6795"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).localStaticIV&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data -->
-<g id="edge22" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).localStaticIV&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data</title>
-<g id="a_edge22"><a xlink:title="at transport.go:114: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data]">
-<path fill="none" stroke="#8b4513" d="M649.2468,-656.5142C668.506,-652.6643 689.2518,-645.0067 702.947,-630 759.1179,-568.4498 718.8292,-526.8633 738.947,-446 752.6265,-391.0151 735.4149,-363.5932 775.947,-324 859.0745,-242.798 912.7261,-269.6995 1027.8672,-254 1107.2592,-243.1749 1128.1677,-249.2276 1208.152,-254 1240.8841,-255.953 1277.8878,-260.5746 1304.6381,-264.3512"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1304.3181,-267.8411 1314.7148,-265.8023 1305.3158,-260.9126 1304.3181,-267.8411"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).localStaticIV&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle -->
-<g id="edge18" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).localStaticIV&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle</title>
-<g id="a_edge18"><a xlink:title="at transport.go:114: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle]">
-<path fill="none" stroke="#8b4513" d="M649.4805,-667.6188C667.5648,-672.1974 687.4071,-679.4746 702.947,-691 726.1149,-708.1828 713.5156,-731.3895 738.947,-745 823.4277,-790.2127 880.4334,-789.552 953.8672,-728 1003.8496,-686.105 948.4165,-635.5113 990.8672,-586 1007.0179,-567.163 1031.4324,-555.8699 1054.5637,-549.1019"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1055.62,-552.4423 1064.3708,-546.4695 1053.8053,-545.6816 1055.62,-552.4423"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).localStaticIV&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).InitializationVector -->
-<g id="edge89" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).localStaticIV&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).InitializationVector</title>
-<g id="a_edge89"><a xlink:title="at transport.go:119: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).InitializationVector]">
-<path fill="none" stroke="#8b4513" d="M649.2561,-665.27C668.0578,-669.5337 688.4644,-677.2088 702.947,-691 737.458,-723.8634 700.0016,-764.5361 738.947,-792 817.0093,-847.0487 873.3868,-843.449 953.8672,-792 986.8734,-770.9 966.5525,-742.715 990.8672,-712 1003.8355,-695.6181 1009.0725,-692.1271 1027.8672,-683 1032.1691,-680.9109 1036.6856,-679.0105 1041.3089,-677.283"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1042.5991,-680.5405 1050.9146,-673.9752 1040.3199,-673.922 1042.5991,-680.5405"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).GetSession -->
-<g id="node50" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).GetSession</title>
-<g id="a_node50"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).GetSession | defined in transport.go:55&#10;at transport.go:63: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NoiseTransport).Handshake]&#10;at transport.go:57: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Session]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M631.8628,-739C631.8628,-739 568.8852,-739 568.8852,-739 562.8852,-739 556.8852,-733 556.8852,-727 556.8852,-727 556.8852,-715 556.8852,-715 556.8852,-709 562.8852,-703 568.8852,-703 568.8852,-703 631.8628,-703 631.8628,-703 637.8628,-703 643.8628,-709 643.8628,-715 643.8628,-715 643.8628,-727 643.8628,-727 643.8628,-733 637.8628,-739 631.8628,-739"/>
-<text text-anchor="middle" x="600.374" y="-716.8" font-family="Verdana" font-size="14.00" fill="#000000">GetSession</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).GetSession&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Session -->
-<g id="edge98" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).GetSession&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Session</title>
-<g id="a_edge98"><a xlink:title="at transport.go:57: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Session]">
-<path fill="none" stroke="#000000" d="M643.95,-717.5257C664.2006,-713.7974 687.2222,-706.2334 702.947,-691 739.8937,-655.208 712.3156,-625.0101 738.947,-581 751.1507,-560.8326 755.4973,-554.7246 775.947,-543 779.5959,-540.9079 783.44,-539.0133 787.3999,-537.2977"/>
-<polygon fill="#000000" stroke="#000000" points="788.7781,-540.5169 796.8128,-533.6108 786.225,-533.999 788.7781,-540.5169"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).GetSession&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NoiseTransport).Handshake -->
-<g id="edge42" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).GetSession&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NoiseTransport).Handshake</title>
-<g id="a_edge42"><a xlink:title="at transport.go:63: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NoiseTransport).Handshake]">
-<path fill="none" stroke="#8b4513" d="M643.865,-726.4143C663.6172,-730.6907 686.2436,-738.3366 702.947,-752 729.1122,-773.4032 721.6118,-789.9792 738.947,-819 754.2447,-844.6097 754.4533,-854.3143 775.947,-875 788.2366,-886.8276 803.5601,-897.2754 818.0085,-905.7527"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="816.4316,-908.8821 826.8567,-910.7711 819.885,-902.7932 816.4316,-908.8821"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge83" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge83"><a xlink:title="at transport.go:109: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M656.1138,-604.06C673.4991,-608.4095 691.1813,-616.1955 702.947,-630 742.2212,-676.0796 730.3571,-1130.1585 775.947,-1170 790.8327,-1183.0087 939.1075,-1183.1515 953.8672,-1170 1060.7595,-1074.755 883.9749,-945.245 990.8672,-850 1062.8284,-785.8799 1101.733,-980.656 1113.8358,-1056.3047"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1110.4346,-1057.2121 1115.4277,-1066.5566 1117.3517,-1056.1379 1110.4346,-1057.2121"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).RouterAddresses -->
-<g id="edge73" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).RouterAddresses</title>
-<g id="a_edge73"><a xlink:title="at transport.go:100: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).RouterAddresses]">
-<path fill="none" stroke="#8b4513" d="M656.038,-611.4065C671.7277,-616.0648 688.4576,-622.1822 702.947,-630 740.1569,-650.0768 736.2014,-676.5798 775.947,-691 813.1142,-704.4847 922.4198,-714.9646 953.8672,-691 1003.1791,-653.4216 979.6517,-460.9752 1027.8672,-422 1063.9956,-392.7955 1190.854,-394.4702 1271.8129,-398.8716"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1271.755,-402.3739 1281.9381,-399.449 1272.1536,-395.3852 1271.755,-402.3739"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data -->
-<g id="edge41" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data</title>
-<g id="a_edge41"><a xlink:title="at transport.go:101: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data]">
-<path fill="none" stroke="#8b4513" d="M656.0325,-599.0793C673.3059,-596.2562 690.9402,-589.9592 702.947,-577 783.7285,-489.8108 677.8277,-413.9413 738.947,-312 774.4605,-252.7669 795.8436,-221 864.9071,-221 864.9071,-221 864.9071,-221 1118.0096,-221 1185.1518,-221 1261.0583,-242.316 1304.9596,-256.8296"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1304.0227,-260.2072 1314.6168,-260.0841 1306.2582,-253.5738 1304.0227,-260.2072"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle -->
-<g id="edge123" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle</title>
-<g id="a_edge123"><a xlink:title="at transport.go:101: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle]">
-<path fill="none" stroke="#8b4513" d="M656.1283,-606.7029C672.7068,-611.2537 689.9049,-618.491 702.947,-630 732.4858,-656.0665 705.9142,-689.5329 738.947,-711 778.9934,-737.0251 915.7816,-739.8186 953.8672,-711 1002.1121,-674.4941 948.8788,-623.5571 990.8672,-580 1007.5526,-562.6912 1031.5719,-552.6774 1054.2501,-546.8888"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1055.248,-550.2505 1064.2018,-544.5866 1053.6702,-543.4306 1055.248,-550.2505"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).StaticKey -->
-<g id="edge109" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).StaticKey</title>
-<g id="a_edge109"><a xlink:title="at transport.go:106: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).StaticKey]">
-<path fill="none" stroke="#8b4513" d="M656.0182,-605.744C672.8825,-610.236 690.2749,-617.681 702.947,-630 739.2259,-665.2681 697.901,-708.4157 738.947,-738 816.4369,-793.8516 878.7604,-797.0174 953.8672,-738 1008.5368,-695.0418 936.1976,-628.9582 990.8672,-586 1012.3886,-569.0889 1042.6587,-571.7072 1068.2645,-578.9695"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1067.2333,-582.3141 1077.8218,-581.9493 1069.3169,-575.6314 1067.2333,-582.3141"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Address -->
-<g id="node52" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Address</title>
-<g id="a_node52"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Address | defined in address.go:11&#10;at address.go:13: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper).GetCurrentTime]&#10;at address.go:19: calling [github.com/samber/oops.Errorf]&#10;at address.go:17: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.NewRouterAddress]&#10;at address.go:17: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Name]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M623.2451,-861C623.2451,-861 577.5029,-861 577.5029,-861 571.5029,-861 565.5029,-855 565.5029,-849 565.5029,-849 565.5029,-837 565.5029,-837 565.5029,-831 571.5029,-825 577.5029,-825 577.5029,-825 623.2451,-825 623.2451,-825 629.2451,-825 635.2451,-831 635.2451,-837 635.2451,-837 635.2451,-849 635.2451,-849 635.2451,-855 629.2451,-861 623.2451,-861"/>
-<text text-anchor="middle" x="600.374" y="-838.8" font-family="Verdana" font-size="14.00" fill="#000000">Address</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Address&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge84" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Address&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge84"><a xlink:title="at address.go:19: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M635.4121,-841.3269C657.7187,-842.2318 685.5822,-847.3368 702.947,-865 758.9521,-921.9676 713.7105,-1166.9151 775.947,-1217 837.5517,-1266.5764 895.1255,-1269.9375 953.8672,-1217 1012.7876,-1163.9015 931.9468,-915.0985 990.8672,-862 1059.3565,-800.278 1100.1823,-983.9477 1113.3277,-1056.7035"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1109.956,-1057.7394 1115.1334,-1066.9831 1116.8505,-1056.5283 1109.956,-1057.7394"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Address&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.NewRouterAddress -->
-<g id="edge90" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Address&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.NewRouterAddress</title>
-<g id="a_edge90"><a xlink:title="at address.go:17: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.NewRouterAddress]">
-<path fill="none" stroke="#8b4513" d="M635.3684,-841.37C657.6565,-842.2931 685.5159,-847.4022 702.947,-865 759.1344,-921.7247 684.909,-982.2241 738.947,-1041 751.7614,-1054.9379 769.5225,-1063.7262 787.6707,-1069.2394"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="786.8985,-1072.6565 797.4667,-1071.9055 788.7368,-1065.9022 786.8985,-1072.6565"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Name -->
-<g id="node53" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Name</title>
-<g id="a_node53"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Name | defined in transport.go:33">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M881.8351,-678C881.8351,-678 847.9791,-678 847.9791,-678 841.9791,-678 835.9791,-672 835.9791,-666 835.9791,-666 835.9791,-654 835.9791,-654 835.9791,-648 841.9791,-642 847.9791,-642 847.9791,-642 881.8351,-642 881.8351,-642 887.8351,-642 893.8351,-648 893.8351,-654 893.8351,-654 893.8351,-666 893.8351,-666 893.8351,-672 887.8351,-678 881.8351,-678"/>
-<text text-anchor="middle" x="864.9071" y="-655.8" font-family="Verdana" font-size="14.00" fill="#000000">Name</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Address&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Name -->
-<g id="edge128" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Address&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Name</title>
-<g id="a_edge128"><a xlink:title="at address.go:17: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Name]">
-<path fill="none" stroke="#000000" d="M635.2919,-841.3575C657.5477,-838.4667 685.3999,-831.1332 702.947,-813 747.6239,-766.8309 690.2658,-714.9255 738.947,-673 762.5067,-652.7098 798.4801,-650.8711 825.9599,-653.2891"/>
-<polygon fill="#000000" stroke="#000000" points="825.7101,-656.7827 836.0323,-654.3947 826.4739,-649.8244 825.7101,-656.7827"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Address&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper).GetCurrentTime -->
-<g id="edge24" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Address&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper).GetCurrentTime</title>
-<g id="a_edge24"><a xlink:title="at address.go:13: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper).GetCurrentTime]">
-<path fill="none" stroke="#8b4513" d="M606.0073,-861.0632C623.697,-918.6145 678.4151,-1103.1067 702.947,-1260 712.0317,-1318.1007 738.1217,-2270.9725 775.947,-2316 781.6721,-2322.8152 789.1435,-2327.7023 797.3245,-2331.1786"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="796.2125,-2334.4977 806.8073,-2334.5316 798.5461,-2327.8981 796.2125,-2334.4977"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Accept -->
-<g id="node54" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Accept</title>
-<g id="a_node54"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Accept | defined in transport.go:70&#10;at transport.go:81: calling [github.com/samber/oops.Errorf]&#10;at transport.go:85: calling [github.com/samber/oops.Errorf]&#10;at transport.go:88: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Session]&#10;at transport.go:84: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Compatible]&#10;at transport.go:71: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NoiseTransport).Accept]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M620.016,-800C620.016,-800 580.732,-800 580.732,-800 574.732,-800 568.732,-794 568.732,-788 568.732,-788 568.732,-776 568.732,-776 568.732,-770 574.732,-764 580.732,-764 580.732,-764 620.016,-764 620.016,-764 626.016,-764 632.016,-770 632.016,-776 632.016,-776 632.016,-788 632.016,-788 632.016,-794 626.016,-800 620.016,-800"/>
-<text text-anchor="middle" x="600.374" y="-777.8" font-family="Verdana" font-size="14.00" fill="#000000">Accept</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Accept&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge96" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Accept&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge96"><a xlink:title="at transport.go:81: calling [github.com/samber/oops.Errorf]&#10;at transport.go:85: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M632.469,-783.0662C655.5096,-785.6237 685.4666,-792.9465 702.947,-813 759.019,-877.3258 708.7278,-1137.4314 775.947,-1190 807.0917,-1214.3567 924.4108,-1216.3735 953.8672,-1190 1009.5024,-1140.1877 935.232,-905.8123 990.8672,-856 1061.2607,-792.974 1101.1425,-983.1155 1113.6689,-1056.9795"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1110.2391,-1057.6922 1115.3189,-1066.9898 1117.1459,-1056.5537 1110.2391,-1057.6922"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Accept&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Session -->
-<g id="edge127" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Accept&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Session</title>
-<g id="a_edge127"><a xlink:title="at transport.go:88: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NewNTCP2Session]">
-<path fill="none" stroke="#000000" d="M632.3907,-780.1842C654.7883,-777.2872 683.9783,-770.0162 702.947,-752 774.2888,-684.2406 703.1947,-609.2427 775.947,-543 779.4155,-539.8418 783.2651,-537.1193 787.362,-534.774"/>
-<polygon fill="#000000" stroke="#000000" points="789.2286,-537.7573 796.6739,-530.2195 786.153,-531.4691 789.2286,-537.7573"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Accept&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NoiseTransport).Accept -->
-<g id="edge140" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Accept&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NoiseTransport).Accept</title>
-<g id="a_edge140"><a xlink:title="at transport.go:71: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/noise.NoiseTransport).Accept]">
-<path fill="none" stroke="#8b4513" d="M632.2168,-784.9711C654.2434,-788.4929 683.0552,-796.188 702.947,-813 758.6598,-860.0869 720.9889,-912.0344 775.947,-960 789.167,-971.538 807.0005,-978.6772 823.2293,-983.0768"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="822.5265,-986.508 833.0711,-985.477 824.1851,-979.7073 822.5265,-986.508"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Compatible -->
-<g id="node55" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Compatible</title>
-<g id="a_node55"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Compatible | defined in transport.go:37&#10;at transport.go:41: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle]&#10;at transport.go:47: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).CheckOption]&#10;at transport.go:47: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).CheckOption]&#10;at transport.go:47: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).CheckOption]&#10;at transport.go:39: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).RouterAddresses]&#10;at transport.go:41: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M897.7359,-617C897.7359,-617 832.0783,-617 832.0783,-617 826.0783,-617 820.0783,-611 820.0783,-605 820.0783,-605 820.0783,-593 820.0783,-593 820.0783,-587 826.0783,-581 832.0783,-581 832.0783,-581 897.7359,-581 897.7359,-581 903.7359,-581 909.7359,-587 909.7359,-593 909.7359,-593 909.7359,-605 909.7359,-605 909.7359,-611 903.7359,-617 897.7359,-617"/>
-<text text-anchor="middle" x="864.9071" y="-594.8" font-family="Verdana" font-size="14.00" fill="#000000">Compatible</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Accept&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Compatible -->
-<g id="edge138" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Accept&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Compatible</title>
-<g id="a_edge138"><a xlink:title="at transport.go:84: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Compatible]">
-<path fill="none" stroke="#000000" d="M632.0445,-779.8077C654.2745,-776.7285 683.4065,-769.3943 702.947,-752 733.591,-724.7217 716.019,-701.0216 738.947,-667 751.9438,-647.7147 756.2477,-642.3602 775.947,-630 786.5508,-623.3467 798.766,-617.9008 810.6812,-613.535"/>
-<polygon fill="#000000" stroke="#000000" points="811.8307,-616.8409 820.1361,-610.2628 809.5414,-610.2258 811.8307,-616.8409"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Compatible&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).RouterAddresses -->
-<g id="edge113" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Compatible&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).RouterAddresses</title>
-<g id="a_edge113"><a xlink:title="at transport.go:39: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).RouterAddresses]">
-<path fill="none" stroke="#8b4513" d="M909.5819,-597.5185C925.5222,-594.7512 942.3615,-588.8908 953.8672,-577 1008.8452,-520.182 929.4221,-452.753 990.8672,-403 1032.4082,-369.3636 1181.8795,-382.3123 1271.7893,-393.7842"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1271.5415,-397.2814 1281.9096,-395.1013 1272.4449,-390.34 1271.5415,-397.2814"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Compatible&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data -->
-<g id="edge126" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Compatible&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data</title>
-<g id="a_edge126"><a xlink:title="at transport.go:41: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.I2PString).Data]">
-<path fill="none" stroke="#8b4513" d="M909.6315,-597.5663C925.578,-594.805 942.4084,-588.9361 953.8672,-577 1010.7301,-517.7687 942.6196,-462.4372 990.8672,-396 1031.278,-340.3542 1131.4563,-384.9778 1208.152,-358 1248.1067,-343.9459 1287.8679,-315.4092 1313.4884,-294.6312"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1315.8107,-297.2526 1321.2922,-288.1859 1311.3531,-291.8554 1315.8107,-297.2526"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Compatible&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle -->
-<g id="edge11" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Compatible&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle</title>
-<g id="a_edge11"><a xlink:title="at transport.go:41: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).TransportStyle]">
-<path fill="none" stroke="#8b4513" d="M909.9347,-596.1879C925.3565,-593.2153 941.7579,-587.5628 953.8672,-577 987.3902,-547.7583 954.0543,-508.9734 990.8672,-484 1007.291,-472.8583 1010.1204,-500.1159 1027.8672,-509 1036.2959,-513.2195 1045.4536,-517.0501 1054.5948,-520.4552"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1053.4891,-523.7768 1064.0837,-523.8481 1055.846,-517.1855 1053.4891,-523.7768"/>
-</a>
-</g>
-</g>
-<!-- (github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).CheckOption -->
-<g id="node86" class="node">
-<title>(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).CheckOption</title>
-<g id="a_node86"><a xlink:title="(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).CheckOption | defined in router_address.go:187">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M1159.4158,-496C1159.4158,-496 1076.6034,-496 1076.6034,-496 1070.6034,-496 1064.6034,-490 1064.6034,-484 1064.6034,-484 1064.6034,-472 1064.6034,-472 1064.6034,-466 1070.6034,-460 1076.6034,-460 1076.6034,-460 1159.4158,-460 1159.4158,-460 1165.4158,-460 1171.4158,-466 1171.4158,-472 1171.4158,-472 1171.4158,-484 1171.4158,-484 1171.4158,-490 1165.4158,-496 1159.4158,-496"/>
-<text text-anchor="middle" x="1118.0096" y="-482.2" font-family="Verdana" font-size="14.00" fill="#000000">router_address</text>
-<text text-anchor="middle" x="1118.0096" y="-465.4" font-family="Verdana" font-size="14.00" fill="#000000">CheckOption</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Compatible&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).CheckOption -->
-<g id="edge17" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).Compatible&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).CheckOption</title>
-<g id="a_edge17"><a xlink:title="at transport.go:47: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).CheckOption]&#10;at transport.go:47: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).CheckOption]&#10;at transport.go:47: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_address.RouterAddress).CheckOption]">
-<path fill="none" stroke="#8b4513" d="M909.6184,-596.4356C925.1882,-593.5043 941.7684,-587.815 953.8672,-577 989.1985,-545.4179 951.9762,-504.078 990.8672,-477 1009.0864,-464.3148 1032.6135,-461.7509 1054.466,-463.3137"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1054.3945,-466.8241 1064.6946,-464.3429 1055.0953,-459.8593 1054.3945,-466.8241"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).processOptions -->
-<g id="node56" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).processOptions</title>
-<g id="a_node56"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).processOptions | defined in session_confirmed_new.go:264&#10;at session_confirmed_new.go:267: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int]&#10;at session_confirmed_new.go:269: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width=".5" d="M643.6858,-243C643.6858,-243 557.0622,-243 557.0622,-243 551.0622,-243 545.0622,-237 545.0622,-231 545.0622,-231 545.0622,-219 545.0622,-219 545.0622,-213 551.0622,-207 557.0622,-207 557.0622,-207 643.6858,-207 643.6858,-207 649.6858,-207 655.6858,-213 655.6858,-219 655.6858,-219 655.6858,-231 655.6858,-231 655.6858,-237 649.6858,-243 643.6858,-243"/>
-<text text-anchor="middle" x="600.374" y="-220.8" font-family="Verdana" font-size="14.00" fill="#000000">processOptions</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).processOptions&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge133" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).processOptions&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge133"><a xlink:title="at session_confirmed_new.go:269: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M655.6364,-237.9636C735.1985,-259.6942 880.4953,-311.4396 953.8672,-413 963.7121,-426.6272 1081.9709,-930.7819 1111.4072,-1056.7169"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1108.0663,-1057.8016 1113.7498,-1066.743 1114.8827,-1056.2089 1108.0663,-1057.8016"/>
-</a>
-</g>
-</g>
-<!-- (github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int -->
-<g id="node82" class="node">
-<title>(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int</title>
-<g id="a_node82"><a xlink:title="(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int | defined in integer.go:32">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M879.9071,-2738C879.9071,-2738 849.9071,-2738 849.9071,-2738 843.9071,-2738 837.9071,-2732 837.9071,-2726 837.9071,-2726 837.9071,-2714 837.9071,-2714 837.9071,-2708 843.9071,-2702 849.9071,-2702 849.9071,-2702 879.9071,-2702 879.9071,-2702 885.9071,-2702 891.9071,-2708 891.9071,-2714 891.9071,-2714 891.9071,-2726 891.9071,-2726 891.9071,-2732 885.9071,-2738 879.9071,-2738"/>
-<text text-anchor="middle" x="864.9071" y="-2724.2" font-family="Verdana" font-size="14.00" fill="#000000">data</text>
-<text text-anchor="middle" x="864.9071" y="-2707.4" font-family="Verdana" font-size="14.00" fill="#000000">Int</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).processOptions&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int -->
-<g id="edge97" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).processOptions&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int</title>
-<g id="a_edge97"><a xlink:title="at session_confirmed_new.go:267: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int]">
-<path fill="none" stroke="#8b4513" d="M655.6221,-229.0494C673.5128,-233.2673 691.6381,-241.2287 702.947,-256 744.1332,-309.7958 736.9226,-1407.2785 738.947,-1475 743.0092,-1610.8904 690.5358,-2592.2285 775.947,-2698 788.2029,-2713.1775 809.1272,-2718.8629 827.6042,-2720.6672"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="827.6295,-2724.1757 837.8308,-2721.3149 828.072,-2717.1897 827.6295,-2724.1757"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ObfuscateKey -->
-<g id="node57" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ObfuscateKey</title>
-<g id="a_node57"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ObfuscateKey | defined in session_confirmed_new.go:140&#10;at session_confirmed_new.go:150: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ObfuscateEphemeral]&#10;at session_confirmed_new.go:143: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M354.8375,-487C354.8375,-487 274.7027,-487 274.7027,-487 268.7027,-487 262.7027,-481 262.7027,-475 262.7027,-475 262.7027,-463 262.7027,-463 262.7027,-457 268.7027,-451 274.7027,-451 274.7027,-451 354.8375,-451 354.8375,-451 360.8375,-451 366.8375,-457 366.8375,-463 366.8375,-463 366.8375,-475 366.8375,-475 366.8375,-481 360.8375,-487 354.8375,-487"/>
-<text text-anchor="middle" x="314.7701" y="-464.8" font-family="Verdana" font-size="14.00" fill="#000000">ObfuscateKey</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ObfuscateKey&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge55" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ObfuscateKey&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge55"><a xlink:title="at session_confirmed_new.go:143: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M366.9864,-467.8728C385.5829,-470.2985 404.9906,-476.6069 417.4805,-491 508.1462,-595.4816 378.2591,-1000.9887 460.801,-1112 527.4287,-1201.6082 614.659,-1110.6326 702.947,-1179 752.0052,-1216.9891 721.0564,-1269.0707 775.947,-1298 845.9017,-1334.8686 895.1255,-1350.9375 953.8672,-1298 1012.7876,-1244.9015 931.9468,-996.0985 990.8672,-943 1038.7856,-899.8164 1087.449,-1004.7359 1107.938,-1057.2456"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1104.7067,-1058.5952 1111.5406,-1066.6914 1111.2472,-1056.1006 1104.7067,-1058.5952"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ObfuscateKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ObfuscateEphemeral -->
-<g id="edge49" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ObfuscateKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ObfuscateEphemeral</title>
-<g id="a_edge49"><a xlink:title="at session_confirmed_new.go:150: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ObfuscateEphemeral]">
-<path fill="none" stroke="#000000" d="M316.545,-487.1845C332.3643,-648.5505 449.7154,-1830.7507 497.801,-1887 503.9101,-1894.1462 511.6195,-1899.6388 520.0562,-1903.8525"/>
-<polygon fill="#000000" stroke="#000000" points="518.8891,-1907.1615 529.4553,-1907.9404 521.681,-1900.7424 518.8891,-1907.1615"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).CreateMessage -->
-<g id="node58" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).CreateMessage</title>
-<g id="a_node58"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).CreateMessage | defined in session_confirmed_new.go:55&#10;at session_confirmed_new.go:62: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey]&#10;at session_confirmed_new.go:75: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewIntegerFromInt]&#10;at session_confirmed_new.go:75: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).calculatePaddingLength]&#10;at session_confirmed_new.go:86: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int]&#10;at session_confirmed_new.go:87: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M357.2804,-365C357.2804,-365 272.2598,-365 272.2598,-365 266.2598,-365 260.2598,-359 260.2598,-353 260.2598,-353 260.2598,-341 260.2598,-341 260.2598,-335 266.2598,-329 272.2598,-329 272.2598,-329 357.2804,-329 357.2804,-329 363.2804,-329 369.2804,-335 369.2804,-341 369.2804,-341 369.2804,-353 369.2804,-353 369.2804,-359 363.2804,-365 357.2804,-365"/>
-<text text-anchor="middle" x="314.7701" y="-342.8" font-family="Verdana" font-size="14.00" fill="#000000">CreateMessage</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).CreateMessage&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewIntegerFromInt -->
-<g id="edge69" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).CreateMessage&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewIntegerFromInt</title>
-<g id="a_edge69"><a xlink:title="at session_confirmed_new.go:75: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewIntegerFromInt]">
-<path fill="none" stroke="#8b4513" d="M369.4595,-350.9784C387.5382,-355.1686 405.9565,-363.1305 417.4805,-378 453.4826,-424.4537 457.8909,-1376.3006 460.801,-1435 474.8211,-1717.7973 428.0386,-1796.5841 497.801,-2071 516.3969,-2144.1484 559.739,-2222.4866 583.703,-2262.3562"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="580.7436,-2264.2259 588.9295,-2270.9522 586.7249,-2260.5892 580.7436,-2264.2259"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).CreateMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey -->
-<g id="edge37" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).CreateMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey</title>
-<g id="a_edge37"><a xlink:title="at session_confirmed_new.go:62: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Transport).LocalStaticKey]">
-<path fill="none" stroke="#000000" d="M369.512,-351.2106C387.4833,-355.4339 405.8183,-363.3574 417.4805,-378 506.4262,-489.677 356.4997,-921.5098 460.801,-1019 524.2387,-1078.2951 442.8771,-697.2578 497.801,-630 507.2181,-618.4681 520.772,-611.1168 534.9557,-606.4591"/>
-<polygon fill="#000000" stroke="#000000" points="536.1736,-609.7516 544.8328,-603.6467 534.2565,-603.0192 536.1736,-609.7516"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).calculatePaddingLength -->
-<g id="node59" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).calculatePaddingLength</title>
-<g id="a_node59"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).calculatePaddingLength | defined in session_confirmed_new.go:284&#10;at session_confirmed_new.go:303: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.Intn]&#10;at session_confirmed_new.go:285: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).Bytes]">
-<path fill="#add8e6" stroke="#000000" stroke-width=".5" d="M668.1647,-365C668.1647,-365 532.5833,-365 532.5833,-365 526.5833,-365 520.5833,-359 520.5833,-353 520.5833,-353 520.5833,-341 520.5833,-341 520.5833,-335 526.5833,-329 532.5833,-329 532.5833,-329 668.1647,-329 668.1647,-329 674.1647,-329 680.1647,-335 680.1647,-341 680.1647,-341 680.1647,-353 680.1647,-353 680.1647,-359 674.1647,-365 668.1647,-365"/>
-<text text-anchor="middle" x="600.374" y="-342.8" font-family="Verdana" font-size="14.00" fill="#000000">calculatePaddingLength</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).CreateMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).calculatePaddingLength -->
-<g id="edge104" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).CreateMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).calculatePaddingLength</title>
-<g id="a_edge104"><a xlink:title="at session_confirmed_new.go:75: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).calculatePaddingLength]">
-<path fill="none" stroke="#000000" d="M369.4995,-347C409.4126,-347 464.3855,-347 510.6767,-347"/>
-<polygon fill="#000000" stroke="#000000" points="510.717,-350.5001 520.7169,-347 510.7169,-343.5001 510.717,-350.5001"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).CreateMessage&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int -->
-<g id="edge116" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).CreateMessage&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int</title>
-<g id="a_edge116"><a xlink:title="at session_confirmed_new.go:86: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int]&#10;at session_confirmed_new.go:87: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int]">
-<path fill="none" stroke="#8b4513" d="M369.5179,-351.2059C387.4898,-355.4287 405.8237,-363.3532 417.4805,-378 462.4163,-434.4619 452.798,-954.2844 460.801,-1026 472.5758,-1131.5152 428.0813,-1181.9297 497.801,-1262 560.349,-1333.8339 644.1998,-1249.0257 702.947,-1324 750.4342,-1384.6042 734.8615,-1939.1156 738.947,-2016 747.0008,-2167.5646 679.1848,-2581.0651 775.947,-2698 788.2987,-2712.9267 809.0293,-2718.6306 827.3724,-2720.5084"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="827.3157,-2724.0126 837.5312,-2721.2028 827.7931,-2717.0289 827.3157,-2724.0126"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).calculatePaddingLength&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.Intn -->
-<g id="edge74" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).calculatePaddingLength&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.Intn</title>
-<g id="a_edge74"><a xlink:title="at session_confirmed_new.go:303: calling [github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.Intn]">
-<path fill="none" stroke="#000000" d="M680.0319,-332.3876C688.4561,-328.4165 696.3419,-323.3813 702.947,-317 769.8001,-252.4117 705.1837,-181.2789 775.947,-121 790.0888,-108.9535 809.8374,-103.3193 827.136,-100.754"/>
-<polygon fill="#000000" stroke="#000000" points="827.9997,-104.1762 837.5182,-99.5235 827.1758,-97.2249 827.9997,-104.1762"/>
-</a>
-</g>
-</g>
-<!-- (github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).Bytes -->
-<g id="node87" class="node">
-<title>(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).Bytes</title>
-<g id="a_node87"><a xlink:title="(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).Bytes | defined in router_info.go:129">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M896.3847,-195C896.3847,-195 833.4295,-195 833.4295,-195 827.4295,-195 821.4295,-189 821.4295,-183 821.4295,-183 821.4295,-171 821.4295,-171 821.4295,-165 827.4295,-159 833.4295,-159 833.4295,-159 896.3847,-159 896.3847,-159 902.3847,-159 908.3847,-165 908.3847,-171 908.3847,-171 908.3847,-183 908.3847,-183 908.3847,-189 902.3847,-195 896.3847,-195"/>
-<text text-anchor="middle" x="864.9071" y="-181.2" font-family="Verdana" font-size="14.00" fill="#000000">router_info</text>
-<text text-anchor="middle" x="864.9071" y="-164.4" font-family="Verdana" font-size="14.00" fill="#000000">Bytes</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).calculatePaddingLength&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).Bytes -->
-<g id="edge110" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).calculatePaddingLength&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).Bytes</title>
-<g id="a_edge110"><a xlink:title="at session_confirmed_new.go:285: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).Bytes]">
-<path fill="none" stroke="#8b4513" d="M680.1807,-332.1558C688.5276,-328.2231 696.3544,-323.2603 702.947,-317 738.1119,-283.6078 703.8016,-247.4127 738.947,-214 758.3287,-195.5738 786.4044,-186.2657 811.133,-181.5883"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="811.851,-185.0168 821.1321,-179.9069 810.6901,-178.1137 811.851,-185.0168"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ReadMessage -->
-<g id="node60" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ReadMessage</title>
-<g id="a_node60"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ReadMessage | defined in session_confirmed_new.go:180&#10;at session_confirmed_new.go:211: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptWithAssociatedData]&#10;at session_confirmed_new.go:184: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:190: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:195: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:201: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:207: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:218: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:240: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:188: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeobfuscateEphemeral]&#10;at session_confirmed_new.go:238: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.ReadRouterInfo]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M353.5138,-426C353.5138,-426 276.0264,-426 276.0264,-426 270.0264,-426 264.0264,-420 264.0264,-414 264.0264,-414 264.0264,-402 264.0264,-402 264.0264,-396 270.0264,-390 276.0264,-390 276.0264,-390 353.5138,-390 353.5138,-390 359.5138,-390 365.5138,-396 365.5138,-402 365.5138,-402 365.5138,-414 365.5138,-414 365.5138,-420 359.5138,-426 353.5138,-426"/>
-<text text-anchor="middle" x="314.7701" y="-403.8" font-family="Verdana" font-size="14.00" fill="#000000">ReadMessage</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ReadMessage&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge6" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ReadMessage&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge6"><a xlink:title="at session_confirmed_new.go:184: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:190: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:195: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:201: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:207: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:218: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:240: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M365.5288,-411.8506C384.5079,-415.911 404.5694,-423.8175 417.4805,-439 593.4866,-645.9701 335.8827,-826.8321 497.801,-1045 557.462,-1125.387 632.0911,-1067.2826 702.947,-1138 750.6736,-1185.6333 716.2949,-1239.5612 775.947,-1271 810.9244,-1289.4343 924.4108,-1297.3735 953.8672,-1271 1009.5024,-1221.1877 935.232,-986.8123 990.8672,-937 1040.2997,-892.7412 1088.5208,-1002.8559 1108.4446,-1057.0202"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1105.2614,-1058.5119 1111.9369,-1066.7392 1111.849,-1056.1447 1105.2614,-1058.5119"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ReadMessage&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.ReadRouterInfo -->
-<g id="edge137" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ReadMessage&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.ReadRouterInfo</title>
-<g id="a_edge137"><a xlink:title="at session_confirmed_new.go:238: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.ReadRouterInfo]">
-<path fill="none" stroke="#8b4513" d="M365.7502,-419.6008C382.698,-424.4382 401.3506,-430.8602 417.4805,-439 457.2607,-459.0747 457.2328,-480.5695 497.801,-499 508.8124,-504.0026 521.013,-507.8901 533.0449,-510.9046"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="532.5496,-514.3826 543.0823,-513.2366 534.1338,-507.5643 532.5496,-514.3826"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ReadMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptWithAssociatedData -->
-<g id="edge2" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ReadMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptWithAssociatedData</title>
-<g id="a_edge2"><a xlink:title="at session_confirmed_new.go:211: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptWithAssociatedData]">
-<path fill="none" stroke="#000000" d="M365.6638,-411.1947C384.9012,-415.1377 405.1138,-423.1341 417.4805,-439 481.143,-520.6762 425.1274,-1272.7821 460.801,-1370 484.2129,-1433.8021 538.7701,-1493.248 572.32,-1525.6093"/>
-<polygon fill="#000000" stroke="#000000" points="570.2945,-1528.5125 579.957,-1532.8585 575.1137,-1523.4355 570.2945,-1528.5125"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ReadMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeobfuscateEphemeral -->
-<g id="edge56" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ReadMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeobfuscateEphemeral</title>
-<g id="a_edge56"><a xlink:title="at session_confirmed_new.go:188: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DeobfuscateEphemeral]">
-<path fill="none" stroke="#000000" d="M365.6666,-411.1926C384.9044,-415.1352 405.1165,-423.1319 417.4805,-439 481.6064,-521.3001 449.1029,-1273.3246 460.801,-1377 465.9913,-1422.9997 466.8474,-1547.5792 497.801,-1582 502.4689,-1587.1907 507.9803,-1591.5037 513.9865,-1595.0848"/>
-<polygon fill="#000000" stroke="#000000" points="512.613,-1598.3155 523.0998,-1599.8248 515.8431,-1592.1053 512.613,-1598.3155"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).EncryptPayload -->
-<g id="node61" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).EncryptPayload</title>
-<g id="a_node61"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).EncryptPayload | defined in session_confirmed_new.go:100&#10;at session_confirmed_new.go:110: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.ConfirmedOptions).Data]&#10;at session_confirmed_new.go:105: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).Bytes]&#10;at session_confirmed_new.go:103: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:107: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:116: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithAssociatedData]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M359.6917,-304C359.6917,-304 269.8485,-304 269.8485,-304 263.8485,-304 257.8485,-298 257.8485,-292 257.8485,-292 257.8485,-280 257.8485,-280 257.8485,-274 263.8485,-268 269.8485,-268 269.8485,-268 359.6917,-268 359.6917,-268 365.6917,-268 371.6917,-274 371.6917,-280 371.6917,-280 371.6917,-292 371.6917,-292 371.6917,-298 365.6917,-304 359.6917,-304"/>
-<text text-anchor="middle" x="314.7701" y="-281.8" font-family="Verdana" font-size="14.00" fill="#000000">EncryptPayload</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).EncryptPayload&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge61" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).EncryptPayload&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge61"><a xlink:title="at session_confirmed_new.go:103: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:107: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M371.5863,-291.3736C388.6428,-295.7757 405.8814,-303.5139 417.4805,-317 499.171,-411.9803 436.2291,-765.8969 497.801,-875 555.7212,-977.6325 634.7326,-946.9012 702.947,-1043 757.7191,-1120.1615 698.4101,-1188.7606 775.947,-1243 808.3448,-1265.6632 924.3093,-1269.2597 953.8672,-1243 1058.2586,-1150.2568 886.4758,-1023.7432 990.8672,-931 1041.9863,-885.5849 1089.8029,-1001.5497 1109.065,-1057.1927"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1105.8043,-1058.4764 1112.3236,-1066.8279 1112.4353,-1056.2337 1105.8043,-1058.4764"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).EncryptPayload&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithAssociatedData -->
-<g id="edge132" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).EncryptPayload&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithAssociatedData</title>
-<g id="a_edge132"><a xlink:title="at session_confirmed_new.go:116: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithAssociatedData]">
-<path fill="none" stroke="#000000" d="M371.6239,-290.4823C389.0027,-294.7974 406.4261,-302.7091 417.4805,-317 455.1378,-365.6823 454.4581,-1362.7806 460.801,-1424 465.8876,-1473.0935 465.0041,-1606.1162 497.801,-1643 499.581,-1645.0018 501.4864,-1646.8732 503.4975,-1648.6226"/>
-<polygon fill="#000000" stroke="#000000" points="501.6318,-1651.5977 511.7365,-1654.7828 505.8235,-1645.9915 501.6318,-1651.5977"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.ConfirmedOptions).Data -->
-<g id="node76" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.ConfirmedOptions).Data</title>
-<g id="a_node76"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.ConfirmedOptions).Data | defined in session_confirmed.go:293">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M626.7423,-157C626.7423,-157 574.0057,-157 574.0057,-157 568.0057,-157 562.0057,-151 562.0057,-145 562.0057,-145 562.0057,-133 562.0057,-133 562.0057,-127 568.0057,-121 574.0057,-121 574.0057,-121 626.7423,-121 626.7423,-121 632.7423,-121 638.7423,-127 638.7423,-133 638.7423,-133 638.7423,-145 638.7423,-145 638.7423,-151 632.7423,-157 626.7423,-157"/>
-<text text-anchor="middle" x="600.374" y="-143.2" font-family="Verdana" font-size="14.00" fill="#000000">messages</text>
-<text text-anchor="middle" x="600.374" y="-126.4" font-family="Verdana" font-size="14.00" fill="#000000">Data</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).EncryptPayload&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.ConfirmedOptions).Data -->
-<g id="edge16" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).EncryptPayload&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.ConfirmedOptions).Data</title>
-<g id="a_edge16"><a xlink:title="at session_confirmed_new.go:110: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.ConfirmedOptions).Data]">
-<path fill="none" stroke="#8b4513" d="M371.5241,-275.4238C387.1695,-270.9493 403.6334,-264.6891 417.4805,-256 462.6129,-227.6794 452.4198,-194.9202 497.801,-167 514.0421,-157.0079 533.8777,-150.5206 551.7624,-146.3366"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="552.7045,-149.714 561.7428,-144.186 551.2299,-142.8711 552.7045,-149.714"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).EncryptPayload&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).Bytes -->
-<g id="edge53" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).EncryptPayload&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).Bytes</title>
-<g id="a_edge53"><a xlink:title="at session_confirmed_new.go:105: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/router_info.RouterInfo).Bytes]">
-<path fill="none" stroke="#8b4513" d="M371.5308,-278.485C387.7952,-274.0742 404.5918,-267.0817 417.4805,-256 481.7596,-200.733 426.3432,-128.6074 497.801,-83 517.0151,-70.7368 681.8581,-74.3498 702.947,-83 745.1082,-100.2937 736.1863,-132.735 775.947,-155 786.6835,-161.0122 799.0526,-165.3996 811.0879,-168.5953"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="810.5335,-172.062 821.0758,-171.0089 812.1778,-165.2579 810.5335,-172.062"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ProcessMessage -->
-<g id="node62" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ProcessMessage</title>
-<g id="a_node62"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ProcessMessage | defined in session_confirmed_new.go:154&#10;at session_confirmed_new.go:157: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:162: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:168: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:161: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).validateRouterInfo]&#10;at session_confirmed_new.go:167: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).processOptions]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M360.5096,-243C360.5096,-243 269.0306,-243 269.0306,-243 263.0306,-243 257.0306,-237 257.0306,-231 257.0306,-231 257.0306,-219 257.0306,-219 257.0306,-213 263.0306,-207 269.0306,-207 269.0306,-207 360.5096,-207 360.5096,-207 366.5096,-207 372.5096,-213 372.5096,-219 372.5096,-219 372.5096,-231 372.5096,-231 372.5096,-237 366.5096,-243 360.5096,-243"/>
-<text text-anchor="middle" x="314.7701" y="-220.8" font-family="Verdana" font-size="14.00" fill="#000000">ProcessMessage</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ProcessMessage&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge26" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ProcessMessage&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge26"><a xlink:title="at session_confirmed_new.go:157: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:162: calling [github.com/samber/oops.Errorf]&#10;at session_confirmed_new.go:168: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M372.7061,-234.9467C388.2835,-239.5513 404.4163,-246.2559 417.4805,-256 469.5185,-294.8129 447.6752,-336.7471 497.801,-378 535.8377,-409.3037 551.1123,-420 600.374,-420 600.374,-420 600.374,-420 739.447,-420 839.8334,-420 884.6855,-418.2584 953.8672,-491 994.5813,-533.8092 1087.2293,-944.928 1111.8867,-1056.9389"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1108.4935,-1057.8057 1114.0566,-1066.8225 1115.3307,-1056.3045 1108.4935,-1057.8057"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ProcessMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).processOptions -->
-<g id="edge95" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ProcessMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).processOptions</title>
-<g id="a_edge95"><a xlink:title="at session_confirmed_new.go:167: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).processOptions]">
-<path fill="none" stroke="#000000" d="M372.5663,-225C419.5877,-225 485.9422,-225 534.9163,-225"/>
-<polygon fill="#000000" stroke="#000000" points="535.0899,-228.5001 545.0898,-225 535.0898,-221.5001 535.0899,-228.5001"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).validateRouterInfo -->
-<g id="node63" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).validateRouterInfo</title>
-<g id="a_node63"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).validateRouterInfo | defined in session_confirmed_new.go:258">
-<path fill="#add8e6" stroke="#000000" stroke-width=".5" d="M653.1135,-304C653.1135,-304 547.6345,-304 547.6345,-304 541.6345,-304 535.6345,-298 535.6345,-292 535.6345,-292 535.6345,-280 535.6345,-280 535.6345,-274 541.6345,-268 547.6345,-268 547.6345,-268 653.1135,-268 653.1135,-268 659.1135,-268 665.1135,-274 665.1135,-280 665.1135,-280 665.1135,-292 665.1135,-292 665.1135,-298 659.1135,-304 653.1135,-304"/>
-<text text-anchor="middle" x="600.374" y="-281.8" font-family="Verdana" font-size="14.00" fill="#000000">validateRouterInfo</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ProcessMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).validateRouterInfo -->
-<g id="edge28" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).ProcessMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).validateRouterInfo</title>
-<g id="a_edge28"><a xlink:title="at session_confirmed_new.go:161: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionConfirmedProcessor).validateRouterInfo]">
-<path fill="none" stroke="#000000" d="M372.5663,-237.3443C416.6203,-246.7534 477.6444,-259.7871 525.4461,-269.9967"/>
-<polygon fill="#000000" stroke="#000000" points="524.9244,-273.4642 535.4349,-272.1301 526.3866,-266.6186 524.9244,-273.4642"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).ObfuscateKey -->
-<g id="node64" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).ObfuscateKey</title>
-<g id="a_node64"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).ObfuscateKey | defined in session_created_new.go:109&#10;at session_created_new.go:112: calling [github.com/samber/oops.Errorf]&#10;at session_created_new.go:118: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ObfuscateEphemeral]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M354.8375,-2175C354.8375,-2175 274.7027,-2175 274.7027,-2175 268.7027,-2175 262.7027,-2169 262.7027,-2163 262.7027,-2163 262.7027,-2151 262.7027,-2151 262.7027,-2145 268.7027,-2139 274.7027,-2139 274.7027,-2139 354.8375,-2139 354.8375,-2139 360.8375,-2139 366.8375,-2145 366.8375,-2151 366.8375,-2151 366.8375,-2163 366.8375,-2163 366.8375,-2169 360.8375,-2175 354.8375,-2175"/>
-<text text-anchor="middle" x="314.7701" y="-2152.8" font-family="Verdana" font-size="14.00" fill="#000000">ObfuscateKey</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).ObfuscateKey&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge76" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).ObfuscateKey&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge76"><a xlink:title="at session_created_new.go:112: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M366.9332,-2148.9549C447.941,-2139.5054 604.852,-2133.7594 702.947,-2211 738.2219,-2238.7757 725.4959,-2262.4916 739.947,-2305 758.5554,-2359.7371 729.7548,-2395.2336 775.947,-2430 807.5371,-2453.7762 925.436,-2457.4756 953.8672,-2430 997.1177,-2388.2032 976.4392,-1406.3901 990.8672,-1348 1013.6778,-1255.6853 1071.2789,-1157.513 1100.4713,-1111.585"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1103.4533,-1113.4188 1105.9123,-1103.1133 1097.5634,-1109.636 1103.4533,-1113.4188"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).ObfuscateKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ObfuscateEphemeral -->
-<g id="edge134" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).ObfuscateKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ObfuscateEphemeral</title>
-<g id="a_edge134"><a xlink:title="at session_created_new.go:118: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ObfuscateEphemeral]">
-<path fill="none" stroke="#000000" d="M354.3791,-2138.7882C374.5978,-2128.3251 398.8002,-2113.906 417.4805,-2097 442.3274,-2074.5132 445.4904,-2065.2744 461.801,-2036 482.3683,-1999.0857 466.538,-1976.4307 497.801,-1948 504.3509,-1942.0435 512.0103,-1937.2303 520.1403,-1933.3412"/>
-<polygon fill="#000000" stroke="#000000" points="521.6758,-1936.491 529.4853,-1929.3312 518.9154,-1930.0582 521.6758,-1936.491"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).CreateMessage -->
-<g id="node65" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).CreateMessage</title>
-<g id="a_node65"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).CreateMessage | defined in session_created_new.go:46&#10;at session_created_new.go:50: calling [github.com/samber/oops.Errorf]&#10;at session_created_new.go:57: calling [github.com/samber/oops.Errorf]&#10;at session_created_new.go:62: calling [github.com/samber/oops.Errorf]&#10;at session_created_new.go:68: calling [github.com/samber/oops.Errorf]&#10;at session_created_new.go:72: calling [github.com/samber/oops.Errorf]&#10;at session_created_new.go:66: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper).GetCurrentTime]&#10;at session_created_new.go:66: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.DateFromTime]&#10;at session_created_new.go:70: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewIntegerFromInt]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M357.2804,-2297C357.2804,-2297 272.2598,-2297 272.2598,-2297 266.2598,-2297 260.2598,-2291 260.2598,-2285 260.2598,-2285 260.2598,-2273 260.2598,-2273 260.2598,-2267 266.2598,-2261 272.2598,-2261 272.2598,-2261 357.2804,-2261 357.2804,-2261 363.2804,-2261 369.2804,-2267 369.2804,-2273 369.2804,-2273 369.2804,-2285 369.2804,-2285 369.2804,-2291 363.2804,-2297 357.2804,-2297"/>
-<text text-anchor="middle" x="314.7701" y="-2274.8" font-family="Verdana" font-size="14.00" fill="#000000">CreateMessage</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).CreateMessage&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge43" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).CreateMessage&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge43"><a xlink:title="at session_created_new.go:50: calling [github.com/samber/oops.Errorf]&#10;at session_created_new.go:57: calling [github.com/samber/oops.Errorf]&#10;at session_created_new.go:62: calling [github.com/samber/oops.Errorf]&#10;at session_created_new.go:68: calling [github.com/samber/oops.Errorf]&#10;at session_created_new.go:72: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M369.5773,-2268.0671C463.6982,-2250.5934 650.9622,-2221.92 702.947,-2259 743.5112,-2287.9338 735.3828,-2442.0662 775.947,-2471 840.324,-2516.9191 896.9429,-2525.887 953.8672,-2471 994.4869,-2431.834 980.5822,-1511.4811 990.8672,-1456 1015.5547,-1322.8263 1078.6454,-1172.6044 1105.5499,-1112.241"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1108.7899,-1113.5698 1109.6939,-1103.0136 1102.4043,-1110.7019 1108.7899,-1113.5698"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).CreateMessage&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewIntegerFromInt -->
-<g id="edge100" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).CreateMessage&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewIntegerFromInt</title>
-<g id="a_edge100"><a xlink:title="at session_created_new.go:70: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewIntegerFromInt]">
-<path fill="none" stroke="#8b4513" d="M369.4995,-2280.9163C412.7474,-2282.4305 473.6768,-2284.5639 522.0842,-2286.2588"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="522.0965,-2289.7613 532.2129,-2286.6134 522.3415,-2282.7656 522.0965,-2289.7613"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).CreateMessage&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/data.DateFromTime -->
-<g id="edge99" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).CreateMessage&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/data.DateFromTime</title>
-<g id="a_edge99"><a xlink:title="at session_created_new.go:66: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.DateFromTime]">
-<path fill="none" stroke="#8b4513" d="M369.3186,-2283.7116C385.6749,-2286.9094 403.0788,-2292.2174 417.4805,-2301 465.561,-2330.3207 457.8554,-2359.3038 497.801,-2399 519.3655,-2420.4299 546.1384,-2441.9473 566.9238,-2457.7021"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="565.0454,-2460.6684 575.1448,-2463.8706 569.2467,-2455.0693 565.0454,-2460.6684"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).CreateMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper).GetCurrentTime -->
-<g id="edge51" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).CreateMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper).GetCurrentTime</title>
-<g id="a_edge51"><a xlink:title="at session_created_new.go:66: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper).GetCurrentTime]">
-<path fill="none" stroke="#8b4513" d="M369.4096,-2269.5288C385.7699,-2265.0346 403.1532,-2258.4868 417.4805,-2249 442.8468,-2232.2038 433.3118,-2209.0348 460.801,-2196 558.0431,-2149.89 600.0417,-2164.4936 702.947,-2196 721.9238,-2201.8101 726.45,-2206.4498 739.947,-2221 761.8787,-2244.6431 753.4466,-2260.8973 775.947,-2284 787.7431,-2296.1118 802.802,-2306.5844 817.1623,-2314.9977"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="815.5478,-2318.1054 825.9779,-2319.9664 818.9848,-2312.0073 815.5478,-2318.1054"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).EncryptPayload -->
-<g id="node66" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).EncryptPayload</title>
-<g id="a_node66"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).EncryptPayload | defined in session_created_new.go:90&#10;at session_created_new.go:97: calling [github.com/samber/oops.Errorf]&#10;at session_created_new.go:102: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.CreatedOptions).Data]&#10;at session_created_new.go:100: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithAssociatedData]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M359.6917,-2236C359.6917,-2236 269.8485,-2236 269.8485,-2236 263.8485,-2236 257.8485,-2230 257.8485,-2224 257.8485,-2224 257.8485,-2212 257.8485,-2212 257.8485,-2206 263.8485,-2200 269.8485,-2200 269.8485,-2200 359.6917,-2200 359.6917,-2200 365.6917,-2200 371.6917,-2206 371.6917,-2212 371.6917,-2212 371.6917,-2224 371.6917,-2224 371.6917,-2230 365.6917,-2236 359.6917,-2236"/>
-<text text-anchor="middle" x="314.7701" y="-2213.8" font-family="Verdana" font-size="14.00" fill="#000000">EncryptPayload</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).EncryptPayload&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge48" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).EncryptPayload&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge48"><a xlink:title="at session_created_new.go:97: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M371.7195,-2202.9254C453.7162,-2184.8507 605.8268,-2165.3312 702.947,-2238 742.1692,-2267.3475 735.9825,-2417.6717 775.947,-2446 840.4593,-2491.7287 896.9449,-2500.8891 953.8672,-2446 994.5654,-2406.7555 979.9012,-1484.4637 990.8672,-1429 1015.1495,-1306.1847 1077.1356,-1169.0955 1104.5827,-1112.1109"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1107.7659,-1113.568 1108.9854,-1103.0436 1101.469,-1110.5104 1107.7659,-1113.568"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).EncryptPayload&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithAssociatedData -->
-<g id="edge131" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).EncryptPayload&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithAssociatedData</title>
-<g id="a_edge131"><a xlink:title="at session_created_new.go:100: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithAssociatedData]">
-<path fill="none" stroke="#000000" d="M371.6506,-2212.9942C388.6072,-2208.7384 405.7705,-2201.2032 417.4805,-2188 562.1666,-2024.8649 353.8765,-1867.8074 497.801,-1704 500.0112,-1701.4844 502.4177,-1699.1694 504.982,-1697.039"/>
-<polygon fill="#000000" stroke="#000000" points="507.0398,-1699.8703 513.1096,-1691.1865 502.9493,-1694.1898 507.0398,-1699.8703"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.CreatedOptions).Data -->
-<g id="node77" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.CreatedOptions).Data</title>
-<g id="a_node77"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.CreatedOptions).Data | defined in session_created.go:302">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M626.7423,-2385C626.7423,-2385 574.0057,-2385 574.0057,-2385 568.0057,-2385 562.0057,-2379 562.0057,-2373 562.0057,-2373 562.0057,-2361 562.0057,-2361 562.0057,-2355 568.0057,-2349 574.0057,-2349 574.0057,-2349 626.7423,-2349 626.7423,-2349 632.7423,-2349 638.7423,-2355 638.7423,-2361 638.7423,-2361 638.7423,-2373 638.7423,-2373 638.7423,-2379 632.7423,-2385 626.7423,-2385"/>
-<text text-anchor="middle" x="600.374" y="-2371.2" font-family="Verdana" font-size="14.00" fill="#000000">messages</text>
-<text text-anchor="middle" x="600.374" y="-2354.4" font-family="Verdana" font-size="14.00" fill="#000000">Data</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).EncryptPayload&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.CreatedOptions).Data -->
-<g id="edge88" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionCreatedProcessor).EncryptPayload&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.CreatedOptions).Data</title>
-<g id="a_edge88"><a xlink:title="at session_created_new.go:102: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.CreatedOptions).Data]">
-<path fill="none" stroke="#8b4513" d="M371.6502,-2228.5214C387.3824,-2233.1441 403.8605,-2239.7144 417.4805,-2249 463.4455,-2280.3371 449.6333,-2317.1673 497.801,-2345 514.0152,-2354.3691 533.7515,-2359.7611 551.565,-2362.8593"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="551.3743,-2366.371 561.79,-2364.4312 552.438,-2359.4523 551.3743,-2366.371"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ObfuscateKey -->
-<g id="node67" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ObfuscateKey</title>
-<g id="a_node67"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ObfuscateKey | defined in session_request_new.go:200&#10;at session_request_new.go:203: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:209: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ObfuscateEphemeral]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M121.937,-2725C121.937,-2725 41.8022,-2725 41.8022,-2725 35.8022,-2725 29.8022,-2719 29.8022,-2713 29.8022,-2713 29.8022,-2701 29.8022,-2701 29.8022,-2695 35.8022,-2689 41.8022,-2689 41.8022,-2689 121.937,-2689 121.937,-2689 127.937,-2689 133.937,-2695 133.937,-2701 133.937,-2701 133.937,-2713 133.937,-2713 133.937,-2719 127.937,-2725 121.937,-2725"/>
-<text text-anchor="middle" x="81.8696" y="-2702.8" font-family="Verdana" font-size="14.00" fill="#000000">ObfuscateKey</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ObfuscateKey&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge31" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ObfuscateKey&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge31"><a xlink:title="at session_request_new.go:203: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M125.9253,-2688.8841C131.0377,-2685.4815 135.8165,-2681.5372 139.7392,-2677 197.4772,-2610.2171 137.9571,-2539.9836 212.0597,-2492 305.2287,-2431.6703 354.6515,-2463.0322 461.801,-2492 479.6823,-2496.8342 480.6735,-2505.9459 497.801,-2513 615.8739,-2561.6291 649.2747,-2568.8708 775.947,-2585 815.1682,-2589.994 924.4595,-2611.4278 953.8672,-2585 1071.8905,-2478.936 979.9952,-2388.2344 991.8672,-2230 1019.6254,-1860.028 967.7961,-1762.1164 1027.8672,-1396 1045.4391,-1288.904 1087.7732,-1166.4668 1107.5282,-1112.734"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1110.8596,-1113.8166 1111.0538,-1103.2235 1104.2961,-1111.3834 1110.8596,-1113.8166"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ObfuscateKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ObfuscateEphemeral -->
-<g id="edge111" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ObfuscateKey&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ObfuscateEphemeral</title>
-<g id="a_edge111"><a xlink:title="at session_request_new.go:209: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ObfuscateEphemeral]">
-<path fill="none" stroke="#000000" d="M128.0092,-2688.826C132.5228,-2685.4777 136.5879,-2681.5626 139.7392,-2677 213.3039,-2570.4895 120.8269,-2190.8305 212.0597,-2099 277.0442,-2033.5898 339.5772,-2119.3208 417.4805,-2070 472.3305,-2035.2743 445.7702,-1986.8225 497.801,-1948 504.6061,-1942.9224 512.245,-1938.67 520.2041,-1935.1099"/>
-<polygon fill="#000000" stroke="#000000" points="521.7331,-1938.266 529.6638,-1931.2407 519.083,-1931.787 521.7331,-1938.266"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).CreateMessage -->
-<g id="node68" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).CreateMessage</title>
-<g id="a_node68"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).CreateMessage | defined in session_request_new.go:136&#10;at session_request_new.go:140: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:146: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:151: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:156: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:160: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:164: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:172: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:162: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewInteger]&#10;at session_request_new.go:170: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper).GetCurrentTime]&#10;at session_request_new.go:154: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewIntegerFromInt]&#10;at session_request_new.go:158: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewIntegerFromInt]&#10;at session_request_new.go:170: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.DateFromTime]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M124.3799,-2908C124.3799,-2908 39.3593,-2908 39.3593,-2908 33.3593,-2908 27.3593,-2902 27.3593,-2896 27.3593,-2896 27.3593,-2884 27.3593,-2884 27.3593,-2878 33.3593,-2872 39.3593,-2872 39.3593,-2872 124.3799,-2872 124.3799,-2872 130.3799,-2872 136.3799,-2878 136.3799,-2884 136.3799,-2884 136.3799,-2896 136.3799,-2896 136.3799,-2902 130.3799,-2908 124.3799,-2908"/>
-<text text-anchor="middle" x="81.8696" y="-2885.8" font-family="Verdana" font-size="14.00" fill="#000000">CreateMessage</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).CreateMessage&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge64" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).CreateMessage&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge64"><a xlink:title="at session_request_new.go:140: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:146: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:151: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:156: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:160: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:164: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:172: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M127.076,-2871.96C131.8745,-2868.5688 136.2626,-2864.6068 139.7392,-2860 188.3673,-2795.5628 149.5528,-2555.0856 212.0597,-2504 247.4058,-2475.1124 371.9025,-2501.4544 417.4805,-2504 453.346,-2506.0031 461.9549,-2510.6746 497.801,-2513 621.1821,-2521.0038 652.3116,-2516.8888 775.947,-2518 855.0195,-2518.7107 896.1417,-2572.0437 953.8672,-2518 1045.072,-2432.6123 1006.2392,-1519.0513 1027.8672,-1396 1046.6546,-1289.1105 1088.3709,-1166.5684 1107.7487,-1112.7715"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1111.083,-1113.8433 1111.2048,-1103.2492 1104.503,-1111.455 1111.083,-1113.8433"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).CreateMessage&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewIntegerFromInt -->
-<g id="edge91" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).CreateMessage&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewIntegerFromInt</title>
-<g id="a_edge91"><a xlink:title="at session_request_new.go:154: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewIntegerFromInt]&#10;at session_request_new.go:158: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewIntegerFromInt]">
-<path fill="none" stroke="#8b4513" d="M127.9901,-2871.8128C132.5071,-2868.4668 136.5782,-2864.5559 139.7392,-2860 177.6385,-2805.3773 162.2786,-2628.1062 175.7392,-2563 187.2798,-2507.1803 174.6064,-2482.9683 212.0597,-2440 291.8045,-2348.5129 433.8217,-2312.0851 522.2291,-2297.8431"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="522.8609,-2301.287 532.2051,-2296.2935 521.7864,-2294.37 522.8609,-2301.287"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).CreateMessage&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewInteger -->
-<g id="edge65" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).CreateMessage&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewInteger</title>
-<g id="a_edge65"><a xlink:title="at session_request_new.go:162: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewInteger]">
-<path fill="none" stroke="#8b4513" d="M136.8678,-2885.1207C236.4243,-2876.2884 445.4199,-2857.747 545.1452,-2848.8997"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="545.661,-2852.3678 555.3126,-2847.9977 545.0424,-2845.3952 545.661,-2852.3678"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).CreateMessage&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/data.DateFromTime -->
-<g id="edge136" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).CreateMessage&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/data.DateFromTime</title>
-<g id="a_edge136"><a xlink:title="at session_request_new.go:170: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.DateFromTime]">
-<path fill="none" stroke="#8b4513" d="M127.9715,-2871.7999C132.4917,-2868.4562 136.5687,-2864.5493 139.7392,-2860 213.2428,-2754.5313 141.0589,-2696.7889 175.7392,-2573 186.3826,-2535.0092 179.2216,-2513.8687 212.0597,-2492 309.2824,-2427.2541 452.708,-2445.5442 535.3079,-2464.146"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="534.5402,-2467.5608 545.0724,-2466.4105 536.1216,-2460.7418 534.5402,-2467.5608"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).CreateMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper).GetCurrentTime -->
-<g id="edge77" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).CreateMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper).GetCurrentTime</title>
-<g id="a_edge77"><a xlink:title="at session_request_new.go:170: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/util/time/sntp.RouterTimestamper).GetCurrentTime]">
-<path fill="none" stroke="#8b4513" d="M128.9751,-2908.1091C244.3566,-2949.0536 543.3054,-3033.9527 702.947,-2883 873.4793,-2721.7493 618.8193,-2534.3386 775.947,-2360 781.7653,-2353.5444 789.151,-2348.8421 797.1703,-2345.4387"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="798.5667,-2348.6571 806.8194,-2342.013 796.2246,-2342.0605 798.5667,-2348.6571"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ProcessMessage -->
-<g id="node69" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ProcessMessage</title>
-<g id="a_node69"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ProcessMessage | defined in session_request_new.go:68&#10;at session_request_new.go:71: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:75: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Date).Time]&#10;at session_request_new.go:81: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int]&#10;at session_request_new.go:87: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int]&#10;at session_request_new.go:75: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ValidateTimestamp]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M127.6091,-2847C127.6091,-2847 36.1301,-2847 36.1301,-2847 30.1301,-2847 24.1301,-2841 24.1301,-2835 24.1301,-2835 24.1301,-2823 24.1301,-2823 24.1301,-2817 30.1301,-2811 36.1301,-2811 36.1301,-2811 127.6091,-2811 127.6091,-2811 133.6091,-2811 139.6091,-2817 139.6091,-2823 139.6091,-2823 139.6091,-2835 139.6091,-2835 139.6091,-2841 133.6091,-2847 127.6091,-2847"/>
-<text text-anchor="middle" x="81.8696" y="-2824.8" font-family="Verdana" font-size="14.00" fill="#000000">ProcessMessage</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ProcessMessage&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge3" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ProcessMessage&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge3"><a xlink:title="at session_request_new.go:71: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M128.5579,-2810.8027C132.9123,-2807.4673 136.79,-2803.5616 139.7392,-2799 179.1923,-2737.9762 198.4011,-1564.3715 212.0597,-1493 239.1034,-1351.6863 170.8919,-1186 314.7701,-1186 314.7701,-1186 314.7701,-1186 461.301,-1186 568.9647,-1186 610.7977,-1147.3226 702.947,-1203 755.7295,-1234.8916 722.0774,-1290.9813 775.947,-1321 810.4844,-1340.2459 924.3933,-1347.3539 953.8672,-1321 1063.8865,-1222.6268 880.8479,-1089.3732 990.8672,-991 1028.2833,-957.5446 1077.11,-1019.8298 1101.9612,-1058.1609"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1099.1559,-1060.2735 1107.4575,-1066.8563 1105.0729,-1056.5333 1099.1559,-1060.2735"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ProcessMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ValidateTimestamp -->
-<g id="edge117" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ProcessMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ValidateTimestamp</title>
-<g id="a_edge117"><a xlink:title="at session_request_new.go:75: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ValidateTimestamp]">
-<path fill="none" stroke="#000000" d="M128.07,-2810.8677C132.573,-2807.5121 136.6189,-2803.5839 139.7392,-2799 183.612,-2734.5482 167.7267,-2527.5543 175.7392,-2450 183.7979,-2371.9987 169.5718,-2164.9084 212.0597,-2099 222.3032,-2083.11 238.3552,-2070.9118 254.7514,-2061.797"/>
-<polygon fill="#000000" stroke="#000000" points="256.6126,-2064.7738 263.8612,-2057.0466 253.376,-2058.567 256.6126,-2064.7738"/>
-</a>
-</g>
-</g>
-<!-- (github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Date).Time -->
-<g id="node80" class="node">
-<title>(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Date).Time</title>
-<g id="a_node80"><a xlink:title="(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Date).Time | defined in date.go:47">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M615.374,-2774C615.374,-2774 585.374,-2774 585.374,-2774 579.374,-2774 573.374,-2768 573.374,-2762 573.374,-2762 573.374,-2750 573.374,-2750 573.374,-2744 579.374,-2738 585.374,-2738 585.374,-2738 615.374,-2738 615.374,-2738 621.374,-2738 627.374,-2744 627.374,-2750 627.374,-2750 627.374,-2762 627.374,-2762 627.374,-2768 621.374,-2774 615.374,-2774"/>
-<text text-anchor="middle" x="600.374" y="-2760.2" font-family="Verdana" font-size="14.00" fill="#000000">data</text>
-<text text-anchor="middle" x="600.374" y="-2743.4" font-family="Verdana" font-size="14.00" fill="#000000">Time</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ProcessMessage&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Date).Time -->
-<g id="edge52" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ProcessMessage&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Date).Time</title>
-<g id="a_edge52"><a xlink:title="at session_request_new.go:75: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Date).Time]">
-<path fill="none" stroke="#8b4513" d="M139.8394,-2820.8385C247.2376,-2805.7179 474.3047,-2773.7492 563.3943,-2761.2064"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="563.8973,-2764.6702 573.3116,-2759.8101 562.9213,-2757.7385 563.8973,-2764.6702"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ProcessMessage&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int -->
-<g id="edge114" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ProcessMessage&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int</title>
-<g id="a_edge114"><a xlink:title="at session_request_new.go:81: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int]&#10;at session_request_new.go:87: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int]">
-<path fill="none" stroke="#8b4513" d="M118.9592,-2847.1348C218.6369,-2893.1526 498.5784,-3004.3342 702.947,-2910 776.2744,-2876.1529 828.6595,-2790.9228 851.742,-2747.038"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="854.8867,-2748.5761 856.3465,-2738.0823 848.6613,-2745.3754 854.8867,-2748.5761"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).EncryptPayload -->
-<g id="node70" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).EncryptPayload</title>
-<g id="a_node70"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).EncryptPayload | defined in session_request_new.go:42&#10;at session_request_new.go:49: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:56: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.RequestOptions).Data]&#10;at session_request_new.go:54: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithDerivedKey]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M126.7912,-2664C126.7912,-2664 36.948,-2664 36.948,-2664 30.948,-2664 24.948,-2658 24.948,-2652 24.948,-2652 24.948,-2640 24.948,-2640 24.948,-2634 30.948,-2628 36.948,-2628 36.948,-2628 126.7912,-2628 126.7912,-2628 132.7912,-2628 138.7912,-2634 138.7912,-2640 138.7912,-2640 138.7912,-2652 138.7912,-2652 138.7912,-2658 132.7912,-2664 126.7912,-2664"/>
-<text text-anchor="middle" x="81.8696" y="-2641.8" font-family="Verdana" font-size="14.00" fill="#000000">EncryptPayload</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).EncryptPayload&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge13" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).EncryptPayload&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge13"><a xlink:title="at session_request_new.go:49: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M136.2118,-2627.7515C137.4669,-2626.578 138.6479,-2625.3291 139.7392,-2624 200.665,-2549.7988 102.4114,-2472.9743 175.7392,-2411 220.5113,-2373.1601 649.0713,-2407.8959 702.947,-2431 742.8726,-2448.1218 735.3474,-2480.5443 775.947,-2496 849.8488,-2524.1333 896.941,-2550.885 953.8672,-2496 994.4084,-2456.9126 981.1811,-1538.4761 990.8672,-1483 1015.9146,-1339.5445 1079.869,-1176.3207 1106.3032,-1112.5587"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1109.5886,-1113.774 1110.2119,-1103.1975 1103.129,-1111.0768 1109.5886,-1113.774"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).EncryptPayload&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithDerivedKey -->
-<g id="edge102" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).EncryptPayload&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithDerivedKey</title>
-<g id="a_edge102"><a xlink:title="at session_request_new.go:54: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).EncryptWithDerivedKey]">
-<path fill="none" stroke="#000000" d="M136.4053,-2627.9019C137.6046,-2626.6849 138.7213,-2625.3861 139.7392,-2624 219.5896,-2515.2663 91.4384,-2123.3209 175.7392,-2018 187.5253,-2003.2751 204.3598,-1993.7471 222.2668,-1987.6341"/>
-<polygon fill="#000000" stroke="#000000" points="223.754,-1990.8399 232.3002,-1984.578 221.7143,-1984.1436 223.754,-1990.8399"/>
-</a>
-</g>
-</g>
-<!-- (github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.RequestOptions).Data -->
-<g id="node88" class="node">
-<title>(github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.RequestOptions).Data</title>
-<g id="a_node88"><a xlink:title="(github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.RequestOptions).Data | defined in session_request.go:296">
-<path fill="#ffe4b5" stroke="#000000" stroke-width="1.5" d="M341.1384,-2578C341.1384,-2578 288.4018,-2578 288.4018,-2578 282.4018,-2578 276.4018,-2572 276.4018,-2566 276.4018,-2566 276.4018,-2554 276.4018,-2554 276.4018,-2548 282.4018,-2542 288.4018,-2542 288.4018,-2542 341.1384,-2542 341.1384,-2542 347.1384,-2542 353.1384,-2548 353.1384,-2554 353.1384,-2554 353.1384,-2566 353.1384,-2566 353.1384,-2572 347.1384,-2578 341.1384,-2578"/>
-<text text-anchor="middle" x="314.7701" y="-2564.2" font-family="Verdana" font-size="14.00" fill="#000000">messages</text>
-<text text-anchor="middle" x="314.7701" y="-2547.4" font-family="Verdana" font-size="14.00" fill="#000000">Data</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).EncryptPayload&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.RequestOptions).Data -->
-<g id="edge101" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).EncryptPayload&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.RequestOptions).Data</title>
-<g id="a_edge101"><a xlink:title="at session_request_new.go:56: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp/messages.RequestOptions).Data]">
-<path fill="none" stroke="#8b4513" d="M130.3253,-2627.9859C133.5251,-2626.6711 136.6868,-2625.336 139.7392,-2624 172.6309,-2609.6031 178.5077,-2600.7828 212.0597,-2588 229.385,-2581.3993 248.9031,-2575.6723 266.2353,-2571.1478"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="267.3257,-2574.482 276.1546,-2568.6252 265.6004,-2567.6979 267.3257,-2574.482"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock -->
-<g id="node71" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock</title>
-<g id="a_node71"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock | defined in session_request_new.go:213&#10;at session_request_new.go:223: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:228: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:234: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:238: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:244: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:248: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:254: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:260: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:266: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:220: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptOptionsBlock]&#10;at session_request_new.go:237: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int]&#10;at session_request_new.go:238: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int]&#10;at session_request_new.go:247: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int]&#10;at session_request_new.go:248: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int]&#10;at session_request_new.go:270: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Date).Time]&#10;at session_request_new.go:275: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Date).Time]&#10;at session_request_new.go:270: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ValidateTimestamp]&#10;at session_request_new.go:264: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewDate]&#10;at session_request_new.go:222: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).AddDelayForSecurity]&#10;at session_request_new.go:232: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewInteger]&#10;at session_request_new.go:242: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewInteger]&#10;at session_request_new.go:252: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewInteger]&#10;at session_request_new.go:258: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewInteger]">
-<path fill="#add8e6" stroke="#000000" stroke-width=".5" d="M374.5235,-2725C374.5235,-2725 255.0167,-2725 255.0167,-2725 249.0167,-2725 243.0167,-2719 243.0167,-2713 243.0167,-2713 243.0167,-2701 243.0167,-2701 243.0167,-2695 249.0167,-2689 255.0167,-2689 255.0167,-2689 374.5235,-2689 374.5235,-2689 380.5235,-2689 386.5235,-2695 386.5235,-2701 386.5235,-2701 386.5235,-2713 386.5235,-2713 386.5235,-2719 380.5235,-2725 374.5235,-2725"/>
-<text text-anchor="middle" x="314.7701" y="-2702.8" font-family="Verdana" font-size="14.00" fill="#000000">processOptionsBlock</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge8" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge8"><a xlink:title="at session_request_new.go:223: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:228: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:234: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:238: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:244: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:248: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:254: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:260: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:266: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M386.7009,-2691.2249C397.4158,-2687.4071 408.0246,-2682.7235 417.4805,-2677 441.2302,-2662.6247 436.21,-2644.8833 460.801,-2632 475.5577,-2624.2689 481.1955,-2627.3377 497.801,-2626 588.6826,-2618.679 611.9068,-2621.0264 702.947,-2626 735.5371,-2627.7804 743.3569,-2632.2196 775.947,-2634 854.9049,-2638.3135 876.1846,-2648.7773 953.8672,-2634 971.7044,-2630.6069 981.4339,-2633.8602 991.8672,-2619 1030.9259,-2563.3685 1017.3216,-1463.1509 1027.8672,-1396 1044.7045,-1288.7861 1087.412,-1166.4088 1107.395,-1112.7126"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1110.7248,-1113.8011 1110.9625,-1103.2089 1104.1713,-1111.341 1110.7248,-1113.8011"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewInteger -->
-<g id="edge86" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewInteger</title>
-<g id="a_edge86"><a xlink:title="at session_request_new.go:232: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewInteger]&#10;at session_request_new.go:242: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewInteger]&#10;at session_request_new.go:252: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewInteger]&#10;at session_request_new.go:258: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewInteger]">
-<path fill="none" stroke="#8b4513" d="M352.4015,-2725.0512C404.1994,-2749.8979 497.423,-2794.6159 553.6298,-2821.5775"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="552.1291,-2824.7394 562.6593,-2825.9088 555.1567,-2818.428 552.1291,-2824.7394"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewDate -->
-<g id="edge47" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock&#45;&gt;github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewDate</title>
-<g id="a_edge47"><a xlink:title="at session_request_new.go:264: calling [github.com/go&#45;i2p/go&#45;i2p/lib/common/data.NewDate]">
-<path fill="none" stroke="#8b4513" d="M386.84,-2699.6821C438.3514,-2694.4516 506.2903,-2687.5532 551.56,-2682.9565"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="552.1124,-2686.4185 561.7077,-2681.9261 551.4052,-2679.4543 552.1124,-2686.4185"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).AddDelayForSecurity -->
-<g id="edge59" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).AddDelayForSecurity</title>
-<g id="a_edge59"><a xlink:title="at session_request_new.go:222: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).AddDelayForSecurity]">
-<path fill="none" stroke="#000000" d="M386.6358,-2697.7153C398.3993,-2693.1719 409.3724,-2686.5652 417.4805,-2677 514.1587,-2562.9488 401.6552,-2123.5003 497.801,-2009 503.261,-2002.4977 510.0344,-1997.3285 517.4794,-1993.2239"/>
-<polygon fill="#000000" stroke="#000000" points="519.0026,-1996.3751 526.4892,-1988.8783 515.9616,-1990.0702 519.0026,-1996.3751"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptOptionsBlock -->
-<g id="edge15" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptOptionsBlock</title>
-<g id="a_edge15"><a xlink:title="at session_request_new.go:220: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).DecryptOptionsBlock]">
-<path fill="none" stroke="#000000" d="M386.6174,-2695.9755C398.0269,-2691.5826 408.881,-2685.4765 417.4805,-2677 465.1701,-2629.9924 449.3287,-2598.791 461.801,-2533 471.5976,-2481.3236 463.2058,-2100.6181 497.801,-2061 503.1917,-2054.8266 509.8567,-2050.1438 517.1813,-2046.6182"/>
-<polygon fill="#000000" stroke="#000000" points="518.8047,-2049.7373 526.7657,-2042.7464 516.1827,-2043.2469 518.8047,-2049.7373"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ValidateTimestamp -->
-<g id="edge45" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ValidateTimestamp</title>
-<g id="a_edge45"><a xlink:title="at session_request_new.go:270: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ValidateTimestamp]">
-<path fill="none" stroke="#000000" d="M242.9865,-2699.8072C222.9436,-2693.7608 204.0227,-2683.1013 194.3995,-2664.5 179.8743,-2636.4236 179.8743,-2123.5764 194.3995,-2095.5 203.4776,-2077.9523 219.9386,-2065.8228 237.8317,-2057.4499"/>
-<polygon fill="#000000" stroke="#000000" points="239.47,-2060.5559 247.2876,-2053.405 236.7169,-2054.12 239.47,-2060.5559"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Date).Time -->
-<g id="edge35" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Date).Time</title>
-<g id="a_edge35"><a xlink:title="at session_request_new.go:270: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Date).Time]&#10;at session_request_new.go:275: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Date).Time]">
-<path fill="none" stroke="#8b4513" d="M386.84,-2719.3648C442.9855,-2728.9974 518.6471,-2741.9784 563.1988,-2749.622"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="562.84,-2753.1115 573.2879,-2751.3529 564.0238,-2746.2123 562.84,-2753.1115"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int -->
-<g id="edge34" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int</title>
-<g id="a_edge34"><a xlink:title="at session_request_new.go:237: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int]&#10;at session_request_new.go:238: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int]&#10;at session_request_new.go:247: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int]&#10;at session_request_new.go:248: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int]">
-<path fill="none" stroke="#8b4513" d="M386.5607,-2690.4172C397.2386,-2686.7121 407.8731,-2682.275 417.4805,-2677 439.9303,-2664.6737 436.8318,-2648.0229 460.801,-2639 485.9811,-2629.5212 677.5809,-2630.0309 702.947,-2639 742.2771,-2652.9066 738.5872,-2679.4396 775.947,-2698 792.1121,-2706.0308 811.4215,-2711.2644 827.9132,-2714.6028"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="827.2914,-2718.0472 837.7643,-2716.4446 828.5779,-2711.1664 827.2914,-2718.0472"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ReadMessage -->
-<g id="node72" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ReadMessage</title>
-<g id="a_node72"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ReadMessage | defined in session_request_new.go:94&#10;at session_request_new.go:98: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:104: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:110: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:116: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:123: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:122: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ReadAndValidatePadding]&#10;at session_request_new.go:120: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int]&#10;at session_request_new.go:114: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock]&#10;at session_request_new.go:102: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ProcessEphemeralKey]&#10;at session_request_new.go:108: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).readOptionsBlock]&#10;at session_request_new.go:96: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ReadEphemeralKey]">
-<path fill="#add8e6" stroke="#000000" stroke-width="1.5" d="M120.6133,-2786C120.6133,-2786 43.1259,-2786 43.1259,-2786 37.1259,-2786 31.1259,-2780 31.1259,-2774 31.1259,-2774 31.1259,-2762 31.1259,-2762 31.1259,-2756 37.1259,-2750 43.1259,-2750 43.1259,-2750 120.6133,-2750 120.6133,-2750 126.6133,-2750 132.6133,-2756 132.6133,-2762 132.6133,-2762 132.6133,-2774 132.6133,-2774 132.6133,-2780 126.6133,-2786 120.6133,-2786"/>
-<text text-anchor="middle" x="81.8696" y="-2763.8" font-family="Verdana" font-size="14.00" fill="#000000">ReadMessage</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ReadMessage&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge9" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ReadMessage&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge9"><a xlink:title="at session_request_new.go:98: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:104: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:110: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:116: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:123: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M127.0651,-2749.9517C131.8654,-2746.5619 136.2569,-2742.6026 139.7392,-2738 221.9705,-2629.3138 102.8924,-2521.5914 212.0597,-2440 246.2029,-2414.4814 664.6939,-2436.3408 702.947,-2452 743.4256,-2468.5702 735.1293,-2502.2837 775.947,-2518 849.7415,-2546.4136 896.1417,-2572.0437 953.8672,-2518 999.4696,-2475.3061 1017.0532,-1457.5256 1027.8672,-1396 1046.6546,-1289.1105 1088.3709,-1166.5684 1107.7487,-1112.7715"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1111.083,-1113.8433 1111.2048,-1103.2492 1104.503,-1111.455 1111.083,-1113.8433"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ReadMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ReadAndValidatePadding -->
-<g id="edge71" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ReadMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ReadAndValidatePadding</title>
-<g id="a_edge71"><a xlink:title="at session_request_new.go:122: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ReadAndValidatePadding]">
-<path fill="none" stroke="#000000" d="M128.6037,-2749.8322C132.9499,-2746.4915 136.8131,-2742.5765 139.7392,-2738 187.4307,-2663.4082 168.3959,-2030.2298 175.7392,-1942 186.8424,-1808.5955 125.8952,-1745.4486 212.0597,-1643 214.7479,-1639.8038 217.753,-1636.9297 220.9991,-1634.3458"/>
-<polygon fill="#000000" stroke="#000000" points="223.2528,-1637.0443 229.5206,-1628.5023 219.294,-1631.2712 223.2528,-1637.0443"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ReadMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ReadEphemeralKey -->
-<g id="edge139" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ReadMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ReadEphemeralKey</title>
-<g id="a_edge139"><a xlink:title="at session_request_new.go:96: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ReadEphemeralKey]">
-<path fill="none" stroke="#000000" d="M128.2316,-2749.9756C132.7062,-2746.6011 136.7013,-2742.6389 139.7392,-2738 202.8354,-2641.6522 140.0692,-1793.8966 212.0597,-1704 218.677,-1695.7367 227.4188,-1689.6146 237.0154,-1685.0902"/>
-<polygon fill="#000000" stroke="#000000" points="238.5141,-1688.2584 246.4368,-1681.2241 235.8567,-1681.7825 238.5141,-1688.2584"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ReadMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ProcessEphemeralKey -->
-<g id="edge106" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ReadMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ProcessEphemeralKey</title>
-<g id="a_edge106"><a xlink:title="at session_request_new.go:102: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.NTCP2Session).ProcessEphemeralKey]">
-<path fill="none" stroke="#000000" d="M128.1992,-2749.9543C132.6795,-2746.5835 136.6848,-2742.628 139.7392,-2738 169.5969,-2692.7599 178.148,-1807.2864 212.0597,-1765 217.0987,-1758.7166 223.3659,-1753.6714 230.3027,-1749.6254"/>
-<polygon fill="#000000" stroke="#000000" points="232.0645,-1752.6565 239.4053,-1745.0169 228.9026,-1746.4113 232.0645,-1752.6565"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ReadMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock -->
-<g id="edge87" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ReadMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock</title>
-<g id="a_edge87"><a xlink:title="at session_request_new.go:114: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).processOptionsBlock]">
-<path fill="none" stroke="#000000" d="M132.6928,-2754.6887C162.9041,-2746.7759 201.8652,-2736.5714 235.9897,-2727.6337"/>
-<polygon fill="#000000" stroke="#000000" points="237.1539,-2730.9469 245.9408,-2725.0274 235.3803,-2724.1754 237.1539,-2730.9469"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).readOptionsBlock -->
-<g id="node73" class="node">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).readOptionsBlock</title>
-<g id="a_node73"><a xlink:title="(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).readOptionsBlock | defined in session_request_new.go:293&#10;at session_request_new.go:298: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:300: calling [github.com/samber/oops.Errorf]">
-<path fill="#add8e6" stroke="#000000" stroke-width=".5" d="M365.6342,-2664C365.6342,-2664 263.906,-2664 263.906,-2664 257.906,-2664 251.906,-2658 251.906,-2652 251.906,-2652 251.906,-2640 251.906,-2640 251.906,-2634 257.906,-2628 263.906,-2628 263.906,-2628 365.6342,-2628 365.6342,-2628 371.6342,-2628 377.6342,-2634 377.6342,-2640 377.6342,-2640 377.6342,-2652 377.6342,-2652 377.6342,-2658 371.6342,-2664 365.6342,-2664"/>
-<text text-anchor="middle" x="314.7701" y="-2641.8" font-family="Verdana" font-size="14.00" fill="#000000">readOptionsBlock</text>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ReadMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).readOptionsBlock -->
-<g id="edge107" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ReadMessage&#45;&gt;(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).readOptionsBlock</title>
-<g id="a_edge107"><a xlink:title="at session_request_new.go:108: calling [(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).readOptionsBlock]">
-<path fill="none" stroke="#000000" d="M119.6167,-2749.9815C126.4693,-2746.2788 133.4367,-2742.2151 139.7392,-2738 174.692,-2714.6237 175.0957,-2697.0453 212.0597,-2677 221.4617,-2671.9014 231.8135,-2667.5303 242.2159,-2663.817"/>
-<polygon fill="#000000" stroke="#000000" points="243.4062,-2667.1093 251.7576,-2660.5897 241.1634,-2660.4783 243.4062,-2667.1093"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ReadMessage&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int -->
-<g id="edge81" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).ReadMessage&#45;&gt;(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int</title>
-<g id="a_edge81"><a xlink:title="at session_request_new.go:120: calling [(github.com/go&#45;i2p/go&#45;i2p/lib/common/data.Integer).Int]">
-<path fill="none" stroke="#8b4513" d="M132.6936,-2775.0225C205.383,-2784.4423 343.2994,-2800 461.301,-2800 461.301,-2800 461.301,-2800 600.374,-2800 646.2729,-2800 658.5554,-2799.6659 702.947,-2788 747.7773,-2776.2189 796.4674,-2754.456 828.6302,-2738.7176"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="830.2449,-2741.8236 837.652,-2734.2483 827.1376,-2735.5511 830.2449,-2741.8236"/>
-</a>
-</g>
-</g>
-<!-- (*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).readOptionsBlock&#45;&gt;github.com/samber/oops.Errorf -->
-<g id="edge92" class="edge">
-<title>(*github.com/go&#45;i2p/go&#45;i2p/lib/transport/ntcp.SessionRequestProcessor).readOptionsBlock&#45;&gt;github.com/samber/oops.Errorf</title>
-<g id="a_edge92"><a xlink:title="at session_request_new.go:298: calling [github.com/samber/oops.Errorf]&#10;at session_request_new.go:300: calling [github.com/samber/oops.Errorf]">
-<path fill="none" stroke="#8b4513" d="M359.6325,-2627.9498C388.0948,-2617.4876 425.9908,-2605.353 460.801,-2600 567.1711,-2583.6428 595.6835,-2591.2426 702.947,-2600 735.7178,-2602.6755 743.1762,-2609.3245 775.947,-2612 871.5933,-2619.8089 923.0133,-2678.8456 991.8672,-2612 1040.3591,-2564.9225 1017.3762,-1462.766 1027.8672,-1396 1044.7136,-1288.7875 1087.4164,-1166.4095 1107.3967,-1112.7129"/>
-<polygon fill="#8b4513" stroke="#8b4513" points="1110.7265,-1113.8012 1110.9636,-1103.2091 1104.1729,-1111.3415 1110.7265,-1113.8012"/>
-</a>
-</g>
-</g>
+<polygon fill="#d3d3d3" stroke="transparent" points="0,0 0,0 0,0 0,0 0,0"/>
 </g>
 </svg>
diff --git a/index.html b/index.html
index 02e55da..4d72458 100644
--- a/index.html
+++ b/index.html
@@ -336,7 +336,7 @@ It is unsafe for production use, and intended only for debugging and testing pur
     </main>
     
     <footer class="page-footer">
-      <p>Generated on 2025-06-11 21:20:19 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
+      <p>Generated on 2025-06-11 22:20:01 • <a href="https://github.com/go-i2p/go-i2p" target="_blank">View on GitHub</a></p>
     </footer>
   </div>
 </body>