From 39bbcd0d56f2be5eb6a72ef2668f862db8c24e5d Mon Sep 17 00:00:00 2001 From: Karutoh Date: Tue, 28 Jan 2025 04:28:55 -0800 Subject: [PATCH] Added missing constructor for NetChannel in NetServerCh. --- include/ehs/io/socket/ehc/NetServerCh.h | 4 +++- src/io/socket/ehc/NetServerCh.cpp | 22 ++++++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/include/ehs/io/socket/ehc/NetServerCh.h b/include/ehs/io/socket/ehc/NetServerCh.h index 5a7511a..0cafce6 100644 --- a/include/ehs/io/socket/ehc/NetServerCh.h +++ b/include/ehs/io/socket/ehc/NetServerCh.h @@ -17,7 +17,9 @@ namespace ehs public: ~NetServerCh() override; - NetServerCh(UInt_64 maxEndpoints = 0); + NetServerCh(); + + NetServerCh(Str_8 name, const Version &version, UInt_64 maxEndpoints); NetServerCh(NetServerCh &&server) noexcept; diff --git a/src/io/socket/ehc/NetServerCh.cpp b/src/io/socket/ehc/NetServerCh.cpp index 52a1566..975f705 100644 --- a/src/io/socket/ehc/NetServerCh.cpp +++ b/src/io/socket/ehc/NetServerCh.cpp @@ -11,20 +11,25 @@ namespace ehs Shutdown(); } - NetServerCh::NetServerCh(const UInt_64 maxEndpoints) - : maxEndpoints(maxEndpoints) + NetServerCh::NetServerCh() + : maxEndpoints(0) + { + } + + NetServerCh::NetServerCh(Str_8 name, const Version &version, const UInt_64 maxEndpoints) + : NetChannel((Str_8 &&)name, version), maxEndpoints(maxEndpoints) { } NetServerCh::NetServerCh(NetServerCh &&server) noexcept - : endpoints((Vector &&)server.endpoints), maxEndpoints(server.maxEndpoints) + : NetChannel((NetChannel &&)server), endpoints((Vector &&)server.endpoints), maxEndpoints(server.maxEndpoints) { for (UInt_64 i = 0; i < endpoints.Size(); i++) endpoints[i]->owner = this; } NetServerCh::NetServerCh(const NetServerCh &server) - : maxEndpoints(server.maxEndpoints) + : NetChannel(server), maxEndpoints(server.maxEndpoints) { } @@ -33,6 +38,8 @@ namespace ehs if (this == &server) return *this; + NetChannel::operator=((NetChannel &&)server); + Shutdown(); endpoints = (Vector &&)server.endpoints; @@ -51,6 +58,8 @@ namespace ehs if (this == &server) return *this; + NetChannel::operator=(server); + Shutdown(); endpoints = {}; @@ -81,6 +90,11 @@ namespace ehs { } + Serializer NetServerCh::OnShutdown() + { + return {}; + } + Serializer OnShutdown() { return {};