diff --git a/.gitignore b/.gitignore index 77ed0c9..3617c3f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ connectionStrings.config *.kdev4 .kdev4/ .idea/ -cmake-build-*/ \ No newline at end of file +cmake-build-*/ +*.db-journal \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index ce53b10..adc23a6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -45,6 +45,7 @@ if(_CMP) PRIVATE ${PROJECT_SOURCE_DIR}/include/client) install(TARGETS client RUNTIME DESTINATION bin/client) + else() ################## diff --git a/protocol.md b/PROTOCOL.md similarity index 100% rename from protocol.md rename to PROTOCOL.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..16c6ff8 --- /dev/null +++ b/README.md @@ -0,0 +1,6 @@ +# imagine a world +sock scape is an interneet game played over the telesockets + +### Thanks mom ! + +e \ No newline at end of file diff --git a/src/server/hosts/master.hpp b/src/server/hosts/master.hpp index a1b66d8..d11bcf9 100644 --- a/src/server/hosts/master.hpp +++ b/src/server/hosts/master.hpp @@ -10,6 +10,7 @@ #include "ctx/master.hpp" #include +#include namespace sosc { /** MASTER -> CLIENT **/ diff --git a/src/server/hosts/master_client.cpp b/src/server/hosts/master_client.cpp index 99bab0e..159bb4f 100644 --- a/src/server/hosts/master_client.cpp +++ b/src/server/hosts/master_client.cpp @@ -1,9 +1,13 @@ #include "master.hpp" +static struct { + std::mutex user_key_mtx; +} _ctx; + /** MASTERCLIENTPOOL CODE **/ void sosc::MasterClientPool::SetupQueries(Queries *queries) { - +#define QRY_ } /** MASTERCLIENT CODE **/ \ No newline at end of file diff --git a/src/server/hosts/master_intra.cpp b/src/server/hosts/master_intra.cpp index ffe51a4..cd3256b 100644 --- a/src/server/hosts/master_intra.cpp +++ b/src/server/hosts/master_intra.cpp @@ -1,6 +1,4 @@ #include "master.hpp" -#include "db/database.hpp" -#include static struct { std::mutex license_check_mtx; diff --git a/src/server/main.cpp b/src/server/main.cpp index afe33d8..3bb4fd9 100644 --- a/src/server/main.cpp +++ b/src/server/main.cpp @@ -58,6 +58,8 @@ bool master_intra(uint16_t port, const sosc::poolinfo_t& info) { bool master_client(uint16_t port, const sosc::poolinfo_t& info) { using namespace sosc; + + return true; } diff --git a/src/server/sock/tcpsock_ssl.cpp b/src/server/sock/tcpsock_ssl.cpp index 6877878..889b4e6 100644 --- a/src/server/sock/tcpsock_ssl.cpp +++ b/src/server/sock/tcpsock_ssl.cpp @@ -1,6 +1,6 @@ #include "tcpsock.hpp" -static struct { +struct { SSL_CTX* server; std::mutex server_mtx; diff --git a/src/web/index.html b/src/web/index.html index 5617f67..7c74f57 100644 --- a/src/web/index.html +++ b/src/web/index.html @@ -3,12 +3,44 @@ client - + - +
+ Connecting to
master server... +
+ + \ No newline at end of file diff --git a/src/web/script.js b/src/web/script.js index e69de29..241fef7 100644 --- a/src/web/script.js +++ b/src/web/script.js @@ -0,0 +1,5 @@ +var ws; + +window.onload = function() { + ws = new WebSocket("wss://localhost:") +}; \ No newline at end of file diff --git a/src/web/style.css b/src/web/style.css new file mode 100644 index 0000000..92816a1 --- /dev/null +++ b/src/web/style.css @@ -0,0 +1,20 @@ +body { + padding-top: 36px; + font-family: monospace; + text-align: center; + background: #000; + color: #fff; +} + +.hidden { + display: none; +} + +#loading { + font-size: 36px; + font-weight: bold; +} + +#login label, #register label { + display: block; +}