networkd: add support for peer address

This patch adds peer address support for
networkd . In the  [Address]  a new configurable
param is Peer.

[Match]
Name=ipip-tun

[Address]
Address=10.0.0.1/32
Peer=10.0.0.2/32

diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c
index 1ba210831661aa946c7f33141291cbb9e61b04a1..8c4ef9964ba822424cafe18811a2b94a436cb466 100644 (file)
--- a/src/network/networkd-address.c
+++ b/src/network/networkd-address.c
@@ -345,13 +345,25 @@ int address_configure(Address *address, Link *link,
                 return r;
         }
 
                 return r;
         }
 

-        if (address->family == AF_INET) {
-                r = sd_rtnl_message_append_in_addr(req, IFA_BROADCAST, &address->broadcast);
+        if (!in_addr_null(address->family, &address->in_addr_peer)) {
+                if (address->family == AF_INET)
+                        r = sd_rtnl_message_append_in_addr(req, IFA_ADDRESS, &address->in_addr_peer.in);
+                else if (address->family == AF_INET6)
+                        r = sd_rtnl_message_append_in6_addr(req, IFA_ADDRESS, &address->in_addr_peer.in6);

                 if (r < 0) {
                 if (r < 0) {

-                        log_error("Could not append IFA_BROADCAST attribute: %s",
+                        log_error("Could not append IFA_ADDRESS attribute: %s",

                                   strerror(-r));
                         return r;
                 }
                                   strerror(-r));
                         return r;
                 }

+        } else {
+                if (address->family == AF_INET) {
+                        r = sd_rtnl_message_append_in_addr(req, IFA_BROADCAST, &address->broadcast);
+                        if (r < 0) {
+                                log_error("Could not append IFA_BROADCAST attribute: %s",
+                                          strerror(-r));
+                                return r;
+                        }
+                }

         }
 
         if (address->label) {
         }
 
         if (address->label) {


@@ -488,6 +500,7 @@ int config_parse_address(const char *unit,
         Network *network = userdata;
         _cleanup_address_free_ Address *n = NULL;
         _cleanup_free_ char *address = NULL;
         Network *network = userdata;
         _cleanup_address_free_ Address *n = NULL;
         _cleanup_free_ char *address = NULL;

+        union in_addr_union *addr;

         const char *e;
         int r;
 
         const char *e;
         int r;
 


@@ -507,6 +520,11 @@ int config_parse_address(const char *unit,
         if (r < 0)
                 return r;
 
         if (r < 0)
                 return r;
 

+        if (streq(lvalue, "Address"))
+                addr = &n->in_addr;
+        else
+                addr = &n->in_addr_peer;
+

         /* Address=address/prefixlen */
 
         /* prefixlen */
         /* Address=address/prefixlen */
 
         /* prefixlen */


@@ -532,7 +550,7 @@ int config_parse_address(const char *unit,
                         return log_oom();
         }
 
                         return log_oom();
         }
 

-        r = net_parse_inaddr(address, &n->family, &n->in_addr);
+        r = net_parse_inaddr(address, &n->family, addr);

         if (r < 0) {
                 log_syntax(unit, LOG_ERR, filename, line, EINVAL,
                            "Address is invalid, ignoring assignment: %s", address);
         if (r < 0) {
                 log_syntax(unit, LOG_ERR, filename, line, EINVAL,
                            "Address is invalid, ignoring assignment: %s", address);

diff --git a/src/network/networkd-network-gperf.gperf b/src/network/networkd-network-gperf.gperf
index ce9047cd06c4ce6a807d737bb87bfd3b3aa50c40..c821eadb705511204a71a0f140e39edf9b7e2a67 100644 (file)
--- a/src/network/networkd-network-gperf.gperf
+++ b/src/network/networkd-network-gperf.gperf
@@ -39,6 +39,7 @@ Network.DNS,                 config_parse_dns,                   0,
 Network.NTP,                 config_parse_dns,                   0,                             offsetof(Network, ntp)
 Network.Tunnel,              config_parse_tunnel,                0,                             offsetof(Network, tunnel)
 Address.Address,             config_parse_address,               0,                             0
 Network.NTP,                 config_parse_dns,                   0,                             offsetof(Network, ntp)
 Network.Tunnel,              config_parse_tunnel,                0,                             offsetof(Network, tunnel)
 Address.Address,             config_parse_address,               0,                             0

+Address.Peer,                config_parse_address,               0,                             0

 Address.Broadcast,           config_parse_broadcast,             0,                             0
 Address.Label,               config_parse_label,                 0,                             0
 Route.Gateway,               config_parse_gateway,               0,                             0
 Address.Broadcast,           config_parse_broadcast,             0,                             0
 Address.Label,               config_parse_label,                 0,                             0
 Route.Gateway,               config_parse_gateway,               0,                             0

diff --git a/src/network/networkd.h b/src/network/networkd.h
index 6a001751570d2a57e4d473e24b56564c91dcd7cf..5df52c98f4e9a5bc7c34dbc4091cfe6d77b071b9 100644 (file)
--- a/src/network/networkd.h
+++ b/src/network/networkd.h
@@ -211,6 +211,7 @@ struct Address {
         struct ifa_cacheinfo cinfo;
 
         union in_addr_union in_addr;
         struct ifa_cacheinfo cinfo;
 
         union in_addr_union in_addr;

+        union in_addr_union in_addr_peer;

 
         LIST_FIELDS(Address, addresses);
 };
 
         LIST_FIELDS(Address, addresses);
 };