Skip to content

Commit

Permalink
merge: dev ino master
Browse files Browse the repository at this point in the history
Refactor: lowered include folders name
  • Loading branch information
0xmemorygrinder authored Oct 28, 2022
2 parents dc04ff8 + e16967d commit 0945e44
Show file tree
Hide file tree
Showing 60 changed files with 117 additions and 117 deletions.
2 changes: 1 addition & 1 deletion examples/tcpEcho/MessageDto.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#pragma once

#include <string>
#include "Polymorph/Network/SerializerTrait.hpp"
#include "polymorph/network/SerializerTrait.hpp"

/**
* @brief Message DTO that will be sent over the network
Expand Down
2 changes: 1 addition & 1 deletion examples/tcpEcho/echoClient.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <iostream>
#include "Polymorph/Network/tcp/Client.hpp"
#include "polymorph/network/tcp/Client.hpp"
#include "MessageDto.hpp"


Expand Down
2 changes: 1 addition & 1 deletion examples/tcpEcho/echoServer.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <iostream>
#include <future>
#include "Polymorph/Network/tcp/Server.hpp"
#include "polymorph/network/tcp/Server.hpp"
#include "MessageDto.hpp"


Expand Down
2 changes: 1 addition & 1 deletion examples/udpEcho/MessageDto.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#pragma once

#include <string>
#include "Polymorph/Network/SerializerTrait.hpp"
#include "polymorph/network/SerializerTrait.hpp"

/**
* @brief Message DTO that will be sent over the network
Expand Down
2 changes: 1 addition & 1 deletion examples/udpEcho/echoClient.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <iostream>
#include "Polymorph/Network/udp/Client.hpp"
#include "polymorph/network/udp/Client.hpp"
#include "MessageDto.hpp"


Expand Down
2 changes: 1 addition & 1 deletion examples/udpEcho/echoServer.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#include <iostream>
#include <future>
#include "Polymorph/Network/udp/Server.hpp"
#include "polymorph/network/udp/Server.hpp"
#include "MessageDto.hpp"


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include "Polymorph/Network/PacketHeader.hpp"
#include "polymorph/network/PacketHeader.hpp"

namespace polymorph::network
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include <cstring>
#include <vector>
#include "Polymorph/Network/types.hpp"
#include "polymorph/network/types.hpp"

namespace polymorph::network
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

#include <cstring>
#include <vector>
#include "Polymorph/Network/Packet.hpp"
#include "Polymorph/Network/exceptions/DeserializingException.hpp"
#include "polymorph/network/Packet.hpp"
#include "polymorph/network/exceptions/DeserializingException.hpp"

namespace polymorph::network
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <mutex>
#include "asio/ip/tcp.hpp"
#include "asio/ip/udp.hpp"
#include "Polymorph/Network/types.hpp"
#include "polymorph/network/types.hpp"

namespace polymorph::network
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include "Polymorph/Network/types.hpp"
#include "polymorph/network/types.hpp"

namespace polymorph::network
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include "Polymorph/Network/types.hpp"
#include "polymorph/network/types.hpp"

namespace polymorph::network
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include "Polymorph/Network/types.hpp"
#include "polymorph/network/types.hpp"

namespace polymorph::network
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include "Polymorph/Network/types.hpp"
#include "polymorph/network/types.hpp"

namespace polymorph::network
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include "Polymorph/Network/types.hpp"
#include "polymorph/network/types.hpp"

namespace polymorph::network
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
#include <thread>
#include <functional>
#include <asio.hpp>
#include "Polymorph/Network/PacketHeader.hpp"
#include "Polymorph/Network/Packet.hpp"
#include "Polymorph/Network/tcp/IPacketHandler.hpp"
#include "Polymorph/Network/SerializerTrait.hpp"
#include "polymorph/network/PacketHeader.hpp"
#include "polymorph/network/Packet.hpp"
#include "polymorph/network/tcp/IPacketHandler.hpp"
#include "polymorph/network/SerializerTrait.hpp"

namespace polymorph::network::tcp
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <queue>
#include <iostream>
#include "APacketHandler.hpp"
#include "Polymorph/Network/dto/ACKDto.hpp"
#include "polymorph/network/dto/ACKDto.hpp"

namespace polymorph::network::tcp
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@

#include <set>
#include <vector>
#include "Polymorph/Network/tcp/IConnectionPool.hpp"
#include "Polymorph/Network/types.hpp"
#include "polymorph/network/tcp/IConnectionPool.hpp"
#include "polymorph/network/types.hpp"

namespace polymorph::network::tcp
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#pragma once

#include <memory>
#include "Polymorph/Network/udp/IClientConnection.hpp"
#include "polymorph/network/udp/IClientConnection.hpp"

namespace polymorph::network::tcp
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include "Polymorph/Network/PacketHeader.hpp"
#include "polymorph/network/PacketHeader.hpp"
#include <vector>

namespace polymorph::network::tcp {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
#pragma once

#include <iostream>
#include "Polymorph/Network/tcp/APacketHandler.hpp"
#include "Polymorph/Network/SessionStore.hpp"
#include "polymorph/network/tcp/APacketHandler.hpp"
#include "polymorph/network/SessionStore.hpp"
#include "ConnectionPool.hpp"

namespace polymorph::network::tcp
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
#include <functional>
#include <asio/ip/udp.hpp>
#include <thread>
#include "Polymorph/Network/udp/IPacketHandler.hpp"
#include "Polymorph/Network/Packet.hpp"
#include "Polymorph/Network/SerializerTrait.hpp"
#include "polymorph/network/udp/IPacketHandler.hpp"
#include "polymorph/network/Packet.hpp"
#include "polymorph/network/SerializerTrait.hpp"

namespace polymorph::network::udp
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
#pragma once

#include "APacketHandler.hpp"
#include "Polymorph/Network/udp/PacketStore.hpp"
#include "Polymorph/Network/udp/Connector.hpp"
#include "Polymorph/Network/dto/ACKDto.hpp"
#include "polymorph/network/udp/PacketStore.hpp"
#include "polymorph/network/udp/Connector.hpp"
#include "polymorph/network/dto/ACKDto.hpp"

namespace polymorph::network::udp
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <asio/io_context.hpp>
#include <queue>
#include <vector>
#include "Polymorph/Network/udp/IPacketHandler.hpp"
#include "polymorph/network/udp/IPacketHandler.hpp"

namespace polymorph::network::udp {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include <vector>
#include <functional>
#include "Polymorph/Network/PacketHeader.hpp"
#include "polymorph/network/PacketHeader.hpp"

namespace polymorph::network::tcp
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
#pragma once

#include <asio/ip/udp.hpp>
#include "Polymorph/Network/types.hpp"
#include "Polymorph/Network/PacketHeader.hpp"
#include "polymorph/network/types.hpp"
#include "polymorph/network/PacketHeader.hpp"

namespace polymorph::network::udp
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
#include <mutex>
#include <asio/ip/udp.hpp>

#include "Polymorph/Network/types.hpp"
#include "Polymorph/Network/PacketHeader.hpp"
#include "polymorph/network/types.hpp"
#include "polymorph/network/PacketHeader.hpp"

namespace polymorph::network::udp
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@

#pragma once

#include "Polymorph/Network/udp/APacketHandler.hpp"
#include "Polymorph/Network/udp/ServerPacketManager.hpp"
#include "Polymorph/Network/udp/PacketStore.hpp"
#include "Polymorph/Network/udp/Connector.hpp"
#include "Polymorph/Network/SessionStore.hpp"
#include "polymorph/network/udp/APacketHandler.hpp"
#include "polymorph/network/udp/ServerPacketManager.hpp"
#include "polymorph/network/udp/PacketStore.hpp"
#include "polymorph/network/udp/Connector.hpp"
#include "polymorph/network/SessionStore.hpp"

namespace polymorph::network::udp
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#include <map>
#include <asio/steady_timer.hpp>
#include <utility>
#include "Polymorph/Network/types.hpp"
#include "polymorph/network/types.hpp"

namespace polymorph::network::udp
{
Expand Down
2 changes: 1 addition & 1 deletion src/include/authorizationKey.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#pragma once

#include "Polymorph/Network/types.hpp"
#include "polymorph/network/types.hpp"

namespace polymorph::network
{
Expand Down
10 changes: 5 additions & 5 deletions src/include/tcp/ClientConnection.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
#include <memory>
#include <asio/ip/udp.hpp>
#include <queue>
#include "Polymorph/Network/SessionStore.hpp"
#include "Polymorph/Network/PacketHeader.hpp"
#include "Polymorph/Network/tcp/IConnectionPool.hpp"
#include "Polymorph/Network/tcp/IPacketHandler.hpp"
#include "Polymorph/Network/tcp/Server.hpp"
#include "polymorph/network/SessionStore.hpp"
#include "polymorph/network/PacketHeader.hpp"
#include "polymorph/network/tcp/IConnectionPool.hpp"
#include "polymorph/network/tcp/IPacketHandler.hpp"
#include "polymorph/network/tcp/Server.hpp"

namespace polymorph::network::tcp
{
Expand Down
10 changes: 5 additions & 5 deletions src/src/SessionStore.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,12 @@
*/


