fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-20 17:30:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
NetworkManager/clients/cli/common.c

1542 lines
43 KiB
C
Raw Normal View History

cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
/*
* nmcli - command-line tool for controlling NetworkManager
* Common functions and data shared between files.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
cli: fix crash by getting addresses and routes Broken by commit 6793a32a8c5445103ba3680bb5e4c31727096099 that changed return values from GSlist to GPtrArray.
2014-09-19 22:52:11 +02:00
* Copyright 2012 - 2014 Red Hat, Inc.
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
*/
all: cleanup includes and let "nm-default.h" include "config.h" - All internal source files (except "examples", which are not internal) should include "config.h" first. As also all internal source files should include "nm-default.h", let "config.h" be included by "nm-default.h" and include "nm-default.h" as first in every source file. We already wanted to include "nm-default.h" before other headers because it might contains some fixes (like "nm-glib.h" compatibility) that is required first. - After including "nm-default.h", we optinally allow for including the corresponding header file for the source file at hand. The idea is to ensure that each header file is self contained. - Don't include "config.h" or "nm-default.h" in any header file (except "nm-sd-adapt.h"). Public headers anyway must not include these headers, and internal headers are never included after "nm-default.h", as of the first previous point. - Include all internal headers with quotes instead of angle brackets. In practice it doesn't matter, because in our public headers we must include other headers with angle brackets. As we use our public headers also to compile our interal source files, effectively the result must be the same. Still do it for consistency. - Except for <config.h> itself. Include it with angle brackets as suggested by https://www.gnu.org/software/autoconf/manual/autoconf.html#Configuration-Headers
2016-02-19 14:57:48 +01:00
#include "nm-default.h"
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
cli: move NmcMetaGenericInfo to "utils.h"
2017-04-04 13:52:13 +02:00
#include "common.h"
cli: move readline related functions to common.h to be usable throughout nmcli Renames readline_x() to nmc_readline() gen_func_basic() to nmc_rl_gen_func_basic() The commit doesn't change functionality, only moves and renames the functions, so that they can be used in other places too.
2014-05-15 10:31:09 +02:00
#include <stdio.h>
cli: add functions for creating NM address and route structures to common.c nmc_parse_and_build_ip[4|6]_address() creating NMIP[4|6]Address nmc_parse_and_build_ip[4|6]_route() creating NMIP[4|6]Route
2013-03-18 17:11:03 +01:00
#include <stdlib.h>
#include <errno.h>
cli: terminate when the input terminal goes away Readline treats I/O errors on stdin as a newline, thus if the terminal disappears with SIGHUP masked we just loop until the end of times and beyond.
2015-08-20 17:18:51 +02:00
#include <termios.h>
#include <sys/ioctl.h>
cli: move readline related functions to common.h to be usable throughout nmcli Renames readline_x() to nmc_readline() gen_func_basic() to nmc_rl_gen_func_basic() The commit doesn't change functionality, only moves and renames the functions, so that they can be used in other places too.
2014-05-15 10:31:09 +02:00
#include <readline/readline.h>
#include <readline/history.h>
cli: make asking VPN secrets for OpenConnect really work by running nm_vpn_openconnect_authenticate_helper() and filling the obtained secrets to the array sent to NM.
2015-12-08 08:45:45 +01:00
#include "nm-vpn-helpers.h"
cli: move utils function from common.h to nm-meta-setting-desc.c These functions are only used by nm-meta-setting-desc.c. Make them internal. Unfortunately, they are part of "common.h" which cannot be used without the rest of nmcli. Still todo.
2017-03-28 12:16:31 +02:00
#include "nm-client-utils.h"
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
#include "utils.h"
cli: use nmc_print() to output device's IP4 info The IP4 info adds a new type: to expose strv arguments for addresses, etc.
2017-04-06 15:14:23 +02:00
/*****************************************************************************/
cli: show additional route attributes in IP4_CONFIG output
2017-09-18 11:42:27 +02:00
static char **
_ip_config_get_routes (NMIPConfig *cfg)
{
gs_unref_hashtable GHashTable *hash = g_hash_table_new (g_str_hash, g_str_equal);
GPtrArray *ptr_array;
char **arr;
guint i;
ptr_array = nm_ip_config_get_routes (cfg);
if (!ptr_array)
return NULL;
arr = g_new (char *, ptr_array->len + 1);
for (i = 0; i < ptr_array->len; i++) {
NMIPRoute *route = g_ptr_array_index (ptr_array, i);
gs_strfreev char **names = NULL;
gs_free char *attributes = NULL;
gsize j;
GString *str;
guint64 metric;
str = g_string_new (NULL);
g_string_append_printf (str,
"dst = %s/%u, nh = %s",
nm_ip_route_get_dest (route),
nm_ip_route_get_prefix (route),
nm_ip_route_get_next_hop (route)
?: (nm_ip_route_get_family (route) == AF_INET ? "0.0.0.0" : "::"));
metric = nm_ip_route_get_metric (route);
if (metric != -1) {
g_string_append_printf (str,
", mt = %u",
(guint) metric);
}
names = nm_ip_route_get_attribute_names (route);
g_hash_table_remove_all (hash);
for (j = 0; names && names[j]; j++)
g_hash_table_insert (hash, names[j], nm_ip_route_get_attribute (route, names[j]));
attributes = nm_utils_format_variant_attributes (hash, ',', '=');
if (attributes) {
g_string_append (str, ", ");
g_string_append (str, attributes);
}
arr[i] = g_string_free (str, FALSE);
}
nm_assert (i == ptr_array->len);
arr[i] = NULL;
return arr;
}
cli: use nmc_print() to output device's IP4 info The IP4 info adds a new type: to expose strv arguments for addresses, etc.
2017-04-06 15:14:23 +02:00
static gconstpointer
_metagen_ip4_config_get_fcn (const NMMetaEnvironment *environment,
gpointer environment_user_data,
const NmcMetaGenericInfo *info,
gpointer target,
NMMetaAccessorGetType get_type,
NMMetaAccessorGetFlags get_flags,
NMMetaAccessorGetOutFlags *out_flags,
gpointer *out_to_free)
{
NMIPConfig *cfg4 = target;
GPtrArray *ptr_array;
char **arr;
const char *const*arrc;
guint i = 0;
nm_assert (info->info_type < _NMC_GENERIC_INFO_TYPE_IP4_CONFIG_NUM);
NMC_HANDLE_TERMFORMAT (NM_META_TERM_COLOR_NORMAL);
switch (info->info_type) {
case NMC_GENERIC_INFO_TYPE_IP4_CONFIG_ADDRESS:
if (!NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_ACCEPT_STRV))
return NULL;
ptr_array = nm_ip_config_get_addresses (cfg4);
if (ptr_array) {
arr = g_new (char *, ptr_array->len + 1);
for (i = 0; i < ptr_array->len; i++) {
NMIPAddress *addr = g_ptr_array_index (ptr_array, i);
arr[i] = g_strdup_printf ("%s/%u",
nm_ip_address_get_address (addr),
nm_ip_address_get_prefix (addr));
}
arr[i] = NULL;
} else
arr = NULL;
goto arr_out;
case NMC_GENERIC_INFO_TYPE_IP4_CONFIG_GATEWAY:
return nm_ip_config_get_gateway (cfg4);
case NMC_GENERIC_INFO_TYPE_IP4_CONFIG_ROUTE:
if (!NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_ACCEPT_STRV))
return NULL;
cli: show additional route attributes in IP4_CONFIG output
2017-09-18 11:42:27 +02:00
arr = _ip_config_get_routes (cfg4);
cli: use nmc_print() to output device's IP4 info The IP4 info adds a new type: to expose strv arguments for addresses, etc.
2017-04-06 15:14:23 +02:00
goto arr_out;
case NMC_GENERIC_INFO_TYPE_IP4_CONFIG_DNS:
if (!NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_ACCEPT_STRV))
return NULL;
arrc = nm_ip_config_get_nameservers (cfg4);
goto arrc_out;
case NMC_GENERIC_INFO_TYPE_IP4_CONFIG_DOMAIN:
if (!NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_ACCEPT_STRV))
return NULL;
arrc = nm_ip_config_get_domains (cfg4);
goto arrc_out;
case NMC_GENERIC_INFO_TYPE_IP4_CONFIG_WINS:
if (!NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_ACCEPT_STRV))
return NULL;
arrc = nm_ip_config_get_wins_servers (cfg4);
goto arrc_out;
default:
break;
}
g_return_val_if_reached (NULL);
arrc_out:
*out_flags |= NM_META_ACCESSOR_GET_OUT_FLAGS_STRV;
return arrc;
arr_out:
*out_flags |= NM_META_ACCESSOR_GET_OUT_FLAGS_STRV;
*out_to_free = arr;
return arr;
}
cli: refactor printing IP6 device info
2017-09-18 12:29:06 +02:00
static gconstpointer
_metagen_ip6_config_get_fcn (const NMMetaEnvironment *environment,
gpointer environment_user_data,
const NmcMetaGenericInfo *info,
gpointer target,
NMMetaAccessorGetType get_type,
NMMetaAccessorGetFlags get_flags,
NMMetaAccessorGetOutFlags *out_flags,
gpointer *out_to_free)
{
NMIPConfig *cfg6 = target;
GPtrArray *ptr_array;
char **arr;
const char *const*arrc;
guint i = 0;
nm_assert (info->info_type < _NMC_GENERIC_INFO_TYPE_IP6_CONFIG_NUM);
NMC_HANDLE_TERMFORMAT (NM_META_TERM_COLOR_NORMAL);
switch (info->info_type) {
case NMC_GENERIC_INFO_TYPE_IP6_CONFIG_ADDRESS:
if (!NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_ACCEPT_STRV))
return NULL;
ptr_array = nm_ip_config_get_addresses (cfg6);
if (ptr_array) {
arr = g_new (char *, ptr_array->len + 1);
for (i = 0; i < ptr_array->len; i++) {
NMIPAddress *addr = g_ptr_array_index (ptr_array, i);
arr[i] = g_strdup_printf ("%s/%u",
nm_ip_address_get_address (addr),
nm_ip_address_get_prefix (addr));
}
arr[i] = NULL;
} else
arr = NULL;
goto arr_out;
case NMC_GENERIC_INFO_TYPE_IP6_CONFIG_GATEWAY:
return nm_ip_config_get_gateway (cfg6);
case NMC_GENERIC_INFO_TYPE_IP6_CONFIG_ROUTE:
if (!NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_ACCEPT_STRV))
return NULL;
cli: show additional route attributes in IP4_CONFIG output
2017-09-18 11:42:27 +02:00
arr = _ip_config_get_routes (cfg6);
cli: refactor printing IP6 device info
2017-09-18 12:29:06 +02:00
goto arr_out;
case NMC_GENERIC_INFO_TYPE_IP6_CONFIG_DNS:
if (!NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_ACCEPT_STRV))
return NULL;
arrc = nm_ip_config_get_nameservers (cfg6);
goto arrc_out;
case NMC_GENERIC_INFO_TYPE_IP6_CONFIG_DOMAIN:
if (!NM_FLAGS_HAS (get_flags, NM_META_ACCESSOR_GET_FLAGS_ACCEPT_STRV))
return NULL;
arrc = nm_ip_config_get_domains (cfg6);
goto arrc_out;
default:
break;
}
g_return_val_if_reached (NULL);
arrc_out:
*out_flags |= NM_META_ACCESSOR_GET_OUT_FLAGS_STRV;
return arrc;
arr_out:
*out_flags |= NM_META_ACCESSOR_GET_OUT_FLAGS_STRV;
*out_to_free = arr;
return arr;
}
cli: use nmc_print() to output device's IP4 info The IP4 info adds a new type: to expose strv arguments for addresses, etc.
2017-04-06 15:14:23 +02:00
const NmcMetaGenericInfo *const metagen_ip4_config[_NMC_GENERIC_INFO_TYPE_IP4_CONFIG_NUM + 1] = {
#define _METAGEN_IP4_CONFIG(type, name) \
[type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_ip4_config_get_fcn)
_METAGEN_IP4_CONFIG (NMC_GENERIC_INFO_TYPE_IP4_CONFIG_ADDRESS, "ADDRESS"),
_METAGEN_IP4_CONFIG (NMC_GENERIC_INFO_TYPE_IP4_CONFIG_GATEWAY, "GATEWAY"),
_METAGEN_IP4_CONFIG (NMC_GENERIC_INFO_TYPE_IP4_CONFIG_ROUTE, "ROUTE"),
_METAGEN_IP4_CONFIG (NMC_GENERIC_INFO_TYPE_IP4_CONFIG_DNS, "DNS"),
_METAGEN_IP4_CONFIG (NMC_GENERIC_INFO_TYPE_IP4_CONFIG_DOMAIN, "DOMAIN"),
_METAGEN_IP4_CONFIG (NMC_GENERIC_INFO_TYPE_IP4_CONFIG_WINS, "WINS"),
};
static const NmcMetaGenericInfo *const metagen_ip4_config_group[] = {
NMC_META_GENERIC_WITH_NESTED ("IP4", metagen_ip4_config, .name_header = N_("GROUP")),
cli: split tracking of meta data out of NmcOutputField When generating output data, nmcli iterates over a list of property-descriptors (nmc_fields_ip4_config), creates an intermediate array (output_data) and finally prints it. However, previously both the meta data (nmc_fields_ip4_config) and the intermediate format use the same type NmcOutputField. This means, certain fields are relevant to describe a property, and other fields are output/formatting fields. Split this up. Now, the meta data is tracked in form of an NMMetaAbstractInfo lists. This separates the information about properties from intermediate steps during creation of the output. Note that currently functions like print_ip4_config() still have all the knowledge about how to generate the output. That is wrong, instead, the meta data (NMMetaAbstractInfo) should describe how to create the output and then all those functions could be replaced. This means, later we want to add more knowledge to the NMMetaAbstractInfo, so it is important to keep them separate from NmcOutputField.
2017-03-31 19:18:16 +02:00
NULL,
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
};
cli: refactor printing IP6 device info
2017-09-18 12:29:06 +02:00
const NmcMetaGenericInfo *const metagen_ip6_config[_NMC_GENERIC_INFO_TYPE_IP6_CONFIG_NUM + 1] = {
#define _METAGEN_IP6_CONFIG(type, name) \
[type] = NMC_META_GENERIC(name, .info_type = type, .get_fcn = _metagen_ip6_config_get_fcn)
_METAGEN_IP6_CONFIG (NMC_GENERIC_INFO_TYPE_IP6_CONFIG_ADDRESS, "ADDRESS"),
_METAGEN_IP6_CONFIG (NMC_GENERIC_INFO_TYPE_IP6_CONFIG_GATEWAY, "GATEWAY"),
_METAGEN_IP6_CONFIG (NMC_GENERIC_INFO_TYPE_IP6_CONFIG_ROUTE, "ROUTE"),
_METAGEN_IP6_CONFIG (NMC_GENERIC_INFO_TYPE_IP6_CONFIG_DNS, "DNS"),
_METAGEN_IP6_CONFIG (NMC_GENERIC_INFO_TYPE_IP6_CONFIG_DOMAIN, "DOMAIN"),
};
static const NmcMetaGenericInfo *const metagen_ip6_config_group[] = {
NMC_META_GENERIC_WITH_NESTED ("IP6", metagen_ip6_config, .name_header = N_("GROUP")),
NULL,
};
cli: use nmc_print() to output device's IP4 info The IP4 info adds a new type: to expose strv arguments for addresses, etc.
2017-04-06 15:14:23 +02:00
/*****************************************************************************/
cli: split tracking of meta data out of NmcOutputField When generating output data, nmcli iterates over a list of property-descriptors (nmc_fields_ip4_config), creates an intermediate array (output_data) and finally prints it. However, previously both the meta data (nmc_fields_ip4_config) and the intermediate format use the same type NmcOutputField. This means, certain fields are relevant to describe a property, and other fields are output/formatting fields. Split this up. Now, the meta data is tracked in form of an NMMetaAbstractInfo lists. This separates the information about properties from intermediate steps during creation of the output. Note that currently functions like print_ip4_config() still have all the knowledge about how to generate the output. That is wrong, instead, the meta data (NMMetaAbstractInfo) should describe how to create the output and then all those functions could be replaced. This means, later we want to add more knowledge to the NMMetaAbstractInfo, so it is important to keep them separate from NmcOutputField.
2017-03-31 19:18:16 +02:00
const NmcMetaGenericInfo *const nmc_fields_dhcp4_config[] = {
NMC_META_GENERIC ("GROUP"), /* 0 */
NMC_META_GENERIC ("OPTION"), /* 1 */
NULL,
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
};
cli: split tracking of meta data out of NmcOutputField When generating output data, nmcli iterates over a list of property-descriptors (nmc_fields_ip4_config), creates an intermediate array (output_data) and finally prints it. However, previously both the meta data (nmc_fields_ip4_config) and the intermediate format use the same type NmcOutputField. This means, certain fields are relevant to describe a property, and other fields are output/formatting fields. Split this up. Now, the meta data is tracked in form of an NMMetaAbstractInfo lists. This separates the information about properties from intermediate steps during creation of the output. Note that currently functions like print_ip4_config() still have all the knowledge about how to generate the output. That is wrong, instead, the meta data (NMMetaAbstractInfo) should describe how to create the output and then all those functions could be replaced. This means, later we want to add more knowledge to the NMMetaAbstractInfo, so it is important to keep them separate from NmcOutputField.
2017-03-31 19:18:16 +02:00
const NmcMetaGenericInfo *const nmc_fields_ip6_config[] = {
NMC_META_GENERIC ("GROUP"), /* 0 */
NMC_META_GENERIC ("ADDRESS"), /* 1 */
NMC_META_GENERIC ("GATEWAY"), /* 2 */
NMC_META_GENERIC ("ROUTE"), /* 3 */
NMC_META_GENERIC ("DNS"), /* 4 */
NMC_META_GENERIC ("DOMAIN"), /* 5 */
NULL,
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
};
cli: split tracking of meta data out of NmcOutputField When generating output data, nmcli iterates over a list of property-descriptors (nmc_fields_ip4_config), creates an intermediate array (output_data) and finally prints it. However, previously both the meta data (nmc_fields_ip4_config) and the intermediate format use the same type NmcOutputField. This means, certain fields are relevant to describe a property, and other fields are output/formatting fields. Split this up. Now, the meta data is tracked in form of an NMMetaAbstractInfo lists. This separates the information about properties from intermediate steps during creation of the output. Note that currently functions like print_ip4_config() still have all the knowledge about how to generate the output. That is wrong, instead, the meta data (NMMetaAbstractInfo) should describe how to create the output and then all those functions could be replaced. This means, later we want to add more knowledge to the NMMetaAbstractInfo, so it is important to keep them separate from NmcOutputField.
2017-03-31 19:18:16 +02:00
const NmcMetaGenericInfo *const nmc_fields_dhcp6_config[] = {
NMC_META_GENERIC ("GROUP"), /* 0 */
NMC_META_GENERIC ("OPTION"), /* 1 */
NULL,
};
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
gboolean
libnm: create NMIPConfig as parent of NMIP4Config and NMIP6Config Create NMIPConfig as the parent of NMIP4Config and NMIP6Config, and remove the two subclasses from the public API; while it's convenient to still have both internally, they are now identical to the outside world.
2014-10-22 13:48:18 -04:00
print_ip4_config (NMIPConfig *cfg4,
cli: don't track output data in global NmCli structure We should not violate the global data to track the output data while it is constructed and printed. Most of the time, we actually clear the output data anyway -- either before constructing it, or after printing it. In some cases we didn't, but I think that is a bug. It's really hard to keep track of this. The output data should belong to a certain scope and get destroyed afterwards. Passing it around is very confusing. Don't do that.
2017-03-30 14:56:19 +02:00
const NmcConfig *nmc_config,
cli: allow specifying 'group.name' syntax for '--fields' and use it for 'nmcli device show'. This allows filtering output not only for whole groups, but also for individual fields in commands that print data in groups (sections). Example: $ nmcli -f general.device,general.driver,ipv4,ipv6.address device show eth0 GENERAL.DEVICE: eth0 GENERAL.DRIVER: e1000e IP4.ADDRESS[1]: ip = 10.0.5.228/23, gw = 10.0.5.254 IP4.ADDRESS[2]: ip = 5.5.5.5/32, gw = 5.5.5.1 IP4.DNS[1]: 192.168.122.1 IP4.DNS[2]: 8.8.8.8 IP4.DOMAIN[1]: mycompany.com
2013-12-10 12:00:53 +01:00
const char *one_field)
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
{
cli: use nmc_print() to output device's IP4 info The IP4 info adds a new type: to expose strv arguments for addresses, etc.
2017-04-06 15:14:23 +02:00
gs_free_error GError *error = NULL;
gs_free char *field_str = NULL;
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
if (cfg4 == NULL)
return FALSE;
cli: use nmc_print() to output device's IP4 info The IP4 info adds a new type: to expose strv arguments for addresses, etc.
2017-04-06 15:14:23 +02:00
if (one_field)
field_str = g_strdup_printf ("IP4.%s", one_field);
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
cli: use nmc_print() to output device's IP4 info The IP4 info adds a new type: to expose strv arguments for addresses, etc.
2017-04-06 15:14:23 +02:00
if (!nmc_print (nmc_config,
(gpointer[]) { cfg4, NULL },
NULL,
(const NMMetaAbstractInfo *const*) metagen_ip4_config_group,
field_str,
&error)) {
return FALSE;
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
}
return TRUE;
}
gboolean
libnm: create NMIPConfig as parent of NMIP4Config and NMIP6Config Create NMIPConfig as the parent of NMIP4Config and NMIP6Config, and remove the two subclasses from the public API; while it's convenient to still have both internally, they are now identical to the outside world.
2014-10-22 13:48:18 -04:00
print_ip6_config (NMIPConfig *cfg6,
cli: don't track output data in global NmCli structure We should not violate the global data to track the output data while it is constructed and printed. Most of the time, we actually clear the output data anyway -- either before constructing it, or after printing it. In some cases we didn't, but I think that is a bug. It's really hard to keep track of this. The output data should belong to a certain scope and get destroyed afterwards. Passing it around is very confusing. Don't do that.
2017-03-30 14:56:19 +02:00
const NmcConfig *nmc_config,
cli: allow specifying 'group.name' syntax for '--fields' and use it for 'nmcli device show'. This allows filtering output not only for whole groups, but also for individual fields in commands that print data in groups (sections). Example: $ nmcli -f general.device,general.driver,ipv4,ipv6.address device show eth0 GENERAL.DEVICE: eth0 GENERAL.DRIVER: e1000e IP4.ADDRESS[1]: ip = 10.0.5.228/23, gw = 10.0.5.254 IP4.ADDRESS[2]: ip = 5.5.5.5/32, gw = 5.5.5.1 IP4.DNS[1]: 192.168.122.1 IP4.DNS[2]: 8.8.8.8 IP4.DOMAIN[1]: mycompany.com
2013-12-10 12:00:53 +01:00
const char *group_prefix,
const char *one_field)
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
{
cli: refactor printing IP6 device info
2017-09-18 12:29:06 +02:00
gs_free_error GError *error = NULL;
gs_free char *field_str = NULL;
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
if (cfg6 == NULL)
return FALSE;
cli: refactor printing IP6 device info
2017-09-18 12:29:06 +02:00
if (one_field)
field_str = g_strdup_printf ("IP6.%s", one_field);
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
cli: refactor printing IP6 device info
2017-09-18 12:29:06 +02:00
if (!nmc_print (nmc_config,
(gpointer[]) { cfg6, NULL },
NULL,
(const NMMetaAbstractInfo *const*) metagen_ip6_config_group,
field_str,
&error)) {
return FALSE;
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
}
return TRUE;
}
gboolean
libnm: create NMDhcpConfig as parent of NMDhcp4Config and NMDhcp6Config As with NMIP4Config and NMIP6Config, merge the two DHCP config classes into one in the public API.
2014-10-22 13:48:18 -04:00
print_dhcp4_config (NMDhcpConfig *dhcp4,
cli: don't track output data in global NmCli structure We should not violate the global data to track the output data while it is constructed and printed. Most of the time, we actually clear the output data anyway -- either before constructing it, or after printing it. In some cases we didn't, but I think that is a bug. It's really hard to keep track of this. The output data should belong to a certain scope and get destroyed afterwards. Passing it around is very confusing. Don't do that.
2017-03-30 14:56:19 +02:00
const NmcConfig *nmc_config,
cli: allow specifying 'group.name' syntax for '--fields' and use it for 'nmcli device show'. This allows filtering output not only for whole groups, but also for individual fields in commands that print data in groups (sections). Example: $ nmcli -f general.device,general.driver,ipv4,ipv6.address device show eth0 GENERAL.DEVICE: eth0 GENERAL.DRIVER: e1000e IP4.ADDRESS[1]: ip = 10.0.5.228/23, gw = 10.0.5.254 IP4.ADDRESS[2]: ip = 5.5.5.5/32, gw = 5.5.5.1 IP4.DNS[1]: 192.168.122.1 IP4.DNS[2]: 8.8.8.8 IP4.DOMAIN[1]: mycompany.com
2013-12-10 12:00:53 +01:00
const char *group_prefix,
const char *one_field)
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
{
GHashTable *table;
cli: split tracking of meta data out of NmcOutputField When generating output data, nmcli iterates over a list of property-descriptors (nmc_fields_ip4_config), creates an intermediate array (output_data) and finally prints it. However, previously both the meta data (nmc_fields_ip4_config) and the intermediate format use the same type NmcOutputField. This means, certain fields are relevant to describe a property, and other fields are output/formatting fields. Split this up. Now, the meta data is tracked in form of an NMMetaAbstractInfo lists. This separates the information about properties from intermediate steps during creation of the output. Note that currently functions like print_ip4_config() still have all the knowledge about how to generate the output. That is wrong, instead, the meta data (NMMetaAbstractInfo) should describe how to create the output and then all those functions could be replaced. This means, later we want to add more knowledge to the NMMetaAbstractInfo, so it is important to keep them separate from NmcOutputField.
2017-03-31 19:18:16 +02:00
const NMMetaAbstractInfo *const*tmpl;
NmcOutputField *arr;
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
if (dhcp4 == NULL)
return FALSE;
libnm: create NMDhcpConfig as parent of NMDhcp4Config and NMDhcp6Config As with NMIP4Config and NMIP6Config, merge the two DHCP config classes into one in the public API.
2014-10-22 13:48:18 -04:00
table = nm_dhcp_config_get_options (dhcp4);
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
if (table) {
GHashTableIter table_iter;
gpointer key, value;
char **options_arr = NULL;
int i = 0;
cli: don't track output data in global NmCli structure We should not violate the global data to track the output data while it is constructed and printed. Most of the time, we actually clear the output data anyway -- either before constructing it, or after printing it. In some cases we didn't, but I think that is a bug. It's really hard to keep track of this. The output data should belong to a certain scope and get destroyed afterwards. Passing it around is very confusing. Don't do that.
2017-03-30 14:56:19 +02:00
NMC_OUTPUT_DATA_DEFINE_SCOPED (out);
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
cli: split tracking of meta data out of NmcOutputField When generating output data, nmcli iterates over a list of property-descriptors (nmc_fields_ip4_config), creates an intermediate array (output_data) and finally prints it. However, previously both the meta data (nmc_fields_ip4_config) and the intermediate format use the same type NmcOutputField. This means, certain fields are relevant to describe a property, and other fields are output/formatting fields. Split this up. Now, the meta data is tracked in form of an NMMetaAbstractInfo lists. This separates the information about properties from intermediate steps during creation of the output. Note that currently functions like print_ip4_config() still have all the knowledge about how to generate the output. That is wrong, instead, the meta data (NMMetaAbstractInfo) should describe how to create the output and then all those functions could be replaced. This means, later we want to add more knowledge to the NMMetaAbstractInfo, so it is important to keep them separate from NmcOutputField.
2017-03-31 19:18:16 +02:00
tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_dhcp4_config;
out_indices = parse_output_fields (one_field,
cli: merge NmcPrintFields into NmcOutputData and pass it directly to print_required_fields()
2017-03-31 12:55:43 +02:00
tmpl, FALSE, NULL, NULL);
cli: split tracking of meta data out of NmcOutputField When generating output data, nmcli iterates over a list of property-descriptors (nmc_fields_ip4_config), creates an intermediate array (output_data) and finally prints it. However, previously both the meta data (nmc_fields_ip4_config) and the intermediate format use the same type NmcOutputField. This means, certain fields are relevant to describe a property, and other fields are output/formatting fields. Split this up. Now, the meta data is tracked in form of an NMMetaAbstractInfo lists. This separates the information about properties from intermediate steps during creation of the output. Note that currently functions like print_ip4_config() still have all the knowledge about how to generate the output. That is wrong, instead, the meta data (NMMetaAbstractInfo) should describe how to create the output and then all those functions could be replaced. This means, later we want to add more knowledge to the NMMetaAbstractInfo, so it is important to keep them separate from NmcOutputField.
2017-03-31 19:18:16 +02:00
arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_FIELD_NAMES);
cli: don't track output data in global NmCli structure We should not violate the global data to track the output data while it is constructed and printed. Most of the time, we actually clear the output data anyway -- either before constructing it, or after printing it. In some cases we didn't, but I think that is a bug. It's really hard to keep track of this. The output data should belong to a certain scope and get destroyed afterwards. Passing it around is very confusing. Don't do that.
2017-03-30 14:56:19 +02:00
g_ptr_array_add (out.output_data, arr);
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
options_arr = g_new (char *, g_hash_table_size (table) + 1);
g_hash_table_iter_init (&table_iter, table);
while (g_hash_table_iter_next (&table_iter, &key, &value))
options_arr[i++] = g_strdup_printf ("%s = %s", (char *) key, (char *) value);
options_arr[i] = NULL;
cli: split tracking of meta data out of NmcOutputField When generating output data, nmcli iterates over a list of property-descriptors (nmc_fields_ip4_config), creates an intermediate array (output_data) and finally prints it. However, previously both the meta data (nmc_fields_ip4_config) and the intermediate format use the same type NmcOutputField. This means, certain fields are relevant to describe a property, and other fields are output/formatting fields. Split this up. Now, the meta data is tracked in form of an NMMetaAbstractInfo lists. This separates the information about properties from intermediate steps during creation of the output. Note that currently functions like print_ip4_config() still have all the knowledge about how to generate the output. That is wrong, instead, the meta data (NMMetaAbstractInfo) should describe how to create the output and then all those functions could be replaced. This means, later we want to add more knowledge to the NMMetaAbstractInfo, so it is important to keep them separate from NmcOutputField.
2017-03-31 19:18:16 +02:00
arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_SECTION_PREFIX);
cli: adapt the code for the new flags and printing facilities The data are added to output_data at first, and then they are printed all at once using print_data(), that takes care of proper alignment and display. The static 'width' values defined in NmcOutputField columns are not used now, but dynamically computed maximal widths override them.
2013-05-22 08:37:50 +02:00
set_val_strc (arr, 0, group_prefix);
set_val_arr (arr, 1, options_arr);
cli: don't track output data in global NmCli structure We should not violate the global data to track the output data while it is constructed and printed. Most of the time, we actually clear the output data anyway -- either before constructing it, or after printing it. In some cases we didn't, but I think that is a bug. It's really hard to keep track of this. The output data should belong to a certain scope and get destroyed afterwards. Passing it around is very confusing. Don't do that.
2017-03-30 14:56:19 +02:00
g_ptr_array_add (out.output_data, arr);
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
cli: don't track output data in global NmCli structure We should not violate the global data to track the output data while it is constructed and printed. Most of the time, we actually clear the output data anyway -- either before constructing it, or after printing it. In some cases we didn't, but I think that is a bug. It's really hard to keep track of this. The output data should belong to a certain scope and get destroyed afterwards. Passing it around is very confusing. Don't do that.
2017-03-30 14:56:19 +02:00
print_data_prepare_width (out.output_data);
cli: pass arguments for print_data separately of NmcOutputData Don't pass on large structs of input arguments. It only convolutes which arguments are passed, and where they come from.
2017-03-31 13:21:47 +02:00
print_data (nmc_config, out_indices, NULL, 0, &out);
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
return TRUE;
}
return FALSE;
}
gboolean
libnm: create NMDhcpConfig as parent of NMDhcp4Config and NMDhcp6Config As with NMIP4Config and NMIP6Config, merge the two DHCP config classes into one in the public API.
2014-10-22 13:48:18 -04:00
print_dhcp6_config (NMDhcpConfig *dhcp6,
cli: don't track output data in global NmCli structure We should not violate the global data to track the output data while it is constructed and printed. Most of the time, we actually clear the output data anyway -- either before constructing it, or after printing it. In some cases we didn't, but I think that is a bug. It's really hard to keep track of this. The output data should belong to a certain scope and get destroyed afterwards. Passing it around is very confusing. Don't do that.
2017-03-30 14:56:19 +02:00
const NmcConfig *nmc_config,
cli: allow specifying 'group.name' syntax for '--fields' and use it for 'nmcli device show'. This allows filtering output not only for whole groups, but also for individual fields in commands that print data in groups (sections). Example: $ nmcli -f general.device,general.driver,ipv4,ipv6.address device show eth0 GENERAL.DEVICE: eth0 GENERAL.DRIVER: e1000e IP4.ADDRESS[1]: ip = 10.0.5.228/23, gw = 10.0.5.254 IP4.ADDRESS[2]: ip = 5.5.5.5/32, gw = 5.5.5.1 IP4.DNS[1]: 192.168.122.1 IP4.DNS[2]: 8.8.8.8 IP4.DOMAIN[1]: mycompany.com
2013-12-10 12:00:53 +01:00
const char *group_prefix,
const char *one_field)
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
{
GHashTable *table;
cli: split tracking of meta data out of NmcOutputField When generating output data, nmcli iterates over a list of property-descriptors (nmc_fields_ip4_config), creates an intermediate array (output_data) and finally prints it. However, previously both the meta data (nmc_fields_ip4_config) and the intermediate format use the same type NmcOutputField. This means, certain fields are relevant to describe a property, and other fields are output/formatting fields. Split this up. Now, the meta data is tracked in form of an NMMetaAbstractInfo lists. This separates the information about properties from intermediate steps during creation of the output. Note that currently functions like print_ip4_config() still have all the knowledge about how to generate the output. That is wrong, instead, the meta data (NMMetaAbstractInfo) should describe how to create the output and then all those functions could be replaced. This means, later we want to add more knowledge to the NMMetaAbstractInfo, so it is important to keep them separate from NmcOutputField.
2017-03-31 19:18:16 +02:00
const NMMetaAbstractInfo *const*tmpl;
NmcOutputField *arr;
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
if (dhcp6 == NULL)
return FALSE;
libnm: create NMDhcpConfig as parent of NMDhcp4Config and NMDhcp6Config As with NMIP4Config and NMIP6Config, merge the two DHCP config classes into one in the public API.
2014-10-22 13:48:18 -04:00
table = nm_dhcp_config_get_options (dhcp6);
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
if (table) {
GHashTableIter table_iter;
gpointer key, value;
char **options_arr = NULL;
int i = 0;
cli: don't track output data in global NmCli structure We should not violate the global data to track the output data while it is constructed and printed. Most of the time, we actually clear the output data anyway -- either before constructing it, or after printing it. In some cases we didn't, but I think that is a bug. It's really hard to keep track of this. The output data should belong to a certain scope and get destroyed afterwards. Passing it around is very confusing. Don't do that.
2017-03-30 14:56:19 +02:00
NMC_OUTPUT_DATA_DEFINE_SCOPED (out);
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
cli: split tracking of meta data out of NmcOutputField When generating output data, nmcli iterates over a list of property-descriptors (nmc_fields_ip4_config), creates an intermediate array (output_data) and finally prints it. However, previously both the meta data (nmc_fields_ip4_config) and the intermediate format use the same type NmcOutputField. This means, certain fields are relevant to describe a property, and other fields are output/formatting fields. Split this up. Now, the meta data is tracked in form of an NMMetaAbstractInfo lists. This separates the information about properties from intermediate steps during creation of the output. Note that currently functions like print_ip4_config() still have all the knowledge about how to generate the output. That is wrong, instead, the meta data (NMMetaAbstractInfo) should describe how to create the output and then all those functions could be replaced. This means, later we want to add more knowledge to the NMMetaAbstractInfo, so it is important to keep them separate from NmcOutputField.
2017-03-31 19:18:16 +02:00
tmpl = (const NMMetaAbstractInfo *const*) nmc_fields_dhcp6_config;
out_indices = parse_output_fields (one_field,
cli: merge NmcPrintFields into NmcOutputData and pass it directly to print_required_fields()
2017-03-31 12:55:43 +02:00
tmpl, FALSE, NULL, NULL);
cli: split tracking of meta data out of NmcOutputField When generating output data, nmcli iterates over a list of property-descriptors (nmc_fields_ip4_config), creates an intermediate array (output_data) and finally prints it. However, previously both the meta data (nmc_fields_ip4_config) and the intermediate format use the same type NmcOutputField. This means, certain fields are relevant to describe a property, and other fields are output/formatting fields. Split this up. Now, the meta data is tracked in form of an NMMetaAbstractInfo lists. This separates the information about properties from intermediate steps during creation of the output. Note that currently functions like print_ip4_config() still have all the knowledge about how to generate the output. That is wrong, instead, the meta data (NMMetaAbstractInfo) should describe how to create the output and then all those functions could be replaced. This means, later we want to add more knowledge to the NMMetaAbstractInfo, so it is important to keep them separate from NmcOutputField.
2017-03-31 19:18:16 +02:00
arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_FIELD_NAMES);
cli: don't track output data in global NmCli structure We should not violate the global data to track the output data while it is constructed and printed. Most of the time, we actually clear the output data anyway -- either before constructing it, or after printing it. In some cases we didn't, but I think that is a bug. It's really hard to keep track of this. The output data should belong to a certain scope and get destroyed afterwards. Passing it around is very confusing. Don't do that.
2017-03-30 14:56:19 +02:00
g_ptr_array_add (out.output_data, arr);
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
options_arr = g_new (char *, g_hash_table_size (table) + 1);
g_hash_table_iter_init (&table_iter, table);
while (g_hash_table_iter_next (&table_iter, &key, &value))
options_arr[i++] = g_strdup_printf ("%s = %s", (char *) key, (char *) value);
options_arr[i] = NULL;
cli: split tracking of meta data out of NmcOutputField When generating output data, nmcli iterates over a list of property-descriptors (nmc_fields_ip4_config), creates an intermediate array (output_data) and finally prints it. However, previously both the meta data (nmc_fields_ip4_config) and the intermediate format use the same type NmcOutputField. This means, certain fields are relevant to describe a property, and other fields are output/formatting fields. Split this up. Now, the meta data is tracked in form of an NMMetaAbstractInfo lists. This separates the information about properties from intermediate steps during creation of the output. Note that currently functions like print_ip4_config() still have all the knowledge about how to generate the output. That is wrong, instead, the meta data (NMMetaAbstractInfo) should describe how to create the output and then all those functions could be replaced. This means, later we want to add more knowledge to the NMMetaAbstractInfo, so it is important to keep them separate from NmcOutputField.
2017-03-31 19:18:16 +02:00
arr = nmc_dup_fields_array (tmpl, NMC_OF_FLAG_SECTION_PREFIX);
cli: adapt the code for the new flags and printing facilities The data are added to output_data at first, and then they are printed all at once using print_data(), that takes care of proper alignment and display. The static 'width' values defined in NmcOutputField columns are not used now, but dynamically computed maximal widths override them.
2013-05-22 08:37:50 +02:00
set_val_strc (arr, 0, group_prefix);
set_val_arr (arr, 1, options_arr);
cli: don't track output data in global NmCli structure We should not violate the global data to track the output data while it is constructed and printed. Most of the time, we actually clear the output data anyway -- either before constructing it, or after printing it. In some cases we didn't, but I think that is a bug. It's really hard to keep track of this. The output data should belong to a certain scope and get destroyed afterwards. Passing it around is very confusing. Don't do that.
2017-03-30 14:56:19 +02:00
g_ptr_array_add (out.output_data, arr);
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
cli: don't track output data in global NmCli structure We should not violate the global data to track the output data while it is constructed and printed. Most of the time, we actually clear the output data anyway -- either before constructing it, or after printing it. In some cases we didn't, but I think that is a bug. It's really hard to keep track of this. The output data should belong to a certain scope and get destroyed afterwards. Passing it around is very confusing. Don't do that.
2017-03-30 14:56:19 +02:00
print_data_prepare_width (out.output_data);
cli: pass arguments for print_data separately of NmcOutputData Don't pass on large structs of input arguments. It only convolutes which arguments are passed, and where they come from.
2017-03-31 13:21:47 +02:00
print_data (nmc_config, out_indices, NULL, 0, &out);
cli: move IP config printing code from devices.c to common.c That allows sharing the code between devices and active connections.
2012-01-06 13:51:33 +01:00
return TRUE;
}
return FALSE;
}
cli: show progress in --pretty mode for 'nmcli con up' We need to use a workaround for VPN connection state. There is a bug somewhere causing that vpn-state-changed signal is not issued on active VPN connection. Debugging showed that D-Bus PropertiesChanged and VpnStateChanged signals are not processed properly. That's why libnm-glib's VPN connection object is not updated. The issue may lie in libnm-glib or even in dbus-glib. I wasn't able to get VpnStateChanged signal via dbus-glib (dbus_g_proxy_add_signal() and dbus_g_proxy_connect_signal()), however received the signal successfully using GDBus. Until the issue is analyzed and fixed, we need to ask for VPN state of active VPN connection every second in order to show progress and exit correctly.
2012-05-09 12:35:27 +02:00
const char *
nmc_device_state_to_string (NMDeviceState state)
{
switch (state) {
case NM_DEVICE_STATE_UNMANAGED:
return _("unmanaged");
case NM_DEVICE_STATE_UNAVAILABLE:
return _("unavailable");
case NM_DEVICE_STATE_DISCONNECTED:
return _("disconnected");
case NM_DEVICE_STATE_PREPARE:
return _("connecting (prepare)");
case NM_DEVICE_STATE_CONFIG:
return _("connecting (configuring)");
case NM_DEVICE_STATE_NEED_AUTH:
return _("connecting (need authentication)");
case NM_DEVICE_STATE_IP_CONFIG:
return _("connecting (getting IP configuration)");
case NM_DEVICE_STATE_IP_CHECK:
return _("connecting (checking IP connectivity)");
case NM_DEVICE_STATE_SECONDARIES:
return _("connecting (starting secondary connections)");
case NM_DEVICE_STATE_ACTIVATED:
return _("connected");
case NM_DEVICE_STATE_DEACTIVATING:
return _("deactivating");
case NM_DEVICE_STATE_FAILED:
return _("connection failed");
default:
return _("unknown");
}
}
cli: add 'metered' property to device
2015-04-30 11:52:04 +02:00
const char *
nmc_device_metered_to_string (NMMetered value)
{
switch (value) {
case NM_METERED_YES:
return _("yes");
case NM_METERED_NO:
return _("no");
case NM_METERED_GUESS_YES:
return _("yes (guessed)");
case NM_METERED_GUESS_NO:
return _("no (guessed)");
default:
return _("unknown");
}
}
cli: show progress in --pretty mode for 'nmcli con up' We need to use a workaround for VPN connection state. There is a bug somewhere causing that vpn-state-changed signal is not issued on active VPN connection. Debugging showed that D-Bus PropertiesChanged and VpnStateChanged signals are not processed properly. That's why libnm-glib's VPN connection object is not updated. The issue may lie in libnm-glib or even in dbus-glib. I wasn't able to get VpnStateChanged signal via dbus-glib (dbus_g_proxy_add_signal() and dbus_g_proxy_connect_signal()), however received the signal successfully using GDBus. Until the issue is analyzed and fixed, we need to ask for VPN state of active VPN connection every second in order to show progress and exit correctly.
2012-05-09 12:35:27 +02:00
const char *
nmc_device_reason_to_string (NMDeviceStateReason reason)
{
switch (reason) {
case NM_DEVICE_STATE_REASON_NONE:
return _("No reason given");
case NM_DEVICE_STATE_REASON_UNKNOWN:
return _("Unknown error");
case NM_DEVICE_STATE_REASON_NOW_MANAGED:
return _("Device is now managed");
case NM_DEVICE_STATE_REASON_NOW_UNMANAGED:
return _("Device is now unmanaged");
case NM_DEVICE_STATE_REASON_CONFIG_FAILED:
return _("The device could not be readied for configuration");
case NM_DEVICE_STATE_REASON_IP_CONFIG_UNAVAILABLE:
cli: fix "etc." typo (bgo #681173) https://bugzilla.gnome.org/show_bug.cgi?id=681173
2012-08-15 06:57:26 +01:00
return _("IP configuration could not be reserved (no available address, timeout, etc.)");
cli: show progress in --pretty mode for 'nmcli con up' We need to use a workaround for VPN connection state. There is a bug somewhere causing that vpn-state-changed signal is not issued on active VPN connection. Debugging showed that D-Bus PropertiesChanged and VpnStateChanged signals are not processed properly. That's why libnm-glib's VPN connection object is not updated. The issue may lie in libnm-glib or even in dbus-glib. I wasn't able to get VpnStateChanged signal via dbus-glib (dbus_g_proxy_add_signal() and dbus_g_proxy_connect_signal()), however received the signal successfully using GDBus. Until the issue is analyzed and fixed, we need to ask for VPN state of active VPN connection every second in order to show progress and exit correctly.
2012-05-09 12:35:27 +02:00
case NM_DEVICE_STATE_REASON_IP_CONFIG_EXPIRED:
return _("The IP configuration is no longer valid");
case NM_DEVICE_STATE_REASON_NO_SECRETS:
return _("Secrets were required, but not provided");
case NM_DEVICE_STATE_REASON_SUPPLICANT_DISCONNECT:
return _("802.1X supplicant disconnected");
case NM_DEVICE_STATE_REASON_SUPPLICANT_CONFIG_FAILED:
return _("802.1X supplicant configuration failed");
case NM_DEVICE_STATE_REASON_SUPPLICANT_FAILED:
return _("802.1X supplicant failed");
case NM_DEVICE_STATE_REASON_SUPPLICANT_TIMEOUT:
return _("802.1X supplicant took too long to authenticate");
case NM_DEVICE_STATE_REASON_PPP_START_FAILED:
return _("PPP service failed to start");
case NM_DEVICE_STATE_REASON_PPP_DISCONNECT:
return _("PPP service disconnected");
case NM_DEVICE_STATE_REASON_PPP_FAILED:
return _("PPP failed");
case NM_DEVICE_STATE_REASON_DHCP_START_FAILED:
return _("DHCP client failed to start");
case NM_DEVICE_STATE_REASON_DHCP_ERROR:
return _("DHCP client error");
case NM_DEVICE_STATE_REASON_DHCP_FAILED:
return _("DHCP client failed");
case NM_DEVICE_STATE_REASON_SHARED_START_FAILED:
return _("Shared connection service failed to start");
case NM_DEVICE_STATE_REASON_SHARED_FAILED:
return _("Shared connection service failed");
case NM_DEVICE_STATE_REASON_AUTOIP_START_FAILED:
return _("AutoIP service failed to start");
case NM_DEVICE_STATE_REASON_AUTOIP_ERROR:
return _("AutoIP service error");
case NM_DEVICE_STATE_REASON_AUTOIP_FAILED:
return _("AutoIP service failed");
case NM_DEVICE_STATE_REASON_MODEM_BUSY:
return _("The line is busy");
case NM_DEVICE_STATE_REASON_MODEM_NO_DIAL_TONE:
return _("No dial tone");
case NM_DEVICE_STATE_REASON_MODEM_NO_CARRIER:
return _("No carrier could be established");
case NM_DEVICE_STATE_REASON_MODEM_DIAL_TIMEOUT:
return _("The dialing request timed out");
case NM_DEVICE_STATE_REASON_MODEM_DIAL_FAILED:
return _("The dialing attempt failed");
case NM_DEVICE_STATE_REASON_MODEM_INIT_FAILED:
return _("Modem initialization failed");
case NM_DEVICE_STATE_REASON_GSM_APN_FAILED:
return _("Failed to select the specified APN");
case NM_DEVICE_STATE_REASON_GSM_REGISTRATION_NOT_SEARCHING:
return _("Not searching for networks");
case NM_DEVICE_STATE_REASON_GSM_REGISTRATION_DENIED:
return _("Network registration denied");
case NM_DEVICE_STATE_REASON_GSM_REGISTRATION_TIMEOUT:
return _("Network registration timed out");
case NM_DEVICE_STATE_REASON_GSM_REGISTRATION_FAILED:
return _("Failed to register with the requested network");
case NM_DEVICE_STATE_REASON_GSM_PIN_CHECK_FAILED:
return _("PIN check failed");
case NM_DEVICE_STATE_REASON_FIRMWARE_MISSING:
return _("Necessary firmware for the device may be missing");
case NM_DEVICE_STATE_REASON_REMOVED:
return _("The device was removed");
case NM_DEVICE_STATE_REASON_SLEEPING:
return _("NetworkManager went to sleep");
case NM_DEVICE_STATE_REASON_CONNECTION_REMOVED:
return _("The device's active connection disappeared");
case NM_DEVICE_STATE_REASON_USER_REQUESTED:
return _("Device disconnected by user or client");
case NM_DEVICE_STATE_REASON_CARRIER:
return _("Carrier/link changed");
case NM_DEVICE_STATE_REASON_CONNECTION_ASSUMED:
return _("The device's existing connection was assumed");
case NM_DEVICE_STATE_REASON_SUPPLICANT_AVAILABLE:
return _("The supplicant is now available");
case NM_DEVICE_STATE_REASON_MODEM_NOT_FOUND:
return _("The modem could not be found");
case NM_DEVICE_STATE_REASON_BT_FAILED:
return _("The Bluetooth connection failed or timed out");
case NM_DEVICE_STATE_REASON_GSM_SIM_NOT_INSERTED:
return _("GSM Modem's SIM card not inserted");
case NM_DEVICE_STATE_REASON_GSM_SIM_PIN_REQUIRED:
return _("GSM Modem's SIM PIN required");
case NM_DEVICE_STATE_REASON_GSM_SIM_PUK_REQUIRED:
return _("GSM Modem's SIM PUK required");
case NM_DEVICE_STATE_REASON_GSM_SIM_WRONG:
return _("GSM Modem's SIM wrong");
case NM_DEVICE_STATE_REASON_INFINIBAND_MODE:
return _("InfiniBand device does not support connected mode");
case NM_DEVICE_STATE_REASON_DEPENDENCY_FAILED:
return _("A dependency of the connection failed");
cli: add NM_DEVICE_STATE_REASON_BR2684_FAILED reason-to-string mapping
2012-06-07 12:08:22 +02:00
case NM_DEVICE_STATE_REASON_BR2684_FAILED:
return _("A problem with the RFC 2684 Ethernet over ADSL bridge");
cli: add NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE reason-to-string mapping
2012-08-30 14:10:33 +02:00
case NM_DEVICE_STATE_REASON_MODEM_MANAGER_UNAVAILABLE:
return _("ModemManager is unavailable");
cli: add NM_DEVICE_STATE_REASON_SSID_NOT_FOUND reason-to-string mapping
2012-09-21 10:04:28 +02:00
case NM_DEVICE_STATE_REASON_SSID_NOT_FOUND:
return _("The Wi-Fi network could not be found");
api: add NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED reason and use that
2012-09-21 14:36:46 +02:00
case NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED:
typo: replace all misstyped 'seconadary' strings with 'secondary'
2012-11-04 23:08:02 +01:00
return _("A secondary connection of the base connection failed");
api: add NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED reason and use that
2012-09-21 14:36:46 +02:00
cli: add missing reason-to-string mappings for NMDeviceStateReason
2013-11-18 16:15:01 +01:00
case NM_DEVICE_STATE_REASON_DCB_FCOE_FAILED:
return _("DCB or FCoE setup failed");
case NM_DEVICE_STATE_REASON_TEAMD_CONTROL_FAILED:
return _("teamd control failed");
cli: add missing reason-to-string mappings for NMDeviceStateReason
2014-05-26 14:07:01 +02:00
case NM_DEVICE_STATE_REASON_MODEM_FAILED:
return _("Modem failed or no longer available");
case NM_DEVICE_STATE_REASON_MODEM_AVAILABLE:
return _("Modem now ready and available");
case NM_DEVICE_STATE_REASON_SIM_PIN_INCORRECT:
return _("SIM PIN was incorrect");
device,libnm,cli: add "new-activation" reason for device state change It will be used when the device is disconnected for new connection activation.
2015-04-07 11:53:09 -04:00
case NM_DEVICE_STATE_REASON_NEW_ACTIVATION:
return _("New connection activation was enqueued");
core/cli: add missing device state-reason to string conversions for NM_DEVICE_STATE_REASON_PARENT_CHANGED and NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED Fixes: cd3df12c8f8ed6c868c12bc4e7fe6ba162dafc5b
2015-05-27 11:05:38 +02:00
case NM_DEVICE_STATE_REASON_PARENT_CHANGED:
return _("The device's parent changed");
case NM_DEVICE_STATE_REASON_PARENT_MANAGED_CHANGED:
return _("The device parent's management changed");
cli: show progress in --pretty mode for 'nmcli con up' We need to use a workaround for VPN connection state. There is a bug somewhere causing that vpn-state-changed signal is not issued on active VPN connection. Debugging showed that D-Bus PropertiesChanged and VpnStateChanged signals are not processed properly. That's why libnm-glib's VPN connection object is not updated. The issue may lie in libnm-glib or even in dbus-glib. I wasn't able to get VpnStateChanged signal via dbus-glib (dbus_g_proxy_add_signal() and dbus_g_proxy_connect_signal()), however received the signal successfully using GDBus. Until the issue is analyzed and fixed, we need to ask for VPN state of active VPN connection every second in order to show progress and exit correctly.
2012-05-09 12:35:27 +02:00
default:
cli: add missing reason-to-string mappings for NMDeviceStateReason
2013-11-18 16:15:01 +01:00
/* TRANSLATORS: Unknown reason for a device state change (NMDeviceStateReason) */
cli: show progress in --pretty mode for 'nmcli con up' We need to use a workaround for VPN connection state. There is a bug somewhere causing that vpn-state-changed signal is not issued on active VPN connection. Debugging showed that D-Bus PropertiesChanged and VpnStateChanged signals are not processed properly. That's why libnm-glib's VPN connection object is not updated. The issue may lie in libnm-glib or even in dbus-glib. I wasn't able to get VpnStateChanged signal via dbus-glib (dbus_g_proxy_add_signal() and dbus_g_proxy_connect_signal()), however received the signal successfully using GDBus. Until the issue is analyzed and fixed, we need to ask for VPN state of active VPN connection every second in order to show progress and exit correctly.
2012-05-09 12:35:27 +02:00
return _("Unknown");
}
}
nmcli: improve setting connection.secondaries property - check if the values being set are existing connections - also allow specifying connections by names, translating them transparently to UUIDs. - nmcli-specific section for 'describe' command added (We use a global nm_cli variable in nmc_property_connection_set_secondaries())
2014-04-16 18:23:50 +02:00
/*
* nmc_find_connection:
libnm: change GSList to GPtrArray in libnm methods libnm mostly used GPtrArrays in its APIs, except that arrays of connections were usually GSLists. Fix this and make them GPtrArrays too (and rename nm_client_list_connections() to nm_client_get_connections() to match everything else).
2014-10-22 12:32:46 -04:00
* @connections: array of NMConnections to search in
nmcli: improve setting connection.secondaries property - check if the values being set are existing connections - also allow specifying connections by names, translating them transparently to UUIDs. - nmcli-specific section for 'describe' command added (We use a global nm_cli variable in nmc_property_connection_set_secondaries())
2014-04-16 18:23:50 +02:00
* @filter_type: "id", "uuid", "path" or %NULL
* @filter_val: connection to find (connection name, UUID or path)
* @start: where to start in @list. The location is updated so that the function
* can be called multiple times (for connections with the same name).
cli/connections: do connection completion in get_connection() Start completing by the id if the filter type is not specified
2016-07-07 14:53:34 +02:00
* @complete: print possible completions
nmcli: improve setting connection.secondaries property - check if the values being set are existing connections - also allow specifying connections by names, translating them transparently to UUIDs. - nmcli-specific section for 'describe' command added (We use a global nm_cli variable in nmc_property_connection_set_secondaries())
2014-04-16 18:23:50 +02:00
*
* Find a connection in @list according to @filter_val. @filter_type determines
* what property is used for comparison. When @filter_type is NULL, compare
* @filter_val against all types. Otherwise, only compare against the specified
* type. If 'path' filter type is specified, comparison against numeric index
* (in addition to the whole path) is allowed.
*
* Returns: found connection, or %NULL
*/
NMConnection *
libnm: change GSList to GPtrArray in libnm methods libnm mostly used GPtrArrays in its APIs, except that arrays of connections were usually GSLists. Fix this and make them GPtrArrays too (and rename nm_client_list_connections() to nm_client_get_connections() to match everything else).
2014-10-22 12:32:46 -04:00
nmc_find_connection (const GPtrArray *connections,
nmcli: improve setting connection.secondaries property - check if the values being set are existing connections - also allow specifying connections by names, translating them transparently to UUIDs. - nmcli-specific section for 'describe' command added (We use a global nm_cli variable in nmc_property_connection_set_secondaries())
2014-04-16 18:23:50 +02:00
const char *filter_type,
const char *filter_val,
cli/connections: do connection completion in get_connection() Start completing by the id if the filter type is not specified
2016-07-07 14:53:34 +02:00
int *start,
gboolean complete)
nmcli: improve setting connection.secondaries property - check if the values being set are existing connections - also allow specifying connections by names, translating them transparently to UUIDs. - nmcli-specific section for 'describe' command added (We use a global nm_cli variable in nmc_property_connection_set_secondaries())
2014-04-16 18:23:50 +02:00
{
NMConnection *connection;
NMConnection *found = NULL;
libnm: change GSList to GPtrArray in libnm methods libnm mostly used GPtrArrays in its APIs, except that arrays of connections were usually GSLists. Fix this and make them GPtrArrays too (and rename nm_client_list_connections() to nm_client_get_connections() to match everything else).
2014-10-22 12:32:46 -04:00
int i;
nmcli: improve setting connection.secondaries property - check if the values being set are existing connections - also allow specifying connections by names, translating them transparently to UUIDs. - nmcli-specific section for 'describe' command added (We use a global nm_cli variable in nmc_property_connection_set_secondaries())
2014-04-16 18:23:50 +02:00
const char *id;
const char *uuid;
const char *path, *path_num;
libnm: change GSList to GPtrArray in libnm methods libnm mostly used GPtrArrays in its APIs, except that arrays of connections were usually GSLists. Fix this and make them GPtrArrays too (and rename nm_client_list_connections() to nm_client_get_connections() to match everything else).
2014-10-22 12:32:46 -04:00
for (i = start ? *start : 0; i < connections->len; i++) {
connection = NM_CONNECTION (connections->pdata[i]);
nmcli: improve setting connection.secondaries property - check if the values being set are existing connections - also allow specifying connections by names, translating them transparently to UUIDs. - nmcli-specific section for 'describe' command added (We use a global nm_cli variable in nmc_property_connection_set_secondaries())
2014-04-16 18:23:50 +02:00
id = nm_connection_get_id (connection);
uuid = nm_connection_get_uuid (connection);
path = nm_connection_get_path (connection);
path_num = path ? strrchr (path, '/') + 1 : NULL;
/* When filter_type is NULL, compare connection ID (filter_val)
* against all types. Otherwise, only compare against the specific
* type. If 'path' filter type is specified, comparison against
* numeric index (in addition to the whole path) is allowed.
*/
cli/connections: do connection completion in get_connection() Start completing by the id if the filter type is not specified
2016-07-07 14:53:34 +02:00
if (!filter_type || strcmp (filter_type, "id") == 0) {
if (complete)
nmc_complete_strings (filter_val, id, NULL);
if (strcmp (filter_val, id) == 0)
goto found;
}
if (!filter_type || strcmp (filter_type, "uuid") == 0) {
if (complete && (filter_type || *filter_val))
nmc_complete_strings (filter_val, uuid, NULL);
if (strcmp (filter_val, uuid) == 0)
goto found;
}
if (!filter_type || strcmp (filter_type, "path") == 0) {
if (complete && (filter_type || *filter_val))
nmc_complete_strings (filter_val, path, filter_type ? path_num : NULL, NULL);
if (g_strcmp0 (filter_val, path) == 0 || (filter_type && g_strcmp0 (filter_val, path_num) == 0))
goto found;
}
continue;
found:
if (!start)
return connection;
if (found) {
*start = i;
return found;
nmcli: improve setting connection.secondaries property - check if the values being set are existing connections - also allow specifying connections by names, translating them transparently to UUIDs. - nmcli-specific section for 'describe' command added (We use a global nm_cli variable in nmc_property_connection_set_secondaries())
2014-04-16 18:23:50 +02:00
}
cli/connections: do connection completion in get_connection() Start completing by the id if the filter type is not specified
2016-07-07 14:53:34 +02:00
found = connection;
nmcli: improve setting connection.secondaries property - check if the values being set are existing connections - also allow specifying connections by names, translating them transparently to UUIDs. - nmcli-specific section for 'describe' command added (We use a global nm_cli variable in nmc_property_connection_set_secondaries())
2014-04-16 18:23:50 +02:00
}
if (start)
libnm: change GSList to GPtrArray in libnm methods libnm mostly used GPtrArrays in its APIs, except that arrays of connections were usually GSLists. Fix this and make them GPtrArrays too (and rename nm_client_list_connections() to nm_client_get_connections() to match everything else).
2014-10-22 12:32:46 -04:00
*start = 0;
nmcli: improve setting connection.secondaries property - check if the values being set are existing connections - also allow specifying connections by names, translating them transparently to UUIDs. - nmcli-specific section for 'describe' command added (We use a global nm_cli variable in nmc_property_connection_set_secondaries())
2014-04-16 18:23:50 +02:00
return found;
}
cli: make asking VPN secrets for OpenConnect really work by running nm_vpn_openconnect_authenticate_helper() and filling the obtained secrets to the array sent to NM.
2015-12-08 08:45:45 +01:00
static gboolean
vpn_openconnect_get_secrets (NMConnection *connection, GPtrArray *secrets)
{
GError *error = NULL;
NMSettingVpn *s_vpn;
const char *vpn_type, *gw, *port;
char *cookie = NULL;
char *gateway = NULL;
char *gwcert = NULL;
int status = 0;
int i;
gboolean ret;
if (!connection)
return FALSE;
if (!nm_connection_is_type (connection, NM_SETTING_VPN_SETTING_NAME))
return FALSE;
s_vpn = nm_connection_get_setting_vpn (connection);
vpn_type = nm_setting_vpn_get_service_type (s_vpn);
if (g_strcmp0 (vpn_type, NM_DBUS_INTERFACE ".openconnect"))
return FALSE;
/* Get gateway and port */
gw = nm_setting_vpn_get_data_item (s_vpn, "gateway");
port = gw ? strrchr (gw, ':') : NULL;
/* Interactively authenticate to OpenConnect server and get secrets */
ret = nm_vpn_openconnect_authenticate_helper (gw, &cookie, &gateway, &gwcert, &status, &error);
if (!ret) {
g_printerr (_("Error: openconnect failed: %s\n"), error->message);
g_clear_error (&error);
return FALSE;
}
if (WIFEXITED (status)) {
if (WEXITSTATUS (status) != 0)
g_printerr (_("Error: openconnect failed with status %d\n"), WEXITSTATUS (status));
} else if (WIFSIGNALED (status))
g_printerr (_("Error: openconnect failed with signal %d\n"), WTERMSIG (status));
/* Append port to the host value */
if (gateway && port) {
char *tmp = gateway;
gateway = g_strdup_printf ("%s%s", gateway, port);
g_free (tmp);
}
/* Fill secrets to the array */
for (i = 0; i < secrets->len; i++) {
NMSecretAgentSimpleSecret *secret = secrets->pdata[i];
if (!g_strcmp0 (secret->vpn_type, vpn_type)) {
if (!g_strcmp0 (secret->vpn_property, "cookie")) {
g_free (secret->value);
secret->value = cookie;
cookie = NULL;
} else if (!g_strcmp0 (secret->vpn_property, "gateway")) {
g_free (secret->value);
secret->value = gateway;
gateway = NULL;
} else if (!g_strcmp0 (secret->vpn_property, "gwcert")) {
g_free (secret->value);
secret->value = gwcert;
gwcert = NULL;
}
}
}
g_free (cookie);
g_free (gateway);
g_free (gwcert);
return TRUE;
}
cli: add support for secret agent to 'nmcli dev connect' too And move secrets getting code to common.c (without changes).
2014-11-20 12:36:14 +01:00
static gboolean
get_secrets_from_user (const char *request_id,
const char *title,
const char *msg,
cli: make asking VPN secrets for OpenConnect really work by running nm_vpn_openconnect_authenticate_helper() and filling the obtained secrets to the array sent to NM.
2015-12-08 08:45:45 +01:00
NMConnection *connection,
cli: add support for secret agent to 'nmcli dev connect' too And move secrets getting code to common.c (without changes).
2014-11-20 12:36:14 +01:00
gboolean ask,
cli: do not echo passwords on terminal when asking for them adds nmc_readline_echo() function that can disable displaying characters.
2015-12-04 12:57:31 +01:00
gboolean echo_on,
cli: add support for secret agent to 'nmcli dev connect' too And move secrets getting code to common.c (without changes).
2014-11-20 12:36:14 +01:00
GHashTable *pwds_hash,
GPtrArray *secrets)
{
int i;
cli: make asking VPN secrets for OpenConnect really work by running nm_vpn_openconnect_authenticate_helper() and filling the obtained secrets to the array sent to NM.
2015-12-08 08:45:45 +01:00
/* Check if there is a VPN OpenConnect secret to ask for */
if (ask)
vpn_openconnect_get_secrets (connection, secrets);
cli: add support for secret agent to 'nmcli dev connect' too And move secrets getting code to common.c (without changes).
2014-11-20 12:36:14 +01:00
for (i = 0; i < secrets->len; i++) {
NMSecretAgentSimpleSecret *secret = secrets->pdata[i];
char *pwd = NULL;
/* First try to find the password in provided passwords file,
* then ask user. */
if (pwds_hash && (pwd = g_hash_table_lookup (pwds_hash, secret->prop_name))) {
pwd = g_strdup (pwd);
} else {
if (ask) {
if (secret->value) {
cli: do not present secrets from openconnect to the user for confirmation It is pointless to present them and require user to press Return for each password prompt.
2015-12-11 13:13:49 +01:00
if (!g_strcmp0 (secret->vpn_type, NM_DBUS_INTERFACE ".openconnect")) {
/* Do not present and ask user for openconnect secrets, we already have them */
continue;
} else {
/* Prefill the password if we have it. */
rl_startup_hook = nmc_rl_set_deftext;
nmc_rl_pre_input_deftext = g_strdup (secret->value);
}
cli: add support for secret agent to 'nmcli dev connect' too And move secrets getting code to common.c (without changes).
2014-11-20 12:36:14 +01:00
}
clients: don't show "(null)" prompt for secrets If the caller doesn't provide a message, simply don't show it.
2016-09-09 21:45:45 +02:00
if (msg)
g_print ("%s\n", msg);
cli: show pre-filled readline input if it is not a real password (rh #1351272) Example: $ nmcli -a con up test-conn Passwords or encryption keys are required to access the wireless network 'kkk'. Username (802-1x.identity): cimrman Password (802-1x.password): https://bugzilla.redhat.com/show_bug.cgi?id=1351272
2016-07-24 15:14:25 +02:00
pwd = nmc_readline_echo (secret->password ? echo_on : TRUE,
"%s (%s): ", secret->name, secret->prop_name);
cli: add support for secret agent to 'nmcli dev connect' too And move secrets getting code to common.c (without changes).
2014-11-20 12:36:14 +01:00
if (!pwd)
pwd = g_strdup ("");
} else {
clients: don't show "(null)" prompt for secrets If the caller doesn't provide a message, simply don't show it.
2016-09-09 21:45:45 +02:00
if (msg)
g_print ("%s\n", msg);
cli: add support for secret agent to 'nmcli dev connect' too And move secrets getting code to common.c (without changes).
2014-11-20 12:36:14 +01:00
g_printerr (_("Warning: password for '%s' not given in 'passwd-file' "
"and nmcli cannot ask without '--ask' option.\n"),
secret->prop_name);
}
}
/* No password provided, cancel the secrets. */
if (!pwd)
return FALSE;
g_free (secret->value);
secret->value = pwd;
}
return TRUE;
}
/**
* nmc_secrets_requested:
* @agent: the #NMSecretAgentSimple
* @request_id: request ID, to eventually pass to
* nm_secret_agent_simple_response()
* @title: a title for the password request
* @msg: a prompt message for the password request
* @secrets: (element-type #NMSecretAgentSimpleSecret): array of secrets
* being requested.
* @user_data: user data passed to the function
*
* This function is used as a callback for "request-secrets" signal of
* NMSecretAgentSimpleSecret.
*/
void
nmc_secrets_requested (NMSecretAgentSimple *agent,
const char *request_id,
const char *title,
const char *msg,
GPtrArray *secrets,
gpointer user_data)
{
NmCli *nmc = (NmCli *) user_data;
cli: make asking VPN secrets for OpenConnect really work by running nm_vpn_openconnect_authenticate_helper() and filling the obtained secrets to the array sent to NM.
2015-12-08 08:45:45 +01:00
NMConnection *connection = NULL;
char *path, *p;
cli: add support for secret agent to 'nmcli dev connect' too And move secrets getting code to common.c (without changes).
2014-11-20 12:36:14 +01:00
gboolean success = FALSE;
cli: get rid of client-global connections list Caching it in the NmCli object is unnecessary, ugly and would be cumbersome in future when we'll be creating the client object only when needed.
2016-08-31 22:50:02 +02:00
const GPtrArray *connections;
cli: add support for secret agent to 'nmcli dev connect' too And move secrets getting code to common.c (without changes).
2014-11-20 12:36:14 +01:00
cli: pass configuration options separately from NmCli structure The NmCli structure is passed around everywhere and contains all the state of the program. It is very hard to follow which parts are used where. Split out more configuration options to a NmcConfig field. This field is mostly immutable, and modified at particular places that now can be easily found.
2017-03-30 12:45:41 +02:00
if (nmc->nmc_config.print_output == NMC_PRINT_PRETTY)
cli: add support for secret agent to 'nmcli dev connect' too And move secrets getting code to common.c (without changes).
2014-11-20 12:36:14 +01:00
nmc_terminal_erase_line ();
cli: make asking VPN secrets for OpenConnect really work by running nm_vpn_openconnect_authenticate_helper() and filling the obtained secrets to the array sent to NM.
2015-12-08 08:45:45 +01:00
/* Find the connection for the request */
path = g_strdup (request_id);
if (path) {
p = strrchr (path, '/');
if (p)
*p = '\0';
cli: get rid of client-global connections list Caching it in the NmCli object is unnecessary, ugly and would be cumbersome in future when we'll be creating the client object only when needed.
2016-08-31 22:50:02 +02:00
connections = nm_client_get_connections (nmc->client);
connection = nmc_find_connection (connections, "path", path, NULL, FALSE);
cli: make asking VPN secrets for OpenConnect really work by running nm_vpn_openconnect_authenticate_helper() and filling the obtained secrets to the array sent to NM.
2015-12-08 08:45:45 +01:00
g_free (path);
}
cli: pass configuration options separately from NmCli structure The NmCli structure is passed around everywhere and contains all the state of the program. It is very hard to follow which parts are used where. Split out more configuration options to a NmcConfig field. This field is mostly immutable, and modified at particular places that now can be easily found.
2017-03-30 12:45:41 +02:00
success = get_secrets_from_user (request_id, title, msg, connection, nmc->nmc_config.in_editor || nmc->ask,
cli: move show_secret field to NmcConfig The show-secret property is basically a part of the current configuration, relevant during printing. It will be passed on to nmc_print(), and hence must be part of NmcConfig.
2017-04-06 15:26:23 +02:00
nmc->nmc_config.show_secrets, nmc->pwds_hash, secrets);
cli: add support for secret agent to 'nmcli dev connect' too And move secrets getting code to common.c (without changes).
2014-11-20 12:36:14 +01:00
if (success)
nm_secret_agent_simple_response (agent, request_id, secrets);
else {
/* Unregister our secret agent on failure, so that another agent
* may be tried */
if (nmc->secret_agent) {
libnm: rename NMSecretAgent to NMSecretAgentOld As with NMVpnPluginOld, rename NMSecretAgent to NMSecretAgentOld, to leave the name "NMSecretAgent" open for a new-and-improved version in NM 1.2.
2014-11-20 11:53:19 -05:00
nm_secret_agent_old_unregister (nmc->secret_agent, NULL, NULL);
cli: add support for secret agent to 'nmcli dev connect' too And move secrets getting code to common.c (without changes).
2014-11-20 12:36:14 +01:00
g_clear_object (&nmc->secret_agent);
}
trivial: whitespace fix
2015-01-11 22:52:40 +01:00
}
cli: add support for secret agent to 'nmcli dev connect' too And move secrets getting code to common.c (without changes).
2014-11-20 12:36:14 +01:00
}
cli: move unique_connection_name() to common.c as nmc_unique_connection_name()
2015-10-05 15:12:14 +02:00
char *
nmc_unique_connection_name (const GPtrArray *connections, const char *try_name)
{
NMConnection *connection;
const char *name;
char *new_name;
all: use "unsigned" instead of "unsigned int"
2017-03-14 11:15:05 +01:00
unsigned num = 1;
cli: move unique_connection_name() to common.c as nmc_unique_connection_name()
2015-10-05 15:12:14 +02:00
int i = 0;
new_name = g_strdup (try_name);
while (i < connections->len) {
connection = NM_CONNECTION (connections->pdata[i]);
name = nm_connection_get_id (connection);
if (g_strcmp0 (new_name, name) == 0) {
g_free (new_name);
new_name = g_strdup_printf ("%s-%d", try_name, num++);
i = 0;
} else
i++;
}
return new_name;
}
cli: add support for secret agent to 'nmcli dev connect' too And move secrets getting code to common.c (without changes).
2014-11-20 12:36:14 +01:00
cli: remove editor thread Currently the editor runs in a dedicated thread so that the blocking call to readline() doesn't stop the processing of D-Bus events in the main loop. The editor thread can access objects concurrently with the main thread and this can cause races and crashes. Remove the editor thread and use the non-blocking readline API. https://bugzilla.gnome.org/show_bug.cgi?id=732097 https://bugzilla.redhat.com/show_bug.cgi?id=1368353
2016-09-02 16:16:34 +02:00
/* readline state variables */
static gboolean nmcli_in_readline = FALSE;
static gboolean rl_got_line;
static char *rl_string;
cli: move readline related functions to common.h to be usable throughout nmcli Renames readline_x() to nmc_readline() gen_func_basic() to nmc_rl_gen_func_basic() The commit doesn't change functionality, only moves and renames the functions, so that they can be used in other places too.
2014-05-15 10:31:09 +02:00
/**
* nmc_cleanup_readline:
*
* Cleanup readline when nmcli is terminated with a signal.
* It makes sure the terminal is not garbled.
*/
void
nmc_cleanup_readline (void)
{
rl_free_line_state ();
rl_cleanup_after_signal ();
}
cli: don't quit nmcli on Ctrl-C while in readline() We rather cancel the input and show new prompt on readline. It is more expected behaviour for interactive input when quitting.
2014-06-16 08:30:22 +02:00
gboolean
nmc_get_in_readline (void)
{
cli: remove editor thread Currently the editor runs in a dedicated thread so that the blocking call to readline() doesn't stop the processing of D-Bus events in the main loop. The editor thread can access objects concurrently with the main thread and this can cause races and crashes. Remove the editor thread and use the non-blocking readline API. https://bugzilla.gnome.org/show_bug.cgi?id=732097 https://bugzilla.redhat.com/show_bug.cgi?id=1368353
2016-09-02 16:16:34 +02:00
return nmcli_in_readline;
cli: don't quit nmcli on Ctrl-C while in readline() We rather cancel the input and show new prompt on readline. It is more expected behaviour for interactive input when quitting.
2014-06-16 08:30:22 +02:00
}
void
nmc_set_in_readline (gboolean in_readline)
{
nmcli_in_readline = in_readline;
cli: remove editor thread Currently the editor runs in a dedicated thread so that the blocking call to readline() doesn't stop the processing of D-Bus events in the main loop. The editor thread can access objects concurrently with the main thread and this can cause races and crashes. Remove the editor thread and use the non-blocking readline API. https://bugzilla.gnome.org/show_bug.cgi?id=732097 https://bugzilla.redhat.com/show_bug.cgi?id=1368353
2016-09-02 16:16:34 +02:00
}
static void
readline_cb (char *line)
{
rl_got_line = TRUE;
rl_string = line;
rl_callback_handler_remove ();
}
static gboolean
stdin_ready_cb (GIOChannel * io, GIOCondition condition, gpointer data)
{
rl_callback_read_char ();
return TRUE;
cli: don't quit nmcli on Ctrl-C while in readline() We rather cancel the input and show new prompt on readline. It is more expected behaviour for interactive input when quitting.
2014-06-16 08:30:22 +02:00
}
cli: do not echo passwords on terminal when asking for them adds nmc_readline_echo() function that can disable displaying characters.
2015-12-04 12:57:31 +01:00
static char *
nmc_readline_helper (const char *prompt)
cli: move readline related functions to common.h to be usable throughout nmcli Renames readline_x() to nmc_readline() gen_func_basic() to nmc_rl_gen_func_basic() The commit doesn't change functionality, only moves and renames the functions, so that they can be used in other places too.
2014-05-15 10:31:09 +02:00
{
cli: remove editor thread Currently the editor runs in a dedicated thread so that the blocking call to readline() doesn't stop the processing of D-Bus events in the main loop. The editor thread can access objects concurrently with the main thread and this can cause races and crashes. Remove the editor thread and use the non-blocking readline API. https://bugzilla.gnome.org/show_bug.cgi?id=732097 https://bugzilla.redhat.com/show_bug.cgi?id=1368353
2016-09-02 16:16:34 +02:00
GIOChannel *io = NULL;
guint io_watch_id;
cli: make prompt argument a printf-like format string, remove history argument for nmc_readline()
2014-06-02 10:18:13 +02:00
cli: don't quit nmcli on Ctrl-C while in readline() We rather cancel the input and show new prompt on readline. It is more expected behaviour for interactive input when quitting.
2014-06-16 08:30:22 +02:00
nmc_set_in_readline (TRUE);
cli: move readline related functions to common.h to be usable throughout nmcli Renames readline_x() to nmc_readline() gen_func_basic() to nmc_rl_gen_func_basic() The commit doesn't change functionality, only moves and renames the functions, so that they can be used in other places too.
2014-05-15 10:31:09 +02:00
cli: remove editor thread Currently the editor runs in a dedicated thread so that the blocking call to readline() doesn't stop the processing of D-Bus events in the main loop. The editor thread can access objects concurrently with the main thread and this can cause races and crashes. Remove the editor thread and use the non-blocking readline API. https://bugzilla.gnome.org/show_bug.cgi?id=732097 https://bugzilla.redhat.com/show_bug.cgi?id=1368353
2016-09-02 16:16:34 +02:00
io = g_io_channel_unix_new (STDIN_FILENO);
io_watch_id = g_io_add_watch (io, G_IO_IN, stdin_ready_cb, NULL);
g_io_channel_unref (io);
read_again:
rl_string = NULL;
rl_got_line = FALSE;
rl_callback_handler_install (prompt, readline_cb);
while ( !rl_got_line
&& g_main_loop_is_running (loop)
&& !nmc_seen_sigint ())
g_main_context_iteration (NULL, TRUE);
/* If Ctrl-C was detected, complete the line */
if (nmc_seen_sigint ()) {
rl_echo_signal_char (SIGINT);
cli: fix failed assertion in readline helper The INT signal can arrive after a new line has been processed in nmc_readline_helper(). In such case, the handler gets uninstalled by readline_cb() and nmc_seen_sigint() returns TRUE. However it's an error to call rl_callback_read_char() without handler, don't do it. Fixes the following: "readline: readline_callback_read_char() called with no handler!" #0 __GI_raise (sig=sig@entry=6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:56 #1 __GI_abort () at abort.c:90 #2 rl_callback_read_char () at ../callback.c:116 #3 nmc_readline_helper (prompt=prompt@entry=0x2aa0d229080 "nmcli> ") at clients/cli/common.c:1387 #4 nmc_readline (prompt_fmt=prompt_fmt@entry=0x2aa0036ac9e "%s") at clients/cli/common.c:1448 #5 do_connection_edit (connection=0x2aa0d215440, nmc=0x2aa00391298 <nm_cli>) at clients/cli/connections.c:7072 Fixes: 995229181cac66c1ac5a2d63120ffbbe3ac136b0 https://bugzilla.redhat.com/show_bug.cgi?id=1458311
2017-06-14 17:41:04 +02:00
if (!rl_got_line) {
rl_stuff_char ('\n');
rl_callback_read_char ();
}
cli: terminate when the input terminal goes away Readline treats I/O errors on stdin as a newline, thus if the terminal disappears with SIGHUP masked we just loop until the end of times and beyond.
2015-08-20 17:18:51 +02:00
}
cli: don't quit nmcli on Ctrl-C while in readline() We rather cancel the input and show new prompt on readline. It is more expected behaviour for interactive input when quitting.
2014-06-16 08:30:22 +02:00
/* Add string to the history */
cli: remove editor thread Currently the editor runs in a dedicated thread so that the blocking call to readline() doesn't stop the processing of D-Bus events in the main loop. The editor thread can access objects concurrently with the main thread and this can cause races and crashes. Remove the editor thread and use the non-blocking readline API. https://bugzilla.gnome.org/show_bug.cgi?id=732097 https://bugzilla.redhat.com/show_bug.cgi?id=1368353
2016-09-02 16:16:34 +02:00
if (rl_string && *rl_string)
add_history (rl_string);
cli: don't quit nmcli on Ctrl-C while in readline() We rather cancel the input and show new prompt on readline. It is more expected behaviour for interactive input when quitting.
2014-06-16 08:30:22 +02:00
if (nmc_seen_sigint ()) {
cli: remove editor thread Currently the editor runs in a dedicated thread so that the blocking call to readline() doesn't stop the processing of D-Bus events in the main loop. The editor thread can access objects concurrently with the main thread and this can cause races and crashes. Remove the editor thread and use the non-blocking readline API. https://bugzilla.gnome.org/show_bug.cgi?id=732097 https://bugzilla.redhat.com/show_bug.cgi?id=1368353
2016-09-02 16:16:34 +02:00
/* Ctrl-C */
cli: don't quit nmcli on Ctrl-C while in readline() We rather cancel the input and show new prompt on readline. It is more expected behaviour for interactive input when quitting.
2014-06-16 08:30:22 +02:00
nmc_clear_sigint ();
cli: pass configuration options separately from NmCli structure The NmCli structure is passed around everywhere and contains all the state of the program. It is very hard to follow which parts are used where. Split out more configuration options to a NmcConfig field. This field is mostly immutable, and modified at particular places that now can be easily found.
2017-03-30 12:45:41 +02:00
if ( nm_cli.nmc_config.in_editor
cli: remove editor thread Currently the editor runs in a dedicated thread so that the blocking call to readline() doesn't stop the processing of D-Bus events in the main loop. The editor thread can access objects concurrently with the main thread and this can cause races and crashes. Remove the editor thread and use the non-blocking readline API. https://bugzilla.gnome.org/show_bug.cgi?id=732097 https://bugzilla.redhat.com/show_bug.cgi?id=1368353
2016-09-02 16:16:34 +02:00
|| (rl_string && *rl_string)) {
cli: make Ctrl-C exit nmcli when line is empty *and* we are not in the editor
2014-06-23 13:59:46 +02:00
/* In editor, or the line is not empty */
/* Call readline again to get new prompt (repeat) */
cli: remove editor thread Currently the editor runs in a dedicated thread so that the blocking call to readline() doesn't stop the processing of D-Bus events in the main loop. The editor thread can access objects concurrently with the main thread and this can cause races and crashes. Remove the editor thread and use the non-blocking readline API. https://bugzilla.gnome.org/show_bug.cgi?id=732097 https://bugzilla.redhat.com/show_bug.cgi?id=1368353
2016-09-02 16:16:34 +02:00
g_free (rl_string);
goto read_again;
cli: make Ctrl-C exit nmcli when line is empty *and* we are not in the editor
2014-06-23 13:59:46 +02:00
} else {
cli: remove editor thread Currently the editor runs in a dedicated thread so that the blocking call to readline() doesn't stop the processing of D-Bus events in the main loop. The editor thread can access objects concurrently with the main thread and this can cause races and crashes. Remove the editor thread and use the non-blocking readline API. https://bugzilla.gnome.org/show_bug.cgi?id=732097 https://bugzilla.redhat.com/show_bug.cgi?id=1368353
2016-09-02 16:16:34 +02:00
/* Not in editor and line is empty, exit */
nmc_exit ();
cli: make Ctrl-C exit nmcli when line is empty *and* we are not in the editor
2014-06-23 13:59:46 +02:00
}
cli: remove editor thread Currently the editor runs in a dedicated thread so that the blocking call to readline() doesn't stop the processing of D-Bus events in the main loop. The editor thread can access objects concurrently with the main thread and this can cause races and crashes. Remove the editor thread and use the non-blocking readline API. https://bugzilla.gnome.org/show_bug.cgi?id=732097 https://bugzilla.redhat.com/show_bug.cgi?id=1368353
2016-09-02 16:16:34 +02:00
} else if (!rl_string) {
/* Ctrl-D, exit */
nmc_exit ();
cli: don't quit nmcli on Ctrl-C while in readline() We rather cancel the input and show new prompt on readline. It is more expected behaviour for interactive input when quitting.
2014-06-16 08:30:22 +02:00
}
/* Return NULL, not empty string */
cli: remove editor thread Currently the editor runs in a dedicated thread so that the blocking call to readline() doesn't stop the processing of D-Bus events in the main loop. The editor thread can access objects concurrently with the main thread and this can cause races and crashes. Remove the editor thread and use the non-blocking readline API. https://bugzilla.gnome.org/show_bug.cgi?id=732097 https://bugzilla.redhat.com/show_bug.cgi?id=1368353
2016-09-02 16:16:34 +02:00
if (rl_string && *rl_string == '\0') {
g_free (rl_string);
rl_string = NULL;
cli: don't quit nmcli on Ctrl-C while in readline() We rather cancel the input and show new prompt on readline. It is more expected behaviour for interactive input when quitting.
2014-06-16 08:30:22 +02:00
}
cli: remove editor thread Currently the editor runs in a dedicated thread so that the blocking call to readline() doesn't stop the processing of D-Bus events in the main loop. The editor thread can access objects concurrently with the main thread and this can cause races and crashes. Remove the editor thread and use the non-blocking readline API. https://bugzilla.gnome.org/show_bug.cgi?id=732097 https://bugzilla.redhat.com/show_bug.cgi?id=1368353
2016-09-02 16:16:34 +02:00
g_source_remove (io_watch_id);
nmc_set_in_readline (FALSE);
return rl_string;
cli: move readline related functions to common.h to be usable throughout nmcli Renames readline_x() to nmc_readline() gen_func_basic() to nmc_rl_gen_func_basic() The commit doesn't change functionality, only moves and renames the functions, so that they can be used in other places too.
2014-05-15 10:31:09 +02:00
}
cli: do not echo passwords on terminal when asking for them adds nmc_readline_echo() function that can disable displaying characters.
2015-12-04 12:57:31 +01:00
/**
* nmc_readline:
* @prompt_fmt: prompt to print (telling user what to enter). It is standard
* printf() format string
* @...: a list of arguments according to the @prompt_fmt format string
*
* Wrapper around libreadline's readline() function.
* If user pressed Ctrl-C, readline() is called again (if not in editor and
* line is empty, nmcli will quit).
* If user pressed Ctrl-D on empty line, nmcli will quit.
*
* Returns: the user provided string. In case the user entered empty string,
* this function returns NULL.
*/
char *
nmc_readline (const char *prompt_fmt, ...)
{
va_list args;
char *prompt, *str;
va_start (args, prompt_fmt);
prompt = g_strdup_vprintf (prompt_fmt, args);
va_end (args);
str = nmc_readline_helper (prompt);
g_free (prompt);
return str;
}
/**
* nmc_readline_echo:
*
* The same as nmc_readline() except it can disable echoing of input characters if @echo_on is %FALSE.
* nmc_readline(TRUE, ...) == nmc_readline(...)
*/
char *
nmc_readline_echo (gboolean echo_on, const char *prompt_fmt, ...)
{
va_list args;
char *prompt, *str;
struct termios termios_orig, termios_new;
va_start (args, prompt_fmt);
prompt = g_strdup_vprintf (prompt_fmt, args);
va_end (args);
/* Disable echoing characters */
if (!echo_on) {
tcgetattr (STDIN_FILENO, &termios_orig);
termios_new = termios_orig;
termios_new.c_lflag &= ~(ECHO);
tcsetattr (STDIN_FILENO, TCSADRAIN, &termios_new);
}
str = nmc_readline_helper (prompt);
g_free (prompt);
/* Restore original terminal settings */
cli: produce new line after readline when echoing was off The new line was missing. Adding termios_new.c_lflag |= (ECHONL | ICANON); did not help. Why? Fixes: a14306c2cebed02cec73bbf18fa24ee79a66b649
2015-12-07 17:18:13 +01:00
if (!echo_on) {
cli: do not echo passwords on terminal when asking for them adds nmc_readline_echo() function that can disable displaying characters.
2015-12-04 12:57:31 +01:00
tcsetattr (STDIN_FILENO, TCSADRAIN, &termios_orig);
cli: produce new line after readline when echoing was off The new line was missing. Adding termios_new.c_lflag |= (ECHONL | ICANON); did not help. Why? Fixes: a14306c2cebed02cec73bbf18fa24ee79a66b649
2015-12-07 17:18:13 +01:00
/* New line - setting ECHONL | ICANON did not help */
fprintf (stdout, "\n");
}
cli: do not echo passwords on terminal when asking for them adds nmc_readline_echo() function that can disable displaying characters.
2015-12-04 12:57:31 +01:00
return str;
}
cli: move readline related functions to common.h to be usable throughout nmcli Renames readline_x() to nmc_readline() gen_func_basic() to nmc_rl_gen_func_basic() The commit doesn't change functionality, only moves and renames the functions, so that they can be used in other places too.
2014-05-15 10:31:09 +02:00
/**
* nmc_rl_gen_func_basic:
* @text: text to complete
* @state: readline state; says whether start from scratch (state == 0)
* @words: strings for completion
*
* Basic function generating list of completion strings for readline.
* See e.g. http://cnswww.cns.cwru.edu/php/chet/readline/readline.html#SEC49
*/
char *
cli: add values_func() to NmcPropertyInfo and use for "connection" setting
2017-03-25 13:20:11 +01:00
nmc_rl_gen_func_basic (const char *text, int state, const char *const*words)
cli: move readline related functions to common.h to be usable throughout nmcli Renames readline_x() to nmc_readline() gen_func_basic() to nmc_rl_gen_func_basic() The commit doesn't change functionality, only moves and renames the functions, so that they can be used in other places too.
2014-05-15 10:31:09 +02:00
{
static int list_idx, len;
const char *name;
if (!state) {
list_idx = 0;
len = strlen (text);
}
/* Return the next name which partially matches one from the 'words' list. */
while ((name = words[list_idx])) {
list_idx++;
if (strncmp (name, text, len) == 0)
return g_strdup (name);
}
return NULL;
}
cli: move completion for connection type to meta data
2017-04-11 15:48:04 +02:00
static struct {
bool initialized;
guint idx;
char **values;
} _rl_compentry_func_wrap = { 0 };
static char *
_rl_compentry_func_wrap_fcn (const char *text, int state)
{
g_return_val_if_fail (_rl_compentry_func_wrap.initialized, NULL);
cli: fix completion of connection types Return only main settings and the special slave types.
2017-04-20 08:56:31 +02:00
while ( _rl_compentry_func_wrap.values
&& _rl_compentry_func_wrap.values[_rl_compentry_func_wrap.idx]
&& !g_str_has_prefix (_rl_compentry_func_wrap.values[_rl_compentry_func_wrap.idx], text))
_rl_compentry_func_wrap.idx++;
if ( !_rl_compentry_func_wrap.values
|| !_rl_compentry_func_wrap.values[_rl_compentry_func_wrap.idx]) {
cli: move completion for connection type to meta data
2017-04-11 15:48:04 +02:00
g_strfreev (_rl_compentry_func_wrap.values);
_rl_compentry_func_wrap.values = NULL;
_rl_compentry_func_wrap.initialized = FALSE;
return NULL;
}
return g_strdup (_rl_compentry_func_wrap.values[_rl_compentry_func_wrap.idx++]);
}
NmcCompEntryFunc
nmc_rl_compentry_func_wrap (const char *const*values)
{
g_strfreev (_rl_compentry_func_wrap.values);
_rl_compentry_func_wrap.values = g_strdupv ((char **) values);
_rl_compentry_func_wrap.idx = 0;
_rl_compentry_func_wrap.initialized = TRUE;
return _rl_compentry_func_wrap_fcn;
}
cli: (trivial) move gen_func_ifnames() from devices.c to common.c and rename it to nmc_rl_gen_func()
2016-09-15 01:20:53 +02:00
char *
nmc_rl_gen_func_ifnames (const char *text, int state)
{
int i;
const GPtrArray *devices;
const char **ifnames;
char *ret;
devices = nm_client_get_devices (nm_cli.client);
if (devices->len == 0)
return NULL;
ifnames = g_new (const char *, devices->len + 1);
for (i = 0; i < devices->len; i++) {
NMDevice *dev = g_ptr_array_index (devices, i);
const char *ifname = nm_device_get_iface (dev);
ifnames[i] = ifname;
}
ifnames[i] = NULL;
ret = nmc_rl_gen_func_basic (text, state, ifnames);
g_free (ifnames);
return ret;
}
cli: add support for secret agent to 'nmcli dev connect' too And move secrets getting code to common.c (without changes).
2014-11-20 12:36:14 +01:00
/* for pre-filling a string to readline prompt */
char *nmc_rl_pre_input_deftext;
int
nmc_rl_set_deftext (void)
{
if (nmc_rl_pre_input_deftext && rl_startup_hook) {
rl_insert_text (nmc_rl_pre_input_deftext);
g_free (nmc_rl_pre_input_deftext);
nmc_rl_pre_input_deftext = NULL;
rl_startup_hook = NULL;
}
return 0;
}
cli: add command for displaying LLDP neighbors The list of LLDP neighbors is available through the D-Bus interface and libnm already provides functions to retrieve it; make the list available through nmcli as well. Sample output: $ nmcli device lldp NEIGHBOR[0].DEVICE: eth0 NEIGHBOR[0].CHASSIS-ID: 00:13:21:58:CA:42 NEIGHBOR[0].PORT-ID: 1 NEIGHBOR[0].PORT-DESCRIPTION: 1 NEIGHBOR[0].SYSTEM-NAME: ProCurve Switch 2600-8-PWR NEIGHBOR[0].SYSTEM-DESCRIPTION: ProCurve J8762A Switch 2600-8-PWR, revision H.08.89 NEIGHBOR[0].SYSTEM-CAPABILITIES: 20 (mac-bridge,router) NEIGHBOR[1].DEVICE: eth2 NEIGHBOR[1].CHASSIS-ID: 00:01:30:F8:AD:A2 NEIGHBOR[1].PORT-ID: 1/1 NEIGHBOR[1].PORT-DESCRIPTION: Summit300-48-Port 1001 NEIGHBOR[1].SYSTEM-NAME: Summit300-48 NEIGHBOR[1].SYSTEM-DESCRIPTION: Summit300-48 - Version 7.4e.1 (Build 5) NEIGHBOR[1].SYSTEM-CAPABILITIES: 20 (mac-bridge,router) https://bugzilla.gnome.org/show_bug.cgi?id=757307
2015-11-10 14:06:02 +01:00
/**
* nmc_parse_lldp_capabilities:
* @value: the capabilities value
*
* Parses LLDP capabilities flags
*
* Returns: a newly allocated string containing capabilities names separated by commas.
*/
char *
nmc_parse_lldp_capabilities (guint value)
{
/* IEEE Std 802.1AB-2009 - Table 8.4 */
const char *names[] = { "other", "repeater", "mac-bridge", "wlan-access-point",
"router", "telephone", "docsis-cable-device", "station-only",
"c-vlan-component", "s-vlan-component", "tpmr" };
gboolean first = TRUE;
GString *str;
int i;
if (!value)
return g_strdup ("none");
str = g_string_new ("");
for (i = 0; i < G_N_ELEMENTS (names); i++) {
if (value & (1 << i)) {
if (!first)
g_string_append_c (str, ',');
first = FALSE;
value &= ~(1 << i);
g_string_append (str, names[i]);
}
}
if (value) {
if (!first)
g_string_append_c (str, ',');
g_string_append (str, "reserved");
}
return g_string_free (str, FALSE);
}
cli: split out do_cmd()
2016-06-23 12:18:52 +02:00
cli: make it possible to call sub-commands with client obtained asynchronously
2016-08-31 21:04:33 +02:00
static void
command_done (GObject *object, GAsyncResult *res, gpointer user_data)
{
GSimpleAsyncResult *simple = (GSimpleAsyncResult *)res;
NmCli *nmc = user_data;
GError *error = NULL;
if (g_simple_async_result_propagate_error (simple, &error)) {
nmc->return_value = error->code;
g_string_assign (nmc->return_text, error->message);
g_error_free (error);
}
if (!nmc->should_wait)
g_main_loop_quit (loop);
}
typedef struct {
NmCli *nmc;
const NMCCommand *cmd;
int argc;
char **argv;
GSimpleAsyncResult *simple;
} CmdCall;
static void
call_cmd (NmCli *nmc, GSimpleAsyncResult *simple, const NMCCommand *cmd, int argc, char **argv);
static void
got_client (GObject *source_object, GAsyncResult *res, gpointer user_data)
{
GError *error = NULL;
CmdCall *call = user_data;
NmCli *nmc = call->nmc;
nmc->should_wait--;
nmc->client = nm_client_new_finish (res, &error);
if (!nmc->client) {
g_simple_async_result_set_error (call->simple, NMCLI_ERROR, NMC_RESULT_ERROR_UNKNOWN,
_("Error: Could not create NMClient object: %s."), error->message);
g_error_free (error);
g_simple_async_result_complete (call->simple);
} else {
call_cmd (nmc, call->simple, call->cmd, call->argc, call->argv);
}
g_slice_free (CmdCall, call);
}
static void
call_cmd (NmCli *nmc, GSimpleAsyncResult *simple, const NMCCommand *cmd, int argc, char **argv)
{
CmdCall *call;
if (nmc->client || !cmd->needs_client) {
/* Check whether NetworkManager is running */
if (cmd->needs_nm_running && !nm_client_get_nm_running (nmc->client)) {
g_simple_async_result_set_error (simple, NMCLI_ERROR, NMC_RESULT_ERROR_NM_NOT_RUNNING,
_("Error: NetworkManager is not running."));
} else
nmc->return_value = cmd->func (nmc, argc, argv);
g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
} else {
nmc->should_wait++;
call = g_slice_new0 (CmdCall);
call->nmc = nmc;
call->cmd = cmd;
call->argc = argc;
call->argv = argv;
call->simple = simple;
nm_client_new_async (NULL, got_client, call);
}
}
cli: complete the [-][-]help arguments
2017-02-14 15:30:01 +01:00
static void
nmc_complete_help (const char *prefix)
{
nmc_complete_strings (prefix, "help", NULL);
if (*prefix == '-')
nmc_complete_strings (prefix, "-help", "--help", NULL);
}
cli: split out do_cmd()
2016-06-23 12:18:52 +02:00
/**
* nmc_do_cmd:
* @nmc: Client instance
* @cmds: Command table
* @cmd: Command
* @argc: Argument count
cli: make it possible to call sub-commands with client obtained asynchronously
2016-08-31 21:04:33 +02:00
* @argv: Arguments vector. Must be a global variable.
cli: split out do_cmd()
2016-06-23 12:18:52 +02:00
*
* Picks the right callback to handle command from the command table.
* If --help argument follows and the usage callback is specified for the command
* it calls the usage callback.
*
* The command table is terminated with a %NULL command. The terminating
* entry's handlers are called if the command is empty.
*
cli: make it possible to call sub-commands with client obtained asynchronously
2016-08-31 21:04:33 +02:00
* The argument vector needs to be a pointer to the global arguments vector that is
* never freed, since the command handler will be called asynchronously and there's
* no callback to free the memory in (for simplicity).
cli: split out do_cmd()
2016-06-23 12:18:52 +02:00
*/
cli: make it possible to call sub-commands with client obtained asynchronously
2016-08-31 21:04:33 +02:00
void
cli: split out do_cmd()
2016-06-23 12:18:52 +02:00
nmc_do_cmd (NmCli *nmc, const NMCCommand cmds[], const char *cmd, int argc, char **argv)
{
const NMCCommand *c;
cli: make it possible to call sub-commands with client obtained asynchronously
2016-08-31 21:04:33 +02:00
GSimpleAsyncResult *simple;
cli: split out do_cmd()
2016-06-23 12:18:52 +02:00
cli: make it possible to call sub-commands with client obtained asynchronously
2016-08-31 21:04:33 +02:00
simple = g_simple_async_result_new (NULL,
command_done,
nmc,
nmc_do_cmd);
if (argc == 0 && nmc->complete) {
g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
return;
}
cli: don't call the nmc_do_cmds() default handler if we're at the end of command completion
2016-07-27 14:53:03 +02:00
cli: make subcommand dispatch do autocompletion
2016-06-24 18:07:24 +02:00
if (argc == 1 && nmc->complete) {
for (c = cmds; c->cmd; ++c) {
cli: make match() return boolean Coccinelle semantic patch: @@ @@ -int +gboolean matches (...); @@ expression pattern, cmd, len; @@ -int +gboolean matches (...) { ... - return memcmp (pattern, cmd, len); + return memcmp (pattern, cmd, len) == 0; } @@ expression prefix, str; @@ ( -matches (prefix, str) != 0 +!matches (prefix, str) | -matches (prefix, str) == 0 +matches (prefix, str) ) @@ expression prefix, str; @@ -(matches (prefix, str)) +matches (prefix, str) @@ expression prefix, str; @@ -(!matches (prefix, str)) +!matches (prefix, str) spatch --smpl-spacing --sp-file match.cocci --dir clients/cli/ \ --include-headers --macro-file shared/nm-utils/gsystem-local-alloc.h
2017-02-15 12:20:55 +01:00
if (!*cmd || matches (cmd, c->cmd))
cli: make subcommand dispatch do autocompletion
2016-06-24 18:07:24 +02:00
g_print ("%s\n", c->cmd);
}
cli: complete the [-][-]help arguments
2017-02-14 15:30:01 +01:00
nmc_complete_help (cmd);
cli: make it possible to call sub-commands with client obtained asynchronously
2016-08-31 21:04:33 +02:00
g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
return;
cli: make subcommand dispatch do autocompletion
2016-06-24 18:07:24 +02:00
}
cli: split out do_cmd()
2016-06-23 12:18:52 +02:00
for (c = cmds; c->cmd; ++c) {
cli: make match() return boolean Coccinelle semantic patch: @@ @@ -int +gboolean matches (...); @@ expression pattern, cmd, len; @@ -int +gboolean matches (...) { ... - return memcmp (pattern, cmd, len); + return memcmp (pattern, cmd, len) == 0; } @@ expression prefix, str; @@ ( -matches (prefix, str) != 0 +!matches (prefix, str) | -matches (prefix, str) == 0 +matches (prefix, str) ) @@ expression prefix, str; @@ -(matches (prefix, str)) +matches (prefix, str) @@ expression prefix, str; @@ -(!matches (prefix, str)) +!matches (prefix, str) spatch --smpl-spacing --sp-file match.cocci --dir clients/cli/ \ --include-headers --macro-file shared/nm-utils/gsystem-local-alloc.h
2017-02-15 12:20:55 +01:00
if (cmd && matches (cmd, c->cmd))
cli: split out do_cmd()
2016-06-23 12:18:52 +02:00
break;
}
if (c->cmd) {
/* A valid command was specified. */
cli: complete the [-][-]help arguments
2017-02-14 15:30:01 +01:00
if (c->usage && argc == 2 && nmc->complete)
nmc_complete_help (*(argv+1));
cli: make it possible to call sub-commands with client obtained asynchronously
2016-08-31 21:04:33 +02:00
if (c->usage && nmc_arg_is_help (*(argv+1))) {
cli: complete the [-][-]help arguments
2017-02-14 15:30:01 +01:00
if (!nmc->complete)
c->usage ();
cli: make it possible to call sub-commands with client obtained asynchronously
2016-08-31 21:04:33 +02:00
g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
cli: use next_arg() on argument boundary Shift argc and argc manually between argument ant its value and use next_arg() between arguments everywhere. Whill be useful to parse global arguments.
2017-03-24 14:00:25 +01:00
} else {
call_cmd (nmc, simple, c, argc, argv);
}
cli: split out do_cmd()
2016-06-23 12:18:52 +02:00
} else if (cmd) {
/* Not a known command. */
if (nmc_arg_is_help (cmd) && c->usage) {
c->usage ();
cli: make it possible to call sub-commands with client obtained asynchronously
2016-08-31 21:04:33 +02:00
g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
cli: split out do_cmd()
2016-06-23 12:18:52 +02:00
} else {
cli: make it possible to call sub-commands with client obtained asynchronously
2016-08-31 21:04:33 +02:00
g_simple_async_result_set_error (simple, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
_("Error: argument '%s' not understood. Try passing --help instead."), cmd);
g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
cli: split out do_cmd()
2016-06-23 12:18:52 +02:00
}
} else if (c->func) {
/* No command, run the default handler. */
cli: make it possible to call sub-commands with client obtained asynchronously
2016-08-31 21:04:33 +02:00
call_cmd (nmc, simple, c, argc, argv);
cli: split out do_cmd()
2016-06-23 12:18:52 +02:00
} else {
/* No command and no default handler. */
cli: make it possible to call sub-commands with client obtained asynchronously
2016-08-31 21:04:33 +02:00
g_simple_async_result_set_error (simple, NMCLI_ERROR, NMC_RESULT_ERROR_USER_INPUT,
_("Error: missing argument. Try passing --help."));
g_simple_async_result_complete_in_idle (simple);
g_object_unref (simple);
cli: split out do_cmd()
2016-06-23 12:18:52 +02:00
}
}
cli: add arbitrary string list completion helper
2016-06-24 18:36:14 +02:00
/**
* nmc_complete_strings:
* @prefix: a string to match
* @...: a %NULL-terminated list of candidate strings
*
* Prints all the matching candidates for completion. Useful when there's
* no better way to suggest completion other than a hardcoded string list.
*/
void
nmc_complete_strings (const char *prefix, ...)
{
va_list args;
const char *candidate;
va_start (args, prefix);
while ((candidate = va_arg (args, const char *))) {
cli: make match() return boolean Coccinelle semantic patch: @@ @@ -int +gboolean matches (...); @@ expression pattern, cmd, len; @@ -int +gboolean matches (...) { ... - return memcmp (pattern, cmd, len); + return memcmp (pattern, cmd, len) == 0; } @@ expression prefix, str; @@ ( -matches (prefix, str) != 0 +!matches (prefix, str) | -matches (prefix, str) == 0 +matches (prefix, str) ) @@ expression prefix, str; @@ -(matches (prefix, str)) +matches (prefix, str) @@ expression prefix, str; @@ -(!matches (prefix, str)) +!matches (prefix, str) spatch --smpl-spacing --sp-file match.cocci --dir clients/cli/ \ --include-headers --macro-file shared/nm-utils/gsystem-local-alloc.h
2017-02-15 12:20:55 +01:00
if (!*prefix || matches (prefix, candidate))
cli: add arbitrary string list completion helper
2016-06-24 18:36:14 +02:00
g_print ("%s\n", candidate);
}
va_end (args);
}
cli: add boolean value completion helper
2016-06-24 18:56:36 +02:00
/**
* nmc_complete_bool:
* @prefix: a string to match
* @...: a %NULL-terminated list of candidate strings
*
* Prints all the matching possible boolean values for completion.
*/
void
nmc_complete_bool (const char *prefix)
{
nmc_complete_strings (prefix, "true", "yes", "on",
"false", "no", "off", NULL);
}
cli: return sane error message for D-Bus policy permission errors The error returned to users when a load_connection(s)/set_logging call fails due to D-Bus policy denial is a bit obscure: $ nmcli general logging level debug Error: failed to set logging: Rejected send message, 4 matched rules; type="method_call", sender=":1.233" (uid=1001 pid=27225 comm="nmcli general logging level debug ") interface="org.freedesktop.NetworkManager" member="SetLogging" error name="(unset)" requested_reply="0" destination=":1.207" (uid=0 pid=25793 comm="/usr/sbin/NetworkManager --no-daemon ") Convert it to a more comprehensible: $ nmcli general logging level debug Error: failed to set logging: access denied https://bugzilla.redhat.com/show_bug.cgi?id=1362542 (cherry picked from commit 805925f9efbc910975104bebe1050f0c663b61f7)
2016-08-19 11:56:58 +02:00
/**
* nmc_error_get_simple_message:
* @error: a GError
*
* Returns a simplified message for some errors hard to understand.
*/
const char *
nmc_error_get_simple_message (GError *error)
{
/* Return a clear message instead of the obscure D-Bus policy error */
if (g_error_matches (error, G_DBUS_ERROR, G_DBUS_ERROR_ACCESS_DENIED))
return _("access denied");
else
return error->message;
}
Reference in a new issue Copy permalink