From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: passt.top; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=VSLhPf/C; dkim-atps=neutral Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by passt.top (Postfix) with ESMTPS id C9E525A026E for ; Mon, 20 Apr 2026 19:21:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1776705709; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=sNYMJYkDijn26Qyg4rs6L19cU7RsExDRyG24kWNA5qU=; b=VSLhPf/CIu70RDONbNqFXrxJTYPbzMi/E+chMuNVeekWTyqxcx58GgPb9VxmwujLHCtpvq knoZHAEmj6YZdAkrItUscnyUOsQvBO2j5XtUo4a8MyTt968i7AAxhKGO6Yg3Uq0NCqcPUc fpx4V3gvBL+20yc0wi6MG2TJ5qfWPCM= Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-649-94u8CQBMMKynf3oldyO63g-1; Mon, 20 Apr 2026 13:21:46 -0400 X-MC-Unique: 94u8CQBMMKynf3oldyO63g-1 X-Mimecast-MFC-AGG-ID: 94u8CQBMMKynf3oldyO63g_1776705705 Received: by mail-pf1-f199.google.com with SMTP id d2e1a72fcca58-82fa6c3a77cso1307608b3a.3 for ; Mon, 20 Apr 2026 10:21:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1776705705; x=1777310505; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:to:subject:user-agent:mime-version:date :message-id:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=sNYMJYkDijn26Qyg4rs6L19cU7RsExDRyG24kWNA5qU=; b=Heagh7JazjhD3h2TVuRGupicyllk08vndngDQ7OgpSi/1/SF5yqS33SEzztrxX958W d+ctUGIA2nC88H2CXt5yUlLooSDk4ZB/zQPAb4BLHeD0HR0tj60WP8MTPEAPUKp76zDO MHMCtWlPngs5KuTUf37tFXO3U3AewIoj92aJmhZ9ZLJMbGHmk7tBYt7ToqnfO8Rk3OoB McIaFLoLkWAigI1h8Xm4EdRRFwu7NyX9j21GOk3or8Snv1Y5cLkOvupdn3PB9TUEB1ET Cd6IAYugHwikaH+b7uqPZaUjOkNmb5UVhNRfek9s1hp3hbjE0LIOPfSdrIDT8wFRINx3 Hg/g== X-Forwarded-Encrypted: i=1; AFNElJ8jvhrfuhTYp8nfK4Nrjn7YLBn8VXOJaBw7P1fHjd3PllLwdLCkPE4W/r13MQyaukYxyy4tSj45fgY=@passt.top X-Gm-Message-State: AOJu0YxP/et54BBaRGM2Xv4yRWv+FDDwGOix09t75+A/8UVUdGLeMXy2 q4mW6rlmfLwUX7brayhsNcmM4LGi407gH9IEzPU9WCRmdSYFkuesmzTZmw7X6Gz0vPiqw4PT1EU Od6I+7JPM5Ph8KX581FuAanG7l6ZVZsaifPBCZxYPkI2weL+77Smd/g== X-Gm-Gg: AeBDievEGaJA/6qqNIoDf25jtz16ZOePZ15KW/fFodgPRyES8uBLZYub1nnvOUuZozd aahuhNBIFdAFNPKDziyCDVr5zjv/NoTdgymhCg1rLt4H9jb7qrsEBbl5jpm0Jx13hnV0ymdknTU vbOC7qMshfb+66VPKtHISlxWZeOXSAE/sbMXn5FFm2Z+TwZuS5A8yCs9RPvVh5Xrkyp46ARt04j vPfCevHCS8lzbu0v82NtSGN/c1ZprMdFy1ILZIgwdSuBJsfuIB459FZWSrwUMcfn3n5SKeR8ssM GNSR51jp8UelmtyG9oVkxnKCmwNXHbifKT07EbCxVWHiQsLZhYgQXzJ4QeZLAAqS/5IyOEanlfT Bq6V8eft3f8Eeg+KOnKyumNmzQRbXLC/WhJq1TKw/uXlp82yF1i7ozr9apXkhAGEBbw== X-Received: by 2002:a05:6a00:2191:b0:82f:5726:be23 with SMTP id d2e1a72fcca58-82f8c9ed41emr14818295b3a.49.1776705705223; Mon, 20 Apr 2026 10:21:45 -0700 (PDT) X-Received: by 2002:a05:6a00:2191:b0:82f:5726:be23 with SMTP id d2e1a72fcca58-82f8c9ed41emr14818254b3a.49.1776705704675; Mon, 20 Apr 2026 10:21:44 -0700 (PDT) Received: from [192.168.100.100] (82-64-211-94.subs.proxad.net. [82.64.211.94]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-82f8ec037e1sm13543467b3a.54.2026.04.20.10.21.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 20 Apr 2026 10:21:43 -0700 (PDT) Message-ID: <7d9b56b1-9525-4651-810d-4fc63456a14f@redhat.com> Date: Mon, 20 Apr 2026 19:21:39 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v3 11/11] fwd: Generalise fwd_rules_info() To: David Gibson , passt-dev@passt.top, Stefano Brivio References: <20260417050520.102247-1-david@gibson.dropbear.id.au> <20260417050520.102247-12-david@gibson.dropbear.id.au> From: Laurent Vivier Autocrypt: addr=lvivier@redhat.com; keydata= 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 In-Reply-To: <20260417050520.102247-12-david@gibson.dropbear.id.au> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: oUUpNBbeCmtp_ByVEYmh2IhtLSVLdEQnFMoinjbapy0_1776705705 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Message-ID-Hash: U4C5K7UZOSOVE523JX6T63NR7WZVS3SP X-Message-ID-Hash: U4C5K7UZOSOVE523JX6T63NR7WZVS3SP X-MailFrom: lvivier@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 X-Mailman-Version: 3.3.8 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 4/17/26 07:05, David Gibson wrote: > fwd_rules_info() is used to print a full table of forwarding rules for > debugging or the like. Currently it has one caller, and uses info() to > dump the messages. However for the upcoming configuration client, we're > going to want to dump the rules in some similar, but not quite identical > ways. For example, at different severity levels, or to stdout instead of > stderr / system log / logfile. > > So, generalise fwd_rules_info() to fwd_rules_dump() which takes a printing > function as a parameter. Because we want this to work with "functions" > like info, which is actually a macro, we have to convert fwd_rules_dump() > to a macro as well. We also allow the prefix and suffix for each rule / > line to be provided as a parameter. > > Signed-off-by: David Gibson Reviewed-by: Laurent Vivier > --- > conf.c | 3 ++- > fwd_rule.c | 16 ---------------- > fwd_rule.h | 20 +++++++++++++++++++- > 3 files changed, 21 insertions(+), 18 deletions(-) > > diff --git a/conf.c b/conf.c > index 5aacfe0f..05861072 100644 > --- a/conf.c > +++ b/conf.c > @@ -902,7 +902,8 @@ dns6: > dir = "Inbound"; > > info("%s forwarding rules (%s):", dir, pif_name(i)); > - fwd_rules_info(c->fwd[i]->rules, c->fwd[i]->count); > + fwd_rules_dump(info, c->fwd[i]->rules, c->fwd[i]->count, > + " ", ""); > } > } > > diff --git a/fwd_rule.c b/fwd_rule.c > index cb462401..0d2e1531 100644 > --- a/fwd_rule.c > +++ b/fwd_rule.c > @@ -124,7 +124,6 @@ const union inany_addr *fwd_rule_addr(const struct fwd_rule *rule) > */ > __attribute__((noinline)) > #endif > -/* cppcheck-suppress staticFunction */ > const char *fwd_rule_fmt(const struct fwd_rule *rule, char *dst, size_t size) > { > const char *percent = *rule->ifname ? "%" : ""; > @@ -158,21 +157,6 @@ const char *fwd_rule_fmt(const struct fwd_rule *rule, char *dst, size_t size) > return dst; > } > > -/** > - * fwd_rules_info() - Print forwarding rules for debugging > - * @fwd: Table to print > - */ > -void fwd_rules_info(const struct fwd_rule *rules, size_t count) > -{ > - unsigned i; > - > - for (i = 0; i < count; i++) { > - char buf[FWD_RULE_STRLEN]; > - > - info(" %s", fwd_rule_fmt(&rules[i], buf, sizeof(buf))); > - } > -} > - > /** > * fwd_rule_conflicts() - Test if two rules conflict with each other > * @a, @b: Rules to test > diff --git a/fwd_rule.h b/fwd_rule.h > index f0f4efda..58551382 100644 > --- a/fwd_rule.h > +++ b/fwd_rule.h > @@ -97,7 +97,25 @@ void fwd_probe_ephemeral(void); > > const union inany_addr *fwd_rule_addr(const struct fwd_rule *rule); > const char *fwd_rule_fmt(const struct fwd_rule *rule, char *dst, size_t size); > -void fwd_rules_info(const struct fwd_rule *rules, size_t count); > void fwd_rule_parse(char optname, const char *optarg, struct fwd_table *fwd); > > +/** > + * fwd_rules_dump() - Dump forwarding rules > + * @fn: Printing/logging function to call > + * @rules: Array of rules to dump > + * @count: Number of rules to dump > + * @prefix: String to print at the start of each rule > + * @suffix: String to print at the end of each rule > + */ > +#define fwd_rules_dump(fn, rules, count, prefix, suffix) \ > + do { \ > + unsigned i_; \ > + for (i_ = 0; i_ < (count); i_++) { \ > + char buf_[FWD_RULE_STRLEN]; \ > + fn("%s%s%s", prefix, \ > + fwd_rule_fmt(&(rules)[i_], buf_, sizeof(buf_)), \ > + suffix); \ > + } \ > + } while (0) > + > #endif /* FWD_RULE_H */