Pull #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

markjunkind wants to merge 199 commits into markjunkind:mv1.1_2.0 from SoWeBegin:mv1.1_2.0

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -415,4 +415,11 @@ Common/x64/ @@
     ExternalLibraries/vcpkg/
     MainServer/x64/
     MainServer/Release/
-    Microvolts-Emulator-V2/
+    Microvolts-Emulator-V2/
+    ExternalLibraries/CommonLib/Common.lib
+    E x t e r n a l L i b r a r i e s / C o m m o n . l i b
+     E x t e r n a l L i b r a r i e s / C o m m o n . l i b

AuthServer/AuthServer.vcxproj

This file was deleted.

AuthServer/AuthServer.vcxproj.filters

This file was deleted.

AuthServer/AuthServerMain.cpp

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,26 +1,46 @@
  
    #include <iostream>

    #include "Utils/Logger.h"

    #include <chrono>

    #include <format>

    #include <asio/execution_context.hpp>

    #include "include/AuthServer.h"

    #include "../include/AuthServer.h"

    #include <iostream>

    #include <Utils/SetupParser.h>

    #include "Utils/Utils.h"

    void printInitialInformation()

    int main()

    {

    	Common::Utils::setConsoleTitle(L"Microvolts Auth Server");

    	auto const time = std::chrono::current_zone()->to_local(std::chrono::system_clock::now());

    	auto const time_s = std::format("{:%Y-%m-%d %X}", time);

    	std::cout << "Auth server initialized on " << time_s << "\n\n";

    }

    	Utils::Logger::log("Auth server initialized on " + time_s, Utils::LogType::Info, "AuthServer");

    	auto parsedServerInfo = Common::Utils::SetupParser::getInstance().getAuthSetup();

    int main()

    {

    #ifdef WIN32

    	SetConsoleTitleW(L"Microvolts Auth Server");

    #endif

    	asio::io_context io_context;

    	Auth::AuthServer srv(io_context, 13001);

    	Utils::Logger::log(std::format("Server Information: IP: {},  Port: {}",

    		parsedServerInfo.ip, parsedServerInfo.port), Utils::LogType::Normal);

    	printInitialInformation();

    	const std::string banner = R"(

       _____   __          __  ____             _         ______                 _       _             

      / ____|  \ \        / / |  _ \           (_)       |  ____|               | |     | |            

     | (___   __\ \  /\  / /__| |_) | ___  __ _ _ _ __   | |__   _ __ ___  _   _| | __ _| |_ ___  _ __ 

      \___ \ / _ \ \/  \/ / _ \  _ < / _ \/ _` | | '_ \  |  __| | '_ ` _ \| | | | |/ _` | __/ _ \| '__|

      ____) | (_) \  /\  /  __/ |_) |  __/ (_| | | | | | | |____| | | | | | |_| | | (_| | || (_) | |   

     |_____/ \___/ \/  \/ \___|____/ \___|\__, |_|_| |_| |______|_| |_| |_|\__,_|_|\__,_|\__\___/|_|   

                                           __/ |                                                       

                                          |___/                                                       

        GitHub: https://github.com/SoWeBegin/MicrovoltsEmulator

    )";

    	Utils::Logger::log(banner, Utils::LogType::Info);

    	asio::io_context io_context;

    	Auth::AuthServer srv(io_context, parsedServerInfo.ip, parsedServerInfo.port);

    	srv.asyncAccept();

    	io_context.run();

    }
      
    }

AuthServer/CMakeLists.txt

-Original file line number
+Diff line change
@@ -0,0 +1,27 @@
+    project(AuthServer LANGUAGES CXX)
+    file(GLOB_RECURSE AUTH_SOURCES CONFIGURE_DEPENDS
+    	${CMAKE_CURRENT_LIST_DIR}/*.cpp
+    )
+    add_executable(AuthServer
+        ${AUTH_SOURCES}
+    )
+    target_include_directories(AuthServer PUBLIC ${CMAKE_CURRENT_LIST_DIR}/include)
+    target_link_libraries(AuthServer PUBLIC
+            Common
+            unofficial::mariadb-connector-cpp::mariadbcpp
+    )
+    if (WIN32)
+        target_link_libraries(AuthServer PUBLIC wsock32 ws2_32)
+    endif()
+    set_target_properties(AuthServer PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}
+    )

AuthServer/include/Structures/AuthAccountInfo.h

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -2,12 +2,13 @@
  
    #define AUTH_ACCOUNTINFO_H

    #include <cstdint>

    #include "Macros.h"

    namespace Auth

    {

    	namespace Structures

    	{

    #pragma pack(push, 1)

    PACK_PUSH(1)

    		struct BasicAccountInfo

    		{

    			std::uint32_t accountId{};

    @@ -29,7 +30,7 @@ namespace Auth
  
    			// commandHeader.option = player grade

    			// commandHeader.extra  = login type 

    		};

    #pragma pack(pop)

    PACK_POP()

    	}

    }

AuthServer/include/Structures/AuthChannels.h

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -8,8 +8,8 @@ namespace Auth
  
    {

    	namespace Structures

    	{

    #pragma pack(push, 1)

    		struct ChannelsInfo

    PACK_PUSH(1)

    struct ChannelsInfo

    		{

    			std::vector<std::uint32_t> channels{};

    @@ -22,7 +22,7 @@ namespace Auth
  
    				}

    			}

    		};

    #pragma pack(pop)

    PACK_POP()

    	}

    }

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pull #1

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!

Pull #1

Are you sure you want to change the base?

Uh oh!

Pull #1

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Uh oh!

Uh oh!