From 827e90e0daabe32e058e08dd2a253425898a7e7a Mon Sep 17 00:00:00 2001
From: Thomas Vanbesien <tvanbesi@proton.me>
Date: Tue, 17 Feb 2026 19:06:22 +0100
Subject: Replace ClientFindServers with unified Client, use trust store
 directories

Replace the single-purpose ClientFindServers program with a unified Client
that supports three operations via CLI: find-servers, get-endpoints, and
read-time.  This simplifies the architecture by using one client binary with
a single config file instead of a monolithic program that did everything in
one run.

Split the ServerRegister config into separate server and client config files
so the LDS-registration credentials are isolated from the server's own
settings.  The discovery URL moves from config to a CLI argument.

Replace repeated trustList config entries with a single trustStore directory
path.  Each program now points to a directory under certs/trust/ containing
.der files, so adding or removing trust is a file-copy operation rather than
editing every config file.  Add loadTrustStore()/freeTrustStore() to
common.c and remove the now-unused configGetAll() from the config parser.

Simplify the test matrix from 6 to 4 cases (security and auth are
orthogonal, so the full 3x2 matrix is unnecessary).  Update run_test.sh to
invoke the new Client three times and use port-polling instead of sleep.
---
 tests/none_anon/client.conf                 |  9 +++++++++
 tests/none_anon/client_find_servers.conf    | 20 --------------------
 tests/none_anon/server_lds.conf             |  3 +--
 tests/none_anon/server_register.conf        | 19 +++++--------------
 tests/none_anon/server_register_client.conf | 12 ++++++++++++
 5 files changed, 27 insertions(+), 36 deletions(-)
 create mode 100644 tests/none_anon/client.conf
 delete mode 100644 tests/none_anon/client_find_servers.conf
 create mode 100644 tests/none_anon/server_register_client.conf

(limited to 'tests/none_anon')

diff --git a/tests/none_anon/client.conf b/tests/none_anon/client.conf
new file mode 100644
index 0000000..32eea7c
--- /dev/null
+++ b/tests/none_anon/client.conf
@@ -0,0 +1,9 @@
+# Client — test: none_anon
+
+applicationUri = urn:bobink.ClientFindServers
+certificate = certs/ClientFindServers_cert.der
+privateKey = certs/ClientFindServers_key.der
+securityMode = None
+securityPolicy = None
+authMode = anonymous
+trustStore = certs/trust/client
diff --git a/tests/none_anon/client_find_servers.conf b/tests/none_anon/client_find_servers.conf
deleted file mode 100644
index 6ea7d2d..0000000
--- a/tests/none_anon/client_find_servers.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# ClientFindServers — test: none_anon
-
-discoveryEndpoint = opc.tcp://localhost:14840
-applicationUri = urn:bobink.ClientFindServers
-
-# Discovery (LDS) side
-discoveryCertificate = certs/ClientFindServers_cert.der
-discoveryPrivateKey = certs/ClientFindServers_key.der
-discoverySecurityMode = None
-discoverySecurityPolicy = None
-discoveryAuthMode = anonymous
-discoveryTrustList = certs/ServerLDS_cert.der
-
-# Server side
-serverCertificate = certs/ClientFindServers_cert.der
-serverPrivateKey = certs/ClientFindServers_key.der
-serverSecurityMode = None
-serverSecurityPolicy = None
-serverAuthMode = anonymous
-serverTrustList = certs/ServerRegister_cert.der
diff --git a/tests/none_anon/server_lds.conf b/tests/none_anon/server_lds.conf
index 705b51f..cf1ae45 100644
--- a/tests/none_anon/server_lds.conf
+++ b/tests/none_anon/server_lds.conf
@@ -8,5 +8,4 @@ cleanupTimeout = 60
 
 authMode = anonymous
 
-trustList = certs/ServerRegisterClient_cert.der
-trustList = certs/ClientFindServers_cert.der
+trustStore = certs/trust/server_lds
diff --git a/tests/none_anon/server_register.conf b/tests/none_anon/server_register.conf
index 349b6c7..e89fd59 100644
--- a/tests/none_anon/server_register.conf
+++ b/tests/none_anon/server_register.conf
@@ -1,21 +1,12 @@
-# ServerRegister — test: none_anon
+# ServerRegister server config — test: none_anon
 
 port = 14841
 applicationUri = urn:bobink.ServerRegister
-serverCertificate = certs/ServerRegister_cert.der
-serverPrivateKey = certs/ServerRegister_key.der
-clientCertificate = certs/ServerRegisterClient_cert.der
-clientPrivateKey = certs/ServerRegisterClient_key.der
+certificate = certs/ServerRegister_cert.der
+privateKey = certs/ServerRegister_key.der
 
-discoveryEndpoint = opc.tcp://localhost:14840
 registerInterval = 10
 
-securityMode = None
-securityPolicy = None
+authMode = anonymous
 
-serverAuthMode = anonymous
-
-clientAuthMode = anonymous
-
-trustList = certs/ServerLDS_cert.der
-trustList = certs/ClientFindServers_cert.der
+trustStore = certs/trust/server_register
diff --git a/tests/none_anon/server_register_client.conf b/tests/none_anon/server_register_client.conf
new file mode 100644
index 0000000..83bf961
--- /dev/null
+++ b/tests/none_anon/server_register_client.conf
@@ -0,0 +1,12 @@
+# ServerRegister client config — test: none_anon
+
+applicationUri = urn:bobink.ServerRegister
+certificate = certs/ServerRegisterClient_cert.der
+privateKey = certs/ServerRegisterClient_key.der
+
+securityMode = None
+securityPolicy = None
+
+authMode = anonymous
+
+trustStore = certs/trust/server_register_client
-- 
cgit v1.2.3