Skip to content

Commit

Permalink
Fixed server one-side message receiving and minor changes
Browse files Browse the repository at this point in the history 
Fixed formating of some info messages.

Added server messaging on UDP-socket is sent wrong header.
This is required when server closed UDP-session but client don't know that so it can receive wrong header or size and close session without waiting for timeout.
  • Loading branch information
@drclaws
drclaws committed Nov 6, 2020
1 parent b22f637 commit 14750b9
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 34 deletions.
3 changes: 2 additions & 1 deletion .vscode/settings.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,6 @@
"map": "cpp",
"regex": "cpp",
"shared_mutex": "cpp"
}
},
"C_Cpp.default.configurationProvider": "ms-vscode.cmake-tools"
}
68 changes: 38 additions & 30 deletions client/MainConsole.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,18 @@ namespace simpleApp
bool isExit = false;
SessionClient * currentSession = nullptr;
console_state currentState;

socket_t sessionSocket = -1;

auto switchState = [&currentState, &currentSession](console_state newState)
auto switchState = [&currentState, &currentSession, &sessionSocket](console_state newState)
{
switch (newState)
{
case console_state::protocol_selection:
if (currentSession != nullptr)
{
delete currentSession;
sessionSocket = -1;
currentSession = nullptr;
}
std::cout << std::endl << "Select protocol: [u]dp or [t]cp" << std::endl;
Expand All @@ -78,6 +81,7 @@ namespace simpleApp
std::cout << std::endl << "Input server IP-address" << std::endl;
break;
case console_state::connected:
sessionSocket = currentSession->getSocket();
std::cout << std::endl << "Connected. Input message" << std::endl;
break;
}
Expand All @@ -93,13 +97,13 @@ namespace simpleApp
fd_set fd_in;
FD_ZERO(&fd_in);

FD_SET(this->breakEventFd, &fd_in);
FD_SET(STDIN_FILENO, &fd_in);
FD_SET(this->breakEventFd, &fd_in);

int largerFd = this->breakEventFd > STDIN_FILENO ? this->breakEventFd : STDIN_FILENO;
if (currentSession != nullptr)
if (sessionSocket != -1)
{
auto sessionSocket = currentSession->getSocket();
FD_SET(sessionSocket, &fd_in);
largerFd = sessionSocket > largerFd ? sessionSocket : largerFd;
}

Expand All @@ -118,6 +122,23 @@ namespace simpleApp
return -1;
}

if (FD_ISSET(this->breakEventFd, &fd_in))
{
eventfd_t decrement = 1;
eventfd_read(this->breakEventFd, &decrement);

std::cout << std::endl;

if (currentState == console_state::protocol_selection)
isExit = true;
else
{
switchState(console_state::protocol_selection);
}

continue;
}

if (currentState == console_state::connected)
{
if (selectResult == 0)
Expand All @@ -127,8 +148,12 @@ namespace simpleApp
{
if (result.status == session_status::connup_timeout)
std::cout << std::endl << "Server does not response";
else if (result.status == session_status::connup_timeout)
std::cout << std::endl << "Server closed session due to timeout";
else if (result.status == session_status::server_error)
std::cout << std::endl << "Server returned internal error";
else
std::cout << std::endl << "Unknown error";
std::cout << std::endl << "Error. Unknown status returned";

if (result.err != 0)
std::cout << " with code " << result.err << std::endl << std::flush;
Expand All @@ -141,29 +166,29 @@ namespace simpleApp
}
}

if (FD_ISSET(currentSession->getSocket(), &fd_in))
if (FD_ISSET(sessionSocket, &fd_in))
{
auto result = currentSession->proceed();

switch (result.status)
{
case session_status::proceed_msg_recv_fail:
std::cout << "Message receiving failed";
std::cout << std::endl << "Message receiving failed";
break;
case session_status::proceed_disconnect:
std::cout << "Session shutdown by server";
std::cout << std::endl << "Session closed by server";
break;
case session_status::recv_wrong_length:
std::cout << "Message with wrong length received";
std::cout << std::endl << "Message with wrong length received";
break;
case session_status::proceed_server_error:
std::cout << "Server error returned";
std::cout << std::endl << "Server error returned";
break;
case session_status::proceed_server_timeout:
std::cout << "Received server timeout";
std::cout << std::endl << "Received server timeout";
break;
default:
std::cout << "Unknown error";
std::cout << std::endl << "Unknown error";
break;
}

Expand All @@ -182,23 +207,6 @@ namespace simpleApp
continue;
}

if (FD_ISSET(this->breakEventFd, &fd_in))
{
eventfd_t decrement = 1;
eventfd_read(this->breakEventFd, &decrement);

std::cout << std::endl;

if (currentState == console_state::protocol_selection)
isExit = true;
else
{
switchState(console_state::protocol_selection);
}

continue;
}

if (FD_ISSET(STDIN_FILENO, &fd_in))
{
std::string line;
Expand Down Expand Up @@ -260,7 +268,7 @@ namespace simpleApp
break;
case session_status::recv_wrong_length:
case session_status::recv_wrong_header:
std::cout << "Received message corrupted";
std::cout << "Received message corrupted. Possible that client didn't receive session close message";
break;
case session_status::server_error:
std::cout << "Error on server-side";
Expand Down
17 changes: 14 additions & 3 deletions server/SessionUdp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ namespace simpleApp

auto len = recvfrom(masterSocket, msgBuff, buffCheckLength, 0, (sockaddr *)&address, &addressLen);

auto sendInitError = [masterSocket, &address]()
{
const msg_headers buff = msg_headers::err_connstart;
sendto(masterSocket, &buff, sizeof(buff), 0, (sockaddr *)&address, sizeof(address));
};

if (len == -1)
{
return session_result(session_status::init_listener_fail, errno);
Expand All @@ -56,10 +62,16 @@ namespace simpleApp
this->_name += std::string(" (") + addressToString(address) + std::string(")");

if (len != sizeof(msg_headers))
{
sendInitError();
return session_result(session_status::init_udp_wrong_length);

}

if (*(reinterpret_cast<msg_headers *>(msgBuff)) != msg_headers::req_connstart)
{
sendInitError();
return session_result(session_status::init_udp_wrong_header);
}

auto initSocket = [this, &address]()
{
Expand Down Expand Up @@ -160,8 +172,7 @@ namespace simpleApp
}
else
{
const uint8_t header = static_cast<const uint8_t>(msg_headers::err_connstart);
sendto(masterSocket, &header, sizeof(header), 0, (sockaddr *)&address, sizeof(sockaddr_in));
sendInitError();
}

return result;
Expand Down

0 comments on commit 14750b9

Please sign in to comment.