649968632e
It's fundamentally wrong to have separate "remove_fcn" and "set_fcn" implementations. Set, reset, add, and remove are all similar, and should be implemented in a similar manner. Merge the implementations all in set-property, which now can: - reset the value (value == NULL && modifier == '\0') - set a value (value != NULL && modifier == '\0') - add a value (value != NULL && modifier == '+') - remove a value (value != NULL && modifier == '-') The real problem is that remove_fcn() behaves fundamentally different from set_fcn(). You can do "+setting.property value1,value2" but you cannot remove them the same way. That is because most remove_fcn() implementations don't expect a list of values. But it's also because of the unnatural split between set_fcn() and remove_fcn(). The next commit will merge set_fcn(), remove_fcn() and reset property. This commit just merges them all in nmc_setting_set_property().
55 lines
2.4 KiB
C
55 lines
2.4 KiB
C
/* nmcli - command-line tool to control NetworkManager
|
|
*
|
|
* 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.
|
|
*
|
|
* Copyright 2010 - 2014 Red Hat, Inc.
|
|
*/
|
|
|
|
#ifndef NMC_SETTINGS_H
|
|
#define NMC_SETTINGS_H
|
|
|
|
#include "nm-meta-setting.h"
|
|
#include "nm-meta-setting-desc.h"
|
|
|
|
#include "nmcli.h"
|
|
|
|
/*****************************************************************************/
|
|
|
|
void nmc_setting_ip4_connect_handlers (NMSettingIPConfig *setting);
|
|
void nmc_setting_ip6_connect_handlers (NMSettingIPConfig *setting);
|
|
void nmc_setting_proxy_connect_handlers (NMSettingProxy *setting);
|
|
void nmc_setting_wireless_connect_handlers (NMSettingWireless *setting);
|
|
void nmc_setting_connection_connect_handlers (NMSettingConnection *setting, NMConnection *connection);
|
|
|
|
char **nmc_setting_get_valid_properties (NMSetting *setting);
|
|
char *nmc_setting_get_property_desc (NMSetting *setting, const char *prop);
|
|
const char *const*nmc_setting_get_property_allowed_values (NMSetting *setting, const char *prop, char ***out_to_free);
|
|
char *nmc_setting_get_property (NMSetting *setting,
|
|
const char *prop,
|
|
GError **error);
|
|
char *nmc_setting_get_property_parsable (NMSetting *setting,
|
|
const char *prop,
|
|
GError **error);
|
|
gboolean nmc_setting_set_property (NMClient *client,
|
|
NMSetting *setting,
|
|
const char *prop,
|
|
char modifier,
|
|
const char *val,
|
|
GError **error);
|
|
|
|
gboolean setting_details (const NmcConfig *nmc_config, NMSetting *setting, const char *one_prop);
|
|
|
|
#endif /* NMC_SETTINGS_H */
|