diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-07-30 13:24:48 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2020-08-05 12:47:55 +0200 |
| commit | 43d031d37f8a9620147347d21b99c33658996407 (patch) | |
| tree | ecb1820f3821d9f6975b59b697d1eedba345272d /src/NetworkManagerUtils.h | |
| parent | 52c9504ef4a9e6a15d43704a9b130396249fc8b4 (diff) | |
| download | NetworkManager-43d031d37f8a9620147347d21b99c33658996407.tar.gz | |
core: merge IPv4/IPv6 implementations of nm_utils_ip_{addresses,routes}_to_dbus()
Diffstat (limited to 'src/NetworkManagerUtils.h')
| -rw-r--r-- | src/NetworkManagerUtils.h | 29 |
1 files changed, 11 insertions, 18 deletions
diff --git a/src/NetworkManagerUtils.h b/src/NetworkManagerUtils.h index 6159ca9d84..7d2b81dd49 100644 --- a/src/NetworkManagerUtils.h +++ b/src/NetworkManagerUtils.h @@ -147,23 +147,16 @@ void nm_utils_ip_route_attribute_to_platform (int addr_family, NMPlatformIPRoute *r, guint32 route_table); -void nm_utils_ip4_addresses_to_dbus (const NMDedupMultiHeadEntry *head_entry, - const NMPObject *best_default_route, - GVariant **out_address_data, - GVariant **out_addresses); - -void nm_utils_ip6_addresses_to_dbus (const NMDedupMultiHeadEntry *head_entry, - NMSettingIP6ConfigPrivacy ipv6_privacy, - const NMPObject *best_default_route, - GVariant **out_address_data, - GVariant **out_addresses); - -void nm_utils_ip4_routes_to_dbus (const NMDedupMultiHeadEntry *head_entry, - GVariant **out_route_data, - GVariant **out_routes); - -void nm_utils_ip6_routes_to_dbus (const NMDedupMultiHeadEntry *head_entry, - GVariant **out_route_data, - GVariant **out_routes); +void nm_utils_ip_addresses_to_dbus (int addr_family, + const NMDedupMultiHeadEntry *head_entry, + const NMPObject *best_default_route, + NMSettingIP6ConfigPrivacy ipv6_privacy, + GVariant **out_address_data, + GVariant **out_addresses); + +void nm_utils_ip_routes_to_dbus (int addr_family, + const NMDedupMultiHeadEntry *head_entry, + GVariant **out_route_data, + GVariant **out_routes); #endif /* __NETWORKMANAGER_UTILS_H__ */ |