From 21c8a6b20effbe1e689505a0cbb23594be06068c Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Tue, 16 Sep 2014 16:42:46 -0400 Subject: 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. --- clients/cli/common.h | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'clients/cli/common.h') diff --git a/clients/cli/common.h b/clients/cli/common.h index 4f43674793..d608ef5ce0 100644 --- a/clients/cli/common.h +++ b/clients/cli/common.h @@ -29,11 +29,8 @@ gboolean print_ip6_config (NMIP6Config *cfg6, NmCli *nmc, const char *group_pref gboolean print_dhcp4_config (NMDhcp4Config *dhcp4, NmCli *nmc, const char *group_prefix, const char *one_field); gboolean print_dhcp6_config (NMDhcp6Config *dhcp6, NmCli *nmc, const char *group_prefix, const char *one_field); -NMIP4Address *nmc_parse_and_build_ip4_address (const char *ip_str, const char *gw_str, GError **error); -NMIP6Address *nmc_parse_and_build_ip6_address (const char *ip_str, const char *gw_str, GError **error); - -NMIP4Route *nmc_parse_and_build_ip4_route (const char *first, const char *second, const char *third, GError **error); -NMIP6Route *nmc_parse_and_build_ip6_route (const char *first, const char *second, const char *third, GError **error); +NMIPAddress *nmc_parse_and_build_address (int family, const char *ip_str, const char *gw_str, GError **error); +NMIPRoute *nmc_parse_and_build_route (int family, const char *first, const char *second, const char *third, GError **error); const char * nmc_device_state_to_string (NMDeviceState state); const char * nmc_device_reason_to_string (NMDeviceStateReason reason); -- cgit v1.2.1