commit 2fd466f415b7b0344483061e4ffa88fdcbce4a18
author Tom Joseph <tomjoseph@in.ibm.com> Thu Mar 30 08:16:47 2017 +0530
committer Patrick Williams <patrick@stwcx.xyz> Mon Apr 24 11:22:15 2017 -0500
tree a250e4eae904414e69d12d36ab146fc9bf29ab3a
parent 7306314f605c6232218144db10ae446a367dbe2e

Add resendPayload function

Resolves openbmc/openbmc#856

Change-Id: I957ce889500840c067e97537e825571cfb77e1c4
Signed-off-by: Tom Joseph <tomjoseph@in.ibm.com>

sd_event_loop.cpp

diff --git a/sd_event_loop.cpp b/sd_event_loop.cpp
index 350a96c..af1a5ee 100644
--- a/sd_event_loop.cpp
+++ b/sd_event_loop.cpp
@@ -149,12 +149,12 @@
             --context.retryCounter;
             std::get<eventloop::EventLoop&>(singletonPool).switchTimer
                     (instance, Timers::RETRY, true);
-            // Resend the SOL payload
+            context.resendPayload(sol::Context::noClear);
         }
         else
         {
             context.retryCounter = context.maxRetryCount;
-            // Resend the SOL payload
+            context.resendPayload(sol::Context::clear);
             std::get<eventloop::EventLoop&>(singletonPool).switchTimer
                     (instance, Timers::RETRY, false);
             std::get<eventloop::EventLoop&>(singletonPool).switchTimer

sol/sol_context.cpp

diff --git a/sol/sol_context.cpp b/sol/sol_context.cpp
index 24339f0..ec48a59 100644
--- a/sol/sol_context.cpp
+++ b/sol/sol_context.cpp
@@ -185,7 +185,15 @@
 
 void Context::resendPayload(bool clear)
 {
+    sendPayload(payloadCache);
 
+    if(clear)
+    {
+        payloadCache.clear();
+        expectedCharCount = 0;
+        std::get<sol::Manager&>(singletonPool).dataBuffer.erase(
+                expectedCharCount);
+    }
 }
 
 void Context::sendPayload(const Buffer& out) const