From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 13 Jan 2015 18:56:13 +0000 (+0100)
Subject: networkd: rename misnamed boolean
X-Git-Tag: v219~524
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=fd6d906cf46ecef45ebbb5a361e1dc436f031d7a

networkd: rename misnamed boolean
---

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index b4eb91ebb..ce0e923cb 100644
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -116,7 +116,7 @@ int address_establish(Address *address, Link *link) {
                 address->scope < RT_SCOPE_LINK;
 
         /* Add firewall entry if this is requested */
-        if (address->ip_forward_done != masq) {
+        if (address->ip_masquerade_done != masq) {
                 union in_addr_union masked = address->in_addr;
                 in_addr_mask(address->family, &masked, address->prefixlen);
 
@@ -124,7 +124,7 @@ int address_establish(Address *address, Link *link) {
                 if (r < 0)
                         log_link_warning_errno(link, r, "Could not enable IP masquerading: %m");
 
-                address->ip_forward_done = masq;
+                address->ip_masquerade_done = masq;
         }
 
         return 0;
@@ -137,7 +137,7 @@ int address_release(Address *address, Link *link) {
         assert(link);
 
         /* Remove masquerading firewall entry if it was added */
-        if (address->ip_forward_done) {
+        if (address->ip_masquerade_done) {
                 union in_addr_union masked = address->in_addr;
                 in_addr_mask(address->family, &masked, address->prefixlen);
 
@@ -145,7 +145,7 @@ int address_release(Address *address, Link *link) {
                 if (r < 0)
                         log_link_warning_errno(link, r, "Failed to disable IP masquerading: %m");
 
-                address->ip_forward_done = false;
+                address->ip_masquerade_done = false;
         }
 
         return 0;
diff --git a/src/network/networkd.h b/src/network/networkd.h
index b36590e2d..ea4547b94 100644
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -160,7 +160,7 @@ struct Address {
         union in_addr_union in_addr;
         union in_addr_union in_addr_peer;
 
-        bool ip_forward_done;
+        bool ip_masquerade_done;
 
         LIST_FIELDS(Address, addresses);
 };