Change naming convention of class properties
This commit is contained in:
1 parent
f45201aa45
commit
eb8bc7a696
14 files changed
+71
-71
No files matched your search
+17
-17
@@ -50,13 +50,13 @@ static char* intToHex(unsigned byteCount, int c) {
|
||||
}
|
||||
|
||||
Server::Server(Logger& logger, EventBus& eventBus)
|
||||
: logger_(logger),
|
||||
eventBus_(eventBus)
|
||||
: _logger(logger),
|
||||
_eventBus(eventBus)
|
||||
{
|
||||
logger_.debug << "Testing some stuff..." << Logger::commit;
|
||||
logger_.debug << "Message header overall size: " << sizeof(Message::Header) << Logger::commit;
|
||||
// logger_.debug << "Message::Header size:" << sizeof(Message::Header) << endl;
|
||||
// logger_.debug << "Message::QR:RESPONSE Enum:" << Message::QR::RESPONSE << endl;
|
||||
_logger.debug << "Testing some stuff..." << Logger::commit;
|
||||
_logger.debug << "Message header overall size: " << sizeof(Message::Header) << Logger::commit;
|
||||
// _logger.debug << "Message::Header size:" << sizeof(Message::Header) << endl;
|
||||
// _logger.debug << "Message::QR:RESPONSE Enum:" << Message::QR::RESPONSE << endl;
|
||||
|
||||
std::fstream myfile;
|
||||
std::streampos beg,end;
|
||||
@@ -68,11 +68,11 @@ Server::Server(Logger& logger, EventBus& eventBus)
|
||||
const unsigned long size = end-beg;
|
||||
Message::Header* header = new Message::Header;
|
||||
myfile.read ((char*)header, sizeof(Message));
|
||||
logger_.debug << "size is: " << size << " bytes." << Logger::commit;
|
||||
_logger.debug << "size is: " << size << " bytes." << Logger::commit;
|
||||
|
||||
logger_.debug << "Header: " << Logger::commit;
|
||||
//logger_.debug << "ID: " << 0x1ef8 <<
|
||||
logger_.debug << "ID: " << intToHex(2, header->id) <<
|
||||
_logger.debug << "Header: " << Logger::commit;
|
||||
//_logger.debug << "ID: " << 0x1ef8 <<
|
||||
_logger.debug << "ID: " << intToHex(2, header->id) <<
|
||||
" QR: " << byteToHex(header->qr) <<
|
||||
" OPCode: " << byteToHex(header->opCode) << Logger::commit <<
|
||||
"Authoritive Answer: " << byteToHex(header->aa) << Logger::commit <<
|
||||
@@ -87,7 +87,7 @@ Server::Server(Logger& logger, EventBus& eventBus)
|
||||
myfile.close();
|
||||
//Testing over
|
||||
|
||||
socket_ = new udp::socket(io_context_, udp::endpoint(udp::v4(), 8853));
|
||||
_socket = new udp::socket(_io_context, udp::endpoint(udp::v4(), 8853));
|
||||
}
|
||||
|
||||
Server::~Server() {
|
||||
@@ -95,14 +95,14 @@ Server::~Server() {
|
||||
}
|
||||
|
||||
void Server::run() {
|
||||
io_context_.run();
|
||||
_io_context.run();
|
||||
do_receive();
|
||||
}
|
||||
|
||||
void Server::do_receive()
|
||||
{
|
||||
socket_->async_receive_from(
|
||||
asio::buffer(data_, 1024), sender_endpoint_,
|
||||
_socket->async_receive_from(
|
||||
asio::buffer(_data, 1024), _sender_endpoint,
|
||||
[this](std::error_code ec, std::size_t bytes_recvd)
|
||||
{
|
||||
if (!ec && bytes_recvd > 0)
|
||||
@@ -118,9 +118,9 @@ void Server::do_receive()
|
||||
|
||||
void Server::do_send(std::size_t length)
|
||||
{
|
||||
socket_->async_send_to(
|
||||
asio::buffer(data_, length), sender_endpoint_,
|
||||
[this](std::error_code /*ec*/, std::size_t /*bytes_sent*/)
|
||||
_socket->async_send_to (
|
||||
asio::buffer(_data, length), _sender_endpoint,
|
||||
[this](std::error_code /*ec*/, std::size_t /*_bytessent*/)
|
||||
{
|
||||
do_receive();
|
||||
});
|
||||
|
||||
Reference in new issue
Block a user