diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-01-13 19:36:02 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-01-15 14:30:32 +0100 |
| commit | dec2a616bb5c4f1d32ab4e466aa5a69719c50b17 (patch) | |
| tree | 7c3a687ab814847caf528f80ee4a6c0c05920fd4 | |
| parent | 0bb10301734159094cf5561d3923ff3927fede95 (diff) | |
| download | NetworkManager-lr/connection-mtu-rh1177582.tar.gz | |
cli: recognize the connection.mtu propertylr/connection-mtu-rh1177582
| -rw-r--r-- | clients/cli/settings.c | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/clients/cli/settings.c b/clients/cli/settings.c index 7d2a46c8c9..7a736e2f63 100644 --- a/clients/cli/settings.c +++ b/clients/cli/settings.c @@ -53,6 +53,7 @@ NmcOutputField nmc_fields_setting_connection[] = { SETTING_FIELD (NM_SETTING_CONNECTION_SLAVE_TYPE, 20), /* 12 */ SETTING_FIELD (NM_SETTING_CONNECTION_SECONDARIES, 40), /* 13 */ SETTING_FIELD (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT, 30), /* 14 */ + SETTING_FIELD (NM_SETTING_CONNECTION_MTU, 6), /* 15 */ {NULL, NULL, 0, NULL, FALSE, FALSE, 0} }; #define NMC_FIELDS_SETTING_CONNECTION_ALL "name"","\ @@ -69,7 +70,8 @@ NmcOutputField nmc_fields_setting_connection[] = { NM_SETTING_CONNECTION_MASTER","\ NM_SETTING_CONNECTION_SLAVE_TYPE","\ NM_SETTING_CONNECTION_SECONDARIES","\ - NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT + NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT","\ + NM_SETTING_CONNECTION_MTU #define NMC_FIELDS_SETTING_CONNECTION_COMMON NMC_FIELDS_SETTING_CONNECTION_ALL /* Available fields for NM_SETTING_WIRED_SETTING_NAME */ @@ -1049,6 +1051,19 @@ DEFINE_GETTER (nmc_property_connection_get_slave_type, NM_SETTING_CONNECTION_SLA DEFINE_GETTER (nmc_property_connection_get_secondaries, NM_SETTING_CONNECTION_SECONDARIES) DEFINE_GETTER (nmc_property_connection_get_gateway_ping_timeout, NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT) +static char * +nmc_property_connection_get_mtu (NMSetting *setting) +{ + NMSettingConnection *s_con = NM_SETTING_CONNECTION (setting); + int mtu; + + mtu = nm_setting_connection_get_mtu (s_con); + if (mtu == 0) + return g_strdup (_("auto")); + else + return g_strdup_printf ("%d", mtu); +} + /* --- NM_SETTING_DCB_SETTING_NAME property get functions --- */ static char * dcb_flags_to_string (NMSettingDcbFlags flags) @@ -5222,6 +5237,13 @@ nmc_properties_init (void) NULL, NULL, NULL); + nmc_add_prop_funcs (GLUE (CONNECTION, MTU), + nmc_property_connection_get_mtu, + nmc_property_set_mtu, + NULL, + NULL, + NULL, + NULL); /* Add editable properties for NM_SETTING_DCB_SETTING_NAME */ nmc_add_prop_funcs (GLUE (DCB, APP_FCOE_FLAGS), @@ -6587,6 +6609,7 @@ setting_connection_details (NMSetting *setting, NmCli *nmc, const char *one_pro set_val_str (arr, 12, nmc_property_connection_get_slave_type (setting)); set_val_str (arr, 13, nmc_property_connection_get_secondaries (setting)); set_val_str (arr, 14, nmc_property_connection_get_gateway_ping_timeout (setting)); + set_val_str (arr, 15, nmc_property_connection_get_mtu (setting)); g_ptr_array_add (nmc->output_data, arr); print_data (nmc); /* Print all data */ |