| Message ID | 20171020112436.17679-1-phil@nwl.cc |
|---|---|
| State | Accepted |
| Delegated to: | Florian Westphal |
| Headers | show |
| Series | [iptables] libxt_recent: Remove ineffective checks for info->name | expand |
Phil Sutter <phil@nwl.cc> wrote: > In struct xt_recent_mtinfo{,_v1}, field 'name' is an array, not a > pointer. So there is no point in comparing it against NULL. Changing the > check to make sure it's content is not an empty string is pointless > either, since a non-empty default string is used and the argument parser > will refuse empty strings as --name argument. So simply get rid of the > checks altogether. Right, applied. -- To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/extensions/libxt_recent.c b/extensions/libxt_recent.c index e1801f1c18952..055ae35080346 100644 --- a/extensions/libxt_recent.c +++ b/extensions/libxt_recent.c @@ -199,7 +199,7 @@ static void recent_print(const void *ip, const struct xt_entry_match *match, if(info->hit_count) printf(" hit_count: %d", info->hit_count); if (info->check_set & XT_RECENT_TTL) printf(" TTL-Match"); - if(info->name) printf(" name: %s", info->name); + printf(" name: %s", info->name); if (info->side == XT_RECENT_SOURCE) printf(" side: source"); if (info->side == XT_RECENT_DEST) @@ -239,7 +239,7 @@ static void recent_save(const void *ip, const struct xt_entry_match *match, if(info->hit_count) printf(" --hitcount %d", info->hit_count); if (info->check_set & XT_RECENT_TTL) printf(" --rttl"); - if(info->name) printf(" --name %s",info->name); + printf(" --name %s",info->name); switch(family) { case NFPROTO_IPV4:
In struct xt_recent_mtinfo{,_v1}, field 'name' is an array, not a pointer. So there is no point in comparing it against NULL. Changing the check to make sure it's content is not an empty string is pointless either, since a non-empty default string is used and the argument parser will refuse empty strings as --name argument. So simply get rid of the checks altogether. Signed-off-by: Phil Sutter <phil@nwl.cc> --- extensions/libxt_recent.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)