From d7c188d81777c17405690aa5884c16e09cbd8ada Mon Sep 17 00:00:00 2001 From: Jeff Becker Date: Mon, 15 Oct 2018 12:19:48 -0400 Subject: [PATCH] Revert "add a check for overlow in event loop" This reverts commit 1042c7382914d6c9a21cc8fdd659bb5ff8d3d16c. --- llarp/ev_epoll.hpp | 4 +--- llarp/ev_kqueue.hpp | 2 -- llarp/ev_win32.hpp | 3 --- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/llarp/ev_epoll.hpp b/llarp/ev_epoll.hpp index c8c16cfda..df374e6c6 100644 --- a/llarp/ev_epoll.hpp +++ b/llarp/ev_epoll.hpp @@ -32,11 +32,9 @@ namespace llarp sockaddr_in6 src; socklen_t slen = sizeof(sockaddr_in6); sockaddr* addr = (sockaddr*)&src; - ssize_t ret = ::recvfrom(fd, buf, sz, 0, addr, &slen); + int ret = ::recvfrom(fd, buf, sz, 0, addr, &slen); if(ret == -1) return -1; - if(sz < ret) - return -1; udp->recvfrom(udp, addr, buf, ret); return 0; } diff --git a/llarp/ev_kqueue.hpp b/llarp/ev_kqueue.hpp index 10ab63c41..38fafdf5c 100644 --- a/llarp/ev_kqueue.hpp +++ b/llarp/ev_kqueue.hpp @@ -46,8 +46,6 @@ namespace llarp llarp::LogWarn("recvfrom failed"); return -1; } - if(sz < ret) - return -1; // Addr is the source udp->recvfrom(udp, addr, buf, ret); return 0; diff --git a/llarp/ev_win32.hpp b/llarp/ev_win32.hpp index 92029af72..4191c8e70 100644 --- a/llarp/ev_win32.hpp +++ b/llarp/ev_win32.hpp @@ -32,9 +32,6 @@ namespace llarp int getData(void* buf, size_t sz, size_t ret) { - // make sure it's not too big - if(sz < ret) - return -1; iosz = ret; return read(buf, sz); }