colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cli: support connection.autoconnect-priority property

Browse Source 
Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Thomas Haller
2014-08-26 16:30:03 +02:00
parent 83e99c2227
commit cf26bb2dea
2 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
clients/cli/connections.c
View File

@@ -61,15 +61,16 @@ static NmcOutputField nmc_fields_con_show[] = {
{"TIMESTAMP", N_("TIMESTAMP"), 12}, /* 3 */
{"TIMESTAMP-REAL", N_("TIMESTAMP-REAL"), 34}, /* 4 */
{"AUTOCONNECT", N_("AUTOCONNECT"), 13}, /* 5 */
{"READONLY", N_("READONLY"), 10}, /* 6 */
{"DBUS-PATH", N_("DBUS-PATH"), 42}, /* 7 */
{"ACTIVE", N_("ACTIVE"), 10}, /* 8 */
{"DEVICE", N_("DEVICE"), 10}, /* 9 */
{"STATE", N_("STATE"), 12}, /* 10 */
{"ACTIVE-PATH", N_("ACTIVE-PATH"), 51}, /* 11 */
{"AUTOCONNECT-PRIORITY", N_("AUTOCONNECT-PRIORITY"), 10}, /* 6 */
{"READONLY", N_("READONLY"), 10}, /* 7 */
{"DBUS-PATH", N_("DBUS-PATH"), 42}, /* 8 */
{"ACTIVE", N_("ACTIVE"), 10}, /* 9 */
{"DEVICE", N_("DEVICE"), 10}, /* 10 */
{"STATE", N_("STATE"), 12}, /* 11 */
{"ACTIVE-PATH", N_("ACTIVE-PATH"), 51}, /* 12 */
{NULL, NULL, 0}
};
#define NMC_FIELDS_CON_SHOW_ALL "NAME,UUID,TYPE,TIMESTAMP,TIMESTAMP-REAL,AUTOCONNECT,READONLY,DBUS-PATH,"\
#define NMC_FIELDS_CON_SHOW_ALL "NAME,UUID,TYPE,TIMESTAMP,TIMESTAMP-REAL,AUTOCONNECT,AUTOCONNECT-PRIORITY,READONLY,DBUS-PATH,"\
"ACTIVE,DEVICE,STATE,ACTIVE-PATH"
#define NMC_FIELDS_CON_SHOW_COMMON "NAME,UUID,TYPE,DEVICE"
@@ -745,6 +746,7 @@ fill_output_connection (gpointer data, gpointer user_data, gboolean active_only)
time_t timestamp_real;
char *timestamp_str;
char *timestamp_real_str = "";
char *prio_str;
NmcOutputField *arr;
NMActiveConnection *ac = NULL;
const char *ac_path = NULL;
@@ -772,6 +774,7 @@ fill_output_connection (gpointer data, gpointer user_data, gboolean active_only)
timestamp_real_str = g_malloc0 (64);
strftime (timestamp_real_str, 64, "%c", localtime (&timestamp_real));
}
prio_str = g_strdup_printf ("%u", nm_setting_connection_get_autoconnect_priority (s_con));
arr = nmc_dup_fields_array (nmc_fields_con_show,
sizeof (nmc_fields_con_show),
@@ -782,12 +785,13 @@ fill_output_connection (gpointer data, gpointer user_data, gboolean active_only)
set_val_str (arr, 3, timestamp_str);
set_val_str (arr, 4, timestamp ? timestamp_real_str : g_strdup (_("never")));
set_val_strc (arr, 5, nm_setting_connection_get_autoconnect (s_con) ? _("yes") : _("no"));
set_val_strc (arr, 6, nm_setting_connection_get_read_only (s_con) ? _("yes") : _("no"));
set_val_strc (arr, 7, nm_connection_get_path (connection));
set_val_strc (arr, 8, ac ? _("yes") : _("no"));
set_val_str (arr, 9, ac_dev);
set_val_strc (arr, 10, ac_state);
set_val_strc (arr, 11, ac_path);
set_val_str (arr, 6, prio_str);
set_val_strc (arr, 7, nm_setting_connection_get_read_only (s_con) ? _("yes") : _("no"));
set_val_strc (arr, 8, nm_connection_get_path (connection));
set_val_strc (arr, 9, ac ? _("yes") : _("no"));
set_val_str (arr, 10, ac_dev);
set_val_strc (arr, 11, ac_state);
set_val_strc (arr, 12, ac_path);
g_ptr_array_add (nmc->output_data, arr);
}

43
clients/cli/settings.c
View File

