From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by passt.top (Postfix) with ESMTP id 462265A005E for ; Thu, 9 Feb 2023 18:45:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675964744; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SChC/J07zonbc/Ho3NtD23U605L/NacVP9oBcVBzVTA=; b=TdeNaIvOPiOl1YpMhvVkwB51kP2Iuld3k/FDmRodRFtcXhBVM8i0zsQalf1sw1nLQfm88y WqtWNqHAHC2sl3/uxijLfNx/OQS3AQsXwI51OczpIkqqDS2Ly8UeqDNumJNmQowjKEliwe ++j4lcv5YTf9qqlG4PS10dbNeoDUEvA= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-594-X5Ml08GAOGmzTg0nUSkG0w-1; Thu, 09 Feb 2023 12:45:43 -0500 X-MC-Unique: X5Ml08GAOGmzTg0nUSkG0w-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B170929AB3F7; Thu, 9 Feb 2023 17:45:42 +0000 (UTC) Received: from maya.cloud.tilaa.com (ovpn-208-4.brq.redhat.com [10.40.208.4]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 58B8F140EBF6; Thu, 9 Feb 2023 17:45:42 +0000 (UTC) Date: Thu, 9 Feb 2023 18:45:40 +0100 From: Stefano Brivio To: Laine Stump Subject: Re: [PATCH v2 4/9] make conf_ports() exit immediately after logging error Message-ID: <20230209184540.2cfbad92@elisabeth> In-Reply-To: <20230208174838.1680517-5-laine@redhat.com> References: <20230208174838.1680517-1-laine@redhat.com> <20230208174838.1680517-5-laine@redhat.com> Organization: Red Hat MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Message-ID-Hash: KNCEYXMKM5LOFLVGTT2QWG5J3N7RCXML X-Message-ID-Hash: KNCEYXMKM5LOFLVGTT2QWG5J3N7RCXML X-MailFrom: sbrivio@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: passt-dev@passt.top, laine@laine.org X-Mailman-Version: 3.3.3 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: On Wed, 8 Feb 2023 12:48:33 -0500 Laine Stump wrote: > Rather than having conf_ports() (possibly) log an error, and then let > the caller log the entire usage() message and exit, just log the error > and exit immediately. > > For some errors, conf_ports would previously not log any specific > message, leaving it up to the user to determine the problem by > guessing. We replace all of those silent returns with errexit() > (logging a specific error), thus permitting us to make conf_ports() > return void, which simplifies the caller. > > We can further simplify the two callers to conf_ports by moving the > check for a missing argument to the port options into conf_ports > itself, and make it more useful by again logging an informative error > for missing option instead of the generic usage() message. > > Signed-off-by: Laine Stump > --- > conf.c | 55 +++++++++++++++++++++++++++++++------------------------ > 1 file changed, 31 insertions(+), 24 deletions(-) > > diff --git a/conf.c b/conf.c > index e5035f7..799b9ff 100644 > --- a/conf.c > +++ b/conf.c > @@ -173,11 +173,9 @@ static int parse_port_range(const char *s, char **endptr, > * @optname: Short option name, t, T, u, or U > * @optarg: Option argument (port specification) > * @fwd: Pointer to @port_fwd to be updated > - * > - * Return: -EINVAL on parsing error, 0 otherwise > */ > -static int conf_ports(const struct ctx *c, char optname, const char *optarg, > - struct port_fwd *fwd) > +static void conf_ports(const struct ctx *c, char optname, const char *optarg, > + struct port_fwd *fwd) > { > char addr_buf[sizeof(struct in6_addr)] = { 0 }, *addr = addr_buf; > char buf[BUFSIZ], *spec, *ifname = NULL, *p; > @@ -185,25 +183,37 @@ static int conf_ports(const struct ctx *c, char optname, const char *optarg, > sa_family_t af = AF_UNSPEC; > bool exclude_only = true; > > + if (!optarg) > + errexit("missing argument to -%s option", optname); This can't happen, as all the options relevant to this function are passed to getopt_long() with 'required_argument'. I see there's a check on !optarg in the caller, but I think you can skip it. > + > if (!strcmp(optarg, "none")) { > if (fwd->mode) > - return -EINVAL; > + goto mode_conflict; > + > fwd->mode = FWD_NONE; > - return 0; > + return; > } > > if (!strcmp(optarg, "auto")) { > - if (fwd->mode || c->mode != MODE_PASTA) > - return -EINVAL; > + if (fwd->mode) > + goto mode_conflict; > + > + if (c->mode != MODE_PASTA) > + errexit("'auto' port forwarding is only allowed for pasta"); > + > fwd->mode = FWD_AUTO; > - return 0; > + return; > } > > if (!strcmp(optarg, "all")) { > unsigned i; > > - if (fwd->mode || c->mode != MODE_PASST) > - return -EINVAL; > + if (fwd->mode) > + goto mode_conflict; > + > + if (c->mode != MODE_PASST) > + errexit("'all' port forwarding is only allowed for passt"); > + > fwd->mode = FWD_ALL; > memset(fwd->map, 0xff, PORT_EPHEMERAL_MIN / 8); > > @@ -214,11 +224,11 @@ static int conf_ports(const struct ctx *c, char optname, const char *optarg, > udp_sock_init(c, 0, AF_UNSPEC, NULL, NULL, i); > } > > - return 0; > + return; > } > > if (fwd->mode > FWD_SPEC) > - return -EINVAL; > + errexit("specific ports cannot be specified together with all/none/auto"); s/specific/Specific/, for consistency. > > fwd->mode = FWD_SPEC; > > @@ -292,7 +302,7 @@ static int conf_ports(const struct ctx *c, char optname, const char *optarg, > udp_sock_init(c, 0, af, addr, ifname, i); > } > > - return 0; > + return; > } > > /* Now process base ranges, skipping exclusions */ > @@ -339,14 +349,13 @@ static int conf_ports(const struct ctx *c, char optname, const char *optarg, > } > } while ((p = next_chunk(p, ','))); > > - return 0; > + return; > bad: > - err("Invalid port specifier %s", optarg); > - return -EINVAL; > - > + errexit("Invalid port specifier %s", optarg); > overlap: > - err("Overlapping port specifier %s", optarg); > - return -EINVAL; > + errexit("Overlapping port specifier %s", optarg); > +mode_conflict: > + errexit("Port forwarding mode '%s' conflicts with previous mode", optarg); Split before 'optarg'. > } > > /** > @@ -1549,8 +1558,7 @@ void conf(struct ctx *c, int argc, char **argv) > > if ((name == 't' && (fwd = &c->tcp.fwd_in)) || > (name == 'u' && (fwd = &c->udp.fwd_in.f))) { > - if (!optarg || conf_ports(c, name, optarg, fwd)) > - usage(argv[0]); > + conf_ports(c, name, optarg, fwd); > } > } while (name != -1); > > @@ -1588,8 +1596,7 @@ void conf(struct ctx *c, int argc, char **argv) > > if ((name == 'T' && (fwd = &c->tcp.fwd_out)) || > (name == 'U' && (fwd = &c->udp.fwd_out.f))) { > - if (!optarg || conf_ports(c, name, optarg, fwd)) > - usage(argv[0]); > + conf_ports(c, name, optarg, fwd); > } > } while (name != -1); > -- Stefano