From 3cf8fd09cb522e5715cafabce8f3805cb56bf0c3 Mon Sep 17 00:00:00 2001 From: malloc Date: Thu, 16 Aug 2018 16:39:13 -0500 Subject: [PATCH] allo --- CMakeLists.txt | 12 ++++++++++ resources/client/fonts/scape.ttf | Bin 0 -> 47620 bytes resources/client/shaders/test.frag | 9 ++++++++ resources/client/shaders/test.vert | 18 +++++++++++++++ {src => resources}/server/_hard_schema.db | Bin {src => resources}/server/_mem_schema.db | Bin src/client/main.cpp | 23 ++++++++++---------- src/{server => common}/crypto/base64.cpp | 0 src/{server => common}/crypto/base64.hpp | 0 src/{server => common}/crypto/bcrypt.cpp | 1 + src/{server => common}/crypto/bcrypt.hpp | 5 ++--- src/{server => common}/crypto/bfish.cpp | 0 src/{server => common}/crypto/bfish.hpp | 2 +- src/{server => common}/crypto/cipher.cpp | 0 src/{server => common}/crypto/cipher.hpp | 2 +- src/{server => common}/crypto/keyex.cpp | 0 src/{server => common}/crypto/keyex.hpp | 4 ++-- src/{server => common}/crypto/sha1.cpp | 0 src/{server => common}/crypto/sha1.hpp | 0 src/{server => common}/sock/frame.cpp | 0 src/{server => common}/sock/frame.hpp | 2 +- src/{server => common}/sock/intrasock.cpp | 0 src/{server => common}/sock/intrasock.hpp | 2 +- src/{server => common}/sock/packet.cpp | 2 ++ src/{server => common}/sock/packet.hpp | 2 +- src/{server => common}/sock/pool.hpp | 2 +- src/{server => common}/sock/scapesock.cpp | 0 src/{server => common}/sock/scapesock.hpp | 6 ++--- src/{server => common}/sock/tcpsock.hpp | 4 ++-- src/{server => common}/sock/tcpsock_bsd.cpp | 0 src/{server => common}/sock/tcpsock_win.cpp | 0 src/{server => common}/utils/bigint.cpp | 0 src/{server => common}/utils/bigint.hpp | 0 src/{server => common}/utils/csprng.cpp | 0 src/{server => common}/utils/csprng.hpp | 0 src/{server => common}/utils/net.cpp | 0 src/{server => common}/utils/net.hpp | 0 src/{server => common}/utils/string.cpp | 0 src/{server => common}/utils/string.hpp | 0 src/{server => common}/utils/time.cpp | 0 src/{server => common}/utils/time.hpp | 0 src/server/db/database.hpp | 4 ++-- src/server/hosts/master.hpp | 14 ++++++------ src/server/hosts/master_intra.cpp | 2 +- src/server/hosts/slave.hpp | 6 ++--- 45 files changed, 82 insertions(+), 40 deletions(-) create mode 100644 resources/client/fonts/scape.ttf create mode 100644 resources/client/shaders/test.frag create mode 100644 resources/client/shaders/test.vert rename {src => resources}/server/_hard_schema.db (100%) rename {src => resources}/server/_mem_schema.db (100%) rename src/{server => common}/crypto/base64.cpp (100%) rename src/{server => common}/crypto/base64.hpp (100%) rename src/{server => common}/crypto/bcrypt.cpp (99%) rename src/{server => common}/crypto/bcrypt.hpp (83%) rename src/{server => common}/crypto/bfish.cpp (100%) rename src/{server => common}/crypto/bfish.hpp (99%) rename src/{server => common}/crypto/cipher.cpp (100%) rename src/{server => common}/crypto/cipher.hpp (93%) rename src/{server => common}/crypto/keyex.cpp (100%) rename src/{server => common}/crypto/keyex.hpp (92%) rename src/{server => common}/crypto/sha1.cpp (100%) rename src/{server => common}/crypto/sha1.hpp (100%) rename src/{server => common}/sock/frame.cpp (100%) rename src/{server => common}/sock/frame.hpp (98%) rename src/{server => common}/sock/intrasock.cpp (100%) rename src/{server => common}/sock/intrasock.hpp (97%) rename src/{server => common}/sock/packet.cpp (99%) rename src/{server => common}/sock/packet.hpp (98%) rename src/{server => common}/sock/pool.hpp (99%) rename src/{server => common}/sock/scapesock.cpp (100%) rename src/{server => common}/sock/scapesock.hpp (93%) rename src/{server => common}/sock/tcpsock.hpp (96%) rename src/{server => common}/sock/tcpsock_bsd.cpp (100%) rename src/{server => common}/sock/tcpsock_win.cpp (100%) rename src/{server => common}/utils/bigint.cpp (100%) rename src/{server => common}/utils/bigint.hpp (100%) rename src/{server => common}/utils/csprng.cpp (100%) rename src/{server => common}/utils/csprng.hpp (100%) rename src/{server => common}/utils/net.cpp (100%) rename src/{server => common}/utils/net.hpp (100%) rename src/{server => common}/utils/string.cpp (100%) rename src/{server => common}/utils/string.hpp (100%) rename src/{server => common}/utils/time.cpp (100%) rename src/{server => common}/utils/time.hpp (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index d1e3cf7..bc53662 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,9 @@ project(sockscape) set(CMAKE_CXX_STANDARD 11) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake") +if(CMAKE_COMPILER_IS_GNUCXX) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -static") +endif() ## CLIENT BUILD ## @@ -13,12 +16,16 @@ find_package(SDL2_image REQUIRED) find_package(SDL2_ttf REQUIRED) file(GLOB_RECURSE client_src + "src/common/*.hpp" + "src/common/*.cpp" "src/client/*.hpp" "src/client/*.cpp" ) add_executable(client ${client_src}) target_include_directories(client + PRIVATE ${PROJECT_SOURCE_DIR}/src/common + PRIVATE ${PROJECT_SOURCE_DIR}/src/client PRIVATE ${PROJECT_SOURCE_DIR}/include/client PRIVATE ${OPENGL_INCLUDE_DIR} PRIVATE ${GLEW_INCLUDE_DIR} @@ -36,6 +43,8 @@ install(TARGETS client RUNTIME DESTINATION bin/client) ## SERVER BUILD ## file(GLOB_RECURSE server_src + "src/common/*.hpp" + "src/common/*.cpp" "src/server/*.hpp" "src/server/*.cpp" "src/server/*.c" @@ -43,6 +52,9 @@ file(GLOB_RECURSE server_src ) add_executable(server ${server_src}) +target_include_directories(server + PRIVATE ${PROJECT_SOURCE_DIR}/src/common + PRIVATE ${PROJECT_SOURCE_DIR}/src/server) if(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") target_link_libraries(server wsock32 ws2_32) elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Linux") diff --git a/resources/client/fonts/scape.ttf b/resources/client/fonts/scape.ttf new file mode 100644 index 0000000000000000000000000000000000000000..7ce7b1ac1b2e5e0542b3e5ce5c4e40e8193e9766 GIT binary patch literal 47620 zcmeIb3xHf_b?5ordiJ}ky1Lb^?v_;Dt@o?d)t0UH3)@KYlf*H$ksOC0+mbCJY{wQh zCWJ5v$w(f;WC_E7lMu3DCdB4(Z?%SiaV9MB5W-->5TaoS<27tvCInc9WEoqQ_xC^F zcdKr-9=2I_X0khKb=R$1kNbV+obR0fd3@)($T?T#Pr+4o@4o&O`|rEph;tu*inEiK z@7%T9t&6tt{F6Li`J=C#ZM=47%SW7x-p%tHZ++dqyD$Fy{@-w}#Ph=EZ@uquz3Yhr zFAW^x&$0t|-~PH+9-I9g=X&pOF1P>oefQqY`3m3nF&?{aKlH$X-}}q&eS=e9b?%`< zckJJH+cT@a`7XYHlGo3@gA>)?=+5!{dY-So<8_DM@HZ!Z^VfO)9j^C*LwDV}?-S); zeUj_FmG8gtb^G3MckZg_T3&wx@2}sv?{)h>{+(C-jdPD&;avC7-FMx4_zy@rQrGxswOFA1WQ-X_ww>|M*;&d+wvo^-MeW{PW!p**Aq3^$=~; z8U9|(8}%>8^PF48ITsDsnW(Tc`W07%FGu-t_BTA{rn`D_y`}Dau~5hrzUH<*|Aq4N z&%4~0FVrVre(BY_c!-`Yln$I^Tny`~dK5j+JNTFTrrW8<0)P2E`rq-F>qpfk*AHWg z9`dhcU)MQ}xAnO6vuBu#eOLHw$9!MJ{Il2Z`0N?3b*A^E-;+Ly_O0WW_+4kZ#%a%I z=9tp-hspOd()Pv7DNBPT<7~|(J)b`6dv%<7E;^>a>G^c7EgGkvNgrR#_?EnVy@%hb|8<|^@p6>M zkEe7_=WTT6J5zbkWA;7%b$vGFmA*ISW&RUf_gn60`F?k_`#tU`T2q=XAATpj_RKxb z8ENE6SIB*U$F;7Gb}YH)qgO_6$bCBZ)p}2TxISKAS)Z=2tPQL8q#;=vXmV4^?r%pcg>{H)=>N`*U^;3WN z)csH8{(M7e4Wn4g^vR2Xzzw47E3WE>T+I!;5%m738*|Iu zxSL>hE8I%Ain&d>X*c6myER;Gom=lVxQ%X;+w8Wut!~zBb91iY=G{4NyF1sN=XSUS zcfPy8UFa^ts=Uly;x2WUxtF8uce&l}a(9Kh(p}}QcGtL9xF2yp>aKM^=B{(Ebl1BZ z+>P#4ZjamRZi2HnyPt5cc0cJ}gUvt0ie#5=j{ib`L`z`msy5Dy1 zcmK-$Yxg_u1MYX-!|oCHLH8l|VfPUiyTmo!qC4jPjr*wkJ@+y9ardbEgnP{WzWcZC z58Nl+|K>jB{?I+{{+;`@`y=-m_s8zD?%yNBPq@#!KXG4h|G|CH{i*ws`!jdk{YUp@ z_n+KX+@HIzy8rB+bpN}1%6-j!-Tfc#FWg_czjA-={>DA+zTy7XebfD&`6;;0tT}9RZ0!6Aw%T-;Y)zU7tcW{$rGj^3h1NEE;)e~1iyHptNDO@175B+2=6K2?lL$fp1IXnM)m zZH`^->iC*#_rzD-w>Ne(FB^+XoAz9^*UtUy-ujo~sJ3-%OB`*keZWfo_J#K1n=AP+{EAQotT-5i<|bu zyYJg;FYMjR_Z2ty-+a@SxU@N$j*f8k`jMM&o`@Y^Q{J4cwo{k1PIYY_s@4}~x5V9> z>p!cDJkIymGW-`&&K6VH}9#}FQ3`H@3r+k_1kXoU!nK)>&jfZ{$Ty`2Y2tAd9eQAj9qRf zcGvBRFX5fcPnV4^*{>&jX27m=(ebgVsfqgW2O$F=x{|To5XQ#%c-!FSnfmc?@tOLb zt6w=W6-RsbJjjHuoOy7j{@|4l&g|1jG#&lbcq(GU5NxPw0y-F4G64oUvwLRWYhRO{ zi9TA}%p@NCry|=`x6M3Qj_cR%xp3l>yfVCb(OnWN~gZzJAv~-T&}FW#H!rK0ml| z@J)kHRmLh;RsMD5tJUG^wbe(fPY#_k^v0pj)COwz)V?@;{qS3dA0H`=92oiLvh~Z} zzU4F8}8E`tjF}#}i`{*G#-~;Nisp*%t-OBar&euU_0Cl%!68TL->83osx&n`H9fU$>f)(urf!U~omo_cKRvr}K5`m5<>(^pL2IDOmnJ=1TQe*5&VPd_~UvFT4we`)&b)8Cms zIel{Gs+kY09$Wq3>VH@>z2;+U{$lOB)_!;0o7TO5-DB$ytbg(;IB*!un1SI>T7+jZL>o4auCy^Vp!ZHX)ifAWGI7kuEt zu?ru%=)#LWaPj(!AAVW=W$(UZ;F5P;+I8tImwxQBWtZJ@*|%PP-^>4E=e0Y(u*j7N-hllr zyRAv&W-n}(3*CR$NJ_=8Uf9g%ICM!~r;9q>ESGvtT-c0se!eHuo_SZlx>eR^m$c+6)oQdYQ&ur(n7G9s{+|m3e zPV8byo&5HZBf06L{Cn<6J&US3J{n%p8HVtL&PLT|rgM)RJ;G1%$s^CqaKKYeAJK{| zb&NGL&Xs2y=lph!bZYxdRYx-%%=eE_RLK5o{WtBW8pz3Etlh=P2r7g!FRJ&8;{IK@z&X7_B7-S3zxM#Q%#rd znFwmjmi3@T8y4>AN$Quae;Z5p*>f@r_a6&Qf6#Gu>ZLLK<<6i;sV^myV=A|8(qtzVk^`d^#>R znl9?uw0Mc@=>~4iMsZ~}cE^vEORlT1DLgC=5;EA7^p&2D`(~3|&-{EcSb91sbTt}D z)utDjf}KaIrk3ZXsy1-+Ba)LdU3v0$9Y1%2Bndl+feQAjjJ45l3h8h(swnQ#Ad);6 z%vX{^v?(cby>3rQ2&W%Nqo4eI^w7xz`qlR;io<+m$=>Xm!vqIov&jgj`y25{CF#?NN>bxtun~{XCROoZvv?5qHH;18jkrgj z9oPujR(QUw@708B2Q06wiiN^K2cg>)jNOHIf-Vu&iMUKIxjO4#le$ z;uY0qcTas`VPV_cc^GFX1B&1WN%9o)dVU@Q&JSzFsJGqNE|hRYw1Ye#44xhp4LPZE zo~}F>VR@QTSM)0qQM8Zxms@- z+X7$u`M^1qWP7wJ?lSR==k!{y*t3jxZm%Rg<)@Pc6VTheHAHn_HmUPaFiIC8WOpN;nN7+Ov|MeXT4+cu z#q~zKQq#_r=I4*CD7l^jV%o>_2P;~e@lZn)iF=_X0?ay(ha1Tn$htz3Sy_mCt8sN9 zUOp5rTX5)!>QLe)78c^6YBITMVIdi)aV8g;;6f#jEhV7RN;ATl29%}Tjb2*lB9*Xj zZrao3094WwP9efagpKtA)H|AcScHk9hw}5eM-0rcWPFF)zsjy}PDN9HZ-=Fjk zGUe(JMChs}`GTgt2EAsW8jZ#glLb*!wf6jCWO__QvwQBwliz{_Lmgv!m5Xb$iDOLV z*`zCssdk*@lMKNTcso={^6+PXXA$g-i}OiEYzsqja6!x}SCgKq1~wG;GOQwFVMJm> zI2xJKu%s>Y7aB)H9V0WHs*FJXG3>@W9I7#{%_qx|ziLB^c+d=oRArDoUg>T`(hXzB zMX6DSRcbWHMr8%YFcgd9qhm(ZV^tGBlxRF!NrwHptnv1qMzc1ox7P-{5j@d&`4|%# zS%_T~xx?l`@p6|aU1Jg2d?Z>dQeimG@H;PU*!pj3P7?$WXdUv$KS=L^Z;+11m}4(- zcTKD8r*$d-=$nmuj>ox1(#=2%4Yafd+FkD6)a>cjVGmPG`c3W_8zVB0bHk&L}xBn);0dfA7hyv z%Nqm3L--zzLf6+618twb-|$S0EQPJrf+3~ud~2Ao81}g%a?SOi23jxhJJmymrig;^@&6yHJwToOf^Vnd)rZKW~%5$Out)&zeUB2FV?lPBKGe!e7KpdTlPmfi@qkNUjF^k*k{c z6qQ-H#f7-L8kgWp4S6=zC9VJv(3TQvjoKpvIZDsnz{qjqyw=RhUX6@q5V=(LB;BA; ziCS?MS!NUg3}M_$$79z*IdY#g%C5#@b+CYx=6I3=C=8~V5JfRx#e~N&UC@W4WLld;(lx_g*YslYBU>B7 zaM00=zgIWI8kkJL(7ZvkVRIm4hnn35GeV+o36~@8t|TL%11U;$k4uJ!n8BdeG0px8 zQvt^f#RCg*Pl{O1)7oGXS*UB#QY`?(2h7Ubt=z*rYG!h(Rdm0&Uq!aNP3?eP@bdc`i=*a%OhWVJ8izDhfHS-f+*%c+r*5kk zZ7F8p^$qFW2BpC=gaka4hBL@byuu^yp490TiQ9O%t8 z%i@T<-A*}rdm6uB1t>V33^E0lY=Wg^|L8kQJ1tuuP!st0$+es^WUA~J3?TCT3Ba9VEJ%up)lCR zg$2aY5rD^n-JGEkqB$vs0jd4LDAUB%9pSZFnPwSdkkP9o{xK^i0BHS z3J2qzg%B5)i}`N+O8SFv7shBu1c>0TIsY0r_k=!_wJO2}upilH~HTlKp*5sat+Yvq!4i zoA|au@TNwg&{Q7~h>~5G%V93Ro*3LbLG~-GSxv|=$q2gqpNF|9@PuS6^GsyT#>;1u z0mO!-Vj6GU)`YA%-0WeT%fzEfGKzvG9LeYfx+Zv`>Jj>|5c)E#PP418U&m!+KQ1sW zQp~35x`Zv0%0L#SZx0Gjjy}qc)sNe^JwnMNrUL2AMyTM#E`fIPe<1ZIyfznNm%(Cs zZJj%-{+EK;IYgCi@B_$6@t`QFm&HPC}G`U6$ zt*_-11=}Gw)s5*`%$0h24bI9hlB^73{c(=s%1~0ov5#v2lM;`SXfNpQ@s+Hm61^fZ zF%&uSsCR~~-@+4yvt%Y^G_$y*Mva`e{Q`rE;uF+CT96&-0gt&%U|P{1MSJ?%FxE$V zl3p(*@-~w}N3e9R$y12+nMzbJid<3P8)@l=Wt{9z6oFkATTJ$~_|G+t$6kR5N<{kZ}@)c|eVu zd=Njub@t-Wq|Q>olU`B-xrUFTgwToj4H@m16(lgNG){}d+3R&vOKI0zdM$k0Q?8XK z0A=Bt;Ni9})Vhqn$a7C-uTi6ZvMoO>$3d3kixVE{9s*!}Rn4_;0F))BWaX$TeJKso z3r-i78jxqVRHCp1$bCklh%rBRLx)5Ok!!tXd9e^^Q=S*9LB!)|mT+MNco20I?9EwZ zlb}n81GIV25@yp-5?QUX=bp?>KTD)YBvRZG1>y5(y8_>ZRY1)^Xz(Z8w~OH=!uDo& zuElexlCzju&gYN9b>&mZ>#U-@fmZi;~um+ zPIaOXjIG?vij^w%Yt>ZB&SxLX_{8S7jZz_NvLGcQoW0D`RW7FKk~BahqX}&>lta)K z1tL+v(Ij5XS~V1IxjpYCn-v|x#w4;k#Mb4s)i6i#vTEGF5a)-I-T|KVRGY<8A3Ddh zqIp6V>teA=`6%jT3Y|&#kSXmk_GOOgx}qGjFRjUqo`t zfI)v*@E49P3ljQxo|tW}QG4vyB328ZkC1`Bkh~94*NxP9P%4WgLsGuQ(qMb?BT`M`o)7lf#0@xrg$hqd!$ws_tK zg51U;U_!p9N(KJUx#pm3AzK$tdKJK(%EyETu|#U5u*vcu$E`V{adPRo(<8 z9#9Eb(2G_sFSLrBu|f$c6EG1jU&ODio{oqJDa|o$yhdB z&g?MW6wDz-1O!($9ert`U+-6i96ElJ&!JD_U@Q1bWHh)<-t#7}o>c0@Cx{9wb534T z{ub!nT-2@=NZ16KNoCF_O+zfroP*B5WQsBRb!rIBv_0BFkqMbMbD~%g=2eOoARL1{ zidb~mpECP6nk8r;+mpA1kp(7777j&E$dvD_pM6YQ zY_dAJmt7xTBZ$TwR{KR6wj{6EnPUOQkxwlMQs}Z4Y~7BOrlzidnbR*5Y}?mCa$!E0 z6x5(lgB8FiJSYC(Y#4w5DF+wCDqfO2fTn$6)U{%~>4img0t4aVqN;LlC&)0K*eN)f z(jeHA2V4_?vB@k6!MLTCBufd*2p&*K9vR9~Ae~5UT&O03=_CXc^u&Q1Q~)#>+B^}g zrt6heiKFUbv9FQ_u|k|t^a{U>6#?N7!v@EbhQ>n$n(EOP+Q?&S({PpTe9`#H+N-39 ztUcvB0_ZFR>Pb+VB~I5!nQ9dsSL8)vjXouAkYh?YBGy#tRQxIs!si7F9pt`hom3i0 zjkmFWFsGB8AgDnmKUqcC8dQnOmEs*AN`^X9OpYF zNJHw7pxh%uqn01ggFtYb2Zq-;BjAm`@F;CK4FM_CCrfKVcF1m_F-t}Yq)`7O$uV~#iW?T3CebSfPDm_s_H>?5IzAlBpD`SI0rAs0y+v0 z=s-@l$=Fe=AAy=y8*sodwpD~t6cAjhoJQ`;!H7vVi-y#SB%@^vysC+U7bUc2Zt{WB z?MI(^B=r+ox!Hrx!igAD1sfGk^iVA3wb|6K#+JIK`@ZL)0xb&@aqN+P-ak zqzZ&p+junvN-~`UM<|eyR5FtoR#-&SR#QXJ@$XjCg*zC&74rTJY#8Cr?fh-Tn%s~>afEEr|g&281sB2%a z1cE1CJ`|OpR7;t8t1<%Y0|gCOSyV#4B%;wA?A0{~`>=ghI!IP0=>=cKT_~dxq0pq8 zxKD6)#Ug2(fT(;73aA`Zi(-NyaF&h_Oqju^DLC~8)8h9GiX;c?L3s_~Qw1z7Y9f4^ zX5o8eD8NkMQ;UWKyeyTc0r{X4qwuL1NsxILTS^K);?12>Quw>t|Hv)H-kqhrV14MPb218yzBt zVnA72-L5Ye@(DnhHqr3p0jpKgy1Xm1E*X$W*+E0WiLfT+Jq$L?JrfxRGGr_YD0&yW zJ2+~TOq6gTjG$F9TCwnSl}h9oYhX6%?dNXPcw792+Z>DISv%aDX4+7r?O0SAtLX?t z*&Fcwfqm_qN1J?jN1HM3oGE|TpGZxt42SOzW!7>T8 zX{enP>abnNhLVxz)5fn@d};g&UEnJY{@cW_kbRGZ0@h5!CJ?h7zY4ms|Tq%n{1Fb6ZuPZunzW>OrG!hV!CGG{dZ7y?BE{KnkF z7QhO))^gV`Z;yw?&tPoMAtIBxtPjhC%XZ1soqAc;5gJgdC|t3~l?S~bgss-zRN_^_%f#Qu;wQwLeV`?s=mzUaDBB_kW>{^G7MJQCT zo65yYwXwNJU{+h_KJ#$&P$w4Yr=x_ISHep|MCk(On#!pA!AMvENBv$%F}YsnkTW7o zo`y96vQl@g$TFTu9wcfBeFDjCnN*EudoAK?DL#(2ReiOPBF}u$g1HyI5-Tj19BV{= zmRv9n`&lLdo)JFcct9msHX>8MzLG|x5F=<;$J=rrV{3MsEmw6f!)gv#vZ7_nyRqds%pQ1{pJO!&&(Fvz-g+NBJR) zA-_B2Xtb~Q-!QhL(mgBRlUI?|r!~5ev|~F+#{XEc9jiICumThC31+3b+BCGUhO@2z`b)Pt}*k`#4XicqN`WhAIeE7DRPa0y-frP4s4rY>yXw zUwpXSjQ{vT(#85ndO^WySV8#)&wd3KyfHap^OmPjRu2#kcddoPDT&&A3>uQDmD zZ2VeE$y9p5P8+6YaL!U(AR8hmiqz$Z)UnRvf>n0+R2NkSONeUQobcv$)mMZ`TKr_n zd#zsDnU=hIW*mh634-sPa^DdPYIDm6g{V`u#2nM~Q6ZH8SY;J>2qd9^knOghwnqh2 z#M??tQegnALq>Zob`6%8tyEeX8yZS+zKW6+6VlF%lxd0vc?jpDL8r!o#4OXZdhqK< zwQK0I3HtRY<)QsQ^2t4fvx-rxGPZ#cpBN)pjx(;&_fX|pvs!GPP#Qxem{cxxUt^Vc z838U;f@x~F4Yu#1roh(dm=EDF_=tdx1+nolR5f+KhFw_zeIpg(#Jp<1jl|mxAL4Mie;f2iwXJM&;->J@r2(u z16hWkNAIkv_-!`|2)nzHj4`*t#^U%`1edh_CM?!7&Jl|=Y!Z}FP?-=_>TLWg!eVl@ zo*r%jF&$G@s97j3Xa4b!_nfpZiqJCE*n`ldD1VM>Po&ifxGd!WaXeIqk^Hx1=vfOD zI_YA3R#sj6HAm^rq?nYp+K^%?b~kWTqNf*^Sq#ixT@T`W&^C3ARby%&Ox{hyz+#G;fLr0{D$)Q$cRPS5C}+#{x=y4gW0uUEhi z{AY1mU=7L?*o&5FZ5j}+As&cX2)hR(uTnsFC=GN7*iM=QHDdar_5BxgREmbcr+52e zCymDDX`x#CeyiUn%vY!qeq>{y)+qL5W`t`{rmIpWS;hkZmH#P&FTH2V4@xukUx7Qc zsYrh2O_CT?w``FERI$a@YO!?(^+E0RZ3PDq}`<8K5v@M!YETJ6|1owA#^)lfeohXL1Dj<)76|ET?;)hdQI_{uu0t%xlf6vt;KOuJ)dQ zz*XoklPPp?oMD;?sj!XTVq&(99~3biH@SUbcY)yG%lIH4X z@JnVPwfPFRfW6tKKgoQ;9GNY11iA{3bGkpxw)!p&s?6?D=L3(#lRot?U`ELR+aWBM zDl|^|0;4#}M%1K2RhCPNlT2x);?2$8KK4EbEF{NNM&I*I!sfF-u#}*)_B)$v#ykTb zJt7wz;GfM;{%gk9K>1Io>cu)X00i38?BHRT9}=qhA$aT?bp>Xi&?-ol4c$r$`aRw1 z)u8k};MKOjo72%Ncd|rbt7_6KOtGuTY`v3F6HX2KQV86pHDaEwUpeiGdCwv^8bCZB z$rgUqIq@!o_saBU!85SUh|C~wn})Rs3(?~NVZ<(|WS+T*#41@N>W2y4_xX^;__=~x)@jsHBT9`;0K#qHXX?6U$5D521iX(#($us_(Yzxvm}( znZ2~Dj1zwu>R8Agh7vcfQlS&UENbHEcs+Z?=aUUA%(b)03=b&Ox{4T#6AFk>Yobb` zA>iMvLv=sw=e9}MP+4n>ZW@DK*twFTJvyB z`8gE2B0}4%rt4;SoFBo)96560328d<%uolyECrBO;c*Ncv1q>S{0a*22-qYabf0jw zD&h`#3T#ZRZu0JZL+~W^cr%(`m~*; zGwf%CxvLuXlp^4#BP(WYpCnr& zX$=!^@FC`~P}jnXjU5Y>eNZe^1$Kv7d#f79rv3JK_{Ua6)}*#euGSi+XG_I8j&v^4 zb@R!l(=O6AtIxhjH(;^b+v!hPq_#w>GxHWlmQKT5+rn)xQQ<>{Dx^h?pNi#%z4ltM zU=*`#(y_J~0_;_MGV~4%{T6c8X((IIfh^H#hqZ55M!ONo6AJ&5CuGHH<41^3Bj&`X zRT8YQy{|p7y3ZF^66_(R%}+{+DRz|oru}FHIuHfyf^Z`_pFCsPn~CNFHpqUf@~FE( z^h4UBz;*_Dl%z>;Ot#QpI|)t-(*ozMB)9@mzBoo}DKha57(xof+pE+{F(4=(Fa!Gx zkZZ-gs`R;5mYW(<+lU^pccu^p_s@@Gaj-vwQ}HKE*HwJDPHLh8_!hv3RFOiFJ*_12 z1s~Uv18Q0hfzYB?wpYtqa=^$eNf=hNmQZ_qHH|M6<0u2dS_%2)fUPMX=g)=om{fd4jrHs*_K}+9ge65h%`&H~nI8NzrDjNI!Rsia?6okq*nq8Jf?JBW7r>9H7IaA_PoAYv)6>%Hy zY{NAnOJ88-w3mq*XF4IUg^ZAKp909XcSbhX@-QJeE_=)ir*HZqxlXzS5<*pn7a*d3j09Gp`g0H4RngG0i${G= zPan@fwr%h0de0lxQp?Rn4$jbMCE{zfy;*{Yw+esdLnDd3bW-)PdqJl_a~$H5vqbLOTy>f~VFq8GNHk`B%5(l@+AjhCvl!DA{I&J+cZk z{BjR(Y`?k(dXgev7oSwv@zW%m0NhS`Rr2ficQR9~D55NdK5Rc=^+LQn2{Um z(U{hJC!V1{7w0HUPhpF9y0yN1uP*RQFGF6{ps@{!hIopmO-yFST+<0$Q=Y8wsUkx* z0nZ4dh2VXzriN7Lu@JSFvIrRn4`_r})-mUmjm2f_hI#M!e6oh;wEbFVnE>r!4v1#X z&*wDGZKwNKe3h70ESqgA0bML`utNv*?NKga>9`*-RJ1d-&`Y#uS1|<`vxoO zjltQ<5p8Oy2f*w+EpseVwG|VEwpqbTpo|}s;Iq&Vg3rx%5`2!+vy1?Ihp83$!Pjdl z$!4g|1`c&YT(%agw^4+pv5BN}jAn_VZZfCvk?jDR^*g|ljT<;KxkAyGaV)lVUE4PI z0@QBVZ_fvD;Z$m4HX**;6eIdlT8sEJkCN&`#@l@ox41d(>9OE0;!aS_4Wjw^Nco2I zCFL8|x21fmm-2HP@?S6XQohF4JzP;p3LH#|cmes|J}bpQs7_EAb-jw6%DjO!fpf=3 znkc^5kad@uOKyRpTf7nwdPvTNe#2vmJ&2%v^OEbP+8Z_+i<{1+zm1f~`FsdOKd-kS z2hcn|7e^V2PhP-xc>NKN>*e#z3rb$rlJ#vS>vP&NkTm8|rTrnWSE>45ORNX=T59p+ z6qM3-qdHdti=@>`QT)M~X+fD&*97d++Te}h$2eps(sdydf4eOXFsp~@{03m`9&f$P52tUclrU4vI1n4WRkOri&i^AsgBp+lR z6WWt(7RPr8kX9u9DX*9vR%{h-2~0Z(jT>evj>NA_3PuC_p;R?UPrWP%il~FYatj*z zl;?!`PiN>LP|ch1Ah^MdY#!2MjG3wUfKaxdfV>^*x9KflHoi5N+9`9XFc<8)<|0lo z7Zei{%m&meY3~E^LE}fYD2HtkPEt!@F6@{C1^BtVa5n_G`9VWS7i%tJg>-UuCIWC$ z#@^;-`J!m_TRQlnKr~*m<^qHyc&pTbk5QAlPxt*)ED)27D-I1?*tM99DPAZ91Anxm zXAn_ZEKm-jEjz@ZRIwZPYQ4E+6~Smg`|0~UR1ImN2jwd);S_UI=pf89J4dzxh+UK) zw)kZ}?I1Ip;T}L)*;7D(exqTIV3{ySy1TLQNfipCgaokgRKA3nuGC&WFMvy=Z_3X) z!%m9_X!_QNOL%{hZP96NVW$2f=5AaC(w=7iU~%b+1N`mme_<5J(4df6f6^oq+*v70 zh0tm#P=T1Hy2vbN;UzRcVw- zG1YcYm1vZ7Y{YlP>Qhs)kX%_Y#f+6MqR@$ro5@7jrj{vmDoK{3k!5~sS~aOpbyPXo z3iWU`R5{uHRe>rr5HgEAOL9}0PPvMOFk8{?ZNdun@ecF%)K})GLq(c)_A_C0&oX8! zzny2amJw?~o>pYzTg#}z0s{al)fTDJXrrONrfDxQb6TlrR5olx@+;ob&J@Qru^nQe$%*Aq@cpm=#QZ|uV-jbsEEJlg?# z0e}h{ovG(Z-2jDo+-xDlj>$GGYcwZo!ZDL8as6`w6_XW11xg80BEkv$51ES)L+ z>nbnOo}ILmsFSW5vA0VZ+WN$Z*6)&$BMfa@>w6L1bhgn~yu?dQnJ_5XZo>vEXNS$0 z)rg`s=F`wNh;qj$rCkZDrEQ0bh=hj=@SK_klzc6Liy z9PE~N6}J4l0`(0@ZV-eiu%(Y>(={a!6$vHOWH}_ku{3C%it3UvhTRR8Lhl&ksiMjl zJtY}xXAc*-*Qu2HJd&qn=kUCoro#iJYx#$ex`!Q0WHjC9Bv}MHq0A6WVT=$W=LqK& z&1@lZM6{1P6`-Mxje1>NAd_$9Kr*(AU88CO0c14c?A5+8+ZNs&)E;SNV{5_42r%U{ zlx=A)aFHmRVk9=yhT+5djEpLVZaq<~mR70?8;U_CkS>GD=n+v>W3)sx-CM89Qi9mc zev8rd(+OLV^pZu=O9h^RaH-)_3pRxub3t)GSg7npv^`q?Tw}IamgUX| z!8O0*UGSk6$GTW~4009Zz z2@qK$y=9}!36Y8!Ryy6c4n1R|8lN{$T}(KJlZ;GzO`9$|-LVL+KJ$n=tz_pSPdS}S=vSw?D3-zl zMh(!OZg>kxHLWQjR7*A(*5O_*Dx>Ys%q3GTkZt1qBAV{BT}(e0^YybDkU23wrn8hU z@;LAH)86GkORMA=fNITEaszecE_r|$6BnJ zIC~EvbWO{COC;08Vx}ymZFY_pKBr01>f{`lWIVDp*2}C`aYtD{uSq6^w;bk$w;bRH zXd5k|WLmpd2D4Mc3mnDCifIl-0hnuxaq^lc!5+uxyl&eFbYqojg?e@sZnsN2CR-C; z^`a)+T5O$@ZY?$8fR<$1wA&Mhsck>fV;JkrXCGHVsPbNXtMAc!rt)nxRZl z+QWQt8dbGFWbWi7FCpewQ0dJXKY5Du7UHRDQc!SYCGEnbN(s$Zn{-gu(S+&{$@orV zR=Cp+TWRZIH;r0V_$|(=;FHa;Djr!7bgM55Fo>o2u|zo-5{_Yas(1C0l4SPB!o{gR zBBxkpFLEu78pw?d+)f<;1s4Yz$NGG61c^_|t)P-sOBb{E6u{mm+R5pQ_KWNb4jZ^_ zdndJJFgnLZ;sM(`V}+K?g4UVZUTRNStLjVcH4R9c-NN+$QQCpvfWNO`s09cZ7C*sc zRKjT;T$UOH?{BGIOa?*u7CBbrmNVu+=_;86jbG*$9PB8 z$$klqPpjNp+Caoc;W2g^*{9k7H7=)1Lv5n=5PEBO*zD>iBK^Wc&nopc!CNXlL-bUk zFSS#`ystgoOit&IX$mN`FolW_CL$Q!=8OX@f5+R0`xfA7yqjRzkEm~&9Ie^_)#N4a@eLNX2|TI5v}XQ=lo=!J%`vs zc79b57M+Fd#sG{uou4{|wC4w>lrtiDsBYS{$mT8xX}U$FwgX;|%lumNEY*=y={0P3 z031&H`zXvi*qSK1$s@|MHu~{Sn{2FDrnb{*1u0K4we1;Fb`@?u(J?>WYB|emS=riZs2is#$nTPs?60&N z4V-z)p>0J}uzv(E*q1XZ6NiShO^8b*NS#<9nz8}*AkwAl#fTWNIJKARr=uJIyV7l? zsE|5n0)icxm4YNu9V{)Nq?V-tBsHq4uGp3V#W)lhHHC(#)J#-r=^C+Yz>8S^9ay|A zAhKt2ewkQ%E&}2tc9@;+-$p%HIxp!re;3?e4f7gr&x;z~%)D6oT0Km!m^Ex~U{jTk25; zPC{;uh}REMt5?)2_s-C>nvj%y%Kl2+t6cdcsUd|CnY$w#(2+S(a)tAmre*d2cM?TR z)Od{rcyWm$b%IITn|YnsVGk51c}I|Tg;|+MD2|Zt@&blj%q6~Ql>|BMA;gk5t9BFH zswyS9&#h7%9d_NYm4!|^n~?e1iS$-(nY0))UTWQC^{gFPhjrIXJzoLaro&VvjoM#o z-+!fZzU^*mf?#Jf?3yg#n+ZvsXKi~@AbAt4x#@Xt%Cqg)UTVv=tetPo)+F28`Sx6u zoHq4_USBd-+4|qLgzeR|phQCdXw&7RcQzqa0EE${i3!M~E?*rK^ zPm$9ZE6u*5qzLoGTnVVjn1_v<9X!j?S#z%oSw1BnS{=R=#0@@%qDQzn6mXfVL4FF~OcMf+w7a=2_Lr4Fv+YlORHbp2 zPZ`pV8p*qyPKDXMIzkJRNed9%c?31g;EKx0-;E!%cZIW-ef(?oqjS54qYV}!J z*7LL*3rR0V#?Ox44*F93uE-qcxZ5+f0m!r1Kd8I6QU}MDNdrIB#M>@Y`2%b!&4C3O znC1Z(0vs+wu?Rw|LgWM}l>XIEYg{QBY4IOFSX!zX?(D@XZ00A$wY)a4 z<4&rA#u`Ce642)}*@P3JPw(agUkAwS(SkzCBH$_HL+acEmR`F=f_p$N522pXfr!g+%=K1hh1t4?dv5Ve~23L|jgh$+PFs3NJgiK{QJ` zx6|j|m?`N(_FM-)%1f|MYfGV6CP!QG3rfMEUP1~^p-$CQ{XfdWrJ6G9RO{;}1t(Gp`pl`Wn*~60A_8OjH_wE&=xobs4W_%4`75EaNrEvi4uFjM=Jt>M~|?f!(06IX=N13K!zl)p$m2w$f$2IJu%e zg$L%6)#QAVRqAH7u6k_w_=@_B95WI^E6=*leQ41Fi;BZ_L>oL2&2XI>YDj4*`n56J zKen7-I*T;Kpa6qJ#p^Mj^V2;Wd)-#szpNTb#Z3?l951`gH%Sb(W?{-C(4ZW@!>ooq ziO`?=^>tNzt9Dk(<(4sdk?` zJ0o@_%mRgE^KG|L7ydfO7<`o_D52J_nKt-$<|dGB57Vr+I%TB#Te}_k-PzLJOU6sR z)spd^5x2I}XIh$yb*ET0lRFDo^+j~9tP#C$Ay^3-+c~^aZjBjK0hRF#vp&Ld-QV(* zF~11>+NL*NKV(j^An}}zy%A<_EFpE)&YOy1Wp!{Du*%;IXrGiBxfowlNWF zSHz8o;mTkG&(u0nwoc9&Q8*f}gbg(y*^VBP>J_3Q2m;Qsi$AyvDT7Bg(4-0{6iK)4R*-Q8KMij`2F7fA5w0vCXi0>8-wI;+{8Frxj8jP zBo0oHlsw7|{o=9P8W*tw#kNQjLdWr-#` znPm+>6&C%WvB_pHqp_4pVWFLdNg3INRbg+p-O*89{cR5}%@a{@YL-&d-4UgyQwy?W zH!(f^d+k<^y}I4HV5ymtPx8`GAzM-4x@J5S4u_<)euXTRGoh*ajU_8oqV z7!bTFc}*7Kl>_DV0)Imfa^)z{bgf(-mAY721$=ym4jZ|@0b0n~>E;QF^9`lJp41Af z!%Oxy0A*z))ofoWSB*d1NueXklQz(3PawU^tpd|0cCkb(DlOFD1DCmnH9bEMi#bqF zq6&dgcY~itE8DKE)7moAE_kX0OK7@H4+FP0DXV?isr~1fR?&zG$%5>i3mB5_I|aP4RJ-o(8QN)v8yIw!6t~KV)B0hnpDNxE z_E%kJ*9*6rpstyWOgAzKkIO7e?c_L~A^~-lS1eD7ecL>wTQJMLFQ`_wo13(AbBuOD zGl)w#)@NEFf^ue^b)d|<)j!4wp`r1F$i%-N_%(q#zUC2WBSjJPJbWqpmbs1OPXC(f zd^pzS=n32E@#rGkP(p6t)Mk*K@5A)Ypd3!q&`~{R>6?onb~}ggN`3NfZG`gL9!f}) zW8b*0Y8kqbQRf?<>dIC$rTm1isFpRSnjmdTDGki`m>r-ig8E0;=Yca}M7o+E8*7}4 zDu9x0IjJvX45G7a2?bd;R>lAz3Zre0Ta7nlq&kOh-{9>L{UDSHv!059ej$ouX+u72 zWnMgb-Uk1UYkDm2=D4b^tY4;Tsm645=uz^ZWo>+Alo9h2@bNhuU$-FZ$Onxy9QeSH zo-X;UXk#^Zd|p*|`VPI_h|FI;82)IVJJ%F{W}G9VK#aTJ2?pRwLJ#k?hMU2`_SOVtjr4Z$*15UdbzYJ zTya|q?+C|LH&FOWI3D8sckQ^x#{4!r?zM3~WXFAW{)2WrV8@TzafRc7;%Dr*#_>?` z%XU0$@A;-3k8oTmK4ZtrbiUMQ$ICe$AVaUYPv||Rjdr}k-gBWHud?H-?0B`ke~%q+ zv|~@tEq43{o$s>omyX!6zt+2S+~?1~-;QlArKY={{;&t#y{^vg#JiBF!yLVidtp4l z<1KDKe_zk5`{@i-x7X`DyOsU>`}w)k&fUY`gLZs3=XIp-I1t`*$i8VGXY~!8-+Y^0 z`LKQJ7OrzRTqpb4t$eCZH?O;Rz5V$+d9JHyWQX{v^K9unwmNtH9S85NAGqtz!}Ztg zd!T;H{`%|h-G5vCt~=}Z-g?je{dd;yx~G2d&idW=9ONAbICJQM`o24FOW%Ck!Fvzi zbMTheALcXu)vfjV-n(9Juitss;rhM%4;`u>POriBb~B+j*d*>{+9K*Mp5JPNyqDMR zVybo5Al$T#AGiD98}{FJ?*sSNcfH}({fF*7$Z#54xADSteByQ{dFCa9t}l%u zV&i_sf7t1>4Wkl`p~OaU5hmWUUo5=qPS3!*;GA*Kvj^VUTQZCbe1mJe0?))UaZF!# ze*Fv#s2|>cFRwPXZR6rEZ3buN>5a_n9_A(~(8BRja6x9CIu@@EGXH~cUSh3a)FKS0tEQr;e-1Q)$iGVX#c)@dC$@TpDKc<2w+S8y!h=ju{+2G zHP9PvC_2`#?$j`L?z`t8%jd>@hxXrj_~4zKxq}xEBW35iS$^)fpRFi?&h@a>R>1AN z!`*TC@ZIOn&fb6j{aX)&Ww7~AfM>`#`ZH^;ouox|C(LD{ceei zbJ^>KE1vQD4>95gmVSR>Wnr#xb>Z^DMf_dJysGP&6rAPzG?#tuK7McGy?60xltUCp zzXe#o6V>M2rBLA>)Rv@bU*_9AHM6rhGhIY?VKDo5;!mg)KFz;qBTzFJ<)cDWj7m{C z>WaFfo~SqKi~6I1XfUdP0*9hnG#rgY%c9X}ELt9oM-$Oxv?5v=t%~Z=R3wa3pnFn@ zI6ikFbv@(^`lwGFARa&f#SP(c4TEEs5gQl-Bac(ZH3=qMNu;q3GMonUuLhZ}CI7UZ zde@C~dEQL_=&dY;ZEg-_Fz?QxAJe(qbzlcwna+0?aDUW`+{N4>?h!S71hG=87DcT%uiMCR5zb%@J8qs`oPP9EbH##rc5iLaLM;AmFMi)gFM=y&m zi7t&Ui(Ve>bid7ATYk~~zI&JZ8@iUi-TgE78^q+^AMIkF=~w99@T<}8=yLbV?q9-( zKXgwXpaf!rz!hPBOr|8P)s_5$In&=hLk3>HjT^s#a zbY1ky==$h}=ti+d|cZQHh;{^@*pnx1Zi=jr)#!t?Fn@!aruUU=LQ9v8ynrQz|i@c8oZ zxGOyF_K$Ph!ehAZT)6IBxb9rI?p(O;T)6IBxb9rI?p(O;T)6IBxb9rI?%d9BopAlR zaQ*Ybz>aqI}=*b&CDBaCB57{`tj@|b>~jkB@M z%K?vbJqHfn{`!0N-?s1GJN#ERY>16*+jkdsz5brN?Bw>{HlN*>`El@Q #include +#include #define GL3_PROTOTYPES 1 #include @@ -39,29 +40,29 @@ int main(int argc, char* argv[]) { glewInit(); #endif - setColor(1, 0, 0, window); - bool running = true; while(running) { + glClearColor(0.0, 0.0, 0.0, 1.0); + glClear(GL_COLOR_BUFFER_BIT); + + SDL_GL_SwapWindow(window); + SDL_Event event; while(SDL_PollEvent(&event)) { if(event.type == SDL_QUIT) running = false; + if(event.type == SDL_WINDOWEVENT && + event.window.event == SDL_WINDOWEVENT_SIZE_CHANGED) + { + + } + if(event.type == SDL_KEYDOWN) { switch(event.key.keysym.sym) { case SDLK_ESCAPE: running = false; break; - case SDLK_r: - setColor(1.0, 0.0, 0.0, window); - break; - case SDLK_g: - setColor(0.0, 1.0, 0.0, window); - break; - case SDLK_b: - setColor(0.0, 0.0, 1.0, window); - break; default: break; } diff --git a/src/server/crypto/base64.cpp b/src/common/crypto/base64.cpp similarity index 100% rename from src/server/crypto/base64.cpp rename to src/common/crypto/base64.cpp diff --git a/src/server/crypto/base64.hpp b/src/common/crypto/base64.hpp similarity index 100% rename from src/server/crypto/base64.hpp rename to src/common/crypto/base64.hpp diff --git a/src/server/crypto/bcrypt.cpp b/src/common/crypto/bcrypt.cpp similarity index 99% rename from src/server/crypto/bcrypt.cpp rename to src/common/crypto/bcrypt.cpp index cf87337..63a1590 100644 --- a/src/server/crypto/bcrypt.cpp +++ b/src/common/crypto/bcrypt.cpp @@ -1,4 +1,5 @@ #include "bcrypt.hpp" +#include "bfish.hpp" static const uint32_t bcrypt_ciphertext[6] = { 0x4f727068, 0x65616e42, 0x65686f6c, diff --git a/src/server/crypto/bcrypt.hpp b/src/common/crypto/bcrypt.hpp similarity index 83% rename from src/server/crypto/bcrypt.hpp rename to src/common/crypto/bcrypt.hpp index 931809b..772c4bf 100644 --- a/src/server/crypto/bcrypt.hpp +++ b/src/common/crypto/bcrypt.hpp @@ -5,9 +5,8 @@ #include #include #include "base64.hpp" -#include "bfish.hpp" -#include "../utils/csprng.hpp" -#include "../utils/string.hpp" +#include "utils/csprng.hpp" +#include "utils/string.hpp" #define BCRYPT_COST 10 diff --git a/src/server/crypto/bfish.cpp b/src/common/crypto/bfish.cpp similarity index 100% rename from src/server/crypto/bfish.cpp rename to src/common/crypto/bfish.cpp diff --git a/src/server/crypto/bfish.hpp b/src/common/crypto/bfish.hpp similarity index 99% rename from src/server/crypto/bfish.hpp rename to src/common/crypto/bfish.hpp index 7747258..bd21403 100644 --- a/src/server/crypto/bfish.hpp +++ b/src/common/crypto/bfish.hpp @@ -24,7 +24,7 @@ private: uint32_t parr[18]; uint32_t sbox[4][256]; - + friend std::string sosc::cgc::bcrypt_hash_raw (const std::string& input, const std::string& salt, uint32_t cost); }; diff --git a/src/server/crypto/cipher.cpp b/src/common/crypto/cipher.cpp similarity index 100% rename from src/server/crypto/cipher.cpp rename to src/common/crypto/cipher.cpp diff --git a/src/server/crypto/cipher.hpp b/src/common/crypto/cipher.hpp similarity index 93% rename from src/server/crypto/cipher.hpp rename to src/common/crypto/cipher.hpp index 2f208be..4ead268 100644 --- a/src/server/crypto/cipher.hpp +++ b/src/common/crypto/cipher.hpp @@ -1,7 +1,7 @@ #ifndef SOSC_CRYPTO_CIPHER_H #define SOSC_CRYPTO_CIPHER_H -#include "../utils/bigint.hpp" +#include "utils/bigint.hpp" #include "keyex.hpp" namespace sosc { diff --git a/src/server/crypto/keyex.cpp b/src/common/crypto/keyex.cpp similarity index 100% rename from src/server/crypto/keyex.cpp rename to src/common/crypto/keyex.cpp diff --git a/src/server/crypto/keyex.hpp b/src/common/crypto/keyex.hpp similarity index 92% rename from src/server/crypto/keyex.hpp rename to src/common/crypto/keyex.hpp index 29811e7..d1f8810 100644 --- a/src/server/crypto/keyex.hpp +++ b/src/common/crypto/keyex.hpp @@ -1,8 +1,8 @@ #ifndef SOSC_CRYPTO_KEYEX_H #define SOSC_CRYPTO_KEYEX_H -#include "../utils/bigint.hpp" -#include "../sock/packet.hpp" +#include "utils/bigint.hpp" +#include "sock/packet.hpp" namespace sosc { namespace cgc { diff --git a/src/server/crypto/sha1.cpp b/src/common/crypto/sha1.cpp similarity index 100% rename from src/server/crypto/sha1.cpp rename to src/common/crypto/sha1.cpp diff --git a/src/server/crypto/sha1.hpp b/src/common/crypto/sha1.hpp similarity index 100% rename from src/server/crypto/sha1.hpp rename to src/common/crypto/sha1.hpp diff --git a/src/server/sock/frame.cpp b/src/common/sock/frame.cpp similarity index 100% rename from src/server/sock/frame.cpp rename to src/common/sock/frame.cpp diff --git a/src/server/sock/frame.hpp b/src/common/sock/frame.hpp similarity index 98% rename from src/server/sock/frame.hpp rename to src/common/sock/frame.hpp index 68ee644..f498302 100644 --- a/src/server/sock/frame.hpp +++ b/src/common/sock/frame.hpp @@ -3,7 +3,7 @@ #include #include -#include "../utils/net.hpp" +#include "utils/net.hpp" #define FRAME_OK 0 #define FRAME_MORE 1 diff --git a/src/server/sock/intrasock.cpp b/src/common/sock/intrasock.cpp similarity index 100% rename from src/server/sock/intrasock.cpp rename to src/common/sock/intrasock.cpp diff --git a/src/server/sock/intrasock.hpp b/src/common/sock/intrasock.hpp similarity index 97% rename from src/server/sock/intrasock.hpp rename to src/common/sock/intrasock.hpp index 48cd474..58fa9bb 100644 --- a/src/server/sock/intrasock.hpp +++ b/src/common/sock/intrasock.hpp @@ -3,7 +3,7 @@ #include "tcpsock.hpp" #include "packet.hpp" -#include "../crypto/cipher.hpp" +#include "crypto/cipher.hpp" namespace sosc { class IntraClient { diff --git a/src/server/sock/packet.cpp b/src/common/sock/packet.cpp similarity index 99% rename from src/server/sock/packet.cpp rename to src/common/sock/packet.cpp index 872d726..0801eba 100644 --- a/src/server/sock/packet.cpp +++ b/src/common/sock/packet.cpp @@ -23,6 +23,8 @@ bool sosc::Packet::AddRegions(std::vector data) { for(const auto& i : data) this->regions.push_back(i); + + return true; } void sosc::Packet::SetRegion(uint8_t index, std::string data) { diff --git a/src/server/sock/packet.hpp b/src/common/sock/packet.hpp similarity index 98% rename from src/server/sock/packet.hpp rename to src/common/sock/packet.hpp index 98a31ed..0552c62 100644 --- a/src/server/sock/packet.hpp +++ b/src/common/sock/packet.hpp @@ -5,7 +5,7 @@ #include #include #include -#include "../utils/net.hpp" +#include "utils/net.hpp" #define PCK_ANY 0 diff --git a/src/server/sock/pool.hpp b/src/common/sock/pool.hpp similarity index 99% rename from src/server/sock/pool.hpp rename to src/common/sock/pool.hpp index 0953b6c..c10aafa 100644 --- a/src/server/sock/pool.hpp +++ b/src/common/sock/pool.hpp @@ -5,7 +5,7 @@ #include #include #include -#include "../db/database.hpp" +#include "db/database.hpp" namespace sosc { typedef struct { diff --git a/src/server/sock/scapesock.cpp b/src/common/sock/scapesock.cpp similarity index 100% rename from src/server/sock/scapesock.cpp rename to src/common/sock/scapesock.cpp diff --git a/src/server/sock/scapesock.hpp b/src/common/sock/scapesock.hpp similarity index 93% rename from src/server/sock/scapesock.hpp rename to src/common/sock/scapesock.hpp index f25d499..49f9f6c 100644 --- a/src/server/sock/scapesock.hpp +++ b/src/common/sock/scapesock.hpp @@ -2,9 +2,9 @@ #define SOSC_SCAPESOCK_H #include -#include "../crypto/sha1.hpp" -#include "../crypto/base64.hpp" -#include "../crypto/cipher.hpp" +#include "crypto/sha1.hpp" +#include "crypto/base64.hpp" +#include "crypto/cipher.hpp" #include "frame.hpp" #include "packet.hpp" #include "tcpsock.hpp" diff --git a/src/server/sock/tcpsock.hpp b/src/common/sock/tcpsock.hpp similarity index 96% rename from src/server/sock/tcpsock.hpp rename to src/common/sock/tcpsock.hpp index 620d183..8ed0484 100644 --- a/src/server/sock/tcpsock.hpp +++ b/src/common/sock/tcpsock.hpp @@ -31,8 +31,8 @@ #include #include #include -#include "../utils/net.hpp" -#include "../utils/string.hpp" +#include "utils/net.hpp" +#include "utils/string.hpp" #define SOSC_TCP_BUFLEN 2048 diff --git a/src/server/sock/tcpsock_bsd.cpp b/src/common/sock/tcpsock_bsd.cpp similarity index 100% rename from src/server/sock/tcpsock_bsd.cpp rename to src/common/sock/tcpsock_bsd.cpp diff --git a/src/server/sock/tcpsock_win.cpp b/src/common/sock/tcpsock_win.cpp similarity index 100% rename from src/server/sock/tcpsock_win.cpp rename to src/common/sock/tcpsock_win.cpp diff --git a/src/server/utils/bigint.cpp b/src/common/utils/bigint.cpp similarity index 100% rename from src/server/utils/bigint.cpp rename to src/common/utils/bigint.cpp diff --git a/src/server/utils/bigint.hpp b/src/common/utils/bigint.hpp similarity index 100% rename from src/server/utils/bigint.hpp rename to src/common/utils/bigint.hpp diff --git a/src/server/utils/csprng.cpp b/src/common/utils/csprng.cpp similarity index 100% rename from src/server/utils/csprng.cpp rename to src/common/utils/csprng.cpp diff --git a/src/server/utils/csprng.hpp b/src/common/utils/csprng.hpp similarity index 100% rename from src/server/utils/csprng.hpp rename to src/common/utils/csprng.hpp diff --git a/src/server/utils/net.cpp b/src/common/utils/net.cpp similarity index 100% rename from src/server/utils/net.cpp rename to src/common/utils/net.cpp diff --git a/src/server/utils/net.hpp b/src/common/utils/net.hpp similarity index 100% rename from src/server/utils/net.hpp rename to src/common/utils/net.hpp diff --git a/src/server/utils/string.cpp b/src/common/utils/string.cpp similarity index 100% rename from src/server/utils/string.cpp rename to src/common/utils/string.cpp diff --git a/src/server/utils/string.hpp b/src/common/utils/string.hpp similarity index 100% rename from src/server/utils/string.hpp rename to src/common/utils/string.hpp diff --git a/src/server/utils/time.cpp b/src/common/utils/time.cpp similarity index 100% rename from src/server/utils/time.cpp rename to src/common/utils/time.cpp diff --git a/src/server/utils/time.hpp b/src/common/utils/time.hpp similarity index 100% rename from src/server/utils/time.hpp rename to src/common/utils/time.hpp diff --git a/src/server/db/database.hpp b/src/server/db/database.hpp index 2cbeb70..6008431 100644 --- a/src/server/db/database.hpp +++ b/src/server/db/database.hpp @@ -2,8 +2,8 @@ #define SOSC_DATABASE_H #include "sqlite/sqlite3.h" -#include "../utils/time.hpp" -#include "../crypto/sha1.hpp" +#include "utils/time.hpp" +#include "crypto/sha1.hpp" #include #include diff --git a/src/server/hosts/master.hpp b/src/server/hosts/master.hpp index 2408cf0..5b57e6e 100644 --- a/src/server/hosts/master.hpp +++ b/src/server/hosts/master.hpp @@ -1,16 +1,16 @@ #ifndef SOSC_HOST_MASTER_H #define SOSC_HOST_MASTER_H -#include "../sock/intrasock.hpp" -#include "../sock/scapesock.hpp" -#include "../sock/pool.hpp" +#include "sock/intrasock.hpp" +#include "sock/scapesock.hpp" +#include "sock/pool.hpp" -#include "../crypto/keyex.hpp" -#include "../crypto/cipher.hpp" +#include "crypto/keyex.hpp" +#include "crypto/cipher.hpp" -#include "../db/database.hpp" +#include "db/database.hpp" -#include "../ctx/master.hpp" +#include "ctx/master.hpp" #include diff --git a/src/server/hosts/master_intra.cpp b/src/server/hosts/master_intra.cpp index fd453f0..48a521e 100644 --- a/src/server/hosts/master_intra.cpp +++ b/src/server/hosts/master_intra.cpp @@ -1,5 +1,5 @@ #include "master.hpp" -#include "../db/database.hpp" +#include "db/database.hpp" #include static struct { diff --git a/src/server/hosts/slave.hpp b/src/server/hosts/slave.hpp index ae1be3f..019eb9f 100644 --- a/src/server/hosts/slave.hpp +++ b/src/server/hosts/slave.hpp @@ -1,9 +1,9 @@ #ifndef SOSC_HOST_SLAVE_H #define SOSC_HOST_SLAVE_H -#include "../sock/scapesock.hpp" -#include "../sock/pool.hpp" -#include "../ctx/slave.hpp" +#include "sock/scapesock.hpp" +#include "sock/pool.hpp" +#include "ctx/slave.hpp" namespace sosc { /** SLAVE -> CLIENT **/