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

cli: add property-info for NMSettingIP4Config and NMSettingIP6Config

Browse Source
This commit is contained in:
Thomas Haller
2017-03-25 15:52:03 +01:00
parent c023edc3bb
commit 40f47dbb06
4 changed files with 511 additions and 662 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
clients/cli/connections.c
View File

@@ -168,8 +168,8 @@ NmcOutputField nmc_fields_settings_names[] = {
SETTING_FIELD (NM_SETTING_802_1X_SETTING_NAME, nmc_fields_setting_8021X + 1), /* 2 */
SETTING_FIELD (NM_SETTING_WIRELESS_SETTING_NAME, nmc_fields_setting_wireless + 1), /* 3 */
SETTING_FIELD (NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, nmc_fields_setting_wireless_security + 1), /* 4 */
SETTING_FIELD (NM_SETTING_IP4_CONFIG_SETTING_NAME, nmc_fields_setting_ip4_config + 1), /* 5 */
SETTING_FIELD (NM_SETTING_IP6_CONFIG_SETTING_NAME, nmc_fields_setting_ip6_config + 1), /* 6 */
SETTING_FIELD_TYPE (NM_SETTING_IP4_CONFIG_SETTING_NAME, NM_META_SETTING_TYPE_IP4_CONFIG),
SETTING_FIELD_TYPE (NM_SETTING_IP6_CONFIG_SETTING_NAME, NM_META_SETTING_TYPE_IP6_CONFIG),
SETTING_FIELD (NM_SETTING_SERIAL_SETTING_NAME, nmc_fields_setting_serial + 1), /* 7 */
SETTING_FIELD (NM_SETTING_PPP_SETTING_NAME, nmc_fields_setting_ppp + 1), /* 8 */
SETTING_FIELD (NM_SETTING_PPPOE_SETTING_NAME, nmc_fields_setting_pppoe + 1), /* 9 */

4
clients/cli/nmcli.c
View File

@@ -151,8 +151,8 @@ complete_fields (const char *prefix)
complete_field (h, "802-1x", nmc_fields_setting_8021X);
complete_field (h, "802-11-wireless", nmc_fields_setting_wireless);
complete_field (h, "802-11-wireless-security", nmc_fields_setting_wireless_security);
complete_field (h, "ipv4", nmc_fields_setting_ip4_config);
complete_field (h, "ipv6", nmc_fields_setting_ip6_config);
complete_field_new (h, "ipv4", NM_META_SETTING_TYPE_IP4_CONFIG);
complete_field_new (h, "ipv6", NM_META_SETTING_TYPE_IP6_CONFIG);
complete_field (h, "serial", nmc_fields_setting_serial);
complete_field (h, "ppp", nmc_fields_setting_ppp);
complete_field (h, "pppoe", nmc_fields_setting_pppoe);

1148
clients/cli/settings.c
View File

File diff suppressed because it is too large Load Diff

17
clients/cli/settings.h
View File

@@ -51,6 +51,7 @@ struct _NmcPropertyInfo {
union {
const char *(*get_direct) (NMSetting *setting);
char *(*get_nmc) (NMSetting *setting, NmcPropertyGetType get_type);
gboolean (*get_gobject_with_default_fcn) (NMSetting *setting);
} get_data;
gboolean (*set_fcn) (const NmcSettingInfo *setting_info,
@@ -74,7 +75,19 @@ struct _NmcPropertyInfo {
const char *describe_message;
const char *const*values_static;
const char *const*(*values_fcn) (const NmcSettingInfo *setting_info,
const NmcPropertyInfo *property_info);
union {
union {
struct {
GType (*get_gtype) (void);
bool has_minmax:1;
int min;
int max;
} gobject_enum;
} values_data;
const char *const*values_static;
};
};
struct _NmcSettingInfo {
@@ -137,8 +150,6 @@ extern NmcOutputField nmc_fields_setting_wired[];
extern NmcOutputField nmc_fields_setting_8021X[];
extern NmcOutputField nmc_fields_setting_wireless[];
extern NmcOutputField nmc_fields_setting_wireless_security[];
extern NmcOutputField nmc_fields_setting_ip4_config[];
extern NmcOutputField nmc_fields_setting_ip6_config[];
extern NmcOutputField nmc_fields_setting_serial[];
extern NmcOutputField nmc_fields_setting_ppp[];
extern NmcOutputField nmc_fields_setting_pppoe[];