From 3d42b59b60e020cefbc321dd47611023d043cf8e Mon Sep 17 00:00:00 2001
From: Nikola Petrov <nikola@petrovv.com>
Date: Thu, 30 Jan 2025 22:55:41 +0100
Subject: [PATCH] combine net

---
 app/src/DnaStore.cpp     |  1 -
 server/inc/sql.hpp       |  1 +
 server/src/server.cpp    |  1 -
 shared/inc/NetConst.hpp  | 17 -----------------
 shared/inc/TcpSocket.hpp | 35 ++++++++++++++++++++++++++---------
 5 files changed, 27 insertions(+), 28 deletions(-)
 delete mode 100644 shared/inc/NetConst.hpp

diff --git a/app/src/DnaStore.cpp b/app/src/DnaStore.cpp
index fdc8152..84af855 100644
--- a/app/src/DnaStore.cpp
+++ b/app/src/DnaStore.cpp
@@ -9,7 +9,6 @@
 #include "sys.hpp"
 #include "DnaStore.hpp"
 #include "TcpSocket.hpp"
-#include "NetConst.hpp"
 
 #include <raylib.h>
 
diff --git a/server/inc/sql.hpp b/server/inc/sql.hpp
index 3e32fbc..3638510 100644
--- a/server/inc/sql.hpp
+++ b/server/inc/sql.hpp
@@ -17,6 +17,7 @@ const char get_gen[] = "SELECT lt.HASH, lt.POS, lt.LIKED FROM like_table lt JOIN
 const char get_user_table_id[] = "SELECT ID FROM user_table WHERE USER_ID = ? AND GEN = ?;";
 
 const char rem_like_w_user_table_id[] = "DELETE FROM like_table WHERE USER_TABLE_ID = ?;";
+
 const char rem_user_table_id[] = "DELETE FROM user_table WHERE ID = ?;";
 
 const char set_checked[] = "UPDATE user_table SET CHECKED = 1 WHERE USER_ID = ? AND GEN = ?;";
diff --git a/server/src/server.cpp b/server/src/server.cpp
index f332fc9..40b2536 100644
--- a/server/src/server.cpp
+++ b/server/src/server.cpp
@@ -1,5 +1,4 @@
 #include "TcpSocket.hpp"
-#include "NetConst.hpp"
 #include "sql.hpp"
 #include "values/DnaManager.hpp"
 #include "checker.hpp"
diff --git a/shared/inc/NetConst.hpp b/shared/inc/NetConst.hpp
deleted file mode 100644
index 60a7b5c..0000000
--- a/shared/inc/NetConst.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include <cinttypes>
-
-constexpr int64_t StartHeader = 1737720524UL;
-constexpr uint16_t serverPort = 9000;
-
-enum Mess
-{
-  RES_OK,
-  RES_NO,
-  REQ_SEND_GEN,
-};
-
-struct Message
-{
-  Mess mess;
-  uint32_t data;
-};
diff --git a/shared/inc/TcpSocket.hpp b/shared/inc/TcpSocket.hpp
index 8f21f88..d5347da 100644
--- a/shared/inc/TcpSocket.hpp
+++ b/shared/inc/TcpSocket.hpp
@@ -1,25 +1,42 @@
 #include <string>
 #include <netinet/in.h>
+#include <cinttypes>
 
 #define AS_DEFAULT_BUFFER_SIZE 0x1000 /*4096 bytes*/
 
+constexpr int64_t StartHeader = 1737720524UL;
+constexpr uint16_t serverPort = 9000;
+
+enum Mess
+{
+  RES_OK,
+  RES_NO,
+  REQ_SEND_GEN,
+};
+
+struct Message
+{
+  Mess mess;
+  uint32_t data;
+};
+
 namespace TcpSocket
 {
 
-    void setTimeout(int seconds, int sock);
+  void setTimeout(int seconds, int sock);
 
-    ssize_t sendt(int sock, const void *bytes, size_t byteslength);
+  ssize_t sendt(int sock, const void *bytes, size_t byteslength);
 
-    ssize_t recvt(int sock, void *bytes, size_t byteslength);
+  ssize_t recvt(int sock, void *bytes, size_t byteslength);
 
-    void closet(int sock);
+  void closet(int sock);
 
-    std::string remoteAddress(sockaddr_in &address);
+  std::string remoteAddress(sockaddr_in &address);
 
-    int remotePort(sockaddr_in &address);
-    int connectt(const char *host, uint16_t port);
+  int remotePort(sockaddr_in &address);
+  int connectt(const char *host, uint16_t port);
 
-    typedef void(OnNewConnectionCallBack)(int sock, sockaddr_in newSocketInfo);
-    int listent(const char *host, uint16_t port, OnNewConnectionCallBack callback);
+  typedef void(OnNewConnectionCallBack)(int sock, sockaddr_in newSocketInfo);
+  int listent(const char *host, uint16_t port, OnNewConnectionCallBack callback);
 
 } // namespace TcpSocket