From c8e37f3868237af1354440d84475e31e8cbd7bfc Mon Sep 17 00:00:00 2001 From: dawidg81 Date: Wed, 4 Mar 2026 09:07:57 +0100 Subject: [PATCH] Migrating Socket to Network interface --- src/.main.cpp.un~ | Bin 0 -> 3655 bytes src/Network/.Socket.hpp.un~ | Bin 0 -> 24342 bytes src/Network/Socket.hpp | 51 ++++++++++++++++++++++++++++++++++++ src/Network/Socket.hpp~ | 51 ++++++++++++++++++++++++++++++++++++ src/main.cpp | 46 +------------------------------- src/main.cpp~ | 24 +++++++++++++++++ 6 files changed, 127 insertions(+), 45 deletions(-) create mode 100644 src/.main.cpp.un~ create mode 100644 src/Network/.Socket.hpp.un~ create mode 100644 src/Network/Socket.hpp create mode 100644 src/Network/Socket.hpp~ create mode 100644 src/main.cpp~ diff --git a/src/.main.cpp.un~ b/src/.main.cpp.un~ new file mode 100644 index 0000000000000000000000000000000000000000..1cc340bb5431d63c1182ce1f753e22931a112f46 GIT binary patch literal 3655 zcmeHJ&u<$=6y7*NuuVg0i$o7dJbb8jiDiW%sw$CNOzeR3%jw#*7tm^BkIks-*=Tp% zs4YG42XN;GCyKaoMF1Yi%)B>mzVE$#dqa*s zdrvi@->lN|2j6~l{m-q9?|%RK(_ZIn{rd->zp?q{H|I95_7|`0ls~a7>pTluDebH| z?w`rV=yS2;gNMH?V6|lVzh)b9CA?zkOx9a}aWgYmnYAZJV1gv8US`RWzRhDB=9rFm z4IOjV9~b!jd6pMguCX{QOLi{|l7u=@@0QR!QL^vx^EvxqydTQmDv!_Dwp5x9rD`du z9hax(ZL{mVZQD0H^+vs0r^6&@1Ugvb)hj#=jaVe(P*aU~Pe%u_9v?WgQ{QUdYTNZ1X_erZ3_^J~&@xiQ zd!x8)?6FB}m2JX=RDZKO6y=B7k{YGIu%blU4%%`S}ssj{s#N(^ca)i?asZnIk< zZ1Ou@uUX%zP-}0`Yj@jzcYQCt+{Ns2MH@A0?cS(ww;FzWfJ?xClXn`QA9?K!20Tn} zyGl)5ntHKd4Ad}lExp1kMQcpPJ3?;W^xIWvC!jK(d%Gm zf#2@~Qf^@R#Hbp#ME`v?#q=fC2Yx}nANx{KBI4V!CveO%FO9?~5!&JS$QCNJQlUiN z716-SrrZ=(f~8cunn>jjf{_gGaNK3Iz~tp)dvIzs@zL={sf0FThgmd4`1MA^Ga$g3 zqVb&rY9NQ>_$WGEHi10Ym#Xhfn`g-zzQCvRmsx$wk$B2}f+XvsYyoXF z)HgHc`u2mVZ&q607I|Tb1+@vHCr-@h z%wc)Teu89%>Oax>W06jf14{Ax32GL%qv24*_#;3%rktPR0W81BlK%i5jRvfkv$CWG ztNGt64-MlJ%^Aypr8JvB4KfGGn9=m`tG@v{0@X?Y literal 0 HcmV?d00001 diff --git a/src/Network/.Socket.hpp.un~ b/src/Network/.Socket.hpp.un~ new file mode 100644 index 0000000000000000000000000000000000000000..611b2a4739e1db3943059458be8370f24d9bc702 GIT binary patch literal 24342 zcmeI)-)|IE6bJC_51@VV&a2OzUsUGgCf58V2p1jc)oY<**!aIQ$jK3 zQmND-n)}n~ayXy!gSjx%al(t2!{|(IDlDDx;@q+yj0Jw&ud0t#DGcWP`K8F4eL3jJ z4$yz^rMZvhCYpO`#)Ku$DgW9p&$Z&&wp8Hzo*(U~?j|<(0&?*2Sn*tx)^glRM3Juv#N(2gh0?>Fh*gtQ5)ab!msR z0Rg8_%A^?9trax@nPUU~#7 zhY^ENo2U`=AhreTT>FP8*qli0supXi?i3=KWMb{A^<5pg+=20Me%_1BB6oUmkrknq z7WITEaAG3dr3BxavxClX!;nf27-DRI6!R>^#UUDPyd&L6Opk}B)Ay~#~s+ChM+lp!9W2< zH-M%dKtt9!C=(F73xX<1DDI;esx7^^G*k9V{e}xX8%32shg@@9A}IEXNiOc6m}^ry z?FX?kVq1|>Uc#^>=lXElT9f1 zXv{kf-Z_;qyt@ZgcUIxNofk#_e%cNv@BCufKVOXfFi`Z`FrxEzCZj=okN8U9ul1tt z7(ztGN^vD}41OKEgW~uC`dAVvja29DijOB@uSeTxi3!^UwuOE?aN7c+U~{5vVNRw$ zGj-92q6Mat^s7Hh?{n6Bv-M;L=)K}A02{!EvCaV_3N|MK_E!Qv{GWkMV-8P!s@HrA zSi{%#-zFe-7v#H`^hN)A=Mos8+r*auwgVOcv0EhICsSZ;F#a@vx&q_?*U1iMY2~+O@uXwzBgvP7N)x+F=HHxEM zRf;@1_zmVwg4cJ50sMgYLcm8K>%c`&>=l#Xy#LDJyCgV`WgYe6@nR*`sF`eS3H$##1hRa?tppnR$8=Q8CdchF=sdE!Su~$sG@lGqd zZG>Co#Y<734)S;*jCP7T!4KW0GZR6vS0uC7WEaW1pKR7jWEagr2xuM>RRJ5CN=GGv zVy{S4=Oh*HYcLf~)~x=f8|=ZDJ8ldwICqKagBscCctud`6^ZwPaj|4z)x2UnAGIG?3ilEpll4!&I8{GS`s6swgb1+x&gTh>K!7rbqbL3{QhZ9p# z6+1*VL5gH`j3OxZib+Q9<(TpD1S6W)T%~{oS^9w&>vD#M@AU9aVQ6F|UpwLe<{nXb zKqGG*t_X^~BH=dNyu+O!tb4`R06EqR1PbiIX_y@ z@>(|xvW%!AII+$VilEplCJ8yCnD8Hma$%Geb%Gz(IWrLydqpz4EIU?CAvTjkxuDr6 zssc95j!Fc@UXiG-NGj%Fs?SY7xT@bznhBSv4~#>FV^*(HQ5|Z(YB*e_#~pNouF{7; zc(xKpIC~w3g=#5rEQHtRRNgDjp2Pc={YvZwY7Qs9!yxcVxbC}BKk1DPXTJy*HmurX zcNM6JjFlp7OmEAL2^_dW5F1mo`NVeGpv;-K?g4$xHjwyL$ohs?m?I^Ajd>G|%GVyc z%X>L0)|LeOj)X-{0hL<`x&w|+&GA!Q7b)wcI4ahbHK~^B4G{=GPe`to^hF*H##1?d zj+Ve|;m5AA){&Wm#r8_yi6l##u4;!R4T+1RkRGF%CjjdF!U~7RVX?I&v|Ac&T|LLv(}#ftZDM<=T%^&N>dirh z3`D&&^8`LzKcE>M8HdHzl72`0X_;qy{Qy`%)^|H6oBw`ArA$VA1xRB+yblkYE}~#_ ZBHg1}x2>9xJRr`x|KmsMdoSI*{uc^`W%U36 literal 0 HcmV?d00001 diff --git a/src/Network/Socket.hpp b/src/Network/Socket.hpp new file mode 100644 index 0000000..dac889a --- /dev/null +++ b/src/Network/Socket.hpp @@ -0,0 +1,51 @@ +#include +#include "../Core/Logger.hpp" + +#pragma once + +#define NET_SOCK_ADDR "0.0.0.0" +#define NET_SOCK_PORT 25565 + +class Socket +{ +private: + Logger log; + +public: + int winInit() + { + WSADATA wsaData; + int result = WSAStartup( MAKEWORD(2, 2), & wsaData ); + if (result != 0) log.err("Network.Socket.winInit: Initialization error"); + + log.info("Network.Socket.winInit: Socket initialized"); + + SOCKET mainSocket = socket( AF_INET, SOCK_STREAM, IPPROTO_TCP ); + if (mainSocket == INVALID_SOCKET) { + log.err("Network.Socket.winInit: Fatal error: Error creating socket"); + log.err(WSAGetLastError()); + WSACleanup(); + return 1; + } + + log.info("Network.Socket.winInit: Socket created"); + + sockaddr_in service; + memset( & service, 0, sizeof(service) ); + service.sin_family = AF_INET; + service.sin_addr.s_addr = inet_addr(NET_SOCK_ADDR); + service.sin_port = htons(NET_SOCK_PORT); + + log.info("Network.Socket.winInit: Socket configured"); + + if (bind(mainSocket, (SOCKADDR *) & service, sizeof(service)) == SOCKET_ERROR ) { + log.err("Network.Socket.winInit: Fatal error: Bind failed"); + closesocket(mainSocket); + return 1; + } + + log.info("Network.Socket.winInit: Socket bound to address " + NET_SOCK_ADDR + " on port " + string to_string(NET_SOCK_PORT) + ". Ready to listen for connections"); + + return 0; + } +}; diff --git a/src/Network/Socket.hpp~ b/src/Network/Socket.hpp~ new file mode 100644 index 0000000..8d215a6 --- /dev/null +++ b/src/Network/Socket.hpp~ @@ -0,0 +1,51 @@ +#include +#include "../Core/Logger.hpp" + +#pragma once + +#define NET_SOCK_ADDR "0.0.0.0" +#define NET_SOCK_PORT 25565 + +class Socket +{ +private: + Logger log; + +public: + int winInit() + { + WSADATA wsaData; + int result = WSAStartup( MAKEWORD(2, 2), & wsaData ); + if (result != 0) log.err("Network.Socket.winInit: Initialization error"); + + log.info("Network.Socket.winInit: Socket initialized"); + + SOCKET mainSocket = socket( AF_INET, SOCK_STREAM, IPPROTO_TCP ); + if (mainSocket == INVALID_SOCKET) { + log.err("Network.Socket.winInit: Fatal error: Error creating socket"); + log.err(WSAGetLastError()); + WSACleanup(); + return 1; + } + + log.info("Network.Socket.winInit: Socket created\n"); + + sockaddr_in service; + memset( & service, 0, sizeof(service) ); + service.sin_family = AF_INET; + service.sin_addr.s_addr = inet_addr(NET_SOCK_ADDR); + service.sin_port = htons(NET_SOCK_PORT); + + log.info("Network.Socket.winInit: Socket configured\n"); + + if (bind(mainSocket, (SOCKADDR *) & service, sizeof(service)) == SOCKET_ERROR ) { + log.err("Network.Socket.winInit: Fatal error: Bind failed"); + closesocket(mainSocket); + return 1; + } + + log.info("Network.Socket.winInit: Socket bound to address " + NET_SOCK_ADDR + " on port " + string to_string(NET_SOCK_PORT) + ". Ready to listen for connections"); + + return 0; + } +}; diff --git a/src/main.cpp b/src/main.cpp index e7b0cb5..9f01155 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1,4 +1,5 @@ #include "Core/Logger.hpp" +#include "Network/Socket.hpp" #include @@ -9,51 +10,6 @@ using namespace std; Logger log; -class Network -{ -public: - class Socket - { - public: - int winInit() - { - WSADATA wsaData; - int result = WSAStartup( MAKEWORD(2, 2), & wsaData ); - if (result != 0) log.err("Network.Socket.winInit: Initialization error"); - - log.info("Network.Socket.winInit: Socket initialized"); - - SOCKET mainSocket = socket( AF_INET, SOCK_STREAM, IPPROTO_TCP ); - if (mainSocket == INVALID_SOCKET) { - log.err("Network.Socket.winInit: Fatal error: Error creating socket"); - log.err(WSAGetLastError()); - WSACleanup(); - return 1; - } - - log.info("Network.Socket.winInit: Socket created\n"); - - sockaddr_in service; - memset( & service, 0, sizeof(service) ); - service.sin_family = AF_INET; - service.sin_addr.s_addr = inet_addr(NET_SOCK_ADDR); - service.sin_port = htons(NET_SOCK_PORT); - - log.info("Network.Socket.winInit: Socket configured\n"); - - if (bind(mainSocket, (SOCKADDR *) & service, sizeof(service)) == SOCKET_ERROR ) { - log.err("Network.Socket.winInit: Fatal error: Bind failed"); - closesocket(mainSocket); - return 1; - } - - log.info("Network.Socket.winInit: Socket bound to address " + NET_SOCK_ADDR + " on port " + string to_string(NET_SOCK_PORT) + ". Ready to listen for connections"); - - return 0; - } - }; -}; - int main() { log.raw("mcc v0.0.0"); Network::Socket socket; diff --git a/src/main.cpp~ b/src/main.cpp~ new file mode 100644 index 0000000..195554f --- /dev/null +++ b/src/main.cpp~ @@ -0,0 +1,24 @@ +#include "Core/Logger.hpp" + +#include + +#define NET_SOCK_ADDR "0.0.0.0" +#define NET_SOCK_PORT 25565 + +using namespace std; + +Logger log; + +class Network +{ +public: + +}; + +int main() { + log.raw("mcc v0.0.0"); + Network::Socket socket; + socket.winInit(); + + return 0; +}