From bc42c615302626a71a1bd516e6dadfe5f33db72b Mon Sep 17 00:00:00 2001 From: Gabriel Ferreira Date: Sat, 7 Aug 2021 14:30:43 -0300 Subject: [PATCH] network: simplify CheckNoZero --- src/network/model/buffer.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/network/model/buffer.cc b/src/network/model/buffer.cc index a05a89016..57259dd97 100644 --- a/src/network/model/buffer.cc +++ b/src/network/model/buffer.cc @@ -812,14 +812,10 @@ bool Buffer::Iterator::CheckNoZero (uint32_t start, uint32_t end) const { NS_LOG_FUNCTION (this << &start << &end); - for (uint32_t i = start; i < end; i++) - { - if (!Check (i)) - { - return false; - } - } - return true; + return !(start < m_dataStart || + end > m_dataEnd || + (end > m_zeroStart && start < m_zeroEnd && m_zeroEnd != m_zeroStart && start != end) + ); } bool Buffer::Iterator::Check (uint32_t i) const