eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 17:09:19 +02:00
Code Issues 123 Wiki Activity

work

Browse Source
This commit is contained in:
milek7
2019-01-27 20:38:03 +01:00
parent 1f83162804
commit 90f18ea651
17 changed files with 168 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
network/backend/asio.cpp
View File

@@ -2,8 +2,8 @@
#include "sn_utils.h"
#include "Logs.h"
network::tcp::connection::connection(asio::io_context &io_ctx, bool client)
: network::connection(client), m_socket(io_ctx)
network::tcp::connection::connection(asio::io_context &io_ctx, bool client, size_t counter)
: network::connection(client, counter), m_socket(io_ctx)
{
m_header_buffer.resize(8);
}
@@ -16,9 +16,7 @@ void network::tcp::connection::disconnect()
void network::tcp::connection::send_data(std::shared_ptr<std::string> buffer)
{
asio::async_write(m_socket, asio::buffer(*buffer.get()), std::bind(&connection::handle_send, this, buffer,
std::placeholders::_1,
std::placeholders::_2));
asio::async_write(m_socket, asio::buffer(*buffer.get()), std::bind(&connection::send_complete, this, buffer));
}
void network::tcp::connection::connected()
@@ -34,12 +32,6 @@ void network::tcp::connection::read_header()
std::placeholders::_1, std::placeholders::_2));
}
void network::tcp::connection::handle_send(
std::shared_ptr<std::string> buf, const asio::error_code &err, size_t bytes_transferred)
{
}
void network::tcp::connection::handle_header(const asio::error_code &err, size_t bytes_transferred)
{
std::istringstream header(m_header_buffer);
@@ -80,32 +72,52 @@ void network::tcp::connection::handle_data(const asio::error_code &err, size_t b
read_header();
}
void network::tcp::connection::send_message(const message &msg)
void network::tcp::connection::write_message(const message &msg, std::ostream &stream)
{
std::ostringstream stream;
size_t beg = (size_t)stream.tellp();
sn_utils::ls_uint32(stream, NETWORK_MAGIC);
sn_utils::ls_uint32(stream, 0);
serialize_message(msg, stream);
size_t size = (size_t)stream.tellp() - 8;
size_t size = (size_t)stream.tellp() - beg - 8;
if (size > MAX_MSG_SIZE) {
ErrorLog("net: message too big", logtype::net);
return;
}
stream.seekp(4, std::ios_base::beg);
stream.seekp(beg + 4, std::ios_base::beg);
sn_utils::ls_uint32(stream, size);
stream.flush();
stream.seekp(0, std::ios_base::end);
}
std::shared_ptr<std::string> buf = std::make_shared<std::string>(stream.str());
send_data(buf);
void network::tcp::connection::send_messages(const std::vector<std::shared_ptr<message> > &messages)
{
if (messages.size() == 0)
return;
std::ostringstream stream;
for (auto const &msg : messages)
write_message(*msg.get(), stream);
stream.flush();
send_data(std::make_shared<std::string>(stream.str()));
}
void network::tcp::connection::send_message(const message &msg)
{
std::ostringstream stream;
write_message(msg, stream);
stream.flush();
send_data(std::make_shared<std::string>(stream.str()));
}
// -----------------
network::tcp::server::server(asio::io_context &io_ctx, const std::string &host, uint32_t port)
: m_acceptor(io_ctx)
network::tcp::server::server(std::shared_ptr<std::istream> buf, asio::io_context &io_ctx, const std::string &host, uint32_t port)
: network::server(buf), m_acceptor(io_ctx)
{
auto endpoint = asio::ip::tcp::endpoint(asio::ip::address::from_string(host), port);
m_acceptor.open(endpoint.protocol());
@@ -144,7 +156,7 @@ void network::tcp::server::handle_accept(std::shared_ptr<connection> conn, const
network::tcp::client::client(asio::io_context &io_ctx, const std::string &host, uint32_t port)
{
std::shared_ptr<connection> conn = std::make_shared<connection>(io_ctx, true);
std::shared_ptr<connection> conn = std::make_shared<connection>(io_ctx, true, messages_counter);
conn->set_handler(std::bind(&client::handle_message, this, std::ref(*conn.get()), std::placeholders::_1));
asio::ip::tcp::endpoint endpoint(

9
network/backend/asio.h
View File

@@ -12,11 +12,11 @@ namespace network::tcp
friend class client;
public:
connection(asio::io_context &io_ctx, bool client = false);
connection(asio::io_context &io_ctx, bool client = false, size_t counter = 0);
virtual void connected() override;
virtual void disconnect() override;
virtual void send_data(std::shared_ptr<std::string> buffer) override;
virtual void send_messages(const std::vector<std::shared_ptr<message> > &messages) override;
virtual void send_message(const message &msg) override;
asio::ip::tcp::socket m_socket;
@@ -25,8 +25,9 @@ namespace network::tcp
std::string m_header_buffer;
std::string m_body_buffer;
void write_message(const message &msg, std::ostream &stream);
void send_data(std::shared_ptr<std::string> buffer);
void read_header();
void handle_send(std::shared_ptr<std::string> buf, const asio::error_code &err, size_t bytes_transferred);
void handle_header(const asio::error_code &err, size_t bytes_transferred);
void handle_data(const asio::error_code &err, size_t bytes_transferred);
};
@@ -40,7 +41,7 @@ namespace network::tcp
asio::ip::tcp::acceptor m_acceptor;
public:
server(asio::io_context &io_ctx, const std::string &host, uint32_t port);
server(std::shared_ptr<std::istream> buf, asio::io_context &io_ctx, const std::string &host, uint32_t port);
};
class client : public network::client

0
network/backend/file.cpp
View File

22
network/backend/file.h
View File

@@ -1,22 +0,0 @@
#include "network/network.h"
namespace network::file
{
class server : public network::server
{
private:
std::fstream stream;
public:
server();
};
class client : public network::client
{
private:
std::fstream stream;
public:
client();
};
}