From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 17 Feb 2021 07:06:31 +0000 (+0900)
Subject: network: address: reuse Address:ip_masquerade_done for IPv6 case
X-Git-Tag: v248-rc1~40^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da0e2baea3145f1ec66182a503812ecefc263fc4;p=thirdparty%2Fsystemd.git

network: address: reuse Address:ip_masquerade_done for IPv6 case

It is not necessary to use different flag for each address family.

Follow-up for 48ed276647c754bfb3ed5c6c5af9404e073ffe54.
---

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index f55f9fafbe7..566709b3715 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -276,12 +276,7 @@ static int address_set_masquerade(Address *address, bool add) {
         if (address->scope >= RT_SCOPE_LINK)
                 return 0;
 
-        if (address->family == AF_INET &&
-            address->ip_masquerade_done == add)
-                return 0;
-
-        if (address->family == AF_INET6 &&
-            address->ipv6_masquerade_done == add)
+        if (address->ip_masquerade_done == add)
                 return 0;
 
         masked = address->in_addr;
@@ -293,10 +288,7 @@ static int address_set_masquerade(Address *address, bool add) {
         if (r < 0)
                 return r;
 
-        if (address->family == AF_INET)
-                address->ip_masquerade_done = add;
-        else if (address->family == AF_INET6)
-                address->ipv6_masquerade_done = add;
+        address->ip_masquerade_done = add;
 
         return 0;
 }
diff --git a/src/network/networkd-address.h b/src/network/networkd-address.h
index d50c5a77f52..7c2d0db3d07 100644
--- a/src/network/networkd-address.h
+++ b/src/network/networkd-address.h
@@ -38,7 +38,6 @@ typedef struct Address {
 
         bool scope_set:1;
         bool ip_masquerade_done:1;
-        bool ipv6_masquerade_done:1;
         AddressFamily duplicate_address_detection;
 
         /* Called when address become ready */