From: Maxim Mamontov Date: Wed, 31 Aug 2011 08:46:42 +0000 (+0300) Subject: Fix header length in RecvHdr X-Git-Tag: 2.408-alpha~24 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/6664a19ff9913571d49a9252e58fddaa9cda7f30?ds=inline;hp=--cc Fix header length in RecvHdr --- 6664a19ff9913571d49a9252e58fddaa9cda7f30 diff --git a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp index 209ea3b2..16a1cefa 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/rsconf.cpp @@ -171,13 +171,11 @@ while (nonstop) close(outerSocket); continue; } - if (RecvLogin(outerSocket) < 0) { close(outerSocket); continue; } - if (state == confLoginCipher) { if (SendLoginAnswer(outerSocket) < 0) @@ -190,7 +188,6 @@ while (nonstop) close(outerSocket); continue; } - if (state == confData) { if (SendLoginSAnswer(outerSocket, ans_ok) < 0) @@ -243,7 +240,7 @@ int CONFIGPROTO::RecvHdr(int sock) char buf[sizeof(STG_HEADER)]; memset(buf, 0, sizeof(STG_HEADER)); int ret; -size_t stgHdrLen = sizeof(STG_HEADER); +size_t stgHdrLen = sizeof(STG_HEADER) - 1; // Without 0-char for (size_t i = 0; i < stgHdrLen; i++) { ret = recv(sock, &buf[i], 1, 0);