mrtoth/cpp11chat
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

implemented cnm::close_connection() + general code cleaning + added TODOS

Browse Source
This commit is contained in:
Kjistóf 2016-12-03 15:30:15 +01:00
parent 6f34d28458
commit 5cfef17cc2
1 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
chat_networking.hpp
View File

@ -47,6 +47,18 @@ namespace chat
}); });
} }
void close_connection()
{
_ios.post([this]
{
_os << chat_message(message::BYE);
asio::write(_socket, _osb);
// TODO: handle last server message
_socket.close();
_ios.stop();
});
}
/* internal methods */ /* internal methods */
private: private:
@ -71,33 +83,37 @@ namespace chat
{ {
throw_if_error(ec); throw_if_error(ec);
std::cout << receive_message_sync() << '\n';
_os << chat_message(message::HELLO); _os << chat_message(message::HELLO);
_os << chat_message(message::NEPTUN, _login); _os << chat_message(message::NEPTUN, _login);
std::reverse(_login.begin(), _login.end()); std::reverse(_login.begin(), _login.end());
_os << chat_message(message::PASSW, _login); _os << chat_message(message::PASSW, _login);
asio::write(_socket, _osb); asio::write(_socket, _osb); // handshake is handled synchronously
// TODO: do something with these couts (decide whether to display this or not)
std::cout << receive_message_sync() << '\n';
std::cout << receive_message_sync() << '\n'; std::cout << receive_message_sync() << '\n';
std::cout << receive_message_sync() << '\n'; std::cout << receive_message_sync() << '\n';
std::cout << receive_message_sync() << '\n'; std::cout << receive_message_sync() << '\n';
receive(); receive(); // then flow goes to receive-loop
} }
std::string receive_message_sync() std::string receive_message_sync()
{ {
boost::system::error_code ec;
std::string data; std::string data;
asio::read_until(_socket, _isb, byte(message::TERM)); asio::read_until(_socket, _isb, byte(message::TERM), ec);
std::getline(_is, data, byte(message::TERM)); std::getline(_is, data, byte(message::TERM));
throw_if_error(ec);
return data; return data;
} }
void receive() void receive()
{ {
asio::async_read_until(_socket, _isb, byte(message::TERM), asio::async_read_until
(_socket, _isb, byte(message::TERM),
[this](boost::system::error_code ec, size_t) [this](boost::system::error_code ec, size_t)
{ {
throw_if_error(ec); throw_if_error(ec);
@ -108,11 +124,11 @@ namespace chat
switch (data[0]) switch (data[0])
{ {
// TODO: handle stuff // TODO: handle stuff
case byte(message::LOGIN):
std::cout << "login\n";
break;
case byte(message::PING): case byte(message::PING):
std::cout << "ping\n"; send(chat_message(message::PONG));
break;
case byte(message::MESSAGE):
std::cout << data << '\n';
break; break;
} }