From: Susant Sahani <ssahani@users.noreply.github.com>
Date: Thu, 22 Dec 2016 09:23:29 +0000 (+0530)
Subject: networkd: Rename ProxyARP to IPv4ProxyARP (#4947)
X-Git-Tag: v233~293
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8f9a206b6c769901b3fb97fbfe549c550b075fee;p=thirdparty%2Fsystemd.git

networkd: Rename ProxyARP to IPv4ProxyARP (#4947)

Rename the arp proxy option to IPv4ProxyARP= in order to clarify
its relationship to IPv4, and map to the various IPv6 options we have.

Fixes: #4768
---

diff --git a/man/systemd.network.xml b/man/systemd.network.xml
index c7083a4fe65..ea9cdeae880 100644
--- a/man/systemd.network.xml
+++ b/man/systemd.network.xml
@@ -603,8 +603,8 @@
         </para></listitem>
         </varlistentry>
         <varlistentry>
-          <term><varname>ProxyARP=</varname></term>
-          <listitem><para>A boolean. Configures proxy ARP. Proxy ARP is the technique in which one host,
+          <term><varname>IPv4ProxyARP=</varname></term>
+          <listitem><para>A boolean. Configures proxy ARP for IPv4. Proxy ARP is the technique in which one host,
           usually a router, answers ARP requests intended for another machine. By "faking" its identity,
           the router accepts responsibility for routing packets to the "real" destination. (see <ulink
           url="https://tools.ietf.org/html/rfc1027">RFC 1027</ulink>.
diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index 4fa17e84527..862cfad1ff8 100644
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -67,6 +67,7 @@ Network.IPv6AcceptRouterAdvertisements, config_parse_tristate,
 Network.IPv6DuplicateAddressDetection,  config_parse_int,                               0,                             offsetof(Network, ipv6_dad_transmits)
 Network.IPv6HopLimit,                   config_parse_int,                               0,                             offsetof(Network, ipv6_hop_limit)
 Network.ProxyARP,                       config_parse_tristate,                          0,                             offsetof(Network, proxy_arp)
+Network.IPv4ProxyARP,                   config_parse_tristate,                          0,                             offsetof(Network, proxy_arp)
 Network.BindCarrier,                    config_parse_strv,                              0,                             offsetof(Network, bind_carrier)
 Address.Address,                        config_parse_address,                           0,                             0
 Address.Peer,                           config_parse_address,                           0,                             0