#include "Polymorph/Network/SessionStore.hpp"
#include "polymorph/network/SessionStore.hpp"
#include "authorizationKey.hpp"
#include "Polymorph/Network/exceptions/UnknownAuthorizationKeyException.hpp"
#include "Polymorph/Network/exceptions/UnauthorizedException.hpp"
#include "Polymorph/Network/exceptions/AlreadyRegisteredException.hpp"
#include "Polymorph/Network/exceptions/UnknownSessionException.hpp"
#include "polymorph/network/exceptions/UnknownAuthorizationKeyException.hpp"
#include "polymorph/network/exceptions/UnauthorizedException.hpp"
#include "polymorph/network/exceptions/AlreadyRegisteredException.hpp"
#include "polymorph/network/exceptions/UnknownSessionException.hpp"

void polymorph::network::SessionStore::registerAuthoredClient(asio::ip::udp::endpoint endpoint,
polymorph::network::SessionId sessionId, polymorph::network::AuthorizationKey key)
Expand Down
6 changes: 3 additions & 3 deletions src/src/tcp/APacketHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
*/

#include <iostream>
#include "Polymorph/Network/tcp/APacketHandler.hpp"
#include "Polymorph/Network/SerializerTrait.hpp"
#include "Polymorph/Network/exceptions/DeserializingException.hpp"
#include "polymorph/network/tcp/APacketHandler.hpp"
#include "polymorph/network/SerializerTrait.hpp"
#include "polymorph/network/exceptions/DeserializingException.hpp"

