mirror/oatpp
2
0
Fork 0
mirror of https://github.com/oatpp/oatpp.git synced 2025-01-30 16:59:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

SimpleTCPConnectionProvider::ExtendedConnection. Fix address info.

Browse Source
This commit is contained in:
lganzzzo 2019-12-10 04:53:24 +02:00
parent 1ac81f4b12
commit de1ab64920
4 changed files with 39 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/oatpp/network/Connection.hpp
View File

@ -67,9 +67,6 @@ public:
* TCP Connection implementation. Extends &id:oatpp::base::Countable; and &id:oatpp::data::stream::IOStream;.
*/
class Connection : public oatpp::base::Countable, public oatpp::data::stream::IOStream {
public:
OBJECT_POOL(Connection_Pool, Connection, 32);
SHARED_OBJECT_POOL(Shared_Connection_Pool, Connection, 32);
private:
data::v_io_handle m_handle;
#if defined(WIN32) || defined(_WIN32)
@ -86,15 +83,6 @@ public:
Connection(data::v_io_handle handle);
public:
/**
* Create shared Connection.
* @param handle - file descriptor (socket handle). See &id:oatpp::data::v_io_handle;.
* @return - shared_ptr to Connection.
*/
static std::shared_ptr<Connection> createShared(data::v_io_handle handle){
return Shared_Connection_Pool::allocateShared(handle);
}
/**
* Virtual Destructor (See &id:oatpp::base::Countable;).
* Close socket handle.

6
src/oatpp/network/client/SimpleTCPConnectionProvider.cpp
View File

@ -113,7 +113,7 @@ std::shared_ptr<oatpp::data::stream::IOStream> SimpleTCPConnectionProvider::getC
}
#endif
return oatpp::network::Connection::createShared(clientHandle);
return std::make_shared<oatpp::network::Connection>(clientHandle);
}
@ -234,7 +234,7 @@ oatpp::async::CoroutineStarterForResult<const std::shared_ptr<oatpp::data::strea
auto error = WSAGetLastError();
if(res == 0 || error == WSAEISCONN) {
return _return(oatpp::network::Connection::createShared(m_clientHandle));
return _return(std::make_shared<oatpp::network::Connection>(m_clientHandle));
}
if(error == WSAEWOULDBLOCK || error == WSAEINPROGRESS) {
return ioWait(m_clientHandle, oatpp::async::Action::IOEventType::IO_EVENT_WRITE);
@ -245,7 +245,7 @@ oatpp::async::CoroutineStarterForResult<const std::shared_ptr<oatpp::data::strea
#else
if(res == 0 || errno == EISCONN) {
return _return(oatpp::network::Connection::createShared(m_clientHandle));
return _return(std::make_shared<oatpp::network::Connection>(m_clientHandle));
}
if(errno == EALREADY || errno == EINPROGRESS) {
return ioWait(m_clientHandle, oatpp::async::Action::IOEventType::IO_EVENT_WRITE);

52
src/oatpp/network/server/SimpleTCPConnectionProvider.cpp
View File

@ -220,7 +220,7 @@ std::shared_ptr<oatpp::data::stream::IOStream> SimpleTCPConnectionProvider::getD
oatpp::data::v_io_handle handle = accept(m_serverHandle, nullptr, nullptr);
if(prepareConnectionHandle(handle)) {
return Connection::createShared(handle);
return std::make_shared<Connection>(handle);
}
return nullptr;
@ -229,35 +229,53 @@ std::shared_ptr<oatpp::data::stream::IOStream> SimpleTCPConnectionProvider::getD
std::shared_ptr<oatpp::data::stream::IOStream> SimpleTCPConnectionProvider::getExtendedConnection() {
socklen_t len;
oatpp::String ipAddress;
int port;
int ipStrSize = INET6_ADDRSTRLEN + 1;
auto ipstr = std::unique_ptr<char[]>(new char[ipStrSize]);
const char* addrFormat;
struct sockaddr_storage addr;
struct sockaddr_storage clientAddress;
socklen_t clientAddressSize = sizeof(clientAddress);
len = sizeof(addr);
oatpp::data::v_io_handle handle = accept(m_serverHandle, (struct sockaddr*) &clientAddress, &clientAddressSize);
oatpp::data::v_io_handle handle = accept(m_serverHandle, (struct sockaddr*)&addr, &len);
if (clientAddress.ss_family == AF_INET) {
if (addr.ss_family == AF_INET) {
struct sockaddr_in *s = (struct sockaddr_in *)&addr;
port = ntohs(s->sin_port);
inet_ntop(AF_INET, &s->sin_addr, ipstr.get(), ipStrSize);
char strIp[INET_ADDRSTRLEN];
struct sockaddr_in* sockAddress = (struct sockaddr_in*) &clientAddress;
inet_ntop(AF_INET, &sockAddress->sin_addr, strIp, INET_ADDRSTRLEN);
ipAddress = (const char*) strIp;
addrFormat = "ipv4";
} else {
struct sockaddr_in6 *s = (struct sockaddr_in6 *)&addr;
port = ntohs(s->sin6_port);
inet_ntop(AF_INET6, &s->sin6_addr, ipstr.get(), ipStrSize);
port = ntohs(sockAddress->sin_port);
} else if (clientAddress.ss_family == AF_INET6) {
char strIp[INET6_ADDRSTRLEN];
struct sockaddr_in6* sockAddress = (struct sockaddr_in6*) &clientAddress;
inet_ntop(AF_INET6, &sockAddress->sin6_addr, strIp, INET6_ADDRSTRLEN);
ipAddress = (const char*) strIp;
addrFormat = "ipv6";
port = ntohs(sockAddress->sin6_port);
} else {
#if defined(WIN32) || defined(_WIN32)
::closesocket(handle);
#else
::close(handle);
#endif
OATPP_LOGE("[oatpp::network::server::SimpleTCPConnectionProvider::getExtendedConnection()]", "Error. Unknown address family.");
return nullptr;
}
if(prepareConnectionHandle(handle)) {
auto connection = ExtendedConnection::createShared(handle);
auto connection = std::make_shared<ExtendedConnection>(handle);
auto& properties = connection->getInputStreamContext()->getMutableProperties();
properties.put(ExtendedConnection::PROPERTY_PEER_ADDRESS, oatpp::String((const char*) ipstr.get()));
properties.put(ExtendedConnection::PROPERTY_PEER_ADDRESS, ipAddress);
properties.put(ExtendedConnection::PROPERTY_PEER_ADDRESS_FORMAT, addrFormat);
properties.put(ExtendedConnection::PROPERTY_PEER_PORT, oatpp::utils::conversion::int32ToStr(port));

2
src/oatpp/network/server/SimpleTCPConnectionProvider.hpp
View File

@ -54,7 +54,7 @@ public:
static const char* const PROPERTY_PEER_ADDRESS_FORMAT;
static const char* const PROPERTY_PEER_PORT;
private:
protected:
ExtendedConnectionContext m_context;
public: