diff --git a/PROTOCOL.md b/PROTOCOL.md index be888e8..812ab79 100644 --- a/PROTOCOL.md +++ b/PROTOCOL.md @@ -163,7 +163,7 @@ Communication between the master server and clients will be done over a WebSocke
- ID 0: Login Attempt + ID 0: Login Response Responder |
@@ -197,7 +197,7 @@ Communication between the master server and clients will be done over a WebSocke
---|
- ID 1: Registration Attempt + ID 1: Registration Response Responder |
@@ -221,7 +221,7 @@ Communication between the master server and clients will be done over a WebSocke
---|
- ID 2: Server List Request + ID 2: Server Listing Responder |
@@ -256,7 +256,7 @@ Communication between the master server and clients will be done over a WebSocke
---|
- ID 0: Login Attempt + ID 0: Login Request Requester |
@@ -285,7 +285,7 @@ Communication between the master server and clients will be done over a WebSocke
---|
- ID 1: Registration Attempt + ID 1: Registration Request Requester |
diff --git a/src/client/sock/socket.cpp b/src/client/sock/socket.cpp
new file mode 100644
index 0000000..618a9d5
--- /dev/null
+++ b/src/client/sock/socket.cpp
@@ -0,0 +1,5 @@
+//
+// Created by alec on 10/16/2018.
+//
+
+#include "socket.hpp"
diff --git a/src/client/sock/socket.hpp b/src/client/sock/socket.hpp
new file mode 100644
index 0000000..9af6996
--- /dev/null
+++ b/src/client/sock/socket.hpp
@@ -0,0 +1,4 @@
+#ifndef SOSC_CLIENT_SOCKET_H
+#define SOSC_CLIENT_SOCKET_H
+
+#endif
diff --git a/src/server/sock/packet.cpp b/src/common/sock/packet.cpp
similarity index 96%
rename from src/server/sock/packet.cpp
rename to src/common/sock/packet.cpp
index 0801eba..3e1ffeb 100644
--- a/src/server/sock/packet.cpp
+++ b/src/common/sock/packet.cpp
@@ -1,4 +1,4 @@
-#include "packet.hpp"
+#include "sock/packet.hpp"
sosc::Packet::Packet() {
this->id = 0;
@@ -151,8 +151,7 @@ std::string* sosc::Packet::ToString(std::string* packet) const {
(*packet)[1] = 0x0B;
(*packet)[6] = this->id;
(*packet)[7] = regions.size();
-
- //for(auto i = this->regions.begin(); i != this->regions.end(); ++i) {
+
for(const auto& i : this->regions) {
if(i.size() < 0xFE)
*packet += (char)i.size();
@@ -164,8 +163,7 @@ std::string* sosc::Packet::ToString(std::string* packet) const {
*packet += net::htonv
---|