polymorph::network::tcp::APacketHandler::~APacketHandler()
{
Expand Down
6 changes: 3 additions & 3 deletions src/src/tcp/Client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
*/


#include "Polymorph/Network/tcp/Client.hpp"
#include "Polymorph/Network/dto/ConnectionDto.hpp"
#include "Polymorph/Network/dto/ConnectionResponseDto.hpp"
#include "polymorph/network/tcp/Client.hpp"
#include "polymorph/network/dto/ConnectionDto.hpp"
#include "polymorph/network/dto/ConnectionResponseDto.hpp"

polymorph::network::tcp::Client::Client(std::string host, std::uint16_t port)
: _serverEndpoint(asio::ip::make_address_v4(host), port), _socket(_context, asio::ip::tcp::endpoint(asio::ip::tcp::v4(), 0))
Expand Down
12 changes: 6 additions & 6 deletions src/src/tcp/ClientConnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
#include <iostream>
#include <utility>
#include "tcp/ClientConnection.hpp"
#include "Polymorph/Network/SerializerTrait.hpp"
#include "Polymorph/Network/dto/ConnectionDto.hpp"
#include "polymorph/network/SerializerTrait.hpp"
#include "polymorph/network/dto/ConnectionDto.hpp"
#include "authorizationKey.hpp"
#include "Polymorph/Network/dto/ConnectionResponseDto.hpp"
#include "Polymorph/Network/exceptions/UnauthorizedException.hpp"
#include "Polymorph/Network/dto/SessionTransferRequestDto.hpp"
#include "Polymorph/Network/dto/SessionTransferResponseDto.hpp"
#include "polymorph/network/dto/ConnectionResponseDto.hpp"
#include "polymorph/network/exceptions/UnauthorizedException.hpp"
#include "polymorph/network/dto/SessionTransferRequestDto.hpp"
#include "polymorph/network/dto/SessionTransferResponseDto.hpp"


polymorph::network::tcp::ClientConnection::ClientConnection(asio::ip::tcp::socket socket, SessionStore &sessionStore, std::weak_ptr<IConnectionPool> pool, Server &packetHandler)
Expand Down
2 changes: 1 addition & 1 deletion src/src/tcp/ConnectionPool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@


#include <algorithm>
#include "Polymorph/Network/tcp/ConnectionPool.hpp"
#include "polymorph/network/tcp/ConnectionPool.hpp"
#include "tcp/ClientConnection.hpp"

void polymorph::network::tcp::ConnectionPool::join(std::shared_ptr<IClientConnection> connection)
Expand Down
2 changes: 1 addition & 1 deletion src/src/tcp/Server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/


#include "Polymorph/Network/tcp/Server.hpp"
#include "polymorph/network/tcp/Server.hpp"
#include "tcp/ClientConnection.hpp"

polymorph::network::tcp::Server::Server(std::uint16_t port, polymorph::network::SessionStore &sessionStore)
Expand Down
Loading

0 comments on commit 0945e44

Please sign in to comment.