From ace21d9c1cec8370053ec366248fdc95f17a263c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Fri, 7 Jun 2019 14:05:52 -0400
Subject: [PATCH] net: add logger support for UdpSocket
---
include/opendht/network_utils.h | 8 +++---
src/dhtrunner.cpp | 2 +-
src/network_utils.cpp | 48 ++++++++++++++++++++++++---------
3 files changed, 41 insertions(+), 17 deletions(-)
diff --git a/include/opendht/network_utils.h b/include/opendht/network_utils.h
index 277fbb66..3a2726ba 100644
--- a/include/opendht/network_utils.h
+++ b/include/opendht/network_utils.h
@@ -21,6 +21,7 @@
#include "sockaddr.h"
#include "utils.h"
+#include "log_enable.h"
#ifdef _WIN32
#include <ws2tcpip.h>
@@ -84,14 +85,14 @@ private:
class OPENDHT_PUBLIC UdpSocket : public DatagramSocket {
public:
- UdpSocket(in_port_t port);
- UdpSocket(const SockAddr& bind4, const SockAddr& bind6);
+ UdpSocket(in_port_t port, const Logger& l = {});
+ UdpSocket(const SockAddr& bind4, const SockAddr& bind6, const Logger& l = {});
~UdpSocket();
int sendTo(const SockAddr& dest, const uint8_t* data, size_t size, bool replied) override;
const SockAddr& getBound(sa_family_t family = AF_UNSPEC) const override {
- return (family == AF_INET6) ? bound6 : bound4;
+ return (family == AF_INET6) ? bound6 : bound4;
}
bool hasIPv4() const override { return s4 != -1; }
@@ -99,6 +100,7 @@ public:
void stop() override;
private:
+ Logger logger;
int s4 {-1};
int s6 {-1};
int stopfd {-1};
diff --git a/src/dhtrunner.cpp b/src/dhtrunner.cpp
index 445ccb9d..24121e8b 100644
--- a/src/dhtrunner.cpp
+++ b/src/dhtrunner.cpp
@@ -102,7 +102,7 @@ DhtRunner::run(const SockAddr& local4, const SockAddr& local6, const Config& con
{
if (not running) {
if (not context.sock)
- context.sock.reset(new net::UdpSocket(local4, local6));
+ context.sock.reset(new net::UdpSocket(local4, local6, context.logger ? *context.logger : Logger{}));
run(config, std::move(context));
}
}
diff --git a/src/network_utils.cpp b/src/network_utils.cpp
index 77322595..3868f0de 100644
--- a/src/network_utils.cpp
+++ b/src/network_utils.cpp
@@ -105,7 +105,7 @@ void udpPipe(int fds[2])
}
#endif
-UdpSocket::UdpSocket(in_port_t port) {
+UdpSocket::UdpSocket(in_port_t port, const Logger& l) : logger(l) {
SockAddr bind4;
bind4.setFamily(AF_INET);
bind4.setPort(port);
@@ -115,7 +115,8 @@ UdpSocket::UdpSocket(in_port_t port) {
openSockets(bind4, bind6);
}
-UdpSocket::UdpSocket(const SockAddr& bind4, const SockAddr& bind6) {
+UdpSocket::UdpSocket(const SockAddr& bind4, const SockAddr& bind6, const Logger& l) : logger(l)
+{
openSockets(bind4, bind6);
}
@@ -151,9 +152,9 @@ UdpSocket::sendTo(const SockAddr& dest, const uint8_t* data, size_t size, bool r
if (sendto(s, data, size, flags, dest.get(), dest.getLength()) == -1) {
int err = errno;
- std::cerr << "Can't send message to " << dest.toString() << ": " << strerror(err) << std::endl;
- if (err == EPIPE) {
- auto bind4 = std::move(bound4), bind6 = std::move(bound6);
+ logger.d("Can't send message to %s: %s", dest.toString().c_str(), strerror(err));
+ if (err == EPIPE || err == ENOTCONN || err == ECONNRESET) {
+ auto bind4 = std::move(bound4), bind6 = std::move(bound6);
openSockets(bind4, bind6);
return sendTo(dest, data, size, false);
}
@@ -189,7 +190,7 @@ UdpSocket::openSockets(const SockAddr& bind4, const SockAddr& bind6)
try {
s4 = bindSocket(bind4, bound4);
} catch (const DhtException& e) {
- std::cerr << "Can't bind inet socket: " << e.what() << std::endl;
+ logger.e("Can't bind inet socket: %s", e.what());
}
}
@@ -199,7 +200,7 @@ UdpSocket::openSockets(const SockAddr& bind4, const SockAddr& bind6)
try {
s6 = bindSocket(bind6, bound6);
} catch (const DhtException& e) {
- std::cerr << "Can't bind inet6 socket: " << e.what() << std::endl;
+ logger.e("Can't bind inet6 socket: %s", e.what());
}
}
#endif
@@ -225,8 +226,8 @@ UdpSocket::openSockets(const SockAddr& bind4, const SockAddr& bind6)
int rc = select(selectFd, &readfds, nullptr, nullptr, nullptr);
if (rc < 0) {
if (errno != EINTR) {
- perror("select");
- std::this_thread::sleep_for( std::chrono::seconds(1) );
+ logger.e("Select error: %s", strerror(errno));
+ std::this_thread::sleep_for(std::chrono::seconds(1));
}
}
@@ -240,7 +241,7 @@ UdpSocket::openSockets(const SockAddr& bind4, const SockAddr& bind6)
if (FD_ISSET(stop_readfd, &readfds)) {
if (recv(stop_readfd, (char*)buf.data(), buf.size(), 0) < 0) {
- std::cerr << "Got stop packet error: " << strerror(errno) << std::endl;
+ logger.e("Got stop packet error: %s", strerror(errno));
break;
}
}
@@ -258,12 +259,33 @@ UdpSocket::openSockets(const SockAddr& bind4, const SockAddr& bind6)
pkt->received = clock::now();
onReceived(std::move(pkt));
} else if (rc == -1) {
- std::cerr << "Error receiving packet: " << strerror(errno) << std::endl;
+ logger.e("Error receiving packet: %s", strerror(errno));
+ int err = errno;
+ if (err == EPIPE || err == ENOTCONN || err == ECONNRESET) {
+ if (s4 >= 0) {
+ close(s4);
+ try {
+ s4 = bindSocket(bound4, bound4);
+ } catch (const DhtException& e) {
+ logger.e("Can't bind inet socket: %s", e.what());
+ }
+ }
+ if (s6 >= 0) {
+ close(s6);
+ try {
+ s6 = bindSocket(bound6, bound6);
+ } catch (const DhtException& e) {
+ logger.e("Can't bind inet6 socket: %s", e.what());
+ }
+ }
+ if (s4 < 0 && s6 < 0)
+ break;
+ }
}
}
}
} catch (const std::exception& e) {
- std::cerr << "Error in DHT networking thread: " << e.what() << std::endl;
+ logger.e("Error in UdpSocket rx thread: %s", e.what());
}
if (s4 >= 0)
close(s4);
@@ -287,7 +309,7 @@ UdpSocket::stop()
if (running.exchange(false)) {
auto sfd = stopfd;
if (sfd != -1 && write(sfd, "\0", 1) == -1) {
- std::cerr << "can't write to stop fd" << std::endl;
+ logger.e("Can't write to stop fd");
}
}
}
--
GitLab