iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

netfilter: xt_multiport: Use switch case instead of multiple condition checks

Browse Source 
There are multiple equality condition checks in the original codes, so it
is better to use switch case instead of them.

Signed-off-by: Gao Feng <fgao@ikuai8.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
This commit is contained in:
Gao Feng 2016-09-26 21:23:37 +08:00 committed by Pablo Neira Ayuso
parent 432490f9d4
commit dd2602d00f
1 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
net/netfilter/xt_multiport.c
View File

@ -42,29 +42,31 @@ ports_match_v1(const struct xt_multiport_v1 *minfo,
e = minfo->ports[++i];
pr_debug("src or dst matches with %d-%d?\n", s, e);
if (minfo->flags == XT_MULTIPORT_SOURCE
&& src >= s && src <= e)
return true ^ minfo->invert;
if (minfo->flags == XT_MULTIPORT_DESTINATION
&& dst >= s && dst <= e)
return true ^ minfo->invert;
if (minfo->flags == XT_MULTIPORT_EITHER
&& ((dst >= s && dst <= e)
|| (src >= s && src <= e)))
return true ^ minfo->invert;
switch (minfo->flags) {
case XT_MULTIPORT_SOURCE:
return (src >= s && src <= e) ^ minfo->invert;
case XT_MULTIPORT_DESTINATION:
return (dst >= s && dst <= e) ^ minfo->invert;
case XT_MULTIPORT_EITHER:
return ((dst >= s && dst <= e) ||
(src >= s && src <= e)) ^ minfo->invert;
default:
break;
}
} else {
/* exact port matching */
pr_debug("src or dst matches with %d?\n", s);
if (minfo->flags == XT_MULTIPORT_SOURCE
&& src == s)
return true ^ minfo->invert;
if (minfo->flags == XT_MULTIPORT_DESTINATION
&& dst == s)
return true ^ minfo->invert;
if (minfo->flags == XT_MULTIPORT_EITHER
&& (src == s || dst == s))
return true ^ minfo->invert;
switch (minfo->flags) {
case XT_MULTIPORT_SOURCE:
return (src == s) ^ minfo->invert;
case XT_MULTIPORT_DESTINATION:
return (dst == s) ^ minfo->invert;
case XT_MULTIPORT_EITHER:
return (src == s || dst == s) ^ minfo->invert;
default:
break;
}
}
}