return -1;
}
int ret = recv(sock, &buf[pos], stgHdrLen - pos, 0);
- if (ret < 0)
+ if (ret <= 0)
{
state = confHdr;
return -1;
{
if (send(sock, ERR_HEADER, sizeof(ERR_HEADER) - 1, 0) < 0)
{
- WriteServLog("send ERR_HEADER error in SendHdrAnswer.");
+ logger("send ERR_HEADER error in SendHdrAnswer.");
return -1;
}
}
{
if (send(sock, OK_HEADER, sizeof(OK_HEADER) - 1, 0) < 0)
{
- WriteServLog("send OK_HEADER error in SendHdrAnswer.");
+ logger("send OK_HEADER error in SendHdrAnswer.");
return -1;
}
}
int ret = recv(sock, &login[pos], ADM_LOGIN_LEN - pos, 0);
- if (ret < 0)
+ if (ret <= 0)
{
// Error in network
state = confHdr;
{
if (send(sock, OK_LOGIN, sizeof(OK_LOGIN) - 1, 0) < 0)
{
- WriteServLog("Send OK_LOGIN error in SendLoginAnswer.");
+ logger("Send OK_LOGIN error in SendLoginAnswer.");
return -1;
}
return 0;
int ret = recv(sock, &loginS[pos], ADM_LOGIN_LEN - pos, 0);
- if (ret < 0)
+ if (ret <= 0)
{
// Network error
printfd(__FILE__, "recv error: '%s'\n", strerror(errno));
{
if (send(sock, ERR_LOGINS, sizeof(ERR_LOGINS) - 1, 0) < 0)
{
- WriteServLog("send ERR_LOGIN error in SendLoginAnswer.");
+ logger("send ERR_LOGIN error in SendLoginAnswer.");
return -1;
}
}
{
if (send(sock, OK_LOGINS, sizeof(OK_LOGINS) - 1, 0) < 0)
{
- WriteServLog("send OK_LOGINS error in SendLoginSAnswer.");
+ logger("send OK_LOGINS error in SendLoginSAnswer.");
return -1;
}
}
//-----------------------------------------------------------------------------
void CONFIGPROTO::WriteLogAccessFailed(uint32_t ip)
{
-WriteServLog("Admin's connect failed. IP %s", inet_ntostring(ip).c_str());
+logger("Admin's connect failed. IP %s", inet_ntostring(ip).c_str());
}
//-----------------------------------------------------------------------------