diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/client.cpp | 2 | ||||
| -rw-r--r-- | src/server/clients.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/server/client.cpp b/src/server/client.cpp index e84a654..aa2cdd1 100644 --- a/src/server/client.cpp +++ b/src/server/client.cpp @@ -23,7 +23,9 @@ Client::Client(SP<Server> server, SP<Clients> clients, bool track, bool oneShot) throw std::runtime_error("server:client: ClientManager doesn't exist"); if (m_wpServer.expired()) throw std::runtime_error("server:client: Server doesn't exist"); +} +void Client::init() { m_sockfd = std::make_shared<LibSock::CFileDescriptor>(accept(m_wpServer.lock()->getSocket()->get(), reinterpret_cast<sockaddr *>(&m_addr), &m_addrLen)); // if this is in the init list, it will run before // m_addrLen, so it won't work :/ diff --git a/src/server/clients.cpp b/src/server/clients.cpp index a274224..710f813 100644 --- a/src/server/clients.cpp +++ b/src/server/clients.cpp @@ -58,9 +58,9 @@ Clients::~Clients() { vpClients.erase(std::remove_if(vpClients.begin(), vpClients.end(), [this](const WP<Clients> &wptr) { return !wptr.owner_before(m_self) && !m_self.owner_before(wptr); }), vpClients.end()); } -SP<Client> Clients::newClient(std::function<void(const WP<Client> &)> loopFunc) { +SP<Client> Clients::newClient() { SP client = SP<Client>(new Client(m_wpServer.lock(), shared_from_this())); - auto &instance = m_vClients.emplace_back(std::jthread([&client, &loopFunc]() { loopFunc(client); }), client); + auto &instance = m_vClients.emplace_back(std::jthread([&client]() { client->init(); }), client); instance.second->m_self = std::weak_ptr<Client>(instance.second); return client; } |