diff options
| author | Dan Winship <danw@gnome.org> | 2014-09-16 16:42:46 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-11-07 07:49:40 -0500 |
| commit | 21c8a6b20effbe1e689505a0cbb23594be06068c (patch) | |
| tree | 15e43867853d0242950e40e049499e1c2d29cc78 /libnm-core/nm-utils-private.h | |
| parent | 303e84e65e5b9b5a403e4f8366e094447d51a9fa (diff) | |
| download | NetworkManager-21c8a6b20effbe1e689505a0cbb23594be06068c.tar.gz | |
libnm-core, all: merge IPv4 and IPv6 address/route types
Merge NMIP4Address and NMIP6Address into NMIPAddress, and NMIP4Route
and NMIP6Route into NMIPRoute. The new types represent IP addresses as
strings, rather than in binary, and so are address-family agnostic.
Diffstat (limited to 'libnm-core/nm-utils-private.h')
| -rw-r--r-- | libnm-core/nm-utils-private.h | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/libnm-core/nm-utils-private.h b/libnm-core/nm-utils-private.h index bc42921514..4a4e82e0d9 100644 --- a/libnm-core/nm-utils-private.h +++ b/libnm-core/nm-utils-private.h @@ -40,29 +40,12 @@ GVariant * _nm_utils_bytes_to_dbus (const GValue *prop_value); void _nm_utils_bytes_from_dbus (GVariant *dbus_value, GValue *prop_value); -GVariant * _nm_utils_ip4_dns_to_dbus (const GValue *prop_value); -void _nm_utils_ip4_dns_from_dbus (GVariant *dbus_value, - GValue *prop_value); -GVariant * _nm_utils_ip4_addresses_to_dbus (const GValue *prop_value); -void _nm_utils_ip4_addresses_from_dbus (GVariant *dbus_value, - GValue *prop_value); -GVariant * _nm_utils_ip4_routes_to_dbus (const GValue *prop_value); -void _nm_utils_ip4_routes_from_dbus (GVariant *dbus_value, - GValue *prop_value); - -GVariant * _nm_utils_ip6_dns_to_dbus (const GValue *prop_value); -void _nm_utils_ip6_dns_from_dbus (GVariant *dbus_value, - GValue *prop_value); -GVariant * _nm_utils_ip6_addresses_to_dbus (const GValue *prop_value); -void _nm_utils_ip6_addresses_from_dbus (GVariant *dbus_value, - GValue *prop_value); -GVariant * _nm_utils_ip6_routes_to_dbus (const GValue *prop_value); -void _nm_utils_ip6_routes_from_dbus (GVariant *dbus_value, - GValue *prop_value); - GSList * _nm_utils_strv_to_slist (char **strv); char ** _nm_utils_slist_to_strv (GSList *slist); +GPtrArray * _nm_utils_strv_to_ptrarray (char **strv); +char ** _nm_utils_ptrarray_to_strv (GPtrArray *ptrarray); + char ** _nm_utils_strsplit_set (const char *str, const char *delimiters, int max_tokens); |