aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Quartulli2017-08-24 15:55:47 +0800
committerDavid Sommerseth2017-09-07 00:19:47 +0200
commit14e4c58b6f903c562475379bb806e26c42d6a52e (patch)
tree4934217ccea9d34f9c94fd29660d6dee245462b5
parent1bea2dc0f89af74281d30e1f27dea6c434ff0c5e (diff)
downloadopenvpn-14e4c58b6f903c562475379bb806e26c42d6a52e.zip
openvpn-14e4c58b6f903c562475379bb806e26c42d6a52e.tar.gz
fragment.c: simplify boolean expression
!A || (A && B) is equivalent to the simpler !A || B therefore it is preferable to use the second version as it is simpler to parse while reading the code. Signed-off-by: Antonio Quartulli <a@unstable.cc> Acked-by: David Sommerseth <davids@openvpn.net> Message-Id: <20170824075547.29844-1-a@unstable.cc> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg15313.html Signed-off-by: David Sommerseth <davids@openvpn.net> (cherry picked from commit 10ae9ed5fe7f09c7edb5af266149a9b5e9bcbaa4)
-rw-r--r--src/openvpn/fragment.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/openvpn/fragment.c b/src/openvpn/fragment.c
index 38de62f..84f0121 100644
--- a/src/openvpn/fragment.c
+++ b/src/openvpn/fragment.c
@@ -208,7 +208,7 @@ fragment_incoming(struct fragment_master *f, struct buffer *buf,
}
/* is this the first fragment for our sequence number? */
- if (!frag->defined || (frag->defined && frag->max_frag_size != size))
+ if (!frag->defined || frag->max_frag_size != size)
{
frag->defined = true;
frag->max_frag_size = size;