From a8931585be64b0b67f5039ee1e77936200080bfc Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Tue, 20 Sep 2022 12:55:00 +0200
Subject: [PATCH] platform,glib-aux: move and rename
 nm_platform_ip4_broadcast_address_create()

---
 src/core/platform/tests/test-cleanup.c |  2 +-
 src/core/platform/tests/test-route.c   | 21 ++++++++++-----------
 src/libnm-glib-aux/nm-inet-utils.h     |  6 ++++++
 src/libnm-platform/nm-platform.h       |  8 +-------
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/core/platform/tests/test-cleanup.c b/src/core/platform/tests/test-cleanup.c
index ae5597a7c4..62d7e4b93c 100644
--- a/src/core/platform/tests/test-cleanup.c
+++ b/src/core/platform/tests/test-cleanup.c
@@ -73,7 +73,7 @@ test_cleanup_internal(void)
                                          addr4,
                                          plen4,
                                          addr4,
-                                         nm_platform_ip4_broadcast_address_create(addr4, plen4),
+                                         nm_ip4_addr_get_broadcast_address(addr4, plen4),
                                          lifetime,
                                          preferred,
                                          0,
diff --git a/src/core/platform/tests/test-route.c b/src/core/platform/tests/test-route.c
index ba8a626b95..f007d2bb77 100644
--- a/src/core/platform/tests/test-route.c
+++ b/src/core/platform/tests/test-route.c
@@ -691,17 +691,16 @@ test_ip4_route_options(gconstpointer test_data)
         const NMPlatformIP4Address *a = &addr[i];
 
         g_assert(a->ifindex == IFINDEX);
-        g_assert(nm_platform_ip4_address_add(
-            NM_PLATFORM_GET,
-            a->ifindex,
-            a->address,
-            a->plen,
-            a->peer_address,
-            nm_platform_ip4_broadcast_address_create(a->address, a->plen),
-            a->lifetime,
-            a->preferred,
-            a->n_ifa_flags,
-            a->label));
+        g_assert(nm_platform_ip4_address_add(NM_PLATFORM_GET,
+                                             a->ifindex,
+                                             a->address,
+                                             a->plen,
+                                             a->peer_address,
+                                             nm_ip4_addr_get_broadcast_address(a->address, a->plen),
+                                             a->lifetime,
+                                             a->preferred,
+                                             a->n_ifa_flags,
+                                             a->label));
         if (a->peer_address == a->address)
             _wait_for_ipv4_addr_device_route(NM_PLATFORM_GET, 200, a->ifindex, a->address, a->plen);
     }
diff --git a/src/libnm-glib-aux/nm-inet-utils.h b/src/libnm-glib-aux/nm-inet-utils.h
index b730bda06d..62bc7d9c1e 100644
--- a/src/libnm-glib-aux/nm-inet-utils.h
+++ b/src/libnm-glib-aux/nm-inet-utils.h
@@ -174,6 +174,12 @@ nm_ip4_addr_netmask_from_prefix(guint32 prefix)
 guint32 nm_ip4_addr_get_default_prefix0(in_addr_t ip);
 guint32 nm_ip4_addr_get_default_prefix(in_addr_t ip);
 
+static inline in_addr_t
+nm_ip4_addr_get_broadcast_address(in_addr_t address, guint8 plen)
+{
+    return address | ~nm_ip4_addr_netmask_from_prefix(plen);
+}
+
 gconstpointer
 nm_ip_addr_clear_host_address(int family, gpointer dst, gconstpointer src, guint32 plen);
 
diff --git a/src/libnm-platform/nm-platform.h b/src/libnm-platform/nm-platform.h
index cb08a3bff7..d723fdbb07 100644
--- a/src/libnm-platform/nm-platform.h
+++ b/src/libnm-platform/nm-platform.h
@@ -1422,12 +1422,6 @@ GType nm_platform_get_type(void);
 
 /*****************************************************************************/
 
-static inline in_addr_t
-nm_platform_ip4_broadcast_address_create(in_addr_t address, guint8 plen)
-{
-    return address | ~nm_ip4_addr_netmask_from_prefix(plen);
-}
-
 static inline in_addr_t
 nm_platform_ip4_broadcast_address_from_addr(const NMPlatformIP4Address *addr)
 {
@@ -1439,7 +1433,7 @@ nm_platform_ip4_broadcast_address_from_addr(const NMPlatformIP4Address *addr)
     /* the set broadcast-address gets ignored, and we determine a default brd base
      * on the peer IFA_ADDRESS. */
     if (addr->peer_address != 0u && addr->plen < 31 /* RFC3021 */)
-        return nm_platform_ip4_broadcast_address_create(addr->peer_address, addr->plen);
+        return nm_ip4_addr_get_broadcast_address(addr->peer_address, addr->plen);
     return 0u;
 }