solved merge conflict

This commit is contained in:
2026-05-29 15:19:26 +02:00
parent 69ff723d0d
commit 836d43a1c8
@@ -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