RDKEMW-6898: GSSDP upgradtion to latest 1.6.3 version

.github/CODEOWNERS

@@ -0,0 +1,5 @@
+# These owners will be the default owners for everything in
+# the repo. Unless a later match takes precedence,
+# @global-owner1 and @global-owner2 will be requested for
+# review when someone opens a pull request.
+*       @rdkcentral/xdialserver-maintainers

.github/workflows/native_full_build.yml

@@ -0,0 +1,25 @@
+name: Build Component in Native Environment
+
+on:
+  push:
+    branches: [ main, 'sprint/**', 'release/**', topic/*, develop ]
+  pull_request:
+    branches: [ main, 'sprint/**', 'release/**', topic/*, develop ]
+
+jobs:
+  build-entservices-on-pr:
+    name: Build xdialserver component in github rdkcentral
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:22.04
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: native build
+        run: |
+          sh -x build_dependencies.sh
+          sh -x cov_build.sh
+        env:
+          GITHUB_TOKEN: ${{ secrets.RDKCM_RDKE }}

Makefile

@@ -20,6 +20,6 @@
 DIRS:= server
 
 all:
-	for dir in $(DIRS); do (cd $$dir && cmake $(PLATFORM_FLAGS) . && make || exit 1) || exit 1; done
+	for dir in $(DIRS); do (cd $$dir && cmake $(DISABLE_SECURITY_TOKEN) $(PLATFORM_FLAGS) . && make || exit 1) || exit 1; done
 clean:
 	for dir in $(DIRS); do (cd $$dir && make clean || exit 1) || exit 1; done

build_dependencies.sh

@@ -0,0 +1,130 @@
+#!/bin/bash
+set -x
+set -e
+##############################
+GITHUB_WORKSPACE="${PWD}"
+
+cd ${GITHUB_WORKSPACE}
+
+# # ############################# 
+#1. Install Dependencies and packages
+
+apt update
+apt install -y git python3 python3-pip cmake ninja-build meson curl libsoup2.4-dev libxml2-dev libglib2.0-dev gobject-introspection libgirepository1.0-dev libgtk-3-dev libcurl4-openssl-dev libcunit1-dev valac pandoc
+pip install jsonref
+
+############################
+# Build trevor-base64
+if [ ! -d "trower-base64" ]; then
+git clone https://github.com/xmidt-org/trower-base64.git
+fi
+cd trower-base64
+meson setup --warnlevel 3 --werror build
+ninja -C build
+ninja -C build install
+cd ..
+###########################################
+# Clone the required repositories
+
+rm -rf iarmbus ThunderTools Thunder entservices-apis entservices-testframework gssdp
+
+
+git clone https://github.com/rdkcentral/iarmbus.git
+export IARMBUS_PATH=$GITHUB_WORKSPACE/iarmbus
+
+git clone --branch  R4.4.3 https://github.com/rdkcentral/ThunderTools.git
+
+git clone --branch R4.4.1 https://github.com/rdkcentral/Thunder.git
+
+git clone --branch main https://github.com/rdkcentral/entservices-apis.git
+
+git clone https://$GITHUB_TOKEN@github.com/rdkcentral/entservices-testframework.git
+
+git clone --branch gssdp-1.2.3 https://gitlab.gnome.org/GNOME/gssdp.git
+
+############################
+# Build gssdp-1.2
+echo "======================================================================================"
+echo "buliding gssdp-1.2"
+cd gssdp
+
+rm -rf build
+meson setup build
+
+ninja -C build
+ninja -C build install
+cd -
+
+############################
+# Build Thunder-Tools
+echo "======================================================================================"
+echo "buliding thunderTools"
+cd ThunderTools
+patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/00010-R4.4-Add-support-for-project-dir.patch
+cd -
+
+
+cmake -G Ninja -S ThunderTools -B build/ThunderTools \
+    -DEXCEPTIONS_ENABLE=ON \
+    -DCMAKE_INSTALL_PREFIX="/usr" \
+    -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \
+    -DGENERIC_CMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \
+
+cmake --build build/ThunderTools --target install
+
+
+############################
+# Build Thunder
+echo "======================================================================================"
+echo "buliding thunder"
+
+cd Thunder
+patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/Use_Legact_Alt_Based_On_ThunderTools_R4.4.3.patch
+patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/error_code_R4_4.patch
+patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/1004-Add-support-for-project-dir.patch
+patch -p1 < $GITHUB_WORKSPACE/entservices-testframework/patches/RDKEMW-733-Add-ENTOS-IDS.patch
+cd -
+
+cmake -G Ninja -S Thunder -B build/Thunder \
+    -DMESSAGING=ON \
+    -DCMAKE_INSTALL_PREFIX="/usr" \
+    -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \
+    -DGENERIC_CMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \
+    -DBUILD_TYPE=Debug \
+    -DBINDING=127.0.0.1 \
+    -DPORT=55555 \
+    -DEXCEPTIONS_ENABLE=ON \
+
+cmake --build build/Thunder --target install
+
+############################
+# Build entservices-apis
+echo "======================================================================================"
+echo "buliding entservices-apis"
+cd entservices-apis
+rm -rf jsonrpc/DTV.json
+cd ..
+
+cmake -G Ninja -S entservices-apis  -B build/entservices-apis \
+    -DEXCEPTIONS_ENABLE=ON \
+    -DCMAKE_INSTALL_PREFIX="/usr" \
+    -DCMAKE_MODULE_PATH="$GITHUB_WORKSPACE/install/tools/cmake" \
+
+cmake --build build/entservices-apis --target install
+
+############################
+
+############################
+# Build and deploy stubs for IARMBus and WPEFramework securityagent
+mkdir -p /usr/include/WPEFramework/securityagent
+cp $GITHUB_WORKSPACE/stubs/securityagent/* /usr/include/WPEFramework/securityagent/ -v
+
+echo "======================================================================================"
+echo "Building IARMBus and WPEFramework securityagent stubs"
+cd $GITHUB_WORKSPACE
+cd ./stubs
+g++ -fPIC -shared -o libIARMBus.so iarm_stubs.cpp -I$GITHUB_WORKSPACE/stubs -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I$IARMBUS_PATH/core -I$IARMBUS_PATH/core/include -fpermissive
+g++ -fPIC -shared -o libWPEFrameworkSecurityUtil.so securityagent/SecurityTokenUtil.cpp  -I$GITHUB_WORKSPACE/stubs -fpermissive
+
+cp libIARMBus.so /usr/local/lib/
+cp libWPEFrameworkSecurityUtil.so /usr/local/lib/

cov_build.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+set -x
+set -e
+##############################
+GITHUB_WORKSPACE="${PWD}"
+ls -la ${GITHUB_WORKSPACE}
+############################
+# Build xdialserver
+echo "buliding xdialserver"
+
+cd ${GITHUB_WORKSPACE}
+
+make
+
+echo "======================================================================================"
+exit 0

server/CMakeLists.txt

@@ -26,15 +26,31 @@ set (GDIAL_VERSION_MINOR 0)
 find_package (PkgConfig REQUIRED)
 pkg_search_module (GLIB REQUIRED glib-2.0)
 pkg_search_module (GIO REQUIRED gio-2.0)
-pkg_search_module (GSSDP12 gssdp-1.2)
-if (GSSDP12_FOUND)
-  pkg_search_module (GSSDP REQUIRED gssdp-1.2)
-  add_definitions(-DHAVE_GSSDP_VERSION_1_2_OR_NEWER)
-  message("Using gssdp-1.2")
+pkg_search_module (LIBSOUP3 libsoup-3.0)
+if (LIBSOUP3_FOUND)
+  add_definitions(-DHAVE_LIBSOUP_VERSION_3)
+  pkg_search_module (GSSDP16 gssdp-1.6)
+  if (GSSDP16_FOUND)
+    pkg_search_module (GSSDP REQUIRED gssdp-1.6)
+    add_definitions(-DHAVE_GSSDP_VERSION_1_6_OR_NEWER)
+    message("Using gssdp-1.6")
+  endif()
 else()
-  pkg_search_module (GSSDP REQUIRED gssdp-1.0)
+  pkg_search_module (GSSDP12 gssdp-1.2)
+  if (GSSDP12_FOUND)
+    pkg_search_module (GSSDP REQUIRED gssdp-1.2)
+    add_definitions(-DHAVE_GSSDP_VERSION_1_2_OR_NEWER)
+    message("Using gssdp-1.2")
+  else()
+    pkg_search_module (GSSDP REQUIRED gssdp-1.0)
+  endif()
+endif()
+if (LIBSOUP3_FOUND)
+  pkg_search_module (SOUP REQUIRED libsoup-3.0)
+  message("Using libsoup-3.0")
+else()
+  pkg_search_module (SOUP REQUIRED libsoup-2.4)
 endif()
-pkg_search_module (SOUP REQUIRED libsoup-2.4)
 pkg_search_module (XML2 REQUIRED libxml-2.0)
 
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -g")
@@ -67,14 +83,27 @@ include_directories (
   ${PROJECT_GLIB_INCLUDE_DIRS}
 )
 
-set (GDIAL_EXEC_SOURCE_FILES
-  ${CMAKE_CURRENT_SOURCE_DIR}/gdial-util.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/gdial-app.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/gdial-rest.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/gdial-ssdp.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/gdial-shield.c
-  ${CMAKE_CURRENT_SOURCE_DIR}/gdialservice.cpp
-)
+if (LIBSOUP3_FOUND)
+  set (GDIAL_EXEC_SOURCE_FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/gdial-util.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gdial-app.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/libsoup3/gdial-rest.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/libsoup3/gdial-ssdp.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/libsoup3/gdial-shield.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gdialservice.cpp
+  )
+  message("Using libsoup-3.0 compatible source files (gdial1p6-*.c)")
+else()
+  set (GDIAL_EXEC_SOURCE_FILES
+    ${CMAKE_CURRENT_SOURCE_DIR}/gdial-util.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gdial-app.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/libsoup2p4/gdial-rest.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/libsoup2p4/gdial-ssdp.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/libsoup2p4/gdial-shield.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gdialservice.cpp
+  )
+  message("Using libsoup-2.4 compatible source files (gdial-*.c)")
+endif()
 
 link_directories (
   ${GLIB_LIBRARY_DIRS}
@@ -101,4 +130,4 @@ target_link_libraries (gdial-server
 
 add_executable (gdial-server-ut gdialserver_ut.cpp)
 
-target_link_libraries (gdial-server-ut gdial-plat gdial-server)
+target_link_libraries (gdial-server-ut gdial-plat gdial-server)

server/gdial-rest.h

@@ -50,8 +50,9 @@ gboolean gdial_rest_server_unregister_all_apps(GDialRestServer *self);
 typedef struct _GDialAppRegistry GDialAppRegistry;
 
 GDIAL_STATIC gboolean gdial_rest_server_is_allowed_origin(GDialRestServer *self, const gchar *header_origin, const gchar *app_name);
-GDIAL_STATIC gchar *gdial_rest_server_new_additional_data_url(guint listening_port, const gchar *app_name, gboolean encode);
+GDIAL_STATIC gchar *gdial_rest_server_new_additional_data_url(guint listening_port, const gchar *app_name, gboolean encode, const gchar* app_uri);
 GDIAL_STATIC GDialAppRegistry *gdial_rest_server_find_app_registry(GDialRestServer *self, const gchar *app_name);
+GDIAL_STATIC GDialAppRegistry *gdial_rest_server_find_app_registry_by_uuid(GDialRestServer *self, const gchar *app_uuid);
 
 G_END_DECLS
 

server/gdial-ssdp.h

@@ -30,6 +30,8 @@ int gdial_ssdp_new(SoupServer *server, GDialOptions *options, const gchar *rando
 int gdial_ssdp_destroy();
 int gdial_ssdp_set_available(bool activationStatus, const gchar *friendlyName);
 int gdial_ssdp_set_friendlyname(const gchar *friendlyName);
+int gdial_ssdp_set_manufacturername(const gchar *manufacturer_name);
+int gdial_ssdp_set_modelname(const gchar *model_name);
 G_END_DECLS
 
 #endif

server/gdialserver_ut.cpp

@@ -43,7 +43,7 @@ class gdialServiceTest: public GDialNotifier
         {
             GDIAL_LOGINFO("Entering ...");
             std::string activation = status ? "true" : "false";
-            service->ActivationChanged(activation,"SampleTest");
+            service->ActivationChanged(std::move(activation),"SampleTest");
             GDIAL_LOGINFO("Exiting ...");
         }
 
@@ -137,9 +137,9 @@ class gdialServiceTest: public GDialNotifier
                     break;
                 }
 
-                appReq->Names = Names;
+                appReq->Names = std::move(Names);
                 appReq->prefixes = prefixes;
-                appReq->cors = prefixes;
+                appReq->cors = std::move(prefixes);
                 appReq->allowStop = allowStop;
 
                 appReqList->pushBack(appReq);
@@ -181,11 +181,6 @@ class gdialServiceTest: public GDialNotifier
             GDIAL_LOGINFO("App:%s  appID:%s",appName.c_str(),appID.c_str());
         }
 
-        virtual void onStopped() override
-        {
-            GDIAL_LOGINFO("~~~~~~~~~~~");
-        }
-
         virtual void updatePowerState(string powerState) override
         {
             GDIAL_LOGINFO("powerState : %s",powerState.c_str());
@@ -229,7 +224,6 @@ int main(int argc, char *argv[])
             if (nullptr != testObject)
             {
                 delete testObject;
-                testObject = nullptr;
             }
             testObject = new gdialServiceTest(gdial_args);
         }
@@ -253,4 +247,4 @@ int main(int argc, char *argv[])
     delete testObject;
 
     return 0;
-}
+}