Merge pull request eminfedar#1 from TheBeardedQuack/master

Created a project structure to build a shared library.

Author: eminfedar

MakeHelper

@@ -0,0 +1,55 @@
+#!make
+
+#OS Commands
+define NoTrailSlash
+$(patsubst %\\,%,$(patsubst %/,%,$(1)))
+endef
+define MakeExe
+$(1)$(EXEEXT)
+endef
+
+#If Windows
+ifeq ($(OS), Windows_NT)
+
+DLLEXT	:= .dll
+EXEEXT	:= .exe
+
+define ReplaceSlash
+$(subst /,\\,$(1))
+endef
+define MakeLib
+$(1)$(DLLEXT)
+endef
+define RM
+-del /F /Q $(call ReplaceSlash,$(call NoTrailSlash,$(1)))
+endef
+define MD
+-mkdir $(call ReplaceSlash,$(call NoTrailSlash,$(1)))
+endef
+define CP
+-robocopy $(call ReplaceSlash,$(1)) $(call ReplaceSlash,$(2)) /E /is
+endef
+
+else
+#If not Windows, assume Linux
+
+DLLEXT	:= .so
+EXEEXT	:=
+
+define ReplaceSlash
+$(subst \\,/,$(1))
+endef
+define MakeLib
+lib$(1)$(DLLEXT)
+endef
+define RM
+rm -rf $(1)
+endef
+define MD
+mkdir -p $(1)
+endef
+define CP
+cp -rf $(1) $(2)
+endef
+
+endif

easysocket/Makefile

@@ -0,0 +1,87 @@
+#!make
+# This make needs:
+# g++
+#
+
+include ../MakeHelper
+
+# Project name
+NAME 		:= $(patsubst %/,%,$(notdir $(CURDIR)))
+
+#The Target Binary Program
+TARGET			:= $(call MakeLib,$(NAME))
+
+#The Directories, Source, Includes, Objects, Binary and Resources
+SRCDIR		?= $(CURDIR)/src
+INCDIR		?= $(CURDIR)/include
+BUILDDIR	?= $(CURDIR)/obj/$(BUILD)
+TARGETDIR	?= $(CURDIR)/bin/$(BUILD)
+RESDIR		?= $(CURDIR)/rsc
+SRCEXT	:= .cpp
+OBJEXT	:= .o
+
+#Compiler and Linker
+BUILD  		?= debug
+BITS		?= 64
+CC			:= g++
+
+#Flags, Libraries and Includes
+CFLAGS.common	:= -std=c++17 -fPIC -m$(BITS) -Wall -Wextra -DBUILD_EASYSOCKET
+CFLAGS.debug 	:= $(CFLAGS.common) -g
+CFLAGS.release	:= $(CFLAGS.common) -Werror
+CFLAGS			?= $(CFLAGS.$(BUILD))
+LIB		:= -L$(TARGETDIR)
+INC		:= -I$(INCDIR)
+
+#---------------------------------------------------------------------------------
+#DO NOT EDIT BELOW THIS LINE
+#---------------------------------------------------------------------------------
+SOURCES	:= $(wildcard $(SRCDIR)/*$(SRCEXT))
+OBJECTS	:= $(patsubst $(SRCDIR)/%,$(BUILDDIR)/%,$(SOURCES:$(SRCEXT)=$(OBJEXT)))
+
+#Default Make
+all: resources $(TARGET) tests docs
+
+#Remake
+remake: cleaner all
+
+#Create template folder structure
+template: directories
+	$(call MD,$(SRCDIR))
+	$(call MD,$(INCDIR))
+	$(call MD,$(RESDIR))
+
+#Make the Directories
+directories:
+	$(call MD,$(TARGETDIR))
+	$(call MD,$(BUILDDIR))
+
+#Copy Resources from Resources Directory to Target Directory
+resources: template
+#	@$(call CP,$(RESDIR)/*,$(TARGETDIR)/)
+
+#Clean only Objecst
+clean:
+	$(call RM,$(BUILDDIR))
+
+#Full Clean, Objects and Binaries
+cleaner: clean
+	$(call RM,$(TARGETDIR))
+
+docs:
+#TODO
+
+tests:
+#TODO
+
+#Link the final executable/library
+$(TARGET): $(OBJECTS)
+	$(CC) -shared -o $(TARGETDIR)/$(TARGET) $^ $(LIB)
+
+#Compile
+$(BUILDDIR)/%$(OBJEXT): $(SRCDIR)/%$(SRCEXT)
+	$(call MD,$(dir $@))
+	$(CC) $(CFLAGS) $(INC) -c -o $@ $<
+
+#Non-File Targets
+.PHONY: all remake template directories resources clean cleaner

easysocket/basesocket.h

@@ -0,0 +1,20 @@
+#ifdef BUILD_EASYSOCKET
+#define EASYSOCKET_API EXPORT_EASYSOCKET
+#else
+#define EASYSOCKET_API IMPORT_EASYSOCKET
+#endif
+
+#if defined(_MSC_VER)
+    //  Microsoft 
+    #define EXPORT_EASYSOCKET __declspec(dllexport)
+    #define IMPORT_EASYSOCKET __declspec(dllimport)
+#elif defined(__GNUC__)
+    //  GCC
+    #define EXPORT_EASYSOCKET __attribute__((visibility("default")))
+    #define IMPORT_EASYSOCKET
+#else
+    //  do nothing and hope for the best?
+    #define EXPORT_EASYSOCKET
+    #define IMPORT_EASYSOCKET
+    #pragma warning Unknown dynamic link import/export semantics.
+#endif

easysocket/include/DllHelper.h

@@ -0,0 +1,45 @@
+#ifndef FDR_BASESOCKET_H
+#define FDR_BASESOCKET_H
+
+#include <DllHelper.h>
+
+#ifdef __linux__
+#include <arpa/inet.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <unistd.h>
+#elif _WIN32
+#include <winsock32.h>
+#endif
+
+#include <string>
+#include <functional>
+
+class EASYSOCKET_API BaseSocket
+{
+protected:
+    int sock = 0;
+
+    static std::string ipToString(sockaddr_in addr);
+
+public:
+    enum EASYSOCKET_API SocketType
+    {
+        TCP = SOCK_STREAM,
+        UDP = SOCK_DGRAM
+    };
+
+    sockaddr_in address;
+    bool isClosed = false;
+
+    std::function<void(std::string)> onError;
+
+    BaseSocket(SocketType sockType = TCP, int socketId = -1);
+
+    void Close();
+
+    std::string remoteAddress();
+    int remotePort();
+};
+
+#endif

easysocket/include/basesocket.h

@@ -0,0 +1,36 @@
+#ifndef FDR_SOCKET_H
+#define FDR_SOCKET_H
+
+#include <DllHelper.h>
+
+#include <basesocket.h>
+#include <string>
+#include <functional>
+#include <thread>
+
+#define BUFFER_SIZE 0xFFFF
+
+class EASYSOCKET_API Socket : public BaseSocket
+{
+public:
+    // Event Listeners:
+    std::function<void(std::string)> onMessageReceived;
+    std::function<void()> onSocketClosed;
+
+    Socket(int socketId = -1);
+
+    void Send(std::string message);
+    void Send(const char *bytes, size_t byteslength);
+
+    void Connect(std::string ipv4, uint16_t port, std::function<void()> onConnected);
+    void Connect(uint32_t IPv4, uint16_t port, std::function<void()> onConnected);
+
+    void Listen();
+
+    void setAddressStruct(sockaddr_in addr);
+
+private:
+    static void Receive(Socket *socket);
+};
+
+#endif

easysocket/include/socket.h

@@ -0,0 +1,30 @@
+#ifndef FDR_TCPSERVER_H
+#define FDR_TCPSERVER_H
+
+#include <DllHelper.h>
+
+#include <socket.h>
+#include <string>
+#include <functional>
+#include <thread>
+
+class EASYSOCKET_API TCPServer : public BaseSocket
+{
+public:
+    // Event Listeners:
+    std::function<void(Socket *)> onNewConnection;
+
+    TCPServer();
+
+    // Binding the server.
+    void Bind(int port);
+    void Bind(const char *address, uint16_t port);
+
+    // Start listening the server.
+    void Listen();
+
+private:
+    static void Accept(TCPServer *server);
+};
+
+#endif

easysocket/include/tcpserver.h

@@ -0,0 +1,18 @@
+#ifndef FDR_UDPSERVER_H
+#define FDR_UDPSERVER_H
+
+#include <DllHelper.h>
+
+#include <udpsocket.h>
+#include <string>
+
+class EASYSOCKET_API UDPServer : public UDPSocket
+{
+public:
+    UDPServer();
+
+    void Bind(int port);
+    void Bind(const char *address, std::uint16_t port);
+};
+
+#endif