From 81001c06d9aebf7c10d1fd19e279adcdca3cfd1e Mon Sep 17 00:00:00 2001
From: zzz <zzz@i2pmail.org>
Date: Tue, 2 Mar 2021 12:28:06 -0500
Subject: [PATCH] Roadmap update; add 4/6 cap info

---
 i2p2www/pages/site/docs/transport/ssu.html   | 18 +++++-
 i2p2www/pages/site/get-involved/roadmap.html | 60 ++++++++++++++++----
 i2p2www/spec/ntcp2.rst                       | 19 ++++++-
 3 files changed, 82 insertions(+), 15 deletions(-)

diff --git a/i2p2www/pages/site/docs/transport/ssu.html b/i2p2www/pages/site/docs/transport/ssu.html
index eba98b0d..3a50f3c9 100644
--- a/i2p2www/pages/site/docs/transport/ssu.html
+++ b/i2p2www/pages/site/docs/transport/ssu.html
@@ -1,7 +1,7 @@
 {% extends "global/layout.html" %}
 {% block title %}{% trans %}Secure Semireliable UDP{% endtrans %} (SSU){% endblock %}
-{% block lastupdated %}2020-09{% endblock %}
-{% block accuratefor %}0.9.48{% endblock %}
+{% block lastupdated %}2021-03{% endblock %}
+{% block accuratefor %}0.9.50{% endblock %}
 {% block content %}
 
 <p>{% trans transports=site_url('docs/transport'), ntcp=site_url('docs/transport/ntcp'), ntcp2=site_url('docs/spec/ntcp2') -%}
@@ -43,7 +43,7 @@ The following properties are stored in the network database.
 
 <ul>
 <li><b>Transport name:</b> SSU
-</li><li><b>caps:</b> [B,C] <a href="#capabilities">{% trans %}See below{%- endtrans %}</a>.
+</li><li><b>caps:</b> [B,C,4,6] <a href="#capabilities">{% trans %}See below{%- endtrans %}</a>.
 </li><li><b>host:</b> IP (IPv4 or IPv6).
   Shortened IPv6 address (with "::") is allowed.
   May or may not be present if firewalled.
@@ -582,6 +582,18 @@ If the peer address contains the 'C' capability, that means
 they are willing and able to serve as an introducer - serving
 as a Bob for an otherwise unreachable Alice.
 {%- endtrans %}</dd>
+ <dt>4</dt><dd>
+As of 0.9.50, indicates outbound IPv4 capability.
+If an IP is published in the host field, this capability is not necessary.
+If this is an address with introducers for IPv4 introductions, '4' should be included.
+If the router is hidden, '4' and '6' may be combined in a single address.
+ </dd>
+ <dt>6</dt><dd>
+As of 0.9.50, indicates outbound IPv6 capability.
+If an IP is published in the host field, this capability is not necessary.
+If this is an address with introducers for IPv6 introductions, '6' should be included (not currently supported).
+If the router is hidden, '4' and '6' may be combined in a single address.
+ </dd>
 </dl>
 
 <h1><a name="future">{% trans %}Future Work{% endtrans %}</a></h1>
diff --git a/i2p2www/pages/site/get-involved/roadmap.html b/i2p2www/pages/site/get-involved/roadmap.html
index 27dd5dbf..a5f738c7 100644
--- a/i2p2www/pages/site/get-involved/roadmap.html
+++ b/i2p2www/pages/site/get-involved/roadmap.html
@@ -1,6 +1,6 @@
 {% extends "global/layout.html" %}
 {% block title %}{{ _('Roadmap') }}{% endblock %}
-{% block lastupdated %}2020-12{% endblock %}
+{% block lastupdated %}2021-03{% endblock %}
 {% block content %}
 
 <p>
@@ -206,13 +206,21 @@ Publish reasonable contact information for infrastructure admins
 
 
 <h2 id="0.9.49">0.9.49</h2>
-<p><b>Target release: Late Feb. 2021</b></p>
+<p><b>Released: February 17, 2021</b></p>
 <ul><li>
-Start work on SSU2
+SSU send individual fragments
+</li><li>
+SSU Westwood+
+</li><li>
+SSU fast retransmit
+</li><li>
+SSU fix partial acks
 </li><li>
 ECIES router encrypted messages
 </li><li>
-Start work on new tunnel build message
+Start rekeying routers to ECIES
+</li><li>
+Start work on new tunnel build message (proposal 157)
 </li><li>
 More SSU performance improvements
 </li><li>
@@ -222,6 +230,12 @@ Start work on i2psnark hybrid v2 support
 </li><li>
 Move web resources to wars
 </li><li>
+Move resources to jars
+</li><li>
+Fix Gradle build
+</li><li>
+Hidden mode fixes
+</li><li>
 Change DoH to RFC 8484
 </li><li>
 Finish work on and deploy I2P "Reseed Plugin"
@@ -252,15 +266,41 @@ Donation page redesign and backend (deployment)
 Review and update information about VCS, Code Repositories, and Mirrors across the entire website.
 </li></ul>
 
-<h2 id="0.9.50">0.9.50 - 0.9.52 (2021)</h2>
+
+
+<h2 id="0.9.50">0.9.50</h2>
+<p><b>Target release: Late May 2021</b></p>
 <ul><li>
-Continue on SSU2
+Accelerate rekeying routers to ECIES
+</li><li>
+UPnP IPv6 support
+</li><li>
+4/6 router address caps
+</li><li>
+IPv6 introducers
+</li><li>
+NTP year 2036 fixes
+</li><li>
+Continue work on new tunnel build message (proposal 157)
+</li><li>
+Start work on SSU2
+</li><li>
+Continue on new tunnel build message
+</li><li>
+Enable DoH for reseeding
+</li></ul>
+
+
+
+<h2 id="0.9.51">0.9.51 - 0.9.52 (2H 2021)</h2>
+<ul><li>
+Accelerate rekeying routers to ECIES
+</li><li>
+Continue work on SSU2
+</li><li>
+Continue work on new tunnel build message (proposal 157)
 </li><li>
 New tunnel build message
-</li><li>
-Rekey routers to ECIES
-</li><li>
-More SSU performance improvements
 </li></ul>
 
 
diff --git a/i2p2www/spec/ntcp2.rst b/i2p2www/spec/ntcp2.rst
index 7a119058..a2341e3b 100644
--- a/i2p2www/spec/ntcp2.rst
+++ b/i2p2www/spec/ntcp2.rst
@@ -3,8 +3,8 @@ NTCP 2
 ======
 .. meta::
     :category: Transports
-    :lastupdated: August 2019
-    :accuratefor: 0.9.42
+    :lastupdated: 2021-03
+    :accuratefor: 0.9.50
 
 .. contents::
 
@@ -1790,6 +1790,21 @@ symmetric crypto keys, and related information.
 Published Router Info
 =====================
 
+Capabilities
+------------
+
+As of release 0.9.50, the "caps" option is supported in NTCP2 addresses,
+similar to SSU. There are two capabilities defined:
+
+4: Indicates outbound IPv4 capability.
+If an IP is published in the host field, this capability is not necessary.
+If the router is hidden, or NTCP2 is outbound only, '4' and '6' may be combined in a single address.
+
+6: Indicates outbound IPv6 capability.
+If an IP is published in the host field, this capability is not necessary.
+If the router is hidden, or NTCP2 is outbound only, '4' and '6' may be combined in a single address.
+
+
 
 Published Addresses
 -------------------