From 2b64cf9126329030f6dc86630c77189b5cd4a484 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Wed, 1 Aug 2018 12:28:34 -0400
Subject: [PATCH] publish i in correct place for NTCP2

---
 libi2pd/RouterInfo.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/libi2pd/RouterInfo.cpp b/libi2pd/RouterInfo.cpp
index 73716989..14153ba0 100644
--- a/libi2pd/RouterInfo.cpp
+++ b/libi2pd/RouterInfo.cpp
@@ -538,6 +538,13 @@ namespace data
 				}
 			}
 
+			if (address.IsPublishedNTCP2 ())
+			{
+				// publish i for NTCP2
+				WriteString ("i", properties); properties << '=';
+				WriteString (address.ntcp2->iv.ToBase64 (), properties); properties << ';';
+			}
+
 			if (!address.IsNTCP2 () || address.IsPublishedNTCP2 ())
 			{
 				WriteString ("port", properties);
@@ -552,11 +559,6 @@ namespace data
 				WriteString (address.ntcp2->staticKey.ToBase64 (), properties); properties << ';';
 				WriteString ("v", properties); properties << '=';
 				WriteString ("2", properties); properties << ';';
-				if (address.IsPublishedNTCP2 ())
-				{
-					WriteString ("i", properties); properties << '=';
-					WriteString (address.ntcp2->iv.ToBase64 (), properties); properties << ';';
-				}
 			}	
 
 			uint16_t size = htobe16 (properties.str ().size ());