From 836d43a1c8fc5a6e6ec255fe4499e3abfce45eb9 Mon Sep 17 00:00:00 2001
From: Alice <alice.mazzoleni@psi.ch>
Date: Mon, 23 Feb 2026 14:46:00 +0100
Subject: [PATCH] solved merge conflict

---
 .../matterhonServer/src/MatterhornClientInterface.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/slsDetectorServers/matterhonServer/src/MatterhornClientInterface.cpp b/slsDetectorServers/matterhonServer/src/MatterhornClientInterface.cpp
index 5c4a92151..6ea6c5962 100644
--- a/slsDetectorServers/matterhonServer/src/MatterhornClientInterface.cpp
+++ b/slsDetectorServers/matterhonServer/src/MatterhornClientInterface.cpp
@@ -19,7 +19,10 @@ MatterhornClientInterface::MatterhornClientInterface(const uint16_t portNumber)
         {detFuncs::F_GET_DETECTOR_TYPE,
          [this](ServerInterface &si) { return this->get_detector_type(si); }},
         {detFuncs::F_INITIAL_CHECKS,
-         [this](ServerInterface &si) { return this->initial_checks(si); }}};
+         [this](ServerInterface &si) { return this->initial_checks(si); }},
+        {detFuncs::F_GET_NUM_INTERFACES, [this](ServerInterface &si) {
+             return this->get_num_udp_interfaces(si);
+         }}};
 
     startTCPServer();
 }
@@ -52,4 +55,10 @@ ReturnCode MatterhornClientInterface::initial_checks(ServerInterface &socket) {
     return static_cast<ReturnCode>(socket.sendResult(initial_checks_passed));
 }
 
+ReturnCode
+MatterhornClientInterface::get_num_udp_interfaces(ServerInterface &socket) {
+    int numUDPInterfaces = 1;
+    return static_cast<ReturnCode>(socket.sendResult(numUDPInterfaces));
+}
+
 } // namespace sls
\ No newline at end of file