mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "conf: Adjust netmask on mismatch between IPv4 address/netmask and gateway"

Browse source 
This reverts commit 7656a6f888: 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 commit is contained in:
Stefano Brivio 2023-05-14 15:22:00 +02:00
parent da54641f14
commit e8fef7525c
1 changed files with 1 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
conf.c
View file

@ -634,9 +634,6 @@ static int conf_ip4_prefix(const char *arg)
static unsigned int conf_ip4(unsigned int ifi, static unsigned int conf_ip4(unsigned int ifi,
struct ip4_ctx *ip4, unsigned char *mac) struct ip4_ctx *ip4, unsigned char *mac)
{ {
in_addr_t addr, gw;
int shift;
if (!ifi) if (!ifi)
ifi = nl_get_ext_if(AF_INET); 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)) if (IN4_IS_ADDR_UNSPECIFIED(&ip4->addr))
nl_addr(0, ifi, AF_INET, &ip4->addr, &ip4->prefix_len, NULL); 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) { if (!ip4->prefix_len) {
in_addr_t addr = ntohl(ip4->addr.s_addr);
if (IN_CLASSA(addr)) if (IN_CLASSA(addr))
ip4->prefix_len = (32 - IN_CLASSA_NSHIFT); ip4->prefix_len = (32 - IN_CLASSA_NSHIFT);
else if (IN_CLASSB(addr)) else if (IN_CLASSB(addr))
@ -665,24 +660,6 @@ static unsigned int conf_ip4(unsigned int ifi,
ip4->prefix_len = 32; 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)); memcpy(&ip4->addr_seen, &ip4->addr, sizeof(ip4->addr_seen));
if (MAC_IS_ZERO(mac)) if (MAC_IS_ZERO(mac))