public inbox for passt-dev@passt.top
 help / color / mirror / code / Atom feed
* [PATCH] conf: Fix mask calculation from prefix_len in conf_print()
@ 2022-11-09 17:38 Stefano Brivio
  2022-11-10  0:14 ` David Gibson
  0 siblings, 1 reply; 2+ messages in thread
From: Stefano Brivio @ 2022-11-09 17:38 UTC (permalink / raw)
  To: passt-dev; +Cc: David Gibson, Paul Holzinger

Reported-by: Paul Holzinger <pholzing@redhat.com>
Fixes: dd09cceaee21 ("Minor improvements to IPv4 netmask handling")
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
---
 conf.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/conf.c b/conf.c
index bfecdff..1adcf83 100644
--- a/conf.c
+++ b/conf.c
@@ -884,7 +884,10 @@ static void conf_print(const struct ctx *c)
 
 	if (c->ifi4) {
 		if (!c->no_dhcp) {
-			uint32_t mask = htonl(0xffffffff << c->ip4.prefix_len);
+			uint32_t mask;
+
+			mask = htonl(0xffffffff << (32 - c->ip4.prefix_len));
+
 			info("DHCP:");
 			info("    assign: %s",
 			     inet_ntop(AF_INET, &c->ip4.addr, buf4, sizeof(buf4)));
-- 
@@ -884,7 +884,10 @@ static void conf_print(const struct ctx *c)
 
 	if (c->ifi4) {
 		if (!c->no_dhcp) {
-			uint32_t mask = htonl(0xffffffff << c->ip4.prefix_len);
+			uint32_t mask;
+
+			mask = htonl(0xffffffff << (32 - c->ip4.prefix_len));
+
 			info("DHCP:");
 			info("    assign: %s",
 			     inet_ntop(AF_INET, &c->ip4.addr, buf4, sizeof(buf4)));
-- 
2.35.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] conf: Fix mask calculation from prefix_len in conf_print()
  2022-11-09 17:38 [PATCH] conf: Fix mask calculation from prefix_len in conf_print() Stefano Brivio
@ 2022-11-10  0:14 ` David Gibson
  0 siblings, 0 replies; 2+ messages in thread
From: David Gibson @ 2022-11-10  0:14 UTC (permalink / raw)
  To: Stefano Brivio; +Cc: passt-dev, Paul Holzinger

[-- Attachment #1: Type: text/plain, Size: 1073 bytes --]

On Wed, Nov 09, 2022 at 06:38:33PM +0100, Stefano Brivio wrote:
> Reported-by: Paul Holzinger <pholzing@redhat.com>
> Fixes: dd09cceaee21 ("Minor improvements to IPv4 netmask handling")
> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  conf.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/conf.c b/conf.c
> index bfecdff..1adcf83 100644
> --- a/conf.c
> +++ b/conf.c
> @@ -884,7 +884,10 @@ static void conf_print(const struct ctx *c)
>  
>  	if (c->ifi4) {
>  		if (!c->no_dhcp) {
> -			uint32_t mask = htonl(0xffffffff << c->ip4.prefix_len);
> +			uint32_t mask;
> +
> +			mask = htonl(0xffffffff << (32 - c->ip4.prefix_len));
> +
>  			info("DHCP:");
>  			info("    assign: %s",
>  			     inet_ntop(AF_INET, &c->ip4.addr, buf4, sizeof(buf4)));

-- 
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 --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2022-11-10  0:24 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-11-09 17:38 [PATCH] conf: Fix mask calculation from prefix_len in conf_print() Stefano Brivio
2022-11-10  0:14 ` David Gibson

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).