RDKEMW-6898 : Upgrade GSSDP to latest version by balav08 · Pull Request #194 · rdkcentral/xdialserver

balav08 · 2026-03-27T11:18:26Z

No description provided.

Copilot

Pull request overview

Upgrades the server stack to support newer GSSDP (1.6) and libsoup 3 by conditionally switching build dependencies and source files, plus adding libsoup3-compatible server handling.

Changes:

Add libsoup2 vs libsoup3 conditional compilation in gdialservice.cpp for request throttling and URI logging.
Update server/CMakeLists.txt to prefer libsoup-3.0 + gssdp-1.6 and switch to gdial1p6-*.c sources when available.
Add a libsoup3-specific shield implementation (gdial1p6-shield.c).

Reviewed changes

Copilot reviewed 5 out of 5 changed files in this pull request and generated 5 comments.

File	Description
server/gdialservice.cpp	Adds libsoup3 conditionals for callback signatures and URI handling.
server/gdial1p6-shield.c	Introduces a libsoup3-oriented connection “shield” implementation.
server/CMakeLists.txt	Selects libsoup3 + gssdp-1.6 and switches source lists accordingly.

Comments suppressed due to low confidence (1)

server/CMakeLists.txt:52

The if (LIBSOUP3_FOUND) block that selects GSSDP packages is missing a matching endif(). As written, the else() branch for LIBSOUP3_FOUND is never closed, which will cause a CMake configure error (unmatched if/else). Add an endif() after the GSSDP selection logic to properly close the LIBSOUP3_FOUND conditional (and keep the SOUP selection outside of it).

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 (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()
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()

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-27T11:23:57Z

server/gdial1p6-shield.c

+static void server_request_remove_callback (SoupMessage *msg) {
+  GDIAL_LOGTRACE("Entering ...");
+  DialShieldConnectionContext * conn_context = (DialShieldConnectionContext *) g_hash_table_lookup(active_conns_, msg);
+  if (conn_context) {
+    if (conn_context->read_timeout_source != 0) {
+      g_print_with_timestamp("server_request_remove_callback tid=[%lx] msg=%p timeout source %d removed",
+        pthread_self(), msg, conn_context->read_timeout_source);
+      g_source_remove(conn_context->read_timeout_source);
+    }
+    g_hash_table_remove(active_conns_, msg);
+    g_free(conn_context);
+    conn_context = NULL;
+  }
+  GDIAL_LOGTRACE("Exiting ...");
+}
+
+static gboolean soup_message_read_timeout_callback(gpointer user_data) {
+  SoupMessage *msg = (SoupMessage*)user_data;
+  GDIAL_LOGTRACE("Entering ...");
+  DialShieldConnectionContext * conn_context = (DialShieldConnectionContext *)g_hash_table_lookup(active_conns_, msg);
+  g_print_with_timestamp("soup_message_read_timeout_callback tid=[%lx] msg=%p", pthread_self(), msg);


This libsoup3 shield implementation mixes SoupServerMessage* (signal callbacks) with SoupMessage* (hash-table key type, timeout callback, weak-ref callback). In libsoup3, SoupServerMessage is not a SoupMessage, so these signatures/casts are incorrect and can lead to undefined behavior or hard-to-debug issues. Use SoupServerMessage* consistently throughout (including server_request_remove_callback, soup_message_read_timeout_callback, and the weak-ref callback).

Copilot · 2026-03-27T11:23:57Z

server/gdial1p6-shield.c

+static void soup_message_weak_ref_callback(gpointer user_data, GObject *obj) {
+  SoupMessage *msg0=(SoupMessage*)obj;
+  SoupMessage *msg=(SoupMessage*)user_data;
+  GDIAL_LOGTRACE("Entering ...");
+  assert(msg0==msg);
+  g_print_with_timestamp("soup_message_weak_ref_callback tid=[%lx] msg=%p", pthread_self(), msg);
+  server_request_remove_callback(msg);
+  GDIAL_LOGTRACE("Exiting ...");


soup_message_weak_ref_callback casts the GObject* to SoupMessage* and asserts equality against the user_data pointer. Under libsoup3 the object being finalized is a SoupServerMessage, so these casts are wrong. Update the callback to use SoupServerMessage* (or just compare raw pointers / GObject*) to avoid relying on an unrelated type.

Copilot · 2026-03-27T11:23:57Z

server/gdial1p6-shield.c

+    SoupMessage *msg = (SoupMessage *)key;
+    server_request_remove_callback(msg);
+  }


gdial_shield_term() iterates active_conns_ keys and casts them to SoupMessage*, but in the libsoup3 build the keys are SoupServerMessage* pointers. Keep the key type consistent with the libsoup3 message type to avoid incorrect casts and to make the ownership/lifetime expectations clear.

Copilot · 2026-03-27T11:23:57Z

server/CMakeLists.txt

+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()


When LIBSOUP3_FOUND is true, GSSDP is only set if GSSDP16_FOUND is true; otherwise GSSDP is never marked REQUIRED and ${GSSDP_INCLUDE_DIRS}/${GSSDP_LIBRARIES} may be empty, leading to build/link failures later. If libsoup3 builds require gssdp-1.6, make pkg_search_module(GSSDP REQUIRED gssdp-1.6) unconditional in that branch (or add a clear fallback/error path).

Copilot · 2026-03-27T11:23:57Z

server/CMakeLists.txt

+    ${CMAKE_CURRENT_SOURCE_DIR}/gdial1p6-rest.c
+    ${CMAKE_CURRENT_SOURCE_DIR}/gdial1p6-ssdp.c


The libsoup3 source list references gdial1p6-rest.c and gdial1p6-ssdp.c, but the repository files are named with a trailing invisible Unicode mark (e.g., gdial1p6-rest.c‎ / gdial1p6-ssdp.c‎). With the current paths, CMake may fail to locate these sources on disk. Rename the files to plain ASCII .c filenames (preferred) or update the CMake source paths to match the actual filenames.

Suggested change

${CMAKE_CURRENT_SOURCE_DIR}/gdial1p6-rest.c

${CMAKE_CURRENT_SOURCE_DIR}/gdial1p6-ssdp.c

${CMAKE_CURRENT_SOURCE_DIR}/gdial1p6-rest.c‎

${CMAKE_CURRENT_SOURCE_DIR}/gdial1p6-ssdp.c‎

mhughesacn · 2026-03-27T11:37:55Z

Hi @balav08 : Please fix the filenames server/gdial1p6-rest.c and server/gdial1p6-ssdp.c which have trailing non-ascii characters. This breaks the scans and will cause lots of confusion:
server/gdial1p6-rest.c\342\200\216
server/gdial1p6-ssdp.c\342\200\216

mhughesacn · 2026-03-30T10:00:17Z

Hi @balav08 : Please check server/gdial1p6-rest.c and server/gdial1p6-ssdp.c which have non-ascii characters in the filenames. This is preventing scans and will cause lots of confusion anyway. Thanks!

balav08 added 5 commits March 27, 2026 16:38

Update CMakeLists.txt

b30a48e

Update gdialservice.cpp

ff5a4ea

Create gdial1p6-rest.c‎

05bb19a

Create gdial1p6-shield.c

fd42dd9

Create gdial1p6-ssdp.c‎

23c602c

Copilot AI review requested due to automatic review settings March 27, 2026 11:18

balav08 requested a review from a team as a code owner March 27, 2026 11:18

Copilot started reviewing on behalf of balav08 March 27, 2026 11:18 View session

Copilot AI reviewed Mar 27, 2026

View reviewed changes

balav08 added 4 commits March 29, 2026 18:57

Update CMakeLists.txt

fdff39d

Update gdial1p6-rest.c‎

e6da76f

Update gdial1p6-shield.c

d6ce8c6

Update gdial1p6-ssdp.c‎

5a2e747

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

RDKEMW-6898 : Upgrade GSSDP to latest version#194

RDKEMW-6898 : Upgrade GSSDP to latest version#194
balav08 wants to merge 9 commits intomainfrom
feature/RDKEMW-6898_mar27

balav08 commented Mar 27, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Mar 27, 2026

Uh oh!

Copilot AI Mar 27, 2026

Uh oh!

Copilot AI Mar 27, 2026

Uh oh!

Copilot AI Mar 27, 2026

Uh oh!

Copilot AI Mar 27, 2026

Uh oh!

mhughesacn commented Mar 27, 2026

Uh oh!

mhughesacn commented Mar 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

		${CMAKE_CURRENT_SOURCE_DIR}/gdial1p6-rest.c
		${CMAKE_CURRENT_SOURCE_DIR}/gdial1p6-ssdp.c

Conversation

balav08 commented Mar 27, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 27, 2026

Choose a reason for hiding this comment

Uh oh!

mhughesacn commented Mar 27, 2026

Uh oh!

mhughesacn commented Mar 30, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants