From 1bbbac7f62d71f0d0c4c71d429aeb2cfdf96e5ac Mon Sep 17 00:00:00 2001 From: "Matthias P. Braendli" Date: Fri, 13 Jan 2017 16:33:33 +0100 Subject: EDI: add protection against runaway memory usage --- lib/UdpSocket.cpp | 7 +++++-- lib/UdpSocket.h | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'lib') diff --git a/lib/UdpSocket.cpp b/lib/UdpSocket.cpp index b88c731..570da5f 100644 --- a/lib/UdpSocket.cpp +++ b/lib/UdpSocket.cpp @@ -261,8 +261,9 @@ UdpReceiver::~UdpReceiver() { } } -void UdpReceiver::start(int port) { +void UdpReceiver::start(int port, size_t max_packets_queued) { m_port = port; + m_max_packets_queued = max_packets_queued; m_thread = std::thread(&UdpReceiver::m_run, this); } @@ -299,7 +300,9 @@ void UdpReceiver::m_run() // TODO replace fprintf fprintf(stderr, "Warning, possible UDP truncation\n"); } - m_packets.push(packet); + + // If this blocks, the UDP socket will lose incoming packets + m_packets.push_wait_if_full(packet, m_max_packets_queued); } else { diff --git a/lib/UdpSocket.h b/lib/UdpSocket.h index 81a7d2b..8c968d2 100644 --- a/lib/UdpSocket.h +++ b/lib/UdpSocket.h @@ -184,7 +184,7 @@ class UdpReceiver { UdpReceiver operator=(const UdpReceiver&) = delete; // Start the receiver in a separate thread - void start(int port); + void start(int port, size_t max_packets_queued); // Get the data contained in a UDP packet, blocks if none available // In case of error, throws a runtime_error @@ -194,6 +194,7 @@ class UdpReceiver { void m_run(void); int m_port; + size_t m_max_packets_queued; std::thread m_thread; std::atomic m_stop; ThreadsafeQueue m_packets; -- cgit v1.2.3