From nobody Fri Dec 12 14:05:55 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass(p=reject dis=none) header.from=lists.libvirt.org ARC-Seal: i=1; a=rsa-sha256; t=1764252101; cv=none; d=zohomail.com; s=zohoarc; b=gL9E8UdMTkAhE4gICYgvlo5TbaobagDvpKgPNhIrAPzYFVXKRAZoIYQzYkMysggqoFv1EGbEJpziLFrky6suydSyPkam/Shok70CtAwtIXlmoYC7kzUEZmzUrrus2Gbr8I5PptA9yIQpcISs183CwS6tovLFjpULIeBqAteZDX0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1764252101; h=Content-Type:Content-Transfer-Encoding:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Owner:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Subject:Subject:To:To:Message-Id:Cc; bh=9Q1unLuMyUl1Mf6OqSa6ka9PXwoyEJZEbseSlndALTc=; b=ZBqp0xfMUibWIEwTQNH5mAzUfjgQfaH7cWjPb0sB1GE1OoTyK5ybqD8Phl46cqFI0QVDH7Q5jQFreJvj3+XtBc53q0lwtUeDbdiw0fk4/IiV8vhewUJsFjVteved5ES2txcjCDCkn5Ph1AVhqpMsWjr6Kwdb3yIvkz3072DJsfo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of lists.libvirt.org designates 8.43.85.245 as permitted sender) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1764252101775413.0751504658749; Thu, 27 Nov 2025 06:01:41 -0800 (PST) Received: by lists.libvirt.org (Postfix, from userid 993) id E3ECD44B38; Thu, 27 Nov 2025 09:01:40 -0500 (EST) Received: from [172.19.199.74] (lists.libvirt.org [8.43.85.245]) by lists.libvirt.org (Postfix) with ESMTP id BD8E244D52; Thu, 27 Nov 2025 08:54:49 -0500 (EST) Received: by lists.libvirt.org (Postfix, from userid 993) id 468C543DBE; Thu, 27 Nov 2025 08:52:39 -0500 (EST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (3072 bits) server-digest SHA256) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 21714446B8 for ; Thu, 27 Nov 2025 08:51:16 -0500 (EST) Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-444-gfwN6o0oNKmjKraDyz3rew-1; Thu, 27 Nov 2025 08:51:14 -0500 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 96832195605A for ; Thu, 27 Nov 2025 13:51:13 +0000 (UTC) Received: from moe (unknown [10.43.3.236]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id E09C01800451 for ; Thu, 27 Nov 2025 13:51:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 4.0.1 (2024-03-26) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-5.0 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED,RCVD_IN_VALIDITY_RPBL_BLOCKED, RCVD_IN_VALIDITY_SAFE_BLOCKED,SPF_PASS autolearn=unavailable autolearn_force=no version=4.0.1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1764251475; 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; bh=9Q1unLuMyUl1Mf6OqSa6ka9PXwoyEJZEbseSlndALTc=; b=G5aefEWqP7JTSzzrrRKDevnPOT8ask1PAscG9dDuadh4gLzOxb6xlZJ1uvOOOjCUzrXu2L isJ6ppT7cMP1TRisrk8v7QwH8HKGmDLazNmGhRKNsXb0cEyqs5cJqTZF5XnQxuvXIpD0cj lOue224iIVJZZ/Brbqx8NGTwoPAQk04= X-MC-Unique: gfwN6o0oNKmjKraDyz3rew-1 X-Mimecast-MFC-AGG-ID: gfwN6o0oNKmjKraDyz3rew_1764251473 To: devel@lists.libvirt.org Subject: [PATCH 6/8] iptablesPrivateChainCreate: Switch to STRSKIP() Date: Thu, 27 Nov 2025 14:51:01 +0100 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: LtHI3QBFLelrIaWMBprzGP4_ev2Omp5BJj4rSYz2LiI_1764251473 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Message-ID-Hash: M5QVMKR62TY4F3YVL3FAWDEB3F57HMGK X-Message-ID-Hash: M5QVMKR62TY4F3YVL3FAWDEB3F57HMGK X-MailFrom: mprivozn@redhat.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; header-match-devel.lists.libvirt.org-0; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Michal Privoznik via Devel Reply-To: Michal Privoznik X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1764252103117019200 Content-Type: text/plain; charset="utf-8"; x-default="true" From: Michal Privoznik The body of iptablesPrivateChainCreate() uses STRPREFIX() to match strings starting with certain prefix. Then it uses pointer arithmetic to skip the prefix. Well, that's exactly what STRSKIP() is meant to do. Switch the body to use the latter. Signed-off-by: Michal Privoznik --- src/network/network_iptables.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/network/network_iptables.c b/src/network/network_iptables.c index be91b273ed..19dcfc7c8b 100644 --- a/src/network/network_iptables.c +++ b/src/network/network_iptables.c @@ -90,17 +90,21 @@ iptablesPrivateChainCreate(virFirewall *fw, =20 line =3D lines; while (line && *line) { - if (STRPREFIX(*line, "-N ")) { /* eg "-N LIBVIRT_INP" */ - if (virHashUpdateEntry(chains, *line + 3, (void *)0x1) < 0) + const char *tmp; + + if ((tmp =3D STRSKIP(*line, "-N "))) { /* eg "-N LIBVIRT_INP" */ + if (virHashUpdateEntry(chains, tmp, (void *)0x1) < 0) return -1; - } else if (STRPREFIX(*line, "-A ")) { /* eg "-A INPUT -j LIBVIRT_I= NP" */ - char *sep =3D strchr(*line + 3, ' '); + } else if ((tmp =3D STRSKIP(*line, "-A "))) { /* eg "-A INPUT -j L= IBVIRT_INP" */ + char *sep =3D strchr(tmp, ' '); =20 if (sep) { + char *target; + *sep =3D '\0'; - if (STRPREFIX(sep + 1, "-j ")) { - if (virHashUpdateEntry(links, sep + 4, - (char *)*line + 3) < 0) + if ((target =3D STRSKIP(sep + 1, "-j "))) { + if (virHashUpdateEntry(links, target, + (char *)tmp) < 0) return -1; } } --=20 2.51.2