From 364c96e5b220f64207490153794b36b76ffe406e Mon Sep 17 00:00:00 2001 From: malloc Date: Thu, 8 Mar 2018 08:14:27 -0600 Subject: [PATCH] websock start --- server/CMakeLists.txt | 2 +- server/src/sock/gamesock.cpp | 2 ++ server/src/sock/gamesock.hpp | 22 ++++++++++++++++++++++ server/src/sock/intrasock.cpp | 2 ++ server/src/sock/intrasock.hpp | 20 ++++++++++++++++++++ server/src/sock/rawsock.cpp | 1 - server/src/sock/rawsock.hpp | 6 ------ server/src/sock/websock.cpp | 1 - server/src/sock/websock.hpp | 16 ---------------- 9 files changed, 47 insertions(+), 25 deletions(-) create mode 100644 server/src/sock/gamesock.cpp create mode 100644 server/src/sock/gamesock.hpp create mode 100644 server/src/sock/intrasock.cpp create mode 100644 server/src/sock/intrasock.hpp delete mode 100644 server/src/sock/rawsock.cpp delete mode 100644 server/src/sock/rawsock.hpp delete mode 100644 server/src/sock/websock.cpp delete mode 100644 server/src/sock/websock.hpp diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 482de2f..f074636 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -4,7 +4,7 @@ project(server) file(GLOB_RECURSE server_src "src/*.hpp" "src/*.cpp" -) +) if(CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -static") diff --git a/server/src/sock/gamesock.cpp b/server/src/sock/gamesock.cpp new file mode 100644 index 0000000..938dfe3 --- /dev/null +++ b/server/src/sock/gamesock.cpp @@ -0,0 +1,2 @@ +#include "gamesock.hpp" + diff --git a/server/src/sock/gamesock.hpp b/server/src/sock/gamesock.hpp new file mode 100644 index 0000000..97075ae --- /dev/null +++ b/server/src/sock/gamesock.hpp @@ -0,0 +1,22 @@ +#ifndef SOSC_GAMESOCK_H +#define SOSC_GAMESOCK_H + +#include "tcpsock.hpp" + +namespace sosc { +class GameConnection { +public: + +private: + sosc::TcpClient client; +}; + +class GameServer { +public: + +private: + +}; +} + +#endif diff --git a/server/src/sock/intrasock.cpp b/server/src/sock/intrasock.cpp new file mode 100644 index 0000000..4075edc --- /dev/null +++ b/server/src/sock/intrasock.cpp @@ -0,0 +1,2 @@ +#include "intrasock.hpp" + diff --git a/server/src/sock/intrasock.hpp b/server/src/sock/intrasock.hpp new file mode 100644 index 0000000..ee51766 --- /dev/null +++ b/server/src/sock/intrasock.hpp @@ -0,0 +1,20 @@ +#ifndef SOSC_INTSOCK_H +#define SOSC_INTSOCK_H + +namespace sosc { +class IntraConnection { +public: + +private: + +}; + +class IntraServer { +public: + +private: + +}; +} + +#endif diff --git a/server/src/sock/rawsock.cpp b/server/src/sock/rawsock.cpp deleted file mode 100644 index 8b13789..0000000 --- a/server/src/sock/rawsock.cpp +++ /dev/null @@ -1 +0,0 @@ - diff --git a/server/src/sock/rawsock.hpp b/server/src/sock/rawsock.hpp deleted file mode 100644 index 42e5a51..0000000 --- a/server/src/sock/rawsock.hpp +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef SOSC_RAWSOCK_H -#define SOSC_RAWSOCK_H - - - -#endif diff --git a/server/src/sock/websock.cpp b/server/src/sock/websock.cpp deleted file mode 100644 index 703da89..0000000 --- a/server/src/sock/websock.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "websock.hpp" diff --git a/server/src/sock/websock.hpp b/server/src/sock/websock.hpp deleted file mode 100644 index bf07f01..0000000 --- a/server/src/sock/websock.hpp +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef SOSC_WEBSOCK_H -#define SOSC_WEBSOCK_H - -#include "tcpsock.hpp" - -namespace sosc { -class WebSocketClient { - -}; - -class WebSocketServer { - -}; -} - -#endif