From: David Gibson <david@gibson.dropbear.id.au>
To: Stefano Brivio <sbrivio@redhat.com>
Cc: passt-dev@passt.top, Callum Parsey <callum@neoninteger.au>,
me@yawnt.com, lemmi@nerd2nerd.org
Subject: Re: [PATCH 06/10] Revert "conf: Adjust netmask on mismatch between IPv4 address/netmask and gateway"
Date: Tue, 16 May 2023 14:00:37 +1000 [thread overview]
Message-ID: <ZGL/5STJgEqFK32M@yekko> (raw)
In-Reply-To: <20230514181415.313420-7-sbrivio@redhat.com>
[-- Attachment #1: Type: text/plain, Size: 2775 bytes --]
On Sun, May 14, 2023 at 08:14:11PM +0200, Stefano Brivio wrote:
> This reverts commit 7656a6f8888237b9e23d63666e921528b6aaf950: now, by
> default, we copy all the routes associated to the outbound interface
> into the routing table of the container, so there's no need for this
> horrible workaround anymore.
>
> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
This was never the right solution - even without the other
considerations raised by this series we probably should have
advertized an explicit host route to the gateway instead of mangling
the netmask.
> ---
> conf.c | 25 +------------------------
> 1 file changed, 1 insertion(+), 24 deletions(-)
>
> diff --git a/conf.c b/conf.c
> index c2a745e..3a2fc2d 100644
> --- a/conf.c
> +++ b/conf.c
> @@ -634,9 +634,6 @@ static int conf_ip4_prefix(const char *arg)
> static unsigned int conf_ip4(unsigned int ifi,
> struct ip4_ctx *ip4, unsigned char *mac)
> {
> - in_addr_t addr, gw;
> - int shift;
> -
> if (!ifi)
> ifi = nl_get_ext_if(AF_INET);
>
> @@ -651,10 +648,8 @@ static unsigned int conf_ip4(unsigned int ifi,
> if (IN4_IS_ADDR_UNSPECIFIED(&ip4->addr))
> nl_addr(0, ifi, AF_INET, &ip4->addr, &ip4->prefix_len, NULL);
>
> - addr = ntohl(ip4->addr.s_addr);
> - gw = ntohl(ip4->gw.s_addr);
> -
> if (!ip4->prefix_len) {
> + in_addr_t addr = ntohl(ip4->addr.s_addr);
> if (IN_CLASSA(addr))
> ip4->prefix_len = (32 - IN_CLASSA_NSHIFT);
> else if (IN_CLASSB(addr))
> @@ -665,24 +660,6 @@ static unsigned int conf_ip4(unsigned int ifi,
> ip4->prefix_len = 32;
> }
>
> - /* We might get an address with a netmask that makes the default
> - * gateway unreachable, and in that case we would fail to configure
> - * the default route, with --config-net, or presumably a DHCP client
> - * in the guest or container would face the same issue.
> - *
> - * The host might have another route, to the default gateway itself,
> - * fixing the situation, but we only read default routes.
> - *
> - * Fix up the mask to allow reaching the default gateway from our
> - * configured address, if needed, and only if we find a non-zero
> - * mask that makes the gateway reachable.
> - */
> - shift = 32 - ip4->prefix_len;
> - while (shift < 32 && addr >> shift != gw >> shift)
> - shift++;
> - if (shift < 32)
> - ip4->prefix_len = 32 - shift;
> -
> memcpy(&ip4->addr_seen, &ip4->addr, sizeof(ip4->addr_seen));
>
> if (MAC_IS_ZERO(mac))
--
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 --]
next prev parent reply other threads:[~2023-05-16 4:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-14 18:14 [PATCH 00/10] RFC/RFT: Optionally copy all routes and addresses for pasta, allow gateway-less routes Stefano Brivio
2023-05-14 18:14 ` [PATCH 01/10] netlink: Fix comment about response buffer size for nl_req() Stefano Brivio
2023-05-16 3:23 ` David Gibson
2023-05-14 18:14 ` [PATCH 02/10] pasta: Improve error handling on failure to join network namespace Stefano Brivio
2023-05-16 3:24 ` David Gibson
2023-05-14 18:14 ` [PATCH 03/10] netlink: Add functionality to copy routes from outer namespace Stefano Brivio
2023-05-14 18:14 ` [PATCH 04/10] conf: --config-net option is for pasta mode only Stefano Brivio
2023-05-16 3:59 ` David Gibson
2023-05-14 18:14 ` [PATCH 05/10] conf, pasta: With --config-net, copy all routes by default Stefano Brivio
2023-05-14 18:14 ` [PATCH 06/10] Revert "conf: Adjust netmask on mismatch between IPv4 address/netmask and gateway" Stefano Brivio
2023-05-16 4:00 ` David Gibson [this message]
2023-05-14 18:14 ` [PATCH 07/10] conf: Don't exit if sourced default route has no gateway Stefano Brivio
2023-05-14 18:14 ` [PATCH 08/10] netlink: Add functionality to copy addresses from outer namespace Stefano Brivio
2023-05-14 18:14 ` [PATCH 09/10] conf, pasta: With --config-net, copy all addresses by default Stefano Brivio
2023-05-14 18:14 ` [PATCH 10/10] passt.h: Fix description of pasta_ifi in struct ctx Stefano Brivio
2023-05-16 4:03 ` David Gibson
2023-05-16 5:06 ` [PATCH 00/10] RFC/RFT: Optionally copy all routes and addresses for pasta, allow gateway-less routes David Gibson
2023-05-16 21:42 ` Stefano Brivio
2023-05-17 1:15 ` David Gibson
2023-05-17 6:52 ` Stefano Brivio
2023-05-18 3:26 ` David Gibson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZGL/5STJgEqFK32M@yekko \
--to=david@gibson.dropbear.id.au \
--cc=callum@neoninteger.au \
--cc=lemmi@nerd2nerd.org \
--cc=me@yawnt.com \
--cc=passt-dev@passt.top \
--cc=sbrivio@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).