Skip to content

Update SessionInfo.cpp #106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update SessionInfo.cpp #106

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 21 additions & 2 deletions src/SessionInfo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
#include "utils/Logger.h"
#include "eip/EncapsPacket.h"
#include "eip/EncapsPacketFactory.h"
#if defined (__unix__) || defined(__APPLE__)
#include <unistd.h>
#elif defined(_WIN32) || defined(WIN32) || defined(_WIN64)
#include <winsock2.h>
#endif

namespace eipScanner {

Expand All @@ -17,7 +22,7 @@ namespace eipScanner {
using eip::EncapsPacketFactory;
using eip::EncapsStatusCodes;

SessionInfo::SessionInfo(const std::string &host, int port, const std::chrono::milliseconds &timeout)
SessionInfo::SessionInfo(const std::string &host, int port, const std::chrono::milliseconds &timeout) try
: _socket{sockets::EndPoint(host, port), timeout}
, _sessionHandle{0} {
_socket.setRecvTimeout(timeout);
Expand All @@ -33,6 +38,20 @@ namespace eipScanner {
_sessionHandle = packet.getSessionHandle();
Logger(LogLevel::INFO) << "Registered session " << _sessionHandle;
}
catch (std::exception& e) {
int sockedFd = this->_socket.getSocketFd();
if (sockedFd > 0)
{
#if defined(_WIN32) || defined(WIN32) || defined(_WIN64)
shutdown(sockedFd, SD_BOTH);
closesocket(sockedFd);
#else
shutdown(sockedFd, SHUT_RDWR);
close(sockedFd);
#endif
}
throw e;
}

SessionInfo::SessionInfo(const std::string &host, int port)
: SessionInfo(host, port, std::chrono::milliseconds(1000)) {
Expand Down Expand Up @@ -76,4 +95,4 @@ namespace eipScanner {
return _socket.getRemoteEndPoint();
}

}
}