strepsirrhini/libreoffice-online
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nb: refactor server code into own function

Browse source 
Change-Id: Iba7363df7452da271fcf9afb54ad1f6177260ddd
Reviewed-on: https://gerrit.libreoffice.org/34235
Reviewed-by: Ashod Nakashian <ashnakash@gmail.com>
Tested-by: Ashod Nakashian <ashnakash@gmail.com>
This commit is contained in:
Ashod Nakashian 2017-02-13 20:55:01 -05:00 committed by Jan Holesovsky
parent 10ab785fa4
commit f41968a726
1 changed files with 37 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
net/loolnb.cpp
View file

@ -465,10 +465,10 @@ private:
std::thread _thread; std::thread _thread;
}; };
SocketAddress addr("127.0.0.1", PortNumber);
std::shared_ptr<Socket> connectClient(const int timeoutMs) std::shared_ptr<Socket> connectClient(const int timeoutMs)
{ {
SocketAddress addr("127.0.0.1", PortNumber);
const auto client = std::make_shared<Socket>(); const auto client = std::make_shared<Socket>();
if (!client->connect(addr, timeoutMs) && errno != EINPROGRESS) if (!client->connect(addr, timeoutMs) && errno != EINPROGRESS)
{ {
@ -481,6 +481,40 @@ std::shared_ptr<Socket> connectClient(const int timeoutMs)
return client; return client;
} }
void server(SocketPoll<Socket>& poller)
{
// Start server.
auto server = std::make_shared<Socket>();
if (!server->bind(addr))
{
const std::string msg = "Failed to bind. (errno: ";
throw std::runtime_error(msg + std::strerror(errno) + ")");
}
if (!server->listen())
{
const std::string msg = "Failed to listen. (errno: ";
throw std::runtime_error(msg + std::strerror(errno) + ")");
}
std::cout << "Listening." << std::endl;
for (;;)
{
if (server->pollRead(30000))
{
std::shared_ptr<Socket> clientSocket = server->accept();
if (!clientSocket)
{
const std::string msg = "Failed to accept. (errno: ";
throw std::runtime_error(msg + std::strerror(errno) + ")");
}
std::cout << "Accepted client #" << clientSocket->fd() << std::endl;
poller.insertNewSocket(clientSocket);
}
}
}
int main(int argc, const char**) int main(int argc, const char**)
{ {
SocketAddress addr("127.0.0.1", PortNumber); SocketAddress addr("127.0.0.1", PortNumber);
@ -561,36 +595,7 @@ int main(int argc, const char**)
} }
}); });
// Start server. server(poller);
auto server = std::make_shared<Socket>();
if (!server->bind(addr))
{
const std::string msg = "Failed to bind. (errno: ";
throw std::runtime_error(msg + std::strerror(errno) + ")");
}
if (!server->listen())
{
const std::string msg = "Failed to listen. (errno: ";
throw std::runtime_error(msg + std::strerror(errno) + ")");
}
std::cout << "Listening." << std::endl;
for (;;)
{
if (server->pollRead(30000))
{
std::shared_ptr<Socket> clientSocket = server->accept();
if (!clientSocket)
{
const std::string msg = "Failed to accept. (errno: ";
throw std::runtime_error(msg + std::strerror(errno) + ")");
}
std::cout << "Accepted client #" << clientSocket->fd() << std::endl;
poller.insertNewSocket(clientSocket);
}
}
std::cout << "Shutting down server." << std::endl; std::cout << "Shutting down server." << std::endl;