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

work

Browse Source
This commit is contained in:
milek7
2018-12-25 23:38:47 +01:00
parent 21fff27903
commit 4db460d655
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
network/network.cpp
View File

@@ -1,10 +1,15 @@
#include "network/network.h" #include "network/network.h"
#include "network/message.h" #include "network/message.h"
#include "Logs.h" #include "Logs.h"
#include "sn_utils.h"
void network::connection::connected() void network::connection::connected()
{ {
WriteLog("net: socket connected", logtype::net); WriteLog("net: socket connected", logtype::net);
message hello;
hello.type = message::CONNECT_REQUEST;
send_message(hello);
} }
void network::connection::message_received(message &msg) void network::connection::message_received(message &msg)
@@ -19,6 +24,8 @@ void network::connection::message_received(message &msg)
{ {
message reply({message::CONNECT_ACCEPT}); message reply({message::CONNECT_ACCEPT});
WriteLog("client accepted", logtype::net);
std::string reply_buf; std::string reply_buf;
std::ostringstream stream(reply_buf); std::ostringstream stream(reply_buf);
reply.serialize(stream); reply.serialize(stream);
@@ -35,10 +42,12 @@ void network::connection::data_received(std::string &buffer)
void network::connection::send_message(message &msg) void network::connection::send_message(message &msg)
{ {
std::shared_ptr<std::string> buf = std::make_shared<std::string>(); std::ostringstream stream;
std::ostringstream stream(*buf.get()); sn_utils::ls_uint32(stream, 0x37305545);
sn_utils::ls_uint32(stream, 2);
msg.serialize(stream); msg.serialize(stream);
stream.flush(); stream.flush();
std::shared_ptr<std::string> buf = std::make_shared<std::string>(stream.str());
send_data(buf); send_data(buf);
} }

3
network/tcp.cpp
View File

@@ -5,7 +5,7 @@
network::tcp_conn::tcp_conn(asio::io_context &io_ctx) network::tcp_conn::tcp_conn(asio::io_context &io_ctx)
: m_socket(io_ctx) : m_socket(io_ctx)
{ {
m_header_buffer.resize(12); m_header_buffer.resize(8);
} }
void network::tcp_conn::disconnect() void network::tcp_conn::disconnect()
@@ -16,6 +16,7 @@ void network::tcp_conn::disconnect()
void network::tcp_conn::connected() void network::tcp_conn::connected()
{ {
connection::connected();
read_header(); read_header();
} }