hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Socket library error handling

Browse source
This commit is contained in:
Thulinma 2020-03-09 19:26:21 +01:00
parent cd19cca36b
commit b4fb0ff4a2
2 changed files with 43 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
lib/socket.cpp
View file

@ -79,14 +79,23 @@ bool Socket::isLocal(const std::string &remotehost){
tmpAddrPtr = &((struct sockaddr_in *)ifa->ifa_addr)->sin_addr; tmpAddrPtr = &((struct sockaddr_in *)ifa->ifa_addr)->sin_addr;
inet_ntop(AF_INET, tmpAddrPtr, addressBuffer, INET_ADDRSTRLEN); inet_ntop(AF_INET, tmpAddrPtr, addressBuffer, INET_ADDRSTRLEN);
INSANE_MSG("Comparing '%s' to '%s'", remotehost.c_str(), addressBuffer); INSANE_MSG("Comparing '%s' to '%s'", remotehost.c_str(), addressBuffer);
if (remotehost == addressBuffer){ret = true; break;} if (remotehost == addressBuffer){
ret = true;
break;
}
INSANE_MSG("Comparing '%s' to '::ffff:%s'", remotehost.c_str(), addressBuffer); INSANE_MSG("Comparing '%s' to '::ffff:%s'", remotehost.c_str(), addressBuffer);
if (remotehost == std::string("::ffff:") + addressBuffer){ret = true; break;} if (remotehost == std::string("::ffff:") + addressBuffer){
ret = true;
break;
}
}else if (ifa->ifa_addr->sa_family == AF_INET6){// check it is IP6 }else if (ifa->ifa_addr->sa_family == AF_INET6){// check it is IP6
tmpAddrPtr = &((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_addr; tmpAddrPtr = &((struct sockaddr_in6 *)ifa->ifa_addr)->sin6_addr;
inet_ntop(AF_INET6, tmpAddrPtr, addressBuffer, INET6_ADDRSTRLEN); inet_ntop(AF_INET6, tmpAddrPtr, addressBuffer, INET6_ADDRSTRLEN);
INSANE_MSG("Comparing '%s' to '%s'", remotehost.c_str(), addressBuffer); INSANE_MSG("Comparing '%s' to '%s'", remotehost.c_str(), addressBuffer);
if (remotehost == addressBuffer){ret = true; break;} if (remotehost == addressBuffer){
ret = true;
break;
}
} }
} }
if (ifAddrStruct != NULL) freeifaddrs(ifAddrStruct); if (ifAddrStruct != NULL) freeifaddrs(ifAddrStruct);
@ -654,7 +663,7 @@ int Socket::Connection::getPureSocket(){
/// Only reports errors if an error actually occured - returns the host address or empty string /// Only reports errors if an error actually occured - returns the host address or empty string
/// otherwise. /// otherwise.
std::string Socket::Connection::getError(){ std::string Socket::Connection::getError(){
return remotehost; return lastErr;
} }
/// Create a new Unix Socket. This socket will (try to) connect to the given address right away. /// Create a new Unix Socket. This socket will (try to) connect to the given address right away.
@ -673,8 +682,8 @@ void Socket::Connection::open(std::string address, bool nonblock){
isTrueSocket = true; isTrueSocket = true;
sSend = socket(PF_UNIX, SOCK_STREAM, 0); sSend = socket(PF_UNIX, SOCK_STREAM, 0);
if (sSend < 0){ if (sSend < 0){
remotehost = strerror(errno); lastErr = strerror(errno);
FAIL_MSG("Could not create socket! Error: %s", remotehost.c_str()); FAIL_MSG("Could not create socket! Error: %s", lastErr.c_str());
return; return;
} }
sockaddr_un addr; sockaddr_un addr;
@ -688,8 +697,8 @@ void Socket::Connection::open(std::string address, bool nonblock){
fcntl(sSend, F_SETFL, flags); fcntl(sSend, F_SETFL, flags);
} }
}else{ }else{
remotehost = strerror(errno); lastErr = strerror(errno);
FAIL_MSG("Could not connect to %s! Error: %s", address.c_str(), remotehost.c_str()); FAIL_MSG("Could not connect to %s! Error: %s", address.c_str(), lastErr.c_str());
close(); close();
} }
} }
@ -732,6 +741,7 @@ void Socket::Connection::open(std::string host, int port, bool nonblock, bool wi
mbedtls_entropy_init(entropy); mbedtls_entropy_init(entropy);
DONTEVEN_MSG("SSL init"); DONTEVEN_MSG("SSL init");
if (mbedtls_ctr_drbg_seed(ctr_drbg, mbedtls_entropy_func, entropy, (const unsigned char *)"meow", 4) != 0){ if (mbedtls_ctr_drbg_seed(ctr_drbg, mbedtls_entropy_func, entropy, (const unsigned char *)"meow", 4) != 0){
lastErr = "SSL socket init failed";
FAIL_MSG("SSL socket init failed"); FAIL_MSG("SSL socket init failed");
close(); close();
return; return;
@ -740,12 +750,14 @@ void Socket::Connection::open(std::string host, int port, bool nonblock, bool wi
int ret = 0; int ret = 0;
if ((ret = mbedtls_net_connect(server_fd, host.c_str(), JSON::Value(port).asString().c_str(), if ((ret = mbedtls_net_connect(server_fd, host.c_str(), JSON::Value(port).asString().c_str(),
MBEDTLS_NET_PROTO_TCP)) != 0){ MBEDTLS_NET_PROTO_TCP)) != 0){
lastErr = "mbedtls_net_connect failed";
FAIL_MSG(" failed\n ! mbedtls_net_connect returned %d\n\n", ret); FAIL_MSG(" failed\n ! mbedtls_net_connect returned %d\n\n", ret);
close(); close();
return; return;
} }
if ((ret = mbedtls_ssl_config_defaults(conf, MBEDTLS_SSL_IS_CLIENT, MBEDTLS_SSL_TRANSPORT_STREAM, if ((ret = mbedtls_ssl_config_defaults(conf, MBEDTLS_SSL_IS_CLIENT, MBEDTLS_SSL_TRANSPORT_STREAM,
MBEDTLS_SSL_PRESET_DEFAULT)) != 0){ MBEDTLS_SSL_PRESET_DEFAULT)) != 0){
lastErr = "mbedtls_ssl_config_defaults failed";
FAIL_MSG(" failed\n ! mbedtls_ssl_config_defaults returned %d\n\n", ret); FAIL_MSG(" failed\n ! mbedtls_ssl_config_defaults returned %d\n\n", ret);
close(); close();
return; return;
@ -756,7 +768,8 @@ void Socket::Connection::open(std::string host, int port, bool nonblock, bool wi
if ((ret = mbedtls_ssl_setup(ssl, conf)) != 0){ if ((ret = mbedtls_ssl_setup(ssl, conf)) != 0){
char estr[200]; char estr[200];
mbedtls_strerror(ret, estr, 200); mbedtls_strerror(ret, estr, 200);
FAIL_MSG("SSL setup error %d: %s", ret, estr); lastErr = estr;
FAIL_MSG("SSL setup error %d: %s", ret, lastErr.c_str());
close(); close();
return; return;
} }
@ -770,7 +783,8 @@ void Socket::Connection::open(std::string host, int port, bool nonblock, bool wi
if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE){ if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE){
char estr[200]; char estr[200];
mbedtls_strerror(ret, estr, 200); mbedtls_strerror(ret, estr, 200);
FAIL_MSG("SSL handshake error %d: %s", ret, estr); lastErr = estr;
FAIL_MSG("SSL handshake error %d: %s", ret, lastErr.c_str());
close(); close();
return; return;
} }
@ -795,12 +809,13 @@ void Socket::Connection::open(std::string host, int port, bool nonblock, bool wi
hints.ai_flags = AI_ADDRCONFIG; hints.ai_flags = AI_ADDRCONFIG;
int s = getaddrinfo(host.c_str(), ss.str().c_str(), &hints, &result); int s = getaddrinfo(host.c_str(), ss.str().c_str(), &hints, &result);
if (s != 0){ if (s != 0){
FAIL_MSG("Could not connect to %s:%i! Error: %s", host.c_str(), port, gai_strerror(s)); lastErr = gai_strerror(s);
FAIL_MSG("Could not connect to %s:%i! Error: %s", host.c_str(), port, lastErr.c_str());
close(); close();
return; return;
} }
remotehost = ""; lastErr = "";
for (rp = result; rp != NULL; rp = rp->ai_next){ for (rp = result; rp != NULL; rp = rp->ai_next){
sSend = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol); sSend = socket(rp->ai_family, rp->ai_socktype, rp->ai_protocol);
if (sSend < 0){continue;} if (sSend < 0){continue;}
@ -808,13 +823,13 @@ void Socket::Connection::open(std::string host, int port, bool nonblock, bool wi
remoteaddr = *((sockaddr_in6 *)rp->ai_addr); remoteaddr = *((sockaddr_in6 *)rp->ai_addr);
break; break;
} }
remotehost += strerror(errno); lastErr += strerror(errno);
::close(sSend); ::close(sSend);
} }
freeaddrinfo(result); freeaddrinfo(result);
if (rp == 0){ if (rp == 0){
FAIL_MSG("Could not connect to %s! Error: %s", host.c_str(), remotehost.c_str()); FAIL_MSG("Could not connect to %s! Error: %s", host.c_str(), lastErr.c_str());
close(); close();
}else{ }else{
if (nonblock){ if (nonblock){
@ -923,7 +938,8 @@ unsigned int Socket::Connection::iwrite(const void *buffer, int len){
if (r < 0){ if (r < 0){
char estr[200]; char estr[200];
mbedtls_strerror(r, estr, 200); mbedtls_strerror(r, estr, 200);
INFO_MSG("Write returns %d: %s", r, estr); lastErr = estr;
INFO_MSG("Write returns %d: %s", r, lastErr.c_str());
} }
if (r < 0){ if (r < 0){
switch (errno){ switch (errno){
@ -932,7 +948,8 @@ unsigned int Socket::Connection::iwrite(const void *buffer, int len){
case EWOULDBLOCK: return 0; break; case EWOULDBLOCK: return 0; break;
default: default:
Error = true; Error = true;
INSANE_MSG("Could not iwrite data! Error: %s", strerror(errno)); lastErr = strerror(errno);
INSANE_MSG("Could not iwrite data! Error: %s", lastErr.c_str());
close(); close();
return 0; return 0;
break; break;
@ -970,7 +987,8 @@ unsigned int Socket::Connection::iwrite(const void *buffer, int len){
case EWOULDBLOCK: return 0; break; case EWOULDBLOCK: return 0; break;
default: default:
Error = true; Error = true;
INSANE_MSG("Could not iwrite data! Error: %s", strerror(errno)); lastErr = strerror(errno);
INSANE_MSG("Could not iwrite data! Error: %s", lastErr.c_str());
close(); close();
return 0; return 0;
break; break;
@ -1012,7 +1030,8 @@ int Socket::Connection::iread(void *buffer, int len, int flags){
Error = true; Error = true;
char estr[200]; char estr[200];
mbedtls_strerror(r, estr, 200); mbedtls_strerror(r, estr, 200);
INFO_MSG("Read returns %d: %s (%s)", r, estr, strerror(errno)); lastErr = estr;
INFO_MSG("Read returns %d: %s (%s)", r, estr, lastErr.c_str());
close(); close();
return 0; return 0;
break; break;
@ -1039,7 +1058,8 @@ int Socket::Connection::iread(void *buffer, int len, int flags){
case EINTR: return 0; break; case EINTR: return 0; break;
default: default:
Error = true; Error = true;
INSANE_MSG("Could not iread data! Error: %s", strerror(errno)); lastErr = strerror(errno);
INSANE_MSG("Could not iread data! Error: %s", lastErr.c_str());
close(); close();
return 0; return 0;
break; break;
@ -1149,6 +1169,7 @@ Socket::Connection::Connection(const Connection &rhs){
remotehost = rhs.remotehost; remotehost = rhs.remotehost;
boundaddr = rhs.boundaddr; boundaddr = rhs.boundaddr;
remoteaddr = rhs.remoteaddr; remoteaddr = rhs.remoteaddr;
lastErr = rhs.lastErr;
up = rhs.up; up = rhs.up;
down = rhs.down; down = rhs.down;
downbuffer = rhs.downbuffer; downbuffer = rhs.downbuffer;
@ -1182,6 +1203,7 @@ Socket::Connection &Socket::Connection::operator=(const Socket::Connection &rhs)
remotehost = rhs.remotehost; remotehost = rhs.remotehost;
boundaddr = rhs.boundaddr; boundaddr = rhs.boundaddr;
remoteaddr = rhs.remoteaddr; remoteaddr = rhs.remoteaddr;
lastErr = rhs.lastErr;
up = rhs.up; up = rhs.up;
down = rhs.down; down = rhs.down;
downbuffer = rhs.downbuffer; downbuffer = rhs.downbuffer;
@ -1776,9 +1798,7 @@ uint16_t Socket::UDPConnection::bind(int port, std::string iface, const std::str
// multicast has a "1110" bit prefix // multicast has a "1110" bit prefix
multicast = (((char *)&(addr4->sin_addr))[0] & 0xF0) == 0xE0; multicast = (((char *)&(addr4->sin_addr))[0] & 0xF0) == 0xE0;
#ifdef __CYGWIN__ #ifdef __CYGWIN__
if (multicast){ if (multicast){((sockaddr_in *)rp->ai_addr)->sin_addr.s_addr = htonl(INADDR_ANY);}
((sockaddr_in*)rp->ai_addr)->sin_addr.s_addr = htonl(INADDR_ANY);
}
#endif #endif
} }
if (multicast){ if (multicast){

1
lib/socket.h
View file

@ -92,6 +92,7 @@ namespace Socket{
#ifdef SSL #ifdef SSL
/// optional extension that uses mbedtls for SSL /// optional extension that uses mbedtls for SSL
protected: protected:
std::string lastErr; ///< Stores last error, if any.
bool sslConnected; bool sslConnected;
int ssl_iread(void *buffer, int len, int flags = 0); ///< Incremental read call. int ssl_iread(void *buffer, int len, int flags = 0); ///< Incremental read call.
unsigned int ssl_iwrite(const void *buffer, int len); ///< Incremental write call. unsigned int ssl_iwrite(const void *buffer, int len); ///< Incremental write call.