RDK-53913: Fixed the event subscription failure in Controller and Network plugins

Signed-off-by: yuvaramachandran_gurusamy <[email protected]>

Author: yuvaramachandran-gurusamy

XCast/XCast.cpp

@@ -315,6 +315,12 @@ const string XCast::Initialize(PluginHost::IShell *service)
             ASSERT(_connectionId != 0);
         #endif
 
+        auto configConnection = _xcast->QueryInterface<Exchange::IConfiguration>();
+        if (configConnection != nullptr) {
+            configConnection->Configure(_service);
+            configConnection->Release();
+        }
+
         PluginHost::IStateControl* stateControl(_xcast->QueryInterface<PluginHost::IStateControl>());
 
         if (stateControl == nullptr) {

XCast/XCast.h

@@ -33,6 +33,7 @@
 
 #include "Module.h"
 #include <interfaces/IXCast.h>
+#include <interfaces/IConfiguration.h>
 #include "tracing/Logging.h"
 #include "tptimer.h"
 #include "libIBus.h"

XCast/XCastImplementation.cpp

@@ -30,9 +30,8 @@
 #endif
 
 #define SERVER_DETAILS "127.0.0.1:9998"
-#define NETWORK_CALLSIGN "org.rdk.Network"
-#define NETWORK_CALLSIGN_VER NETWORK_CALLSIGN ".1"
-#define THUNDER_RPC_TIMEOUT 2000
+#define NETWORK_CALLSIGN_VER "org.rdk.Network.1"
+#define THUNDER_RPC_TIMEOUT 5000
 #define MAX_SECURITY_TOKEN_SIZE 1024
 
 #define API_VERSION_NUMBER_MAJOR 1
@@ -65,6 +64,11 @@ namespace Plugin {
     XCastImplementation::~XCastImplementation()
     {
         Deinitialize();
+        if (nullptr != mShell)
+        {
+            mShell->Release();
+            mShell = nullptr;
+        }
     }
 
     void XCastImplementation::Register(Exchange::IXCast::INotification* sink)
@@ -123,6 +127,15 @@ namespace Plugin {
         }
     }
 
+    uint32_t XCastImplementation::Configure(PluginHost::IShell* service)
+    {
+        LOGINFO("Configuring XCast");
+        ASSERT(service != nullptr);
+        mShell = service;
+        mShell->AddRef();
+        return Core::ERROR_NONE;
+    }
+
     uint32_t XCastImplementation::enableCastService(string friendlyname,bool enableService) const
     {
         LOGINFO("XcastService::enableCastService: ARGS = %s : %d", friendlyname.c_str(), enableService);
@@ -395,68 +408,59 @@ namespace Plugin {
 
     std::string XCastImplementation::getSecurityToken()
     {
-        std::string token = "token=";
-        int tokenLength = 0;
-        unsigned char buffer[MAX_SECURITY_TOKEN_SIZE] = {0};
-        static std::string endpoint;
-
-        if(endpoint.empty()) {
-            Core::SystemInfo::GetEnvironment(_T("THUNDER_ACCESS"), endpoint);
-            LOGINFO("Thunder RPC Endpoint read from env - %s", endpoint.c_str());
-        }
-
-        if(endpoint.empty()) {
-            Core::File file("/etc/WPEFramework/config.json");
-            if(file.Open(true)) {
-                JsonObject config;
-                if(config.IElement::FromFile(file)) {
-                    Core::JSON::String port = config.Get("port");
-                    Core::JSON::String binding = config.Get("binding");
-                    if(!binding.Value().empty() && !port.Value().empty())
-                        endpoint = binding.Value() + ":" + port.Value();
-                }
-                file.Close();
-            }
-
-            if(endpoint.empty()) 
-                endpoint = _T("127.0.0.1:9998");
-
-            LOGINFO("Thunder RPC Endpoint read from config file - %s", endpoint.c_str());
-            Core::SystemInfo::SetEnvironment(_T("THUNDER_ACCESS"), endpoint);
-        }
-            
-        string payload = "http://localhost";
-        if(payload.empty()) {
-            tokenLength = GetSecurityToken(sizeof(buffer), buffer);
-        } else {
-            int buffLength = std::min(sizeof(buffer), payload.length());
-            ::memcpy(buffer, payload.c_str(), buffLength);
-            tokenLength = GetToken(sizeof(buffer), buffLength, buffer);
+        if (nullptr == mShell)
+        {
+            return (std::string(""));
         }
 
-        if(tokenLength > 0) {
-            token.append((char*)buffer);
-        } else {
-            token.clear();
+        std::string token;
+        auto security = mShell->QueryInterfaceByCallsign<PluginHost::IAuthenticate>("SecurityAgent");
+        if (nullptr != security)
+        {
+            std::string payload = "http://localhost";
+            if (security->CreateToken(static_cast<uint16_t>(payload.length()),
+                                        reinterpret_cast<const uint8_t *>(payload.c_str()),
+                                        token) == Core::ERROR_NONE)
+            {
+                LOGINFO("got security token - %s", token.empty() ? "" : token.c_str());
+            }
+            else
+            {
+                LOGERR("failed to get security token");
+            }
+            security->Release();
+        }
+        else
+        {
+            LOGERR("No security agent\n");
         }
 
-        LOGINFO("Thunder token - %s", token.empty() ? "" : token.c_str());
-        return token;
+        std::string query = "token=" + token;
+        Core::SystemInfo::SetEnvironment(_T("THUNDER_ACCESS"), (_T(SERVER_DETAILS)));
+        return query;
     }
 
     // Thunder plugins communication
-	void XCastImplementation::getThunderPlugins()
+    void XCastImplementation::getThunderPlugins()
     {
         string token = getSecurityToken();
 
         if (nullptr == m_ControllerObj)
         {
-            m_ControllerObj = new WPEFramework::JSONRPC::LinkType<Core::JSON::IElement>("", "", false, token);
+            if(token.empty())
+            {
+                m_ControllerObj = new WPEFramework::JSONRPC::LinkType<Core::JSON::IElement>("", "", false);
+            }
+            else
+            {
+                m_ControllerObj = new WPEFramework::JSONRPC::LinkType<Core::JSON::IElement>("","", false, token);
+            }
 
             if (nullptr != m_ControllerObj)
             {
+                LOGINFO("JSONRPC: Controller: initialization ok");
                 bool isSubscribed = false;
-                auto ev_ret = m_ControllerObj->Subscribe<JsonObject>(1000, _T("statechange"),&XCastImplementation::eventHandler_pluginState,this);
+                auto ev_ret = m_ControllerObj->Subscribe<JsonObject>(THUNDER_RPC_TIMEOUT, _T("statechange"),&XCastImplementation::eventHandler_pluginState,this);
                 if (ev_ret == Core::ERROR_NONE)
                 {
                     LOGINFO("Controller - statechange event subscribed");

XCast/XCastImplementation.h

@@ -22,6 +22,7 @@
 #include "Module.h"
 #include <interfaces/Ids.h>
 #include <interfaces/IXCast.h>
+#include <interfaces/IConfiguration.h>
 #include "tracing/Logging.h"
 #include "XCastManager.h"
 #include "XCastNotifier.h"
@@ -102,7 +103,6 @@ namespace Plugin {
         virtual uint32_t Request(const command state) override { return Core::ERROR_GENERAL; }
         virtual void Register(IStateControl::INotification* notification) override {}
         virtual void Unregister(IStateControl::INotification* notification) override {}
-        virtual uint32_t Configure(PluginHost::IShell* service) override { return Core::ERROR_NONE; }
 
         virtual uint32_t Initialize(bool networkStandbyMode) override;
         virtual void Deinitialize(void) override;
@@ -137,6 +137,7 @@ namespace Plugin {
         std::list<Exchange::IXCast::INotification*> _notificationClients;
         static XCastImplementation* _instance;
         bool m_networkStandbyMode{false};
+        PluginHost::IShell* mShell;
 
         void dispatchEvent(Event,string callsign, const JsonObject &params);
         void Dispatch(Event event,string callsign, const JsonObject params);
@@ -161,6 +162,9 @@ namespace Plugin {
         bool getDefaultNameAndIPAddress(std::string& interface, std::string& ipaddress);
         void updateNWConnectivityStatus(std::string nwInterface, bool nwConnected, std::string ipaddress = "");
 
+        // IConfiguration interface
+        uint32_t Configure(PluginHost::IShell* shell);
+
     public:
         XCastImplementation();
         virtual ~XCastImplementation();