diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt index 8a88c4a..212176d 100644 --- a/server/CMakeLists.txt +++ b/server/CMakeLists.txt @@ -1,3 +1,4 @@ +set(CMAKE_CONFIGURATION_TYPES "Debug" CACHE STRING "" FORCE) cmake_minimum_required(VERSION 2.6) project(server) diff --git a/server/src/main.cpp b/server/src/main.cpp index 17565c5..6874718 100644 --- a/server/src/main.cpp +++ b/server/src/main.cpp @@ -2,7 +2,9 @@ #include "sock/tcpsock.hpp" int main(int argc, char **argv) { - auto sock = TcpClient(); + //auto sock = sosc::TcpClient(); + + std::cout << "compiled on windows" << std::endl; return 0; } diff --git a/server/src/sock/ip.cpp b/server/src/sock/ip.cpp new file mode 100644 index 0000000..fb97c7a --- /dev/null +++ b/server/src/sock/ip.cpp @@ -0,0 +1,2 @@ +#include "ip.hpp" + diff --git a/server/src/sock/ip.hpp b/server/src/sock/ip.hpp new file mode 100644 index 0000000..1da0bd0 --- /dev/null +++ b/server/src/sock/ip.hpp @@ -0,0 +1,12 @@ +#ifndef SOSC_UTIL_IP_H +#define SOSC_UTIL_IP_H + +namespace sosc { +class IpAddress { + +protected: + +}; +} + +#endif diff --git a/server/src/sock/tcpsock.cpp b/server/src/sock/tcpsock.cpp index d49a51e..a417ed1 100644 --- a/server/src/sock/tcpsock.cpp +++ b/server/src/sock/tcpsock.cpp @@ -1,6 +1,41 @@ #include "tcpsock.hpp" -TcpClient::TcpClient() { - std::cout << "test" << std::endl; +/****************************/ +/* BEGIN TCPCLIENT CODE */ +/****************************/ + +#ifdef _WIN32 +sosc::TcpClient::TcpClient() { + this->sock_open = false; + this->addr_len = -1; } +bool sosc::TcpClient::Init(std::string host, std::uint16_t port) { + if(this->sock_open) + return false; + + struct addrinfo hints, *result, *ptr; + +} + +#else + +#endif + +/****************************/ +/* END TCPCLIENT CODE */ +/****************************/ +/* BEGIN TCPSERVER CODE */ +/****************************/ + +#ifdef _WIN32 +sosc::TcpServer::TcpServer() { + +} +#else + +#endif + +/****************************/ +/* END TCPSERVER CODE */ +/****************************/ diff --git a/server/src/sock/tcpsock.hpp b/server/src/sock/tcpsock.hpp index 447237e..28a2e7d 100644 --- a/server/src/sock/tcpsock.hpp +++ b/server/src/sock/tcpsock.hpp @@ -1,15 +1,52 @@ #ifndef SOSC_TCPSOCK_H #define SOSC_TCPSOCK_H +#ifdef _WIN32 + #include + #include + + #define SOSC_SOCK_T SOCKET + #define SOSC_ADDR_T SOCKADDR_IN +#else + #include + #include + #include + #include + #include + #include + #include + #include + + #define SOSC_SOCK_T int + #define SOSC_ADDR_T struct sockaddr_in +#endif + +#include +#include +#include #include +#define SOSC_TCP_BUFLEN 2048 + +namespace sosc { class TcpClient { public: TcpClient(); + bool Init(std::string host, std::uint16_t port); ~TcpClient(); protected: + bool Init(SOSC_SOCK_T sock, SOSC_ADDR_T addr, int addr_len); + SOSC_SOCK_T sock; + bool sock_open; + + SOSC_ADDR_T addr; + int addr_len; + + char buffer[SOSC_TCP_BUFLEN]; + + friend class TcpServer; }; class TcpServer { @@ -18,7 +55,8 @@ public: ~TcpServer(); protected: - + SOSC_SOCK_T sock; }; +} #endif diff --git a/server/src/utils/net.cpp b/server/src/utils/net.cpp new file mode 100644 index 0000000..c389e05 --- /dev/null +++ b/server/src/utils/net.cpp @@ -0,0 +1,2 @@ +#include "net.hpp" + diff --git a/server/src/utils/net.hpp b/server/src/utils/net.hpp new file mode 100644 index 0000000..2083403 --- /dev/null +++ b/server/src/utils/net.hpp @@ -0,0 +1,10 @@ +#ifndef SOSC_UTIL_NET_H +#define SOSC_UTIL_NET_H + +namespace sosc { +namespace util { +namespace net { + +}}} + +#endif diff --git a/server/src/utils/string.cpp b/server/src/utils/string.cpp new file mode 100644 index 0000000..9a4e359 --- /dev/null +++ b/server/src/utils/string.cpp @@ -0,0 +1,3 @@ +#include "string.hpp" +using namespace sosc::util::str; + diff --git a/server/src/utils/string.hpp b/server/src/utils/string.hpp new file mode 100644 index 0000000..4232dc8 --- /dev/null +++ b/server/src/utils/string.hpp @@ -0,0 +1,10 @@ +#ifndef SOSC_UTIL_STRING_H +#define SOSC_UTIL_STRING_H + +namespace sosc { +namespace util { +namespace str { + +}}} + +#endif