From 96d928a83c35d3919d24ee1d352624a6305d904b Mon Sep 17 00:00:00 2001
From: anulax1225 <anulax1225@icloud.com>
Date: Wed, 13 Mar 2024 16:27:54 +0100
Subject: [PATCH] Working abstraction

---
 bakanet/src/bakanet.h                          | 8 ++++----
 bakanet/src/bakanet/sock_layer/ip_address.h    | 2 +-
 bakanet/src/bakanet/sock_layer/socket.h        | 2 +-
 bakanet/src/plaform/linux/linux_ip_address.cpp | 4 ++--
 bakanet/src/plaform/linux/linux_socket.cpp     | 2 +-
 premake5.lua                                   | 4 ++++
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/bakanet/src/bakanet.h b/bakanet/src/bakanet.h
index 6498047..5e2f894 100755
--- a/bakanet/src/bakanet.h
+++ b/bakanet/src/bakanet.h
@@ -1,6 +1,6 @@
 #pragma once 
 
-#include <bakanet/ip_address.h>
-#include <bakanet/packet.h>
-#include <bakanet/socket.h>
-#include <bakanet/dns_lookup.h>
\ No newline at end of file
+#include <bakanet/sock_layer/ip_address.h>
+#include <bakanet/sock_layer/packet.h>
+#include <bakanet/sock_layer/socket.h>
+#include <bakanet/sock_layer/dns_lookup.h>
\ No newline at end of file
diff --git a/bakanet/src/bakanet/sock_layer/ip_address.h b/bakanet/src/bakanet/sock_layer/ip_address.h
index 4ddf6ba..43fa92e 100755
--- a/bakanet/src/bakanet/sock_layer/ip_address.h
+++ b/bakanet/src/bakanet/sock_layer/ip_address.h
@@ -10,7 +10,7 @@ namespace Bk::Net {
 		IpAddress(std::string ip, IpVersion ipv = IpVersion::IPv4)
 		: str(ip), version(ipv) { }
 		
-		std::unique_ptr<void*> get_data();
+		struct in_addr get_data();
 		std::string str;
 		IpVersion version;
 	};
diff --git a/bakanet/src/bakanet/sock_layer/socket.h b/bakanet/src/bakanet/sock_layer/socket.h
index 2a6c155..eeedc78 100755
--- a/bakanet/src/bakanet/sock_layer/socket.h
+++ b/bakanet/src/bakanet/sock_layer/socket.h
@@ -11,7 +11,7 @@ namespace Bk::Net {
 	class Socket 
 	{
 	public:
-		virtual ~Socket() { }
+		virtual ~Socket() {}
 
 		virtual bool init() = 0;
 		virtual bool start(int cpt_conn) = 0;
diff --git a/bakanet/src/plaform/linux/linux_ip_address.cpp b/bakanet/src/plaform/linux/linux_ip_address.cpp
index 43292e7..b6b9133 100755
--- a/bakanet/src/plaform/linux/linux_ip_address.cpp
+++ b/bakanet/src/plaform/linux/linux_ip_address.cpp
@@ -2,10 +2,10 @@
 #include <string.h>
 
 namespace Bk::Net {
-    std::unique_ptr<void*> IpAddress::get_data() 
+    struct in_addr IpAddress::get_data() 
     {
         struct in_addr addr;
         if (inet_pton(AF_INET, str.c_str(), &addr) <= 0) perror("Bad IP");
-        return std::make_unique<void*>(&addr); 
+        return addr; 
     }
 }
\ No newline at end of file
diff --git a/bakanet/src/plaform/linux/linux_socket.cpp b/bakanet/src/plaform/linux/linux_socket.cpp
index 2dd46e5..ef7e8fa 100755
--- a/bakanet/src/plaform/linux/linux_socket.cpp
+++ b/bakanet/src/plaform/linux/linux_socket.cpp
@@ -11,7 +11,7 @@ namespace Bk::Net {
 	        perror("socket failed");
 	        exit(EXIT_FAILURE);
 	    }
-	    addr.sin_addr = *(struct in_addr*)*ip_addr.get_data();
+	    addr.sin_addr = ip_addr.get_data();
 		addr.sin_family = (int)ip_addr.version;
     	addr.sin_port = htons(port);
 	}
diff --git a/premake5.lua b/premake5.lua
index cefb04e..d8c53e1 100755
--- a/premake5.lua
+++ b/premake5.lua
@@ -14,4 +14,8 @@ IncludeDirs["bakanet"] = "%{wks.location}/bakanet/src/"
 
 group "NetCore"
 	include "bakanet"
+group ""
+
+group "Sandbox"
+	include "sandbox"
 group ""
\ No newline at end of file