diff -U2 -r /var/lib/copr-rpmbuild/results/i2pd-git/upstream-unpacked/Source0/i2pd-openssl/libi2pd/Datagram.cpp /var/lib/copr-rpmbuild/results/i2pd-git/srpm-unpacked/i2pd-openssl.tar.gz-extract/i2pd-openssl/libi2pd/Datagram.cpp
--- /var/lib/copr-rpmbuild/results/i2pd-git/upstream-unpacked/Source0/i2pd-openssl/libi2pd/Datagram.cpp	2025-06-30 19:57:17.000000000 +0000
+++ /var/lib/copr-rpmbuild/results/i2pd-git/srpm-unpacked/i2pd-openssl.tar.gz-extract/i2pd-openssl/libi2pd/Datagram.cpp	2025-06-30 19:49:42.000000000 +0000
@@ -59,26 +59,16 @@
 		if (session)
 		{
-			if (session->GetVersion () == eDatagramV3)
+			if (m_Owner->GetIdentity ()->GetSigningKeyType () == i2p::data::SIGNING_KEY_TYPE_DSA_SHA1)
 			{
-				constexpr uint8_t flags[] = { 0x00, 0x03 }; // datagram3, no options
-				auto msg = CreateDataMessage ({{m_Owner->GetIdentity ()->GetIdentHash (), 32}, 
-					{flags, 2}, {payload, len}}, fromPort, toPort, i2p::client::PROTOCOL_TYPE_DATAGRAM3, false); // datagram3
-				session->SendMsg(msg);
+				uint8_t hash[32];
+				SHA256(payload, len, hash);
+				m_Owner->Sign (hash, 32, m_Signature.data ());
 			}
 			else
-			{	
-				if (m_Owner->GetIdentity ()->GetSigningKeyType () == i2p::data::SIGNING_KEY_TYPE_DSA_SHA1)
-				{
-					uint8_t hash[32];
-					SHA256(payload, len, hash);
-					m_Owner->Sign (hash, 32, m_Signature.data ());
-				}
-				else
-					m_Owner->Sign (payload, len, m_Signature.data ());
+				m_Owner->Sign (payload, len, m_Signature.data ());
 
-				auto msg = CreateDataMessage ({{m_From.data (), m_From.size ()}, {m_Signature.data (), m_Signature.size ()}, {payload, len}},
-					fromPort, toPort, i2p::client::PROTOCOL_TYPE_DATAGRAM, !session->IsRatchets ()); // datagram1
-				session->SendMsg(msg);
-			}	
+			auto msg = CreateDataMessage ({{m_From.data (), m_From.size ()}, {m_Signature.data (), m_Signature.size ()}, {payload, len}},
+				fromPort, toPort, false, !session->IsRatchets ()); // datagram
+			session->SendMsg(msg);
 		}
 	}
@@ -87,5 +77,5 @@
 	{
 		if (session)
-			session->SendMsg(CreateDataMessage ({{payload, len}}, fromPort, toPort, i2p::client::PROTOCOL_TYPE_RAW, !session->IsRatchets ())); // raw
+			session->SendMsg(CreateDataMessage ({{payload, len}}, fromPort, toPort, true, !session->IsRatchets ())); // raw
 	}
 
@@ -156,5 +146,4 @@
 				{
 					auto session = ObtainSession (ident);
-					session->SetVersion (eDatagramV3);
 					session->SetRemoteLeaseSet (ls);
 					session->Ack ();
@@ -286,5 +275,5 @@
 	std::shared_ptr<I2NPMessage> DatagramDestination::CreateDataMessage (
 		const std::vector<std::pair<const uint8_t *, size_t> >& payloads,
-		uint16_t fromPort, uint16_t toPort, uint8_t protocolType, bool checksum)
+		uint16_t fromPort, uint16_t toPort, bool isRaw, bool checksum)
 	{
 		size_t size;
@@ -302,6 +291,6 @@
 			htobe32buf (msg->GetPayload (), size); // length
 			htobe16buf (buf + 4, fromPort); // source port
-			htobe16buf (buf + 6, toPort); // destination port	
-			buf[9] = protocolType; // raw or datagram protocol
+			htobe16buf (buf + 6, toPort); // destination port
+			buf[9] = isRaw ? i2p::client::PROTOCOL_TYPE_RAW : i2p::client::PROTOCOL_TYPE_DATAGRAM; // raw or datagram protocol
 			msg->len += size + 4;
 			msg->FillI2NPMessageHeader (eI2NPData, 0, checksum);
@@ -362,5 +351,6 @@
 		const i2p::data::IdentHash & remoteIdent) :
 		m_LocalDestination(localDestination), m_RemoteIdent(remoteIdent),
-		m_LastUse (0), m_LastFlush (0), m_RequestingLS (false), m_Version (eDatagramV1)
+		m_LastUse (0), m_LastFlush (0),
+		m_RequestingLS(false)
 	{
 	}
diff -U2 -r /var/lib/copr-rpmbuild/results/i2pd-git/upstream-unpacked/Source0/i2pd-openssl/libi2pd/Datagram.h /var/lib/copr-rpmbuild/results/i2pd-git/srpm-unpacked/i2pd-openssl.tar.gz-extract/i2pd-openssl/libi2pd/Datagram.h
--- /var/lib/copr-rpmbuild/results/i2pd-git/upstream-unpacked/Source0/i2pd-openssl/libi2pd/Datagram.h	2025-06-30 19:57:17.000000000 +0000
+++ /var/lib/copr-rpmbuild/results/i2pd-git/srpm-unpacked/i2pd-openssl.tar.gz-extract/i2pd-openssl/libi2pd/Datagram.h	2025-06-30 19:49:42.000000000 +0000
@@ -46,11 +46,4 @@
 	const int DATAGRAM_SESSION_ACK_REQUEST_INTERVAL = 5500; // in milliseconds
 
-	enum DatagramVersion
-	{
-		eDatagramV1 = 1,
-		eDatagramV2 = 2,
-		eDatagramV3 = 3,
-	};	
-	
 	constexpr uint16_t DATAGRAM3_FLAG_OPTIONS = 0x10;
 	
@@ -77,7 +70,4 @@
 			bool IsRatchets () const { return m_RoutingSession && m_RoutingSession->IsRatchets (); }
 			void SetRemoteLeaseSet (std::shared_ptr<const i2p::data::LeaseSet> ls) { m_RemoteLeaseSet = ls; }
-
-			DatagramVersion GetVersion () const { return m_Version; }
-			void SetVersion (DatagramVersion version) { m_Version = version; }
 			
 		struct Info
@@ -115,5 +105,4 @@
 			uint64_t m_LastUse, m_LastFlush; // milliseconds
 			bool m_RequestingLS;
-			DatagramVersion m_Version;
 	};
 
@@ -159,5 +148,5 @@
 
 			std::shared_ptr<I2NPMessage> CreateDataMessage (const std::vector<std::pair<const uint8_t *, size_t> >& payloads,
-				uint16_t fromPort, uint16_t toPort, uint8_t protocolType, bool checksum = true);
+				uint16_t fromPort, uint16_t toPort, bool isRaw = false, bool checksum = true);
 
 			void HandleDatagram (uint16_t fromPort, uint16_t toPort, uint8_t *const& buf, size_t len);