RDK-63143: [TEST] fork removal on 1.6.4 release

source/Makefile.am

@@ -70,6 +70,17 @@ telemetry2_0_LDFLAGS += -lwebconfig_framework
 telemetry2_0_CFLAGS += -DFEATURE_SUPPORT_WEBCONFIG
 endif
 
+if IS_LIBRDKCONFIG_ENABLED
+telemetry2_0_LDFLAGS += -lrdkconfig
+telemetry2_0_CFLAGS += $(LIBRDKCONFIG_FLAG)
+endif
+
+if IS_LIBRDKCERTSEL_ENABLED
+telemetry2_0_LDFLAGS += -lRdkCertSelector
+telemetry2_0_CFLAGS += $(LIBRDKCERTSEL_FLAG)
+telemetry2_0_CFLAGS += -DENABLE_RDKB_SUPPORT
+endif
+
 if ENABLE_CCSP_SUPPORT
 telemetry2_0_LDFLAGS+=-lccsp_common 
 telemetry2_0_SOURCES += t2ssp/ssp_main.c t2ssp/ssp_action.c t2ssp/ssp_messagebus_interface.c t2ssp/dm_pack_datamodel.c

source/bulkdata/profile.c

@@ -582,7 +582,7 @@ static void* CollectAndReport(void* data)
                             if(n == ETIMEDOUT)
                             {
                                 T2Info("TIMEOUT for maxUploadLatency of profile %s\n", profile->name);
-                                ret = sendReportOverHTTP(httpUrl, jsonReport, NULL);
+                                ret = sendReportOverHTTP(httpUrl, jsonReport);
                             }
                             else
                             {
@@ -619,7 +619,7 @@ static void* CollectAndReport(void* data)
                         }
                         else
                         {
-                            ret = sendReportOverHTTP(httpUrl, jsonReport, NULL);
+                            ret = sendReportOverHTTP(httpUrl, jsonReport);
                         }
                     }
                     else

source/bulkdata/profilexconf.c

@@ -49,7 +49,6 @@ static pthread_mutex_t plMutex; /* TODO - we can remove plMutex most likely but
 static pthread_cond_t reuseThread;
 static bool reportThreadExits = false;
 
-static pid_t xconfReportPid;
 static bool isAbortTriggered = false ;
 static bool isOnDemandReport = false ;
 
@@ -384,7 +383,7 @@ static void* CollectAndReportXconf(void* data)
                 else
                 {
                     T2Debug("Abort upload is not yet set.\n");
-                    ret = sendReportOverHTTP(profile->t2HTTPDest->URL, jsonReport, &xconfReportPid);
+                    ret = sendReportOverHTTP(profile->t2HTTPDest->URL, jsonReport);
                 }
 
 #ifdef PERSIST_LOG_MON_REF
@@ -401,7 +400,6 @@ static void* CollectAndReportXconf(void* data)
                 }
 #endif
 
-                xconfReportPid = -1 ;
                 if(ret == T2ERROR_FAILURE)
                 {
                     if(profile->cachedReportList != NULL && Vector_Size(profile->cachedReportList) >= MAX_CACHED_REPORTS)
@@ -1003,43 +1001,3 @@ T2ERROR ProfileXConf_storeMarkerEvent(T2Event *eventInfo)
     return T2ERROR_SUCCESS;
 }
 
-
-T2ERROR ProfileXConf_terminateReport()
-{
-
-    T2ERROR ret = T2ERROR_FAILURE;
-
-    if(!singleProfile)
-    {
-        T2Error("Xconf profile is not set.\n");
-        return ret;
-    }
-
-    // Check whether any XconfReport is in progress
-    if(singleProfile->reportInProgress)
-    {
-        isAbortTriggered = true;
-        // Check if a child pid is still alive
-        if((xconfReportPid > 0) && !kill(xconfReportPid, 0))
-        {
-            T2Info("Report upload in progress, terminating the forked reporting child : %d \n", xconfReportPid);
-            if(!kill(xconfReportPid, SIGKILL))
-            {
-                ret = T2ERROR_SUCCESS;
-            }
-        }
-        else
-        {
-            T2Info(" Report upload has net yet started, set the abort flag \n");
-            ret = T2ERROR_SUCCESS;
-        }
-    }
-    else
-    {
-        T2Info("No report generation in progress. No further action required for abort.\n");
-    }
-
-    return ret;
-
-}
-

source/bulkdata/profilexconf.h

@@ -80,7 +80,6 @@ void    ProfileXConf_updateMarkerComponentMap();
 void    ProfileXConf_notifyTimeout(bool isClearSeekMap, bool isOnDemand);
 T2ERROR ProfileXConf_storeMarkerEvent(T2Event *eventInfo);
 char*   ProfileXconf_getName();
-T2ERROR ProfileXConf_terminateReport();
 
 T2ERROR ReportProfiles_setProfileXConf(ProfileXConf *profile);
 

source/bulkdata/reportprofiles.c

@@ -434,7 +434,7 @@ static void* reportOnDemand(void *input)
     else if(!strncmp(action, ON_DEMAND_ACTION_ABORT, MAX_PROFILENAMES_LENGTH))
     {
         T2Info("Abort report on demand \n");
-        ProfileXConf_terminateReport();
+        T2Info("Abort of the on-demand report is no longer supported; fork-based report execution and termination have been removed\n");
     }
     else
     {
@@ -704,11 +704,6 @@ T2ERROR ReportProfiles_uninit( )
     {
         getMarkerCompRbusSub(false);    // remove Rbus subscription
     }
-#ifdef LIBRDKCERTSEL_BUILD
-    curlCertSelectorFree();
-#else
-    uninitMtls();
-#endif
     T2ER_Uninit();
     destroyT2MarkerComponentMap();
     uninitScheduler();

source/protocol/http/Makefile.am

@@ -20,11 +20,11 @@ AM_CFLAGS =
 
 lib_LTLIBRARIES = libhttp.la
 
-libhttp_la_SOURCES = curlinterface.c
+libhttp_la_SOURCES = curlinterface.c multicurlinterface.c
 libhttp_la_LDFLAGS = -shared -fPIC -lcurl
 if IS_LIBRDKCERTSEL_ENABLED
 libhttp_la_CFLAGS = $(LIBRDKCERTSEL_FLAG)
-libhttp_la_LDFLAGS += -lRdkCertSelector
+libhttp_la_LDFLAGS += -lRdkCertSelector -lrdkconfig
 endif
 libhttp_la_CPPFLAGS = -fPIC -I${PKG_CONFIG_SYSROOT_DIR}$(includedir)/dbus-1.0 \
                                 -I${PKG_CONFIG_SYSROOT_DIR}$(libdir)/dbus-1.0/include \