generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-29 20:59:45 +01:00
Code Issues Projects Releases Wiki Activity

fixed GH #2492: Net::Socket::address() crash on Android

Browse Source
This commit is contained in:
Günter Obiltschnig
2019-06-22 14:46:38 +02:00
parent 5cfd767239
commit e5f49a898d
1 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
Net/src/SocketImpl.cpp
View File

@@ -18,11 +18,26 @@
#include "Poco/NumberFormatter.h" #include "Poco/NumberFormatter.h"
#include "Poco/Timestamp.h" #include "Poco/Timestamp.h"
#include <string.h> // FD_SET needs memset on some platforms, so we can't use <cstring> #include <string.h> // FD_SET needs memset on some platforms, so we can't use <cstring>
#if defined(_WIN32) && _WIN32_WINNT >= 0x0600
#ifndef POCO_HAVE_FD_POLL
#define POCO_HAVE_FD_POLL 1
#endif
#elif defined(POCO_OS_FAMILY_BSD)
#ifndef POCO_HAVE_FD_POLL
#define POCO_HAVE_FD_POLL 1
#endif
#endif
#if defined(POCO_HAVE_FD_EPOLL) #if defined(POCO_HAVE_FD_EPOLL)
#include <sys/epoll.h> #include <sys/epoll.h>
#elif defined(POCO_HAVE_FD_POLL) #elif defined(POCO_HAVE_FD_POLL)
#ifndef _WIN32
#include <poll.h> #include <poll.h>
#endif #endif
#endif
#if defined(sun) || defined(__sun) || defined(__sun__) #if defined(sun) || defined(__sun) || defined(__sun__)
@@ -89,8 +104,8 @@ SocketImpl* SocketImpl::acceptConnection(SocketAddress& clientAddr)
{ {
if (_sockfd == POCO_INVALID_SOCKET) throw InvalidSocketException(); if (_sockfd == POCO_INVALID_SOCKET) throw InvalidSocketException();
char buffer[SocketAddress::MAX_ADDRESS_LENGTH]; sockaddr_storage buffer;
struct sockaddr* pSA = reinterpret_cast<struct sockaddr*>(buffer); struct sockaddr* pSA = reinterpret_cast<struct sockaddr*>(&buffer);
poco_socklen_t saLen = sizeof(buffer); poco_socklen_t saLen = sizeof(buffer);
poco_socket_t sd; poco_socket_t sd;
do do
@@ -189,7 +204,7 @@ void SocketImpl::connectNB(const SocketAddress& address)
void SocketImpl::bind(const SocketAddress& address, bool reuseAddress) void SocketImpl::bind(const SocketAddress& address, bool reuseAddress)
{ {
bind(address, reuseAddress, true); bind(address, reuseAddress, reuseAddress);
} }
@@ -375,8 +390,8 @@ int SocketImpl::receiveFrom(void* buffer, int length, SocketAddress& address, in
} }
} }
char abuffer[SocketAddress::MAX_ADDRESS_LENGTH]; sockaddr_storage abuffer;
struct sockaddr* pSA = reinterpret_cast<struct sockaddr*>(abuffer); struct sockaddr* pSA = reinterpret_cast<struct sockaddr*>(&abuffer);
poco_socklen_t saLen = sizeof(abuffer); poco_socklen_t saLen = sizeof(abuffer);
int rc; int rc;
do do
@@ -414,7 +429,7 @@ void SocketImpl::sendUrgent(unsigned char data)
int SocketImpl::available() int SocketImpl::available()
{ {
int result; int result = 0;
ioctl(FIONREAD, result); ioctl(FIONREAD, result);
return result; return result;
} }
@@ -649,9 +664,9 @@ Poco::Timespan SocketImpl::getReceiveTimeout()
SocketAddress SocketImpl::address() SocketAddress SocketImpl::address()
{ {
if (_sockfd == POCO_INVALID_SOCKET) throw InvalidSocketException(); if (_sockfd == POCO_INVALID_SOCKET) throw InvalidSocketException();
char buffer[SocketAddress::MAX_ADDRESS_LENGTH]; sockaddr_storage buffer;
struct sockaddr* pSA = reinterpret_cast<struct sockaddr*>(buffer); struct sockaddr* pSA = reinterpret_cast<struct sockaddr*>(&buffer);
poco_socklen_t saLen = sizeof(buffer); poco_socklen_t saLen = sizeof(buffer);
int rc = ::getsockname(_sockfd, pSA, &saLen); int rc = ::getsockname(_sockfd, pSA, &saLen);
if (rc == 0) if (rc == 0)
@@ -661,18 +676,18 @@ SocketAddress SocketImpl::address()
return SocketAddress(); return SocketAddress();
} }
SocketAddress SocketImpl::peerAddress() SocketAddress SocketImpl::peerAddress()
{ {
if (_sockfd == POCO_INVALID_SOCKET) throw InvalidSocketException(); if (_sockfd == POCO_INVALID_SOCKET) throw InvalidSocketException();
char buffer[SocketAddress::MAX_ADDRESS_LENGTH]; sockaddr_storage buffer;
struct sockaddr* pSA = reinterpret_cast<struct sockaddr*>(buffer); struct sockaddr* pSA = reinterpret_cast<struct sockaddr*>(&buffer);
poco_socklen_t saLen = sizeof(buffer); poco_socklen_t saLen = sizeof(buffer);
int rc = ::getpeername(_sockfd, pSA, &saLen); int rc = ::getpeername(_sockfd, pSA, &saLen);
if (rc == 0) if (rc == 0)
return SocketAddress(pSA, saLen); return SocketAddress(pSA, saLen);
else else
error(); error();
return SocketAddress(); return SocketAddress();
} }
@@ -707,18 +722,18 @@ void SocketImpl::setOption(int level, int option, const Poco::Timespan& value)
struct timeval tv; struct timeval tv;
tv.tv_sec = (long) value.totalSeconds(); tv.tv_sec = (long) value.totalSeconds();
tv.tv_usec = (long) value.useconds(); tv.tv_usec = (long) value.useconds();
setRawOption(level, option, &tv, sizeof(tv)); setRawOption(level, option, &tv, sizeof(tv));
} }
void SocketImpl::setRawOption(int level, int option, const void* value, poco_socklen_t length) void SocketImpl::setRawOption(int level, int option, const void* value, poco_socklen_t length)
{ {
if (_sockfd == POCO_INVALID_SOCKET) throw InvalidSocketException(); if (_sockfd == POCO_INVALID_SOCKET) throw InvalidSocketException();
#if defined(POCO_VXWORKS) #if defined(POCO_VXWORKS)
int rc = ::setsockopt(_sockfd, level, option, (char*) value, length); int rc = ::setsockopt(_sockfd, level, option, (char*) value, length);
#else #else
int rc = ::setsockopt(_sockfd, level, option, reinterpret_cast<const char*>(value), length); int rc = ::setsockopt(_sockfd, level, option, reinterpret_cast<const char*>(value), length);
#endif #endif
if (rc == -1) error(); if (rc == -1) error();
@@ -767,7 +782,7 @@ void SocketImpl::getOption(int level, int option, IPAddress& value)
void SocketImpl::getRawOption(int level, int option, void* value, poco_socklen_t& length) void SocketImpl::getRawOption(int level, int option, void* value, poco_socklen_t& length)
{ {
if (_sockfd == POCO_INVALID_SOCKET) throw InvalidSocketException(); if (_sockfd == POCO_INVALID_SOCKET) throw InvalidSocketException();
int rc = ::getsockopt(_sockfd, level, option, reinterpret_cast<char*>(value), &length); int rc = ::getsockopt(_sockfd, level, option, reinterpret_cast<char*>(value), &length);
if (rc == -1) error(); if (rc == -1) error();
} }
@@ -781,7 +796,7 @@ void SocketImpl::setLinger(bool on, int seconds)
setRawOption(SOL_SOCKET, SO_LINGER, &l, sizeof(l)); setRawOption(SOL_SOCKET, SO_LINGER, &l, sizeof(l));
} }
void SocketImpl::getLinger(bool& on, int& seconds) void SocketImpl::getLinger(bool& on, int& seconds)
{ {
struct linger l; struct linger l;
@@ -888,7 +903,7 @@ void SocketImpl::setBroadcast(bool flag)
setOption(SOL_SOCKET, SO_BROADCAST, value); setOption(SOL_SOCKET, SO_BROADCAST, value);
} }
bool SocketImpl::getBroadcast() bool SocketImpl::getBroadcast()
{ {
int value(0); int value(0);
@@ -939,7 +954,7 @@ void SocketImpl::initSocket(int af, int type, int proto)
// will crash the process. This only happens on UNIX, and not Linux. // will crash the process. This only happens on UNIX, and not Linux.
// //
// In order to have POCO sockets behave the same across platforms, it is // In order to have POCO sockets behave the same across platforms, it is
// best to just ignore SIGPIPE all together. // best to just ignore SIGPIPE altogether.
setOption(SOL_SOCKET, SO_NOSIGPIPE, 1); setOption(SOL_SOCKET, SO_NOSIGPIPE, 1);
#endif #endif
} }
@@ -987,7 +1002,7 @@ int SocketImpl::fcntl(poco_fcntl_request_t request, long arg)
return rc; return rc;
} }
#endif #endif
void SocketImpl::reset(poco_socket_t aSocket) void SocketImpl::reset(poco_socket_t aSocket)
{ {