pass options from Datagram2 and Datagram3 to handlers

libi2pd/Datagram.cpp

@@ -165,7 +165,7 @@ namespace datagram
 			session->Ack();
 			auto r = FindReceiver(toPort);
 			if(r)
-				r(identity, fromPort, toPort, buf + headerLen, len -headerLen);
+				r(identity, fromPort, toPort, buf + headerLen, len - headerLen, nullptr);
 			else
 				LogPrint (eLogWarning, "DatagramDestination: no receiver for port ", toPort);
 		}
@@ -218,8 +218,20 @@ namespace datagram
 		}
 		uint16_t flags = bufbe16toh (buf + identityLen);
 		size_t offset = identityLen + 2;
+		bool isOptions = false;
 		if (flags & DATAGRAM2_FLAG_OPTIONS)
-			offset += bufbe16toh (buf + offset) + 2;
+		{	
+			isOptions = true;
+			m_Options.CleanUp ();
+			auto optionsLen = m_Options.FromBuffer (buf + offset, len - offset);
+			if (optionsLen)
+				offset += optionsLen;
+			else
+			{
+				LogPrint (eLogWarning, "Datagram: datagram2 can't read options");
+				return;
+			}
+		}	
 		if (offset > len)
 		{
 			LogPrint (eLogWarning, "Datagram: datagram2 is too short ", len, " expected ", offset);
@@ -256,7 +268,7 @@ namespace datagram
 		session->Ack();
 		auto r = FindReceiver(toPort);
 		if(r)
-			r(identity, fromPort, toPort, buf + offset, len - offset - signatureLen);
+			r(identity, fromPort, toPort, buf + offset, len - offset - signatureLen, isOptions ? &m_Options : nullptr);
 		else
 			LogPrint (eLogWarning, "DatagramDestination: no receiver for port ", toPort);
 	}	
@@ -288,14 +300,26 @@ namespace datagram
 					{
 						uint16_t flags = bufbe16toh (buf + 32);
 						size_t offset = 34;
+						bool isOptions = false;
 						if (flags & DATAGRAM3_FLAG_OPTIONS)
-							offset += bufbe16toh (buf + offset) + 2;
+						{	
+							isOptions = true;
+							m_Options.CleanUp ();
+							auto optionsLen = m_Options.FromBuffer (buf + offset, len - offset);
+							if (optionsLen)
+								offset += optionsLen;
+							else
+							{
+								LogPrint (eLogWarning, "Datagram: datagram3 can't read options");
+								return;
+							}	
+						}	
 						if (offset > len)
 						{
 							LogPrint (eLogWarning, "Datagram: datagram3 is too short ", len, " expected ", offset);
 							return;
 						}	
-						r(*ls->GetIdentity (), fromPort, toPort, buf + offset, len - offset);
+						r(*ls->GetIdentity (), fromPort, toPort, buf + offset, len - offset, isOptions ? &m_Options : nullptr);
 					}	
 					else
 						LogPrint (eLogWarning, "Datagram: no receiver for port ", toPort);

libi2pd/Datagram.h

@@ -20,6 +20,7 @@
 #include "LeaseSet.h"
 #include "I2NPProtocol.h"
 #include "Garlic.h"
+#include "util.h"
 #include "ECIESX25519AEADRatchetSession.h"
 
 namespace i2p
@@ -124,7 +125,8 @@ namespace datagram
 	const size_t MAX_DATAGRAM_SIZE = 32768;
 	class DatagramDestination
 	{
-		typedef std::function<void (const i2p::data::IdentityEx& from, uint16_t fromPort, uint16_t toPort, const uint8_t * buf, size_t len)> Receiver;
+		typedef std::function<void (const i2p::data::IdentityEx& from, uint16_t fromPort, uint16_t toPort, 
+			const uint8_t * buf, size_t len, const i2p::util::Mapping * options)> Receiver;
 		typedef std::function<void (uint16_t fromPort, uint16_t toPort, const uint8_t * buf, size_t len)> RawReceiver;
 
 		public:
@@ -193,6 +195,7 @@ namespace datagram
 			DatagramVersion m_Version; // default for destination
 			i2p::data::GzipInflator m_Inflator;
 			std::unique_ptr<i2p::data::GzipDeflator> m_Deflator;
+			i2p::util::Mapping m_Options;
 			std::vector<uint8_t> m_From, m_Signature;
 			i2p::util::MemoryPool<I2NPMessageBuffer<I2NP_MAX_MESSAGE_SIZE> > m_I2NPMsgsPool;
 	};

libi2pd/util.cpp

@@ -223,7 +223,7 @@ namespace util
 
 	size_t Mapping::FromBuffer (size_t size, const uint8_t * buf, size_t len)
 	{
-		if (len < size) return 0;
+		if (!size || len < size) return 0;
 		size_t offset = 0;
 		while (offset < size)
 		{

libi2pd/util.h

@@ -239,6 +239,7 @@ namespace util
 			std::string_view operator[](std::string_view param) const;
 			bool Insert (std::string_view param, std::string_view value);
 			void CleanUp ();
+			bool IsEmpty () const { return m_Options.empty (); }
 			
 			static std::string_view ExtractString (const uint8_t * buf, size_t len);
 			static size_t WriteString (std::string_view str, uint8_t * buf, size_t len);