From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id C55195A026D for ; Thu, 7 Dec 2023 15:31:47 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1701959502; bh=7NONuA3M2TfzuZQxLxdvwmkwTGo4bKRpfe7LAaYRyxQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=osuHWklFencqOv3/6syvBD7g9XFnX8n+4qCLcWiKszZez9nbE5WPHzDY6RLNggNF+ Ox943nmHB+6+Ect+p6mGcMJGj7lh5KBeZ0Rj0BstFUnPGawTirq5BWxiPELjh6Lj/S ZliVidbd+0na3biAxDwDn5/ndsx2/MDAbo0iDWfetRwAshGRzBMUMF3XEuIO3exjyI /HFnPWcwYzPj1DWToF+jzbM4MF5MjaZiL/K2GqpajG8Zi1je0RScjUehv8thwUcB3N cfCP486/CFhlvistL1ppm3x/Y/VZbZ65rtZQQ70uaHQtb2OB4wujHJzinQL4EYrLjq JsAFSPYrx5CRg== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4SmGtQ1S15z4xNH; Fri, 8 Dec 2023 01:31:42 +1100 (AEDT) From: David Gibson To: Stefano Brivio , passt-dev@passt.top Subject: [PATCH 3/8] treewide: Add IN4ADDR_ANY_INIT macro Date: Fri, 8 Dec 2023 01:31:35 +1100 Message-ID: <20231207143140.1851378-4-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231207143140.1851378-1-david@gibson.dropbear.id.au> References: <20231207143140.1851378-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Message-ID-Hash: BUSO26CYH65BQSFAXNTAUBAEYBYFQJRC X-Message-ID-Hash: BUSO26CYH65BQSFAXNTAUBAEYBYFQJRC X-MailFrom: dgibson@gandalf.ozlabs.org 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: David Gibson 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: We already define IN4ADDR_LOOPBACK_INIT to initialise a struct in_addr to the loopback address, make a similar one for the unspecified / any address. This avoids messying things with the internal structure of struct in_addr where we don't care about it. Signed-off-by: David Gibson --- icmp.c | 2 +- util.h | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/icmp.c b/icmp.c index a1de8ae..2a15d25 100644 --- a/icmp.c +++ b/icmp.c @@ -169,7 +169,7 @@ int icmp_tap_handler(const struct ctx *c, uint8_t pif, int af, if (af == AF_INET) { struct sockaddr_in sa = { .sin_family = AF_INET, - .sin_addr = { .s_addr = htonl(INADDR_ANY) }, + .sin_addr = IN4ADDR_ANY_INIT, }; union icmp_epoll_ref iref; struct icmphdr *ih; diff --git a/util.h b/util.h index 53bb54b..6b11951 100644 --- a/util.h +++ b/util.h @@ -122,6 +122,9 @@ (((struct in_addr *)(a))->s_addr == ((struct in_addr *)b)->s_addr) #define IN4ADDR_LOOPBACK_INIT \ { .s_addr = htonl_constant(INADDR_LOOPBACK) } +#define IN4ADDR_ANY_INIT \ + { .s_addr = htonl_constant(INADDR_ANY) } + #define NS_FN_STACK_SIZE (RLIMIT_STACK_VAL * 1024 / 8) int do_clone(int (*fn)(void *), char *stack_area, size_t stack_size, int flags, -- 2.43.0