@@ -43,14 +43,15 @@ NmcOutputField nmc_fields_setting_connection[] = {
SETTING_FIELD (NM_SETTING_CONNECTION_INTERFACE_NAME, 20), /* 3 */
SETTING_FIELD (NM_SETTING_CONNECTION_TYPE, 17), /* 4 */
SETTING_FIELD (NM_SETTING_CONNECTION_AUTOCONNECT, 13), /* 5 */
SETTING_FIELD (NM_SETTING_CONNECTION_TIMESTAMP, 10), /* 6 */
SETTING_FIELD (NM_SETTING_CONNECTION_READ_ONLY, 10), /* 7 */
SETTING_FIELD (NM_SETTING_CONNECTION_PERMISSIONS, 30), /* 8 */
SETTING_FIELD (NM_SETTING_CONNECTION_ZONE, 10), /* 9 */
SETTING_FIELD (NM_SETTING_CONNECTION_MASTER, 20), /* 10 */
SETTING_FIELD (NM_SETTING_CONNECTION_SLAVE_TYPE, 20), /* 11 */
SETTING_FIELD (NM_SETTING_CONNECTION_SECONDARIES, 40), /* 12 */
SETTING_FIELD (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT, 30), /* 13 */
SETTING_FIELD (NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY, 10), /* 6 */
SETTING_FIELD (NM_SETTING_CONNECTION_TIMESTAMP, 10), /* 7 */
SETTING_FIELD (NM_SETTING_CONNECTION_READ_ONLY, 10), /* 8 */
SETTING_FIELD (NM_SETTING_CONNECTION_PERMISSIONS, 30), /* 9 */
SETTING_FIELD (NM_SETTING_CONNECTION_ZONE, 10), /* 10 */
SETTING_FIELD (NM_SETTING_CONNECTION_MASTER, 20), /* 11 */
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 */
{NULL, NULL, 0, NULL, FALSE, FALSE, 0}
};
#define NMC_FIELDS_SETTING_CONNECTION_ALL "name"","\
@@ -59,6 +60,7 @@ NmcOutputField nmc_fields_setting_connection[] = {
NM_SETTING_CONNECTION_INTERFACE_NAME","\
NM_SETTING_CONNECTION_TYPE","\
NM_SETTING_CONNECTION_AUTOCONNECT","\
NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY","\
NM_SETTING_CONNECTION_TIMESTAMP","\
NM_SETTING_CONNECTION_READ_ONLY","\
NM_SETTING_CONNECTION_PERMISSIONS","\
@@ -1004,6 +1006,7 @@ DEFINE_GETTER (nmc_property_connection_get_uuid, NM_SETTING_CONNECTION_UUID)
DEFINE_GETTER (nmc_property_connection_get_interface_name, NM_SETTING_CONNECTION_INTERFACE_NAME)
DEFINE_GETTER (nmc_property_connection_get_type, NM_SETTING_CONNECTION_TYPE)
DEFINE_GETTER (nmc_property_connection_get_autoconnect, NM_SETTING_CONNECTION_AUTOCONNECT)
DEFINE_GETTER (nmc_property_connection_get_autoconnect_priority, NM_SETTING_CONNECTION_AUTOCONNECT_PRIORITY)
DEFINE_GETTER (nmc_property_connection_get_timestamp, NM_SETTING_CONNECTION_TIMESTAMP)
DEFINE_GETTER (nmc_property_connection_get_read_only, NM_SETTING_CONNECTION_READ_ONLY)
@@ -5135,6 +5138,13 @@ nmc_properties_init (void)
NULL,
NULL,
NULL);
nmc_add_prop_funcs (GLUE (CONNECTION, AUTOCONNECT_PRIORITY),
nmc_property_connection_get_autoconnect_priority,
nmc_property_set_int,
NULL,
NULL,
NULL,
NULL);
nmc_add_prop_funcs (GLUE (CONNECTION, TIMESTAMP),
nmc_property_connection_get_timestamp,
NULL, /* read-only */
@@ -6502,14 +6512,15 @@ setting_connection_details (NMSetting *setting, NmCli *nmc, const char *one_prop
set_val_str (arr, 3, nmc_property_connection_get_interface_name (setting));
set_val_str (arr, 4, nmc_property_connection_get_type (setting));
set_val_str (arr, 5, nmc_property_connection_get_autoconnect (setting));
set_val_str (arr, 6, nmc_property_connection_get_timestamp (setting));
set_val_str (arr, 7, nmc_property_connection_get_read_only (setting));
set_val_str (arr, 8, nmc_property_connection_get_permissions (setting));
set_val_str (arr, 9, nmc_property_connection_get_zone (setting));
set_val_str (arr, 10, nmc_property_connection_get_master (setting));
set_val_str (arr, 11, nmc_property_connection_get_slave_type (setting));
set_val_str (arr, 12, nmc_property_connection_get_secondaries (setting));
set_val_str (arr, 13, nmc_property_connection_get_gateway_ping_timeout (setting));
set_val_str (arr, 6, nmc_property_connection_get_autoconnect_priority (setting));
set_val_str (arr, 7, nmc_property_connection_get_timestamp (setting));
set_val_str (arr, 8, nmc_property_connection_get_read_only (setting));
set_val_str (arr, 9, nmc_property_connection_get_permissions (setting));
set_val_str (arr, 10, nmc_property_connection_get_zone (setting));
set_val_str (arr, 11, nmc_property_connection_get_master (setting));
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));
g_ptr_array_add (nmc->output_data, arr);
print_data (nmc); /* Print all data */