diff options
author | Thomas Haller <thaller@redhat.com> | 2014-08-28 18:42:58 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2014-10-12 22:31:39 +0200 |
commit | 3aaefd4e2293b7b543e36bded1c7518f4c1ebe29 (patch) | |
tree | 18b2b25394bf2c6f37a30a796f9d5f7adf66cf65 | |
parent | ec6167267239475126ae5eacb0fd32ddbfeb51dc (diff) | |
download | NetworkManager-3aaefd4e2293b7b543e36bded1c7518f4c1ebe29.tar.gz |
cli: support new properties NM_SETTING_IP4_CONFIG_ROUTE_METRIC and NM_SETTING_IP6_CONFIG_ROUTE_METRIC
Signed-off-by: Thomas Haller <thaller@redhat.com>
-rw-r--r-- | clients/cli/settings.c | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 11958422eb..65919fa0b0 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -263,7 +263,8 @@ NmcOutputField nmc_fields_setting_ip4_config[] = { SETTING_FIELD (NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME, 19), /* 9 */ SETTING_FIELD (NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME, 14), /* 10 */ SETTING_FIELD (NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, 15), /* 11 */ - SETTING_FIELD (NM_SETTING_IP4_CONFIG_MAY_FAIL, 12), /* 12 */ + SETTING_FIELD (NM_SETTING_IP4_CONFIG_ROUTE_METRIC, 15), /* 12 */ + SETTING_FIELD (NM_SETTING_IP4_CONFIG_MAY_FAIL, 12), /* 13 */ {NULL, NULL, 0, NULL, FALSE, FALSE, 0} }; #define NMC_FIELDS_SETTING_IP4_CONFIG_ALL "name"","\ @@ -278,6 +279,7 @@ NmcOutputField nmc_fields_setting_ip4_config[] = { NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME","\ NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME","\ NM_SETTING_IP4_CONFIG_NEVER_DEFAULT","\ + NM_SETTING_IP4_CONFIG_ROUTE_METRIC","\ NM_SETTING_IP4_CONFIG_MAY_FAIL #define NMC_FIELDS_SETTING_IP4_CONFIG_COMMON NMC_FIELDS_SETTING_IP4_CONFIG_ALL @@ -292,9 +294,10 @@ NmcOutputField nmc_fields_setting_ip6_config[] = { SETTING_FIELD (NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES, 19), /* 6 */ SETTING_FIELD (NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS, 16), /* 7 */ SETTING_FIELD (NM_SETTING_IP6_CONFIG_NEVER_DEFAULT, 15), /* 8 */ - SETTING_FIELD (NM_SETTING_IP6_CONFIG_MAY_FAIL, 12), /* 9 */ - SETTING_FIELD (NM_SETTING_IP6_CONFIG_IP6_PRIVACY, 15), /* 10 */ - SETTING_FIELD (NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME, 14), /* 11 */ + SETTING_FIELD (NM_SETTING_IP6_CONFIG_ROUTE_METRIC, 15), /* 9 */ + SETTING_FIELD (NM_SETTING_IP6_CONFIG_MAY_FAIL, 12), /* 10 */ + SETTING_FIELD (NM_SETTING_IP6_CONFIG_IP6_PRIVACY, 15), /* 11 */ + SETTING_FIELD (NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME, 14), /* 12 */ {NULL, NULL, 0, NULL, FALSE, FALSE, 0} }; #define NMC_FIELDS_SETTING_IP6_CONFIG_ALL "name"","\ @@ -306,6 +309,7 @@ NmcOutputField nmc_fields_setting_ip6_config[] = { NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES","\ NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS","\ NM_SETTING_IP6_CONFIG_NEVER_DEFAULT","\ + NM_SETTING_IP6_CONFIG_ROUTE_METRIC","\ NM_SETTING_IP6_CONFIG_MAY_FAIL","\ NM_SETTING_IP6_CONFIG_IP6_PRIVACY","\ NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME @@ -1284,6 +1288,7 @@ DEFINE_GETTER (nmc_property_ipv4_get_dhcp_client_id, NM_SETTING_IP4_CONFIG_DHCP_ DEFINE_GETTER (nmc_property_ipv4_get_dhcp_send_hostname, NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME) DEFINE_GETTER (nmc_property_ipv4_get_dhcp_hostname, NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME) DEFINE_GETTER (nmc_property_ipv4_get_never_default, NM_SETTING_IP4_CONFIG_NEVER_DEFAULT) +DEFINE_GETTER (nmc_property_ipv4_get_route_metric, NM_SETTING_IP4_CONFIG_ROUTE_METRIC) DEFINE_GETTER (nmc_property_ipv4_get_may_fail, NM_SETTING_IP4_CONFIG_MAY_FAIL) /* --- NM_SETTING_IP6_CONFIG_SETTING_NAME property get functions --- */ @@ -1369,6 +1374,7 @@ nmc_property_ipv6_get_routes (NMSetting *setting) DEFINE_GETTER (nmc_property_ipv6_get_ignore_auto_routes, NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES) DEFINE_GETTER (nmc_property_ipv6_get_ignore_auto_dns, NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS) DEFINE_GETTER (nmc_property_ipv6_get_never_default, NM_SETTING_IP6_CONFIG_NEVER_DEFAULT) +DEFINE_GETTER (nmc_property_ipv6_get_route_metric, NM_SETTING_IP6_CONFIG_ROUTE_METRIC) DEFINE_GETTER (nmc_property_ipv6_get_may_fail, NM_SETTING_IP6_CONFIG_MAY_FAIL) DEFINE_GETTER (nmc_property_ipv6_get_dhcp_hostname, NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME) @@ -5530,6 +5536,13 @@ nmc_properties_init (void) NULL, NULL, NULL); + nmc_add_prop_funcs (GLUE (IP4_CONFIG, ROUTE_METRIC), + nmc_property_ipv4_get_route_metric, + nmc_property_set_int64, + NULL, + NULL, + NULL, + NULL); nmc_add_prop_funcs (GLUE (IP4_CONFIG, MAY_FAIL), nmc_property_ipv4_get_may_fail, nmc_property_set_bool, @@ -5595,6 +5608,13 @@ nmc_properties_init (void) NULL, NULL, NULL); + nmc_add_prop_funcs (GLUE (IP6_CONFIG, ROUTE_METRIC), + nmc_property_ipv6_get_route_metric, + nmc_property_set_int64, + NULL, + NULL, + NULL, + NULL); nmc_add_prop_funcs (GLUE (IP6_CONFIG, MAY_FAIL), nmc_property_ipv6_get_may_fail, nmc_property_set_bool, @@ -6771,7 +6791,8 @@ setting_ip4_config_details (NMSetting *setting, NmCli *nmc, const char *one_prop set_val_str (arr, 9, nmc_property_ipv4_get_dhcp_send_hostname (setting)); set_val_str (arr, 10, nmc_property_ipv4_get_dhcp_hostname (setting)); set_val_str (arr, 11, nmc_property_ipv4_get_never_default (setting)); - set_val_str (arr, 12, nmc_property_ipv4_get_may_fail (setting)); + set_val_str (arr, 12, nmc_property_ipv4_get_route_metric (setting)); + set_val_str (arr, 13, nmc_property_ipv4_get_may_fail (setting)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ @@ -6805,9 +6826,10 @@ setting_ip6_config_details (NMSetting *setting, NmCli *nmc, const char *one_prop set_val_str (arr, 6, nmc_property_ipv6_get_ignore_auto_routes (setting)); set_val_str (arr, 7, nmc_property_ipv6_get_ignore_auto_dns (setting)); set_val_str (arr, 8, nmc_property_ipv6_get_never_default (setting)); - set_val_str (arr, 9, nmc_property_ipv6_get_may_fail (setting)); - set_val_str (arr, 10, nmc_property_ipv6_get_ip6_privacy (setting)); - set_val_str (arr, 11, nmc_property_ipv6_get_dhcp_hostname (setting)); + set_val_str (arr, 9, nmc_property_ipv6_get_route_metric (setting)); + set_val_str (arr, 10, nmc_property_ipv6_get_may_fail (setting)); + set_val_str (arr, 11, nmc_property_ipv6_get_ip6_privacy (setting)); + set_val_str (arr, 12, nmc_property_ipv6_get_dhcp_hostname (setting)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ |