From a0aedfda25d3c0857a2b0cb95b9fcc63b5ba5014 Mon Sep 17 00:00:00 2001 From: JustinAJ Date: Tue, 14 Oct 2014 06:40:06 -0400 Subject: [PATCH] Improved/safer reconnect routine --- Release/Plugins/RenX.Core.lib | Bin 54854 -> 54854 bytes RenX.Core/RenX_Server.cpp | 7 +++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index b3ccf2bec5f07a6db24bea4eebb320f5c6fbd2c4..7aeaa2e4faddfa4266f3e33c6e06f0f7a1d15f1c 100644 GIT binary patch delta 3365 zcmZ`*X-t%75MHm;qG3^xZ-Z4K9#vX#rHEpYqlSu+dQ^*|V7DHvsR}V|tW8tFiU`WF z?0^T#x>BWxh$tRaLGc1A2#Z%*n_7&|+1W$u zUu3oRk}<+*Ncg1iVExbGlhmuX1q05(gzOOzxcLv$4}!A&dars`|918`Gg^ZIH~fVa za<TjwZ7$>7OWlYs_lXUKC^?kvMI5IS-LNRH705f6nPxFEFJfLsFq(DAYX)7jlS>ND?Aq0NgJMfQ+K4%I`B9Ny58D^BCAkSyG)d3@T-WQ)pKCb|W8E5bfqr zafP7EO`(t6#fFy+O7>A`)jlp>0ZH~S2$B~3sH`QTEW0Rc-SFA3h)JmK{fvrX5fucG zSi!X-l?N3>=qzK*QI|hC^ zI7-%u9%2h|wyF+(B#n4Wrd5$KtTN3oQUwi_9~+@$Ncw>n!Bg<^&cAEv>zW(_*30T$ zk-15(X@XKTIt_y-k^XSLS{*;k)~1u_uHq|bKSY?Rhfv(i=r50aq0pAa*=o5stT?k)@78z$IYW?IIx!d;Yt3#E;^3n!xvUfs%Z_r_ z5iz1pAFaBt7*RC(*E;HHPaTKLBeLNb-wW){xF+%nI?iR`*sncF#_Hp1WjOEp&9E6?ZrYQ))rx*bhC_6>P z)}B%?T+(SWI!TKZL+-Ni(H;E9d|DBbf7UoeE!?=cRvLsgt)ECQdH0^T z{)ZsBKd~V4fM9?6U;9618(>1423bCKg&EfAuW#hoHtx1E0!@YyyCdgpQ9IL>vwyeU z9CO2K{dLpJ5cBDE78BQ3e)4y9WWK6NVkd{A!g83eb@DJH#}qF~n(pP(B$eBcJ(;0G?|lc%oi2IoU$c~7U@(5`B8S0pCyi4)VKUwo4FDJ dBJX_M?OD?3yiHyWx1$V$27~TU6=UuM{{t3-&jq?a(BBFRy1;q=fAS_;KZE7(ZO-*CyKa(cfcjkNN`(A6yKW1mKwg2&JWW8nE`N7cX^@yt zL5uTODnWWJ(3@`-^CDdzLHBv$2(WJT{TE%y?Cw^R8IeH27HvyZKm;>1b}B{gHicaLWdBcJh)e;gLl6w zImXVdq1f0R-x{$5`{#~A16G5wog`Y#&I-fJ1}k<^==xpx(uny)8MG#80(PtziLRhI z0+mMsJ+A77-Yw5k!tQz~SJ7^+UTQRL4{Oxp)u3w+(Ri?Dl|o~61%+l;Y%}sv1udY!06Vx{Y=;+Cf<5L4}D97MvBmlzGLB+ z1EXb~=pnWcXRG?ahti0*WO_9j!>iH_BUR8?^^p-uhU6c35j=%2?)=-9{;sGHuwGK{ zip))NO&646&}jrbiS&naHR||bwsxIFPc>gb`$57?JDAEObWG&`@ZkH>h}w$DC5)v4 zBVLrfVd^{qz?0@EwZSv#F;{pbkVh<}9vb&z4q6h-@eVFYh<&ayuFfhVdbcJB$Qgpv(n-P4RA+XJ5QiRN$z`R8Sbl`N zj))QU`e@aE#fYNOzt&Svd+Rw|9+CA&`Cedm#y68!&@nCx$9~NTGS(bhBlF4PlN#7d z8JeFPcxdDRBEL_Lvm%)9P&?&&eEd_HPlAx%vqkaqQSVWc;vxJ5H%&nZKFJ8EK>0~3 zw(g{Q;gV00(Q#_CM8LBrjuIh!E)W(XLc+8F*d3jubQRT;chvhM>w>KjpJbY-H$-fz zXiZkiNZ56nThrsE);u}QcR@K8ThFl3Q=~s6qC}1~k>lRLFi1ViIXs1wqwXw!!m#4s zE|F5PE^v9ublkqc(}BiB{hhSVFU7Zz|cpju=)a4ja-fGJL3sl5~L)c|?j-;v^F0-nN)IL|(h$`H_M*45Rk||YH zRETV0739>=+u{QOyB5-0M}v1ls4`gyk0 diff --git a/RenX.Core/RenX_Server.cpp b/RenX.Core/RenX_Server.cpp index de5440e..2555fba 100644 --- a/RenX.Core/RenX_Server.cpp +++ b/RenX.Core/RenX_Server.cpp @@ -56,13 +56,12 @@ int RenX::Server::think() } else if (Jupiter::Socket::getLastError() != 10035) // This is a serious error { + RenX::Server::wipeData(); + RenX::Server::sendLogChan(IRCCOLOR "07[Warning]" IRCCOLOR " Connection to Renegade-X server lost. Reconnection attempt in progress."); if (RenX::Server::reconnect()) - RenX::Server::sendLogChan(IRCCOLOR "07[Warning]" IRCCOLOR " Connection to Renegade-X server lost. Reconnection attempt in progress."); + RenX::Server::sendLogChan(IRCCOLOR "06[Progress]" IRCCOLOR " Connection to Renegade-X server reestablished. Initializing Renegade-X RCON protocol..."); else - { - RenX::Server::wipeData(); RenX::Server::sendLogChan(IRCCOLOR "04[Error]" IRCCOLOR " Connection to Renegade-X server lost. Reconnection attempt failed."); - } } } return 0;