From: David Gibson <david@gibson.dropbear.id.au>
To: passt-dev@passt.top
Subject: Re: [PATCH 01/28] Clean up parsing of port ranges
Date: Thu, 29 Sep 2022 11:04:17 +1000 [thread overview]
Message-ID: <YzTvEc0WeO/rJjyt@yekko> (raw)
In-Reply-To: <20220928225731.124f76d4@elisabeth>
[-- Attachment #1: Type: text/plain, Size: 2064 bytes --]
On Wed, Sep 28, 2022 at 10:57:31PM +0200, Stefano Brivio wrote:
> On Wed, 28 Sep 2022 14:33:12 +1000
> David Gibson <david(a)gibson.dropbear.id.au> wrote:
>
> > conf_ports() parses ranges of ports for the -t, -u, -T and -U options.
> > The code is quite difficult to the follow, to the point that clang-tidy
> > and cppcheck disagree on whether one of the pointers can be NULL at some
> > points.
> >
> > Rework the code with the use of two new helper functions:
> > * parse_port_range() operates a bit like strtoul(), but can parse a whole
> > port range specification (e.g. '80' or '1000-1015')
> > * next_chunk() does the necessary wrapping around strchr() to advance to
> > just after the next given delimiter, while cleanly handling if there
> > are no more delimiters
> >
> > The new version is easier to follow,
>
> Indeed. Just one excess whitespace:
>
> > [...]
> > + if (*p == ':') { /* There's a range to map to as well */
> > + if (parse_port_range(p + 1, &p, &mapped_range))
> > goto bad;
> > -
> > - if (start_dst > end_dst) /* 22-80:8080:8022 */
> > + if ((mapped_range.last - mapped_range.first) !=
> > + (orig_range.last - orig_range.first))
> > goto bad;
> > + } else {
> > + mapped_range = orig_range;
> > + }
> >
> > - if (end_dst != -1 &&
> > - end_dst - start_dst != end_src - start_src)
> > - goto bad; /* 22-81:8022:8080 */
> > -
> > - for (i = start_src; i <= end_src; i++) {
> > - if (bitmap_isset(fwd->map, i))
> > - goto overlap;
> > + if ((*p != '\0') && (*p != ',')) /* Garbage after the ranges */
>
> ...here. I can drop it myself.
Actually, I might as well respin it quickly. That way I can add some
of the extra background information you've supplied to the commit
messages, which might be useful for posterity.
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2022-09-29 1:04 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-28 4:33 [PATCH 00/28] Fixes for static checkers David Gibson
2022-09-28 4:33 ` [PATCH 01/28] Clean up parsing of port ranges David Gibson
2022-09-28 20:57 ` Stefano Brivio
2022-09-29 1:04 ` David Gibson [this message]
2022-09-28 4:33 ` [PATCH 02/28] clang-tidy: Suppress warning about unchecked error in logfn macro David Gibson
2022-09-28 4:33 ` [PATCH 03/28] clang-tidy: Fix spurious null pointer warning in pasta_start_ns() David Gibson
2022-09-28 4:33 ` [PATCH 04/28] clang-tidy: Remove duplicate #include from icmp.c David Gibson
2022-09-28 4:33 ` [PATCH 05/28] Catch failures when installing signal handlers David Gibson
2022-09-28 4:33 ` [PATCH 06/28] Pack DHCPv6 "on wire" structures David Gibson
2022-09-28 4:33 ` [PATCH 07/28] Clean up parsing in conf_runas() David Gibson
2022-09-28 20:57 ` Stefano Brivio
2022-09-29 1:44 ` David Gibson
2022-09-28 4:33 ` [PATCH 08/28] cppcheck: Reduce scope of some variables David Gibson
2022-09-28 4:33 ` [PATCH 09/28] Don't shadow 'i' in conf_ports() David Gibson
2022-09-28 4:33 ` [PATCH 10/28] Don't shadow global function names David Gibson
2022-09-28 4:33 ` [PATCH 11/28] Stricter checking for nsholder.c David Gibson
2022-09-28 4:33 ` [PATCH 12/28] cppcheck: Work around false positive NULL pointer dereference error David Gibson
2022-09-28 4:33 ` [PATCH 13/28] cppcheck: Use inline suppression for ffsl() David Gibson
2022-09-28 4:33 ` [PATCH 14/28] cppcheck: Use inline suppressions for qrap.c David Gibson
2022-09-28 4:33 ` [PATCH 15/28] cppcheck: Use inline suppression for strtok() in conf.c David Gibson
2022-09-28 4:33 ` [PATCH 16/28] Avoid ugly 'end' members in netlink structures David Gibson
2022-09-28 4:33 ` [PATCH 17/28] cppcheck: Broaden suppression for unused struct members David Gibson
2022-09-28 4:33 ` [PATCH 18/28] cppcheck: Remove localtime suppression for pcap.c David Gibson
2022-09-28 4:33 ` [PATCH 19/28] qrap: Handle case of PATH environment variable being unset David Gibson
2022-09-28 4:33 ` [PATCH 20/28] cppcheck: Suppress same-value-in-ternary branches warning David Gibson
2022-09-28 20:58 ` Stefano Brivio
2022-09-29 1:00 ` David Gibson
2022-09-28 4:33 ` [PATCH 21/28] cppcheck: Suppress NULL pointer warning in tcp_sock_consume() David Gibson
2022-09-28 20:58 ` Stefano Brivio
2022-09-29 1:07 ` David Gibson
2022-09-28 4:33 ` [PATCH 22/28] Regenerate seccomp.h if seccomp.sh changes David Gibson
2022-09-28 4:33 ` [PATCH 23/28] cppcheck: Avoid errors due to zeroes in bitwise ORs David Gibson
2022-09-28 4:33 ` [PATCH 24/28] cppcheck: Remove unused knownConditionTrueFalse suppression David Gibson
2022-09-28 20:58 ` Stefano Brivio
2022-09-29 1:24 ` David Gibson
2022-09-28 4:33 ` [PATCH 25/28] cppcheck: Remove unused objectIndex suppressions David Gibson
2022-09-28 20:58 ` Stefano Brivio
2022-09-29 1:12 ` David Gibson
2022-09-28 4:33 ` [PATCH 26/28] cppcheck: Remove unused va_list_usedBeforeStarted suppression David Gibson
2022-09-28 4:33 ` [PATCH 27/28] Mark unused functions for cppcheck David Gibson
2022-09-28 4:33 ` [PATCH 28/28] cppcheck: Remove unused unmatchedSuppression suppressions David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YzTvEc0WeO/rJjyt@yekko \
--to=david@gibson.dropbear.id.au \
--cc=passt-dev@passt.top \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://passt.top/passt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for IMAP folder(s).