From 34295adb05f10386fad0f72ab4b925091c314533 Mon Sep 17 00:00:00 2001
From: orignal <i2porignal@yandex.ru>
Date: Wed, 22 Jan 2020 14:26:47 -0500
Subject: [PATCH] attach LeaseSet clove

---
 libi2pd/ECIESX25519AEADRatchetSession.cpp | 40 ++++++++++++++++-------
 libi2pd/ECIESX25519AEADRatchetSession.h   |  1 +
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/libi2pd/ECIESX25519AEADRatchetSession.cpp b/libi2pd/ECIESX25519AEADRatchetSession.cpp
index 74443e5e..285eaa7e 100644
--- a/libi2pd/ECIESX25519AEADRatchetSession.cpp
+++ b/libi2pd/ECIESX25519AEADRatchetSession.cpp
@@ -302,18 +302,36 @@ namespace garlic
 
     std::vector<uint8_t> ECIESX25519AEADRatchetSession::CreatePayload (std::shared_ptr<const I2NPMessage> msg)
     {
-        uint16_t cloveSize = msg->GetPayloadLength () + 9 + 1;
-        std::vector<uint8_t> v(cloveSize + 3);
-        uint8_t * payload = v.data ();
-        payload[0] = eECIESx25519BlkGalicClove; // clove type
-        htobe16buf (payload + 1, cloveSize); // size        
-        payload[3] = 0; // flag and delivery instructions
-        payload[4] = msg->GetTypeID (); // I2NP msg type
-        htobe32buf (payload + 5, msg->GetMsgID ()); // msgID     
-        htobe32buf (payload + 9, msg->GetExpiration ()/1000); // expiration in seconds     
-        memcpy (payload + 13, msg->GetPayload (), msg->GetPayloadLength ());
+        size_t payloadLen = 0;
+        if (payloadLen) 
+            payloadLen += msg->GetPayloadLength () + 13;
+        auto leaseSet = CreateDatabaseStoreMsg (GetOwner ()->GetLeaseSet ());
+        if (leaseSet)
+            payloadLen += leaseSet->GetPayloadLength () + 13;                
+        std::vector<uint8_t> v(payloadLen);
+        size_t offset = 0;
+        if (leaseSet)
+            offset += CreateGarlicClove (leaseSet, v.data () + offset, payloadLen - offset);
+        if (msg)    
+            offset += CreateGarlicClove (msg, v.data () + offset, payloadLen - offset);
         return v;
-    }    
+    }   
+
+    size_t ECIESX25519AEADRatchetSession::CreateGarlicClove (std::shared_ptr<const I2NPMessage> msg, uint8_t * buf, size_t len)
+    {
+        if (!msg) return 0;
+        uint16_t cloveSize = msg->GetPayloadLength () + 9 + 1;
+        if ((int)len < cloveSize + 3) return 0;
+        buf[0] = eECIESx25519BlkGalicClove; // clove type
+        htobe16buf (buf + 1, cloveSize); // size        
+        buf[3] = 0; // flag and delivery instructions
+        buf[4] = msg->GetTypeID (); // I2NP msg type
+        htobe32buf (buf + 5, msg->GetMsgID ()); // msgID     
+        htobe32buf (buf + 9, msg->GetExpiration ()/1000); // expiration in seconds     
+        memcpy (buf + 13, msg->GetPayload (), msg->GetPayloadLength ());
+        return cloveSize + 3;
+    }
+ 
 }
 }
 
diff --git a/libi2pd/ECIESX25519AEADRatchetSession.h b/libi2pd/ECIESX25519AEADRatchetSession.h
index 829f0517..05dfc961 100644
--- a/libi2pd/ECIESX25519AEADRatchetSession.h
+++ b/libi2pd/ECIESX25519AEADRatchetSession.h
@@ -81,6 +81,7 @@ namespace garlic
             bool NewOutgoingSessionMessage (const uint8_t * payload, size_t len, uint8_t * out, size_t outLen);
             bool NewSessionReplyMessage (const uint8_t * payload, size_t len, uint8_t * out, size_t outLen);
             std::vector<uint8_t> CreatePayload (std::shared_ptr<const I2NPMessage> msg);
+            size_t CreateGarlicClove (std::shared_ptr<const I2NPMessage> msg, uint8_t * buf, size_t len);
 
         private: