diff options
| author | Dan Winship <danw@gnome.org> | 2014-10-28 09:58:25 -0400 |
|---|---|---|
| committer | Dan Winship <danw@redhat.com> | 2014-11-19 09:24:09 -0500 |
| commit | c14486984ec087cabda61bb6ef2a5c587bbaf760 (patch) | |
| tree | ed71cede12adc3b0b2244264f2d2547b259eae2b | |
| parent | 3889ff864c5fab3b6d86f0fe19acc206cc5fb37c (diff) | |
| download | NetworkManager-c14486984ec087cabda61bb6ef2a5c587bbaf760.tar.gz | |
libnm, libnm-util: move settings doc generation to libnm-core
Move the settings/plugins doc generation from libnm-util to
libnm-core, since libnm-util isn't being updated for all new
properties.
With this commit, the keyfile and ifcfg-rh documentation is basically
unchanged, except that deprecated properties are now gone, and new
properties have been added, and the sections are in a different order.
(generate-plugin-docs.pl just outputs the settings in Makefile order,
and they were unsorted in libnm-util, but are sorted in libnm-core).
The settings documentation used for nm-settings.5, the D-Bus API docs,
and the nmcli help is changed a bit more at this point, and mostly for
the worse, since the libnm-core setting properties don't match up with
the D-Bus API as well as the libnm-util ones do. To be fixed...
(I also removed the "plugins docs" line in each plugin docs comment
block while moving them, since those blocks will be used for more than
just plugins soon, and it's sort of obvious anyway.)
42 files changed, 1242 insertions, 1369 deletions
diff --git a/.gitignore b/.gitignore index 8aa06cad5d..405ad78e7a 100644 --- a/.gitignore +++ b/.gitignore @@ -152,9 +152,6 @@ valgrind-*.log /libnm-glib/tests/test-nm-client /libnm-glib/tests/test-remote-settings-client -/libnm-util/nm-ifcfg-rh-docs.xml -/libnm-util/nm-keyfile-docs.xml -/libnm-util/nm-setting-docs.xml /libnm-util/nm-version.h /libnm-util/test-crypto /libnm-util/tests/test-crypto @@ -166,6 +163,9 @@ valgrind-*.log /libnm-util/tests/test-setting-8021x /libnm-util/tests/test-setting-dcb +/libnm/nm-ifcfg-rh-docs.xml +/libnm/nm-keyfile-docs.xml +/libnm/nm-setting-docs.xml /libnm/tests/test-nm-client /libnm/tests/test-remote-settings-client /libnm/tests/test-secret-agent diff --git a/clients/cli/Makefile.am b/clients/cli/Makefile.am index 482de7a833..6cf1c74e5f 100644 --- a/clients/cli/Makefile.am +++ b/clients/cli/Makefile.am @@ -51,7 +51,7 @@ nmcli_LDADD += $(POLKIT_LIBS) endif if BUILD_SETTING_DOCS -settings-docs.c: settings-docs.xsl $(top_builddir)/libnm-util/nm-setting-docs.xml +settings-docs.c: settings-docs.xsl $(top_builddir)/libnm/nm-setting-docs.xml $(AM_V_GEN) xsltproc --output $@ $^ BUILT_SOURCES = settings-docs.c diff --git a/docs/api/Makefile.am b/docs/api/Makefile.am index a364da035c..5283f73f72 100644 --- a/docs/api/Makefile.am +++ b/docs/api/Makefile.am @@ -15,7 +15,7 @@ GENERATED_FILES = spec.html if SETTING_DOCS_AVAILABLE -settings-spec.xml: settings-spec.xsl $(top_builddir)/libnm-util/nm-setting-docs.xml +settings-spec.xml: settings-spec.xsl $(top_builddir)/libnm/nm-setting-docs.xml $(AM_V_GEN) xsltproc --output $@ $^ # Top-level SGML file includes (depends on) settings-spec.xml diff --git a/libnm-core/nm-setting-8021x.c b/libnm-core/nm-setting-8021x.c index 144b9b5986..90f52f6025 100644 --- a/libnm-core/nm-setting-8021x.c +++ b/libnm-core/nm-setting-8021x.c @@ -3101,6 +3101,14 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * properties of this setting; refer to wpa_supplicant documentation for the * allowed combinations. **/ + /* ---ifcfg-rh--- + * property: eap + * variable: IEEE_8021X_EAP_METHODS(+) + * values: "LEAP", "PWD", "TLS", "PEAP", "TTLS", "FAST" + * description: EAP method for 802.1X authentication. + * example: IEEE_8021X_EAP_METHODS=PEAP + * ---end--- + */ g_object_class_install_property (object_class, PROP_EAP, g_param_spec_boxed (NM_SETTING_802_1X_EAP, "", "", @@ -3114,6 +3122,13 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * Identity string for EAP authentication methods. Often the user's user or * login name. **/ + /* ---ifcfg-rh--- + * property: identity + * variable: IEEE_8021X_IDENTITY(+) + * description: Identity for EAP authentication methods. + * example: IEEE_8021X_IDENTITY=itsme + * ---end--- + */ g_object_class_install_property (object_class, PROP_IDENTITY, g_param_spec_string (NM_SETTING_802_1X_IDENTITY, "", "", @@ -3128,6 +3143,12 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * unencrypted identity with EAP types that support different tunneled * identity like EAP-TTLS. **/ + /* ---ifcfg-rh--- + * property: anonymous-identity + * variable: IEEE_8021X_ANON_IDENTITY(+) + * description: Anonymous identity for EAP authentication methods. + * ---end--- + */ g_object_class_install_property (object_class, PROP_ANONYMOUS_IDENTITY, g_param_spec_string (NM_SETTING_802_1X_ANONYMOUS_IDENTITY, "", "", @@ -3140,6 +3161,13 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * * UTF-8 encoded file path containing PAC for EAP-FAST. **/ + /* ---ifcfg-rh--- + * property: pac-file + * variable: IEEE_8021X_PAC_FILE(+) + * description: File with PAC (Protected Access Credential) for EAP-FAST. + * example: IEEE_8021X_PAC_FILE=/home/joe/my-fast.pac + * ---end--- + */ g_object_class_install_property (object_class, PROP_PAC_FILE, g_param_spec_string (NM_SETTING_802_1X_PAC_FILE, "", "", @@ -3165,6 +3193,13 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * Setting this property directly is discouraged; use the * nm_setting_802_1x_set_ca_cert() function instead. **/ + /* ---ifcfg-rh--- + * property: ca-cert + * variable: IEEE_8021X_CA_CERT(+) + * description: CA certificate for EAP. + * example: IEEE_8021X_CA_CERT=/home/joe/cacert.crt + * ---end--- + */ g_object_class_install_property (object_class, PROP_CA_CERT, g_param_spec_boxed (NM_SETTING_802_1X_CA_CERT, "", "", @@ -3183,6 +3218,12 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * certificates to be added to the verification chain in addition to the * certificate specified in the #NMSetting8021x:ca-cert property. **/ + /* ---ifcfg-rh--- + * property: ca-path + * variable: (none) + * description: The property is not handled by ifcfg-rh plugin. + * ---end--- + */ g_object_class_install_property (object_class, PROP_CA_PATH, g_param_spec_string (NM_SETTING_802_1X_CA_PATH, "", "", @@ -3197,6 +3238,13 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * by the authentication server. When unset, no verification of the * authentication server certificate's subject is performed. **/ + /* ---ifcfg-rh--- + * property: subject-match + * variable: IEEE_8021X_SUBJECT_MATCH(+) + * description: Substring to match subject of server certificate against. + * example: IEEE_8021X_SUBJECT_MATCH="Red Hat" + * ---end--- + */ g_object_class_install_property (object_class, PROP_SUBJECT_MATCH, g_param_spec_string (NM_SETTING_802_1X_SUBJECT_MATCH, "", "", @@ -3211,6 +3259,13 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * certificate presented by the authentication server. If the list is empty, * no verification of the server certificate's altSubjectName is performed. **/ + /* ---ifcfg-rh--- + * property: altubject-matches + * variable: IEEE_8021X_AlTSUBJECT_MATCHES(+) + * description: List of strings to be matched against the altSubjectName. + * example: IEEE_8021X_ALTSUBJECT_MATCHES="s1.domain.cc" + * ---end--- + */ g_object_class_install_property (object_class, PROP_ALTSUBJECT_MATCHES, g_param_spec_boxed (NM_SETTING_802_1X_ALTSUBJECT_MATCHES, "", "", @@ -3234,6 +3289,13 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * Setting this property directly is discouraged; use the * nm_setting_802_1x_set_client_cert() function instead. **/ + /* ---ifcfg-rh--- + * property: client-cert + * variable: IEEE_8021X_CLIENT_CERT(+) + * description: Client certificate for EAP. + * example: IEEE_8021X_CLIENT_CERT=/home/joe/mycert.crt + * ---end--- + */ g_object_class_install_property (object_class, PROP_CLIENT_CERT, g_param_spec_boxed (NM_SETTING_802_1X_CLIENT_CERT, "", "", @@ -3255,6 +3317,13 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * so, this property may be set to "0" or "1" to force that specific PEAP * version. **/ + /* ---ifcfg-rh--- + * property: phase1-peapver + * variable: IEEE_8021X_PEAP_VERSION(+) + * values: 0, 1 + * description: Use to force a specific PEAP version. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PHASE1_PEAPVER, g_param_spec_string (NM_SETTING_802_1X_PHASE1_PEAPVER, "", "", @@ -3270,6 +3339,14 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * PEAPv1. Set to "1" to force use of the new PEAP label. See the * wpa_supplicant documentation for more details. **/ + /* ---ifcfg-rh--- + * property: phase1-peaplabel + * variable: IEEE_8021X_PEAP_FORCE_NEW_LABEL(+) + * values: yes, no + * default: no + * description: Use to force the new PEAP label during key derivation. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PHASE1_PEAPLABEL, g_param_spec_string (NM_SETTING_802_1X_PHASE1_PEAPLABEL, "", "", @@ -3287,6 +3364,14 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * both authenticated and unauthenticated provisioning). See the * wpa_supplicant documentation for more details. **/ + /* ---ifcfg-rh--- + * property: phase1-fast-provisioning + * variable: IEEE_8021X_FAST_PROVISIONING(+) + * values: space-separated list of these values [allow-auth, allow-unauth] + * description: Enable in-line provisioning of EAP-FAST credentials. + * example: IEEE_8021X_FAST_PROVISIONING="allow-auth allow-unauth" + * ---end--- + */ g_object_class_install_property (object_class, PROP_PHASE1_FAST_PROVISIONING, g_param_spec_string (NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING, "", "", @@ -3304,6 +3389,15 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * Each "phase 2" inner method requires specific parameters for successful * authentication; see the wpa_supplicant documentation for more details. **/ + /* ---ifcfg-rh--- + * property: phase2-auth + * variable: IEEE_8021X_INNER_AUTH_METHODS(+) + * values: "PAP", "CHAP", "MSCHAP", "MSCHAPV2", "GTC", "OTP", "MD5" and "TLS" + * description: Inner non-EAP authentication methods. IEEE_8021X_INNER_AUTH_METHODS + * can contain values both for 'phase2-auth' and 'phase2-autheap' properties. + * example: IEEE_8021X_INNER_AUTH_METHODS=PAP + * ---end--- + */ g_object_class_install_property (object_class, PROP_PHASE2_AUTH, g_param_spec_string (NM_SETTING_802_1X_PHASE2_AUTH, "", "", @@ -3321,6 +3415,15 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * requires specific parameters for successful authentication; see the * wpa_supplicant documentation for more details. **/ + /* ---ifcfg-rh--- + * property: phase2-autheap + * variable: IEEE_8021X_INNER_AUTH_METHODS(+) + * values: "EAP-MD5", "EAP-MSCHAPV2", "EAP-GTC", "EAP-OTP" and "EAP-TLS" + * description: Inner EAP-based authentication methods. Note that + * IEEE_8021X_INNER_AUTH_METHODS is also used for 'phase2-auth' values. + * example: IEEE_8021X_INNER_AUTH_METHODS="MSCHAPV2 EAP-TLS" + * ---end--- + */ g_object_class_install_property (object_class, PROP_PHASE2_AUTHEAP, g_param_spec_string (NM_SETTING_802_1X_PHASE2_AUTHEAP, "", "", @@ -3380,6 +3483,13 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * authentication. When unset, no verification of the authentication server * certificate's subject is performed. **/ + /* ---ifcfg-rh--- + * property: phase2-subject-match + * variable: IEEE_8021X_PHASE2_SUBJECT_MATCH(+) + * description: Substring to match subject of server certificate against. + * example: IEEE_8021X_PHASE2_SUBJECT_MATCH="Red Hat" + * ---end--- + */ g_object_class_install_property (object_class, PROP_PHASE2_SUBJECT_MATCH, g_param_spec_string (NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH, "", "", @@ -3395,6 +3505,11 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * "phase 2" authentication. If the list is empty, no verification of the * server certificate's altSubjectName is performed. **/ + /* ---ifcfg-rh--- + * property: phase2-altsubject-matches + * variable: IEEE_8021X_PHASE2_ALTSUBJECT_MATCHES(+) + * ---end--- + */ g_object_class_install_property (object_class, PROP_PHASE2_ALTSUBJECT_MATCHES, g_param_spec_boxed (NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES, "", "", @@ -3421,6 +3536,13 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * Setting this property directly is discouraged; use the * nm_setting_802_1x_set_phase2_client_cert() function instead. **/ + /* ---ifcfg-rh--- + * property: phase2-client-cert + * variable: IEEE_8021X_INNER_CLIENT_CERT(+) + * description: Client certificate for inner EAP method. + * example: IEEE_8021X_INNER_CLIENT_CERT=/home/joe/mycert.crt + * ---end--- + */ g_object_class_install_property (object_class, PROP_PHASE2_CLIENT_CERT, g_param_spec_boxed (NM_SETTING_802_1X_PHASE2_CLIENT_CERT, "", "", @@ -3439,6 +3561,13 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * #NMSetting8021x:password property and the #NMSetting8021x:password-raw * property are specified, #NMSetting8021x:password is preferred. **/ + /* ---ifcfg-rh--- + * property: password + * variable: IEEE_8021X_PASSWORD(+) + * description: UTF-8 encoded password used for EAP. It can also go to "key-" + * lookaside file, or it can be owned by a secret agent. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PASSWORD, g_param_spec_string (NM_SETTING_802_1X_PASSWORD, "", "", @@ -3452,6 +3581,12 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * * Flags indicating how to handle the #NMSetting8021x:password property. **/ + /* ---ifcfg-rh--- + * property: password-flags + * variable: IEEE_8021X_PASSWORD_FLAGS(+) + * description: Password flags for IEEE_8021X_PASSWORD password. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PASSWORD_FLAGS, g_param_spec_flags (NM_SETTING_802_1X_PASSWORD_FLAGS, "", "", @@ -3468,6 +3603,12 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * #NMSetting8021x:password property and the #NMSetting8021x:password-raw * property are specified, #NMSetting8021x:password is preferred. **/ + /* ---ifcfg-rh--- + * property: password-raw + * variable: (none) + * description: The property is not handled by ifcfg-rh plugin. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PASSWORD_RAW, g_param_spec_boxed (NM_SETTING_802_1X_PASSWORD_RAW, "", "", @@ -3485,6 +3626,12 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * * Flags indicating how to handle the #NMSetting8021x:password-raw property. **/ + /* ---ifcfg-rh--- + * property: password-raw-flags + * variable: (none) + * description: The property is not handled by ifcfg-rh plugin. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PASSWORD_RAW_FLAGS, g_param_spec_flags (NM_SETTING_802_1X_PASSWORD_RAW_FLAGS, "", "", @@ -3524,6 +3671,13 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * private key password to prevent unauthorized access to unencrypted * private key data. **/ + /* ---ifcfg-rh--- + * property: private-key + * variable: IEEE_8021X_PRIVATE_KEY(+) + * description: Private key for EAP-TLS. + * example: IEEE_8021X_PRIVATE_KEY=/home/joe/mykey.p12 + * ---end--- + */ g_object_class_install_property (object_class, PROP_PRIVATE_KEY, g_param_spec_boxed (NM_SETTING_802_1X_PRIVATE_KEY, "", "", @@ -3545,6 +3699,13 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * secrets to NetworkManager; it is generally set automatically when setting * the private key by the nm_setting_802_1x_set_private_key() function. **/ + /* ---ifcfg-rh--- + * property: private-key-password + * variable: IEEE_8021X_PRIVATE_KEY_PASSWORD(+) + * description: Password for IEEE_8021X_PRIVATE_KEY. It can also go to "key-" + * lookaside file, or it can be owned by a secret agent. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PRIVATE_KEY_PASSWORD, g_param_spec_string (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD, "", "", @@ -3559,6 +3720,12 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * Flags indicating how to handle the #NMSetting8021x:private-key-password * property. **/ + /* ---ifcfg-rh--- + * property: private-key-password-flags + * variable: IEEE_8021X_PRIVATE_KEY_PASSWORD_FLAGS(+) + * description: Password flags for IEEE_8021X_PRIVATE_KEY_PASSWORD password. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PRIVATE_KEY_PASSWORD_FLAGS, g_param_spec_flags (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS, "", "", @@ -3593,6 +3760,12 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * Setting this property directly is discouraged; use the * nm_setting_802_1x_set_phase2_private_key() function instead. **/ + /* ---ifcfg-rh--- + * property: phase2-private-key + * variable: IEEE_8021X_INNER_PRIVATE_KEY(+) + * description: Private key for inner authentication method for EAP-TLS. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PHASE2_PRIVATE_KEY, g_param_spec_boxed (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, "", "", @@ -3615,6 +3788,13 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * the private key by the nm_setting_802_1x_set_phase2_private_key() * function. **/ + /* ---ifcfg-rh--- + * property: phase2-private-key-password + * variable: IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD(+) + * description: Password for IEEE_8021X_INNER_PRIVATE_KEY. It can also go to "key-" + * lookaside file, or it can be owned by a secret agent. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PHASE2_PRIVATE_KEY_PASSWORD, g_param_spec_string (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD, "", "", @@ -3629,6 +3809,12 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * Flags indicating how to handle the * #NMSetting8021x:phase2-private-key-password property. **/ + /* ---ifcfg-rh--- + * property: phase2-private-key-password-flags + * variable: IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD_FLAGS(+) + * description: Password flags for IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD password. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS, g_param_spec_flags (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS, "", "", @@ -3642,6 +3828,12 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * * PIN used for EAP authentication methods. **/ + /* ---ifcfg-rh--- + * property: pin + * variable: (none) + * description: The property is not handled by ifcfg-rh plugin. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PIN, g_param_spec_string (NM_SETTING_802_1X_PIN, "", "", @@ -3655,6 +3847,12 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * * Flags indicating how to handle the #NMSetting8021x:pin property. **/ + /* ---ifcfg-rh--- + * property: pin-flags + * variable: (none) + * description: The property is not handled by ifcfg-rh plugin. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PIN_FLAGS, g_param_spec_flags (NM_SETTING_802_1X_PIN_FLAGS, "", "", @@ -3673,6 +3871,12 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * addition to any certificates specified by the #NMSetting8021x:ca-cert and * #NMSetting8021x:phase2-ca-cert properties. **/ + /* ---ifcfg-rh--- + * property: system-ca-certs + * variable: (none) + * description: The property is not handled by ifcfg-rh plugin. + * ---end--- + */ g_object_class_install_property (object_class, PROP_SYSTEM_CA_CERTS, g_param_spec_boolean (NM_SETTING_802_1X_SYSTEM_CA_CERTS, "", "", diff --git a/libnm-core/nm-setting-bond.c b/libnm-core/nm-setting-bond.c index e793ac1c1e..9fb7b356c6 100644 --- a/libnm-core/nm-setting-bond.c +++ b/libnm-core/nm-setting-bond.c @@ -726,6 +726,13 @@ nm_setting_bond_class_init (NMSettingBondClass *setting_class) * * Type: GHashTable(utf8,utf8) **/ + /* ---ifcfg-rh--- + * property: options + * variable: BONDING_OPTS + * description: Bonding options. + * example: BONDING_OPTS="miimon=100 mode=broadcast" + * ---end--- + */ g_object_class_install_property (object_class, PROP_OPTIONS, g_param_spec_boxed (NM_SETTING_BOND_OPTIONS, "", "", diff --git a/libnm-core/nm-setting-bridge-port.c b/libnm-core/nm-setting-bridge-port.c index c594656b21..763af37bcf 100644 --- a/libnm-core/nm-setting-bridge-port.c +++ b/libnm-core/nm-setting-bridge-port.c @@ -258,6 +258,14 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *setting_class) * * The Spanning Tree Protocol (STP) priority of this bridge port. **/ + /* ---ifcfg-rh--- + * property: priority + * variable: BRIDGING_OPTS: priority= + * values: 0 - 63 + * default: 32 + * description: STP priority. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PRIORITY, g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PRIORITY, "", "", @@ -273,6 +281,14 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *setting_class) * The Spanning Tree Protocol (STP) port cost for destinations via this * port. **/ + /* ---ifcfg-rh--- + * property: path-cost + * variable: BRIDGING_OPTS: path_cost= + * values: 1 - 65535 + * default: 100 + * description: STP cost. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PATH_COST, g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PATH_COST, "", "", @@ -288,6 +304,13 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *setting_class) * Enables or disabled "hairpin mode" for the port, which allows frames to * be sent back out through the port the frame was received on. **/ + /* ---ifcfg-rh--- + * property: hairpin-mode + * variable: BRIDGING_OPTS: hairpin_mode= + * default: yes + * description: Hairpin mode of the bridge port. + * ---end--- + */ g_object_class_install_property (object_class, PROP_HAIRPIN_MODE, g_param_spec_boolean (NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, "", "", diff --git a/libnm-core/nm-setting-bridge.c b/libnm-core/nm-setting-bridge.c index 6758b77930..acd3f62703 100644 --- a/libnm-core/nm-setting-bridge.c +++ b/libnm-core/nm-setting-bridge.c @@ -364,6 +364,22 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * MAC address will be set. When matching an existing (outside * NetworkManager created) bridge, this MAC address must match. **/ + /* ---keyfile--- + * property: mac-address + * format: ususal hex-digits-and-colons notation + * description: MAC address in traditional hex-digits-and-colons notation, + * or semicolon separated list of 6 decimal bytes (obsolete) + * example: mac-address=00:22:68:12:79:A2 + * mac-address=0;34;104;18;121;162; + * ---end--- + * ---ifcfg-rh--- + * property: mac-address + * variable: MACADDR(+) + * description: MAC address of the bridge. Note that this requires a recent + * kernel support, originally introduced in 3.15 upstream kernel) + * MACADDR for bridges is an NM extension. + * ---end--- + */ g_object_class_install_property (object_class, PROP_MAC_ADDRESS, g_param_spec_string (NM_SETTING_BRIDGE_MAC_ADDRESS, "", "", @@ -381,6 +397,13 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * * Controls whether Spanning Tree Protocol (STP) is enabled for this bridge. **/ + /* ---ifcfg-rh--- + * property: stp + * variable: STP + * default: no + * description: Span tree protocol participation. + * ---end--- + */ g_object_class_install_property (object_class, PROP_STP, g_param_spec_boolean (NM_SETTING_BRIDGE_STP, "", "", @@ -397,6 +420,14 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * values are "better"; the lowest priority bridge will be elected the root * bridge. **/ + /* ---ifcfg-rh--- + * property: priority + * variable: BRIDGING_OPTS: priority= + * values: 0 - 32768 + * default: 32768 + * description: STP priority. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PRIORITY, g_param_spec_uint (NM_SETTING_BRIDGE_PRIORITY, "", "", @@ -411,6 +442,14 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * * The Spanning Tree Protocol (STP) forwarding delay, in seconds. **/ + /* ---ifcfg-rh--- + * property: forward-delay + * variable: DELAY + * values: 2 - 30 + * default: 15 + * description: STP forwarding delay. + * ---end--- + */ g_object_class_install_property (object_class, PROP_FORWARD_DELAY, g_param_spec_uint (NM_SETTING_BRIDGE_FORWARD_DELAY, "", "", @@ -425,6 +464,14 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * * The Spanning Tree Protocol (STP) hello time, in seconds. **/ + /* ---ifcfg-rh--- + * property: hello-time + * variable: BRIDGING_OPTS: hello_time= + * values: 1 - 10 + * default: 2 + * description: STP hello time. + * ---end--- + */ g_object_class_install_property (object_class, PROP_HELLO_TIME, g_param_spec_uint (NM_SETTING_BRIDGE_HELLO_TIME, "", "", @@ -439,6 +486,14 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * * The Spanning Tree Protocol (STP) maximum message age, in seconds. **/ + /* ---ifcfg-rh--- + * property: max-age + * variable: BRIDGING_OPTS: max_age= + * values: 6 - 40 + * default: 20 + * description: STP maximum message age. + * ---end--- + */ g_object_class_install_property (object_class, PROP_MAX_AGE, g_param_spec_uint (NM_SETTING_BRIDGE_MAX_AGE, "", "", @@ -453,6 +508,14 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * * The Ethernet MAC address aging time, in seconds. **/ + /* ---ifcfg-rh--- + * property: ageing-time + * variable: BRIDGING_OPTS: ageing_time= + * values: 0 - 1000000 + * default: 300 + * description: Ethernet MAC ageing time. + * ---end--- + */ g_object_class_install_property (object_class, PROP_AGEING_TIME, g_param_spec_uint (NM_SETTING_BRIDGE_AGEING_TIME, "", "", diff --git a/libnm-core/nm-setting-connection.c b/libnm-core/nm-setting-connection.c index 9587ebcb1b..f5fb5b4598 100644 --- a/libnm-core/nm-setting-connection.c +++ b/libnm-core/nm-setting-connection.c @@ -1223,6 +1223,12 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * A human readable unique identifier for the connection, like "Work Wi-Fi" * or "T-Mobile 3G". **/ + /* ---ifcfg-rh--- + * property: id + * variable: NAME(+) + * description: User friendly name for the connection profile. + * ---end--- + */ g_object_class_install_property (object_class, PROP_ID, g_param_spec_string (NM_SETTING_CONNECTION_ID, "", "", @@ -1247,6 +1253,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * be generated by nm_utils_uuid_generate() or * nm_utils_uuid_generate_from_string(). **/ + /* ---ifcfg-rh--- + * property: uuid + * variable: UUID(+) + * description: UUID for the connetcion profile. When missing NetworkManager + * creates the UUID itself (by hashing the file). + * ---end--- + */ g_object_class_install_property (object_class, PROP_UUID, g_param_spec_string (NM_SETTING_CONNECTION_UUID, "", "", @@ -1270,6 +1283,14 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * can be used with, and if interface names change or are reordered the * connection may be applied to the wrong interface. **/ + /* ---ifcfg-rh--- + * property: interface-name + * variable: DEVICE + * description: Interface name of the device this profile is bound to. The variable + * can be left out when the profile should apply for more devices. Note that DEVICE + * can be required for some connection types. + * ---end--- + */ g_object_class_install_property (object_class, PROP_INTERFACE_NAME, g_param_spec_string (NM_SETTING_CONNECTION_INTERFACE_NAME, "", "", @@ -1292,6 +1313,15 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * non-hardware dependent connections like VPN or otherwise, should contain * the setting name of that setting type (ie, "vpn" or "bridge", etc). **/ + /* ---ifcfg-rh--- + * property: type + * variable: TYPE (DEVICETYPE, DEVICE) + * values: Ethernet, Wireless, InfiniBand, Bridge, Bond, Vlan, Team, TeamPort + * description: Base type of the connection. DEVICETYPE is used for teaming + * connections. + * example: TYPE=Ethernet; TYPE=Bond; TYPE=Bridge; DEVICETYPE=TeamPort + * ---end--- + */ g_object_class_install_property (object_class, PROP_TYPE, g_param_spec_string (NM_SETTING_CONNECTION_TYPE, "", "", @@ -1315,6 +1345,14 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * [reserved] information present must be ignored and is reserved for future * use. All of [type], [id], and [reserved] must be valid UTF-8. */ + /* ---ifcfg-rh--- + * property: permissions + * variable: USERS(+) + * description: USERS restrict the access for this conenction to certain + * users only. + * example: USERS="joe bob" + * ---end--- + */ g_object_class_install_property (object_class, PROP_PERMISSIONS, g_param_spec_boxed (NM_SETTING_CONNECTION_PERMISSIONS, "", "", @@ -1330,6 +1368,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * %TRUE to automatically activate the connection, %FALSE to require manual * intervention to activate the connection. **/ + /* ---ifcfg-rh--- + * property: autoconnect + * variable: ONBOOT + * default: yes + * description: Whether the connection should be autoconnected (not only while booting). + * ---end--- + */ g_object_class_install_property (object_class, PROP_AUTOCONNECT, g_param_spec_boolean (NM_SETTING_CONNECTION_AUTOCONNECT, "", "", @@ -1401,6 +1446,14 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * the connection will be placed in the default zone as defined by the * firewall. **/ + /* ---ifcfg-rh--- + * property: zone + * variable: ZONE(+) + * description: Trust level of this connection. The string is usually used + * for a firewall. + * example: ZONE=Work + * ---end--- + */ g_object_class_install_property (object_class, PROP_ZONE, g_param_spec_string (NM_SETTING_CONNECTION_ZONE, "", "", @@ -1415,6 +1468,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * * Interface name of the master device or UUID of the master connection. **/ + /* ---ifcfg-rh--- + * property: master + * variable: MASTER, TEAM_MASTER, BRIDGE + * description: Reference to master connection. The variable used depends on + * the connection type. + * ---end--- + */ g_object_class_install_property (object_class, PROP_MASTER, g_param_spec_string (NM_SETTING_CONNECTION_MASTER, "", "", @@ -1431,6 +1491,14 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * %NM_SETTING_BOND_SETTING_NAME), or %NULL if this connection is not a * slave. **/ + /* ---ifcfg-rh--- + * property: slave-type + * variable: MASTER, TEAM_MASTER, DEVICETYPE, BRIDGE + * description: Slave type doesn't map directly to a variable, but it is + * recognized using different variables. MASTER for bonding, + * TEAM_MASTER and DEVICETYPE for teaming, BRIDGE for bridging. + * ---end--- + */ g_object_class_install_property (object_class, PROP_SLAVE_TYPE, g_param_spec_string (NM_SETTING_CONNECTION_SLAVE_TYPE, "", "", @@ -1447,6 +1515,13 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * connection itself is activated. Currently only VPN connections are * supported. **/ + /* ---ifcfg-rh--- + * property: secondaries + * variable: SECONDARY_UUIDS(+) + * description: UUID of VPN connections that should be activated + * together with this connection. + * ---end--- + */ g_object_class_install_property (object_class, PROP_SECONDARIES, g_param_spec_boxed (NM_SETTING_CONNECTION_SECONDARIES, "", "", @@ -1461,6 +1536,15 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * If greater than zero, delay success of IP addressing until either the * timeout is reached, or an IP gateway replies to a ping. **/ + /* ---ifcfg-rh--- + * property: gateway-ping-timeout + * variable: GATEWAY_PING_TIMEOUT(+) + * default: 0 + * description: If greater than zero, the IP connectivity will be checked by + * pinging the gateway and waiting for the specified timeout (in seconds). + * example: GATEWAY_PING_TIMEOUT=5 + * ---end--- + */ g_object_class_install_property (object_class, PROP_GATEWAY_PING_TIMEOUT, g_param_spec_uint (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT, "", "", diff --git a/libnm-core/nm-setting-dcb.c b/libnm-core/nm-setting-dcb.c index 6b213db7b6..a4fa00c840 100644 --- a/libnm-core/nm-setting-dcb.c +++ b/libnm-core/nm-setting-dcb.c @@ -917,6 +917,14 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * be any combination of %NM_SETTING_DCB_FLAG_ENABLE, * %NM_SETTING_DCB_FLAG_ADVERTISE, and %NM_SETTING_DCB_FLAG_WILLING. **/ + /* ---ifcfg-rh--- + * property: app-fcoe-flags + * variable: DCB_APP_FCOE_ENABLE, DCB_APP_FCOE_ADVERTISE, DCB_APP_FCOE_WILLING + * description: FCOE flags. + * default: no + * example: DCB_APP_FCOE_ENABLE=yes DCB_APP_FCOE_ADVERTISE=yes + * ---end--- + */ g_object_class_install_property (object_class, PROP_APP_FCOE_FLAGS, g_param_spec_flags (NM_SETTING_DCB_APP_FCOE_FLAGS, "", "", @@ -932,6 +940,13 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * default priority. Only used when the #NMSettingDcb:app-fcoe-flags * property includes the %NM_SETTING_DCB_FLAG_ENABLE flag. **/ + /* ---ifcfg-rh--- + * property: app-fcoe-priority + * variable: DCB_APP_FCOE_PRIORITY + * values: 0 - 7 + * description: Priority of FCoE frames. + * ---end--- + */ g_object_class_install_property (object_class, PROP_APP_FCOE_PRIORITY, g_param_spec_int (NM_SETTING_DCB_APP_FCOE_PRIORITY, "", "", @@ -946,6 +961,14 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * The FCoE controller mode; either %NM_SETTING_DCB_FCOE_MODE_FABRIC * (default) or %NM_SETTING_DCB_FCOE_MODE_VN2VN. **/ + /* ---ifcfg-rh--- + * property: app-fcoe-mode + * variable: DCB_APP_FCOE_MODE + * values: fabric, vn2vn + * default: fabric + * description: FCoE controller mode. + * ---end--- + */ g_object_class_install_property (object_class, PROP_APP_FCOE_MODE, g_param_spec_string (NM_SETTING_DCB_APP_FCOE_MODE, "", "", @@ -961,6 +984,13 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * may be any combination of %NM_SETTING_DCB_FLAG_ENABLE, * %NM_SETTING_DCB_FLAG_ADVERTISE, and %NM_SETTING_DCB_FLAG_WILLING. **/ + /* ---ifcfg-rh--- + * property: app-iscsi-flags + * variable: DCB_APP_ISCSI_ENABLE, DCB_APP_ISCSI_ADVERTISE, DCB_APP_ISCSI_WILLING + * default: no + * description: iSCSI flags. + * ---end--- + */ g_object_class_install_property (object_class, PROP_APP_ISCSI_FLAGS, g_param_spec_flags (NM_SETTING_DCB_APP_ISCSI_FLAGS, "", "", @@ -976,6 +1006,13 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * for default priority. Only used when the #NMSettingDcb:app-iscsi-flags * property includes the %NM_SETTING_DCB_FLAG_ENABLE flag. **/ + /* ---ifcfg-rh--- + * property: app-iscsi-priority + * variable: DCB_APP_ISCSI_PRIORITY + * values: 0 - 7 + * description: Priority of iSCSI frames. + * ---end--- + */ g_object_class_install_property (object_class, PROP_APP_ISCSI_PRIORITY, g_param_spec_int (NM_SETTING_DCB_APP_ISCSI_PRIORITY, "", "", @@ -991,6 +1028,13 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * be any combination of %NM_SETTING_DCB_FLAG_ENABLE, * %NM_SETTING_DCB_FLAG_ADVERTISE, and %NM_SETTING_DCB_FLAG_WILLING. **/ + /* ---ifcfg-rh--- + * property: app-fip-flags + * variable: DCB_APP_FIP_ENABLE, DCB_APP_FIP_ADVERTISE, DCB_APP_FIP_WILLING + * default: no + * description: FIP flags. + * ---end--- + */ g_object_class_install_property (object_class, PROP_APP_FIP_FLAGS, g_param_spec_flags (NM_SETTING_DCB_APP_FIP_FLAGS, "", "", @@ -1006,6 +1050,13 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * default priority. Only used when the #NMSettingDcb:app-fip-flags * property includes the %NM_SETTING_DCB_FLAG_ENABLE flag. **/ + /* ---ifcfg-rh--- + * property: app-fip-priority + * variable: DCB_APP_FIP_PRIORITY + * values: 0 - 7 + * description: Priority of FIP frames. + * ---end--- + */ g_object_class_install_property (object_class, PROP_APP_FIP_PRIORITY, g_param_spec_int (NM_SETTING_DCB_APP_FIP_PRIORITY, "", "", @@ -1021,6 +1072,13 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * Flags may be any combination of %NM_SETTING_DCB_FLAG_ENABLE, * %NM_SETTING_DCB_FLAG_ADVERTISE, and %NM_SETTING_DCB_FLAG_WILLING. **/ + /* ---ifcfg-rh--- + * property: priority-flow-control-flags + * variable: DCB_PFC_ENABLE, DCB_PFC_ADVERTISE, DCB_PFC_WILLING + * default: no + * description: Priority flow control flags. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PFC_FLAGS, g_param_spec_flags (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS, "", "", @@ -1038,6 +1096,14 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Element-type: gboolean **/ + /* ---ifcfg-rh--- + * property: priority-flow-control + * variable: DCB_PFC_UP + * description: Priority flow control values. String of 8 "0" and "1", where "0". + * means "do not transmit priority pause", "1" means "transmit pause". + * example: DCB_PFC_UP=01101110 + * ---end--- + */ g_object_class_install_property (object_class, PROP_PFC, g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL, "", "", @@ -1056,6 +1122,13 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * any combination of %NM_SETTING_DCB_FLAG_ENABLE, * %NM_SETTING_DCB_FLAG_ADVERTISE, and %NM_SETTING_DCB_FLAG_WILLING. **/ + /* ---ifcfg-rh--- + * property: priority-group-flags + * variable: DCB_PG_ENABLE, DCB_PG_ADVERTISE, DCB_PG_WILLING + * default: no + * description: Priority groups flags. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PRIORITY_GROUP_FLAGS, g_param_spec_flags (NM_SETTING_DCB_PRIORITY_GROUP_FLAGS, "", "", @@ -1073,6 +1146,14 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Element-type: guint **/ + /* ---ifcfg-rh--- + * property: priority-group-id + * variable: DCB_PG_ID + * description: Priority groups values. String of eight priorities (0 - 7) or "f" + * (unrestricted). + * example: DCB_PG_ID=1205f173 + * ---end--- + */ g_object_class_install_property (object_class, PROP_PRIORITY_GROUP_ID, g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_GROUP_ID, "", "", @@ -1094,6 +1175,13 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Element-type: guint **/ + /* ---ifcfg-rh--- + * property: priority-group-bandwidth + * variable: DCB_PG_PCT + * description: Priority groups values. Eight bandwidths (in percent), separated with commas. + * example: DCB_PG_PCT=10,5,10,15,10,10,10,30 + * ---end--- + */ g_object_class_install_property (object_class, PROP_PRIORITY_GROUP_BANDWIDTH, g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH, "", "", @@ -1116,6 +1204,14 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Element-type: guint **/ + /* ---ifcfg-rh--- + * property: priority-bandwidth + * variable: DCB_PG_UPPCT + * description: Priority values. Eight bandwidths (in percent), separated with commas. + * The sum of the numbers must be 100. + * example: DCB_PG_UPPCT=7,13,10,10,15,15,10,20 + * ---end--- + */ g_object_class_install_property (object_class, PROP_PRIORITY_BANDWIDTH, g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_BANDWIDTH, "", "", @@ -1136,6 +1232,14 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Element-type: gboolean **/ + /* ---ifcfg-rh--- + * property: priority-strict-bandwidth + * variable: DCB_PG_STRICT + * description: Priority values. String of eight "0" or "1", where "0" means + * "may not utilize all bandwidth", "1" means "may utilize all bandwidth". + * example: DCB_PG_STRICT=01101110 + * ---end--- + */ g_object_class_install_property (object_class, PROP_PRIORITY_STRICT, g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH, "", "", @@ -1156,6 +1260,13 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Element-type: guint **/ + /* ---ifcfg-rh--- + * property: priority-traffic-class + * variable: DCB_PG_UP2TC + * description: Priority values. String of eight trafic class values (0 - 7). + * example: DCB_PG_UP2TC=01623701 + * ---end--- + */ g_object_class_install_property (object_class, PROP_PRIORITY_TRAFFIC_CLASS, g_param_spec_boxed (NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS, "", "", diff --git a/libnm-core/nm-setting-infiniband.c b/libnm-core/nm-setting-infiniband.c index ec193fdbf8..b0afe04f11 100644 --- a/libnm-core/nm-setting-infiniband.c +++ b/libnm-core/nm-setting-infiniband.c @@ -396,6 +396,21 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) * permanent MAC address matches. This property does not change the MAC * address of the device (i.e. MAC spoofing). **/ + /* ---keyfile--- + * property: mac-address + * format: ususal hex-digits-and-colons notation + * description: MAC address in traditional hex-digits-and-colons notation, or + * or semicolon separated list of 20 decimal bytes (obsolete) + * example: mac-address= 80:00:00:6d:fe:80:00:00:00:00:00:00:00:02:55:00:70:33:cf:01 + * ---end--- + * ---ifcfg-rh--- + * property: mac-address + * variable: HWADDR + * description: IBoIP 20-byte hardware address of the device (in traditional + * hex-digits-and-colons notation). + * example: HWADDR=01:02:03:04:05:06:07:08:09:0A:01:02:03:04:05:06:07:08:09:11 + * ---end--- + */ g_object_class_install_property (object_class, PROP_MAC_ADDRESS, g_param_spec_string (NM_SETTING_INFINIBAND_MAC_ADDRESS, "", "", @@ -414,6 +429,12 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) * If non-zero, only transmit packets of the specified size or smaller, * breaking larger packets up into multiple frames. **/ + /* ---ifcfg-rh--- + * property: mtu + * variable: MTU + * description: MTU of the interface. + * ---end--- + */ g_object_class_install_property (object_class, PROP_MTU, g_param_spec_uint (NM_SETTING_INFINIBAND_MTU, "", "", @@ -429,6 +450,14 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) * The IP-over-InfiniBand transport mode. Either "datagram" or * "connected". **/ + /* ---ifcfg-rh--- + * property: transport-mode + * variable: CONNECTED_MODE + * default: CONNECTED_MODE=no + * description: CONNECTED_MODE=yes for "connected" mode, CONNECTED_MODE=no for + * "datagram" mode + * ---end--- + */ g_object_class_install_property (object_class, PROP_TRANSPORT_MODE, g_param_spec_string (NM_SETTING_INFINIBAND_TRANSPORT_MODE, "", "", @@ -446,6 +475,16 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) * unsigned integer, whose high bit is set if it is a "full membership" * P_Key. **/ + /* ---ifcfg-rh--- + * property: p-key + * variable: PKEY_ID (and PKEY=yes) + * default: PKEY=no + * description: InfiniBand P_Key. The value can be a hex number prefixed with "0x" + * or a decimal number. + * When PKEY_ID is specified, PHYSDEV and DEVICE also must be specified. + * example: PKEY=yes PKEY_ID=2 PHYSDEV=mlx4_ib0 DEVICE=mlx4_ib0.8002 + * ---end--- + */ g_object_class_install_property (object_class, PROP_P_KEY, g_param_spec_int (NM_SETTING_INFINIBAND_P_KEY, "", "", @@ -463,6 +502,14 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) * specify the base device by setting either this property or * #NMSettingInfiniband:mac-address. **/ + /* ---ifcfg-rh--- + * property: parent + * variable: PHYSDEV (PKEY=yes) + * default: PKEY=no + * description: InfiniBand parent device. + * example: PHYSDEV=ib0 + * ---end--- + */ g_object_class_install_property (object_class, PROP_PARENT, g_param_spec_string (NM_SETTING_INFINIBAND_PARENT, "", "", diff --git a/libnm-core/nm-setting-ip4-config.c b/libnm-core/nm-setting-ip4-config.c index 008e87eea9..b71767e71c 100644 --- a/libnm-core/nm-setting-ip4-config.c +++ b/libnm-core/nm-setting-ip4-config.c @@ -442,12 +442,134 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *ip4_class) /* properties */ + /* ---ifcfg-rh--- + * property: method + * variable: BOOTPROTO + * format: string + * values: none, dhcp (bootp), static, ibft, autoip, shared + * default: none + * description: Method used for IPv4 protocol configuration. + * ---end--- + */ + + /* ---keyfile--- + * property: dns + * format: list of DNS IP addresses + * description: List of DNS servers. + * example: dns=1.2.3.4;8.8.8.8;8.8.4.4; + * ---end--- + * ---ifcfg-rh--- + * property: dns + * variable: DNS1, DNS2, ... + * format: string + * description: List of DNS servers. Even if NetworkManager supports many DNS + * servers, initscripts and resolver only care about the first three, usually. + * example: DNS1=1.2.3.4 DNS2=10.0.0.254 DNS3=8.8.8.8 + * ---end--- + */ + + /* ---ifcfg-rh--- + * property: dns-search + * variable: DOMAIN + * format: string (space-separated domains) + * description: List of DNS search domains. + * ---end--- + */ + + /* ---keyfile--- + * property: addresses + * variable: address1, address2, ... + * format: address/plen[,gateway] + * description: List of static IP addresses. + * example: address1=192.168.100.100/24,192.168.100.1 + * address2=10.1.1.5/24 + * ---end--- + * ---ifcfg-rh--- + * property: addresses + * variable: IPADDR, PREFIX, GATEWAY, IPADDR1, PREFIX1, GATEWAY1, ... + * description: List of static IP addresses. + * example: IPADDR 10.5.5.23 PREFIX=24 GATEWAY=10.5.5.1 + * ---end--- + */ + + /* ---keyfile--- + * property: routes + * variable: route1, route2, ... + * format: route/plen[,gateway,metric] + * description: List of IP routes. + * example: route1=8.8.8.0/24,10.1.1.1,77 + * route2=7.7.0.0/16 + * ---end--- + * ---ifcfg-rh--- + * property: routes + * variable: ADDRESS1, NETMASK1, GATEWAY1, METRIC1, ... + * description: List of static routes. They are not stored in ifcfg-* file, + * but in route-* file instead. + * ---end--- + */ + + /* ---ifcfg-rh--- + * property: ignore-auto-routes + * variable: PEERROUTES(+) + * default: yes + * description: PEERROUTES has the opposite meaning as 'ignore-auto-routes' property. + * ---end--- + */ + + /* ---ifcfg-rh--- + * property: ignore-auto-dns + * variable: PEERDNS + * default: yes + * description: PEERDNS has the opposite meaning as 'ignore-auto-dns' property. + * ---end--- + */ + + /* ---ifcfg-rh--- + * property: dhcp-send-hostname + * variable: DHCP_SEND_HOSTNAME(+) + * default: yes + * description: Whether DHCP_HOSTNAME should be sent to the DHCP server. + * ---end--- + */ + + /* ---ifcfg-rh--- + * property: dhcp-hostname + * variable: DHCP_HOSTNAME + * description: Hostname to send to the DHCP server. + * ---end--- + */ + + /* ---ifcfg-rh--- + * property: never-default + * variable: DEFROUTE (GATEWAYDEV in /etc/sysconfig/network) + * default: yes + * description: DEFROUTE=no tells NetworkManager that this connection + * should not be assigned the default route. DEFROUTE has the opposite + * meaning as 'never-default' property. + * ---end--- + */ + + /* ---ifcfg-rh--- + * property: may-fail + * variable: IPV4_FAILURE_FATAL(+) + * default: no + * description: IPV4_FAILURE_FATAL has the opposite meaning as 'may-fail' property. + * ---end--- + */ + /** * NMSettingIP4Config:dhcp-client-id: * * A string sent to the DHCP server to identify the local machine which the * DHCP server may use to customize the DHCP lease and options. **/ + /* ---ifcfg-rh--- + * property: dhcp-client-id + * variable: DHCP_CLIENT_ID(+) + * description: A string sent to the DHCP server to identify the local machine. + * example: DHCP_CLIENT_ID=ax-srv-1 + * ---end--- + */ g_object_class_install_property (object_class, PROP_DHCP_CLIENT_ID, g_param_spec_string (NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, "", "", diff --git a/libnm-core/nm-setting-ip6-config.c b/libnm-core/nm-setting-ip6-config.c index 7bfce8ef47..a737dffec3 100644 --- a/libnm-core/nm-setting-ip6-config.c +++ b/libnm-core/nm-setting-ip6-config.c @@ -368,6 +368,109 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *ip6_class) setting_class->verify = verify; /* Properties */ + + /* ---ifcfg-rh--- + * property: method + * variable: IPV6INIT, IPV6FORWARDING, IPV6_AUTOCONF, DHCPV6C + * default: IPV6INIT=yes; IPV6FORWARDING=no; IPV6_AUTOCONF=!IPV6FORWARDING, DHCPV6=no + * description: Method used for IPv6 protocol configuration. + * ignore ~ IPV6INIT=no; auto ~ IPV6_AUTOCONF=yes; dhcp ~ IPV6_AUTOCONF=no and DHCPV6C=yes + * ---end--- + */ + + /* ---keyfile--- + * property: dns + * format: list of DNS IP addresses + * description: List of DNS servers. + * example: dns=2001:4860:4860::8888;2001:4860:4860::8844; + * ---end--- + * ---ifcfg-rh--- + * property: dns + * variable: DNS1, DNS2, ... + * format: string + * description: List of DNS servers. NetworkManager uses the variables both + * for IPv4 and IPv6. + * ---end--- + */ + + /* ---ifcfg-rh--- + * property: dns-search + * variable: DOMAIN + * format: string (space-separated domains) + * description: List of DNS search domains. + * ---end--- + */ + + /* ---keyfile--- + * property: addresses + * variable: address1, address2, ... + * format: address/plen[,gateway] + * description: List of static IP addresses. + * example: address1=abbe::cafe/96,abbe::1 + * ---end--- + * ---ifcfg-rh--- + * property: addresses + * variable: IPV6ADDR, IPV6_DEFAULTGW, IPV6ADDR_SECONDARIES + * description: List of static IP addresses. + * ---end--- + */ + + /* ---keyfile--- + * property: routes + * variable: route1, route2, ... + * format: route/plen[,gateway,metric] + * description: List of IP routes. + * example: route1=2001:4860:4860::/64,2620:52:0:2219:222:68ff:fe11:5403 + * ---end--- + * ---ifcfg-rh--- + * property: routes + * variable: (none) + * description: List of static routes. They are not stored in ifcfg-* file, + * but in route6-* file instead in the form of command line for 'ip route add'. + * ---end--- + */ + + /* ---ifcfg-rh--- + * property: ignore-auto-routes + * variable: IPV6_PEERROUTES(+) + * default: yes + * description: IPV6_PEERROUTES has the opposite meaning as 'ignore-auto-routes' property. + * ---end--- + */ + + /* ---ifcfg-rh--- + * property: ignore-auto-dns + * variable: IPV6_PEERDNS(+) + * default: yes + * description: IPV6_PEERDNS has the opposite meaning as 'ignore-auto-dns' property. + * ---end--- + */ + + /* ---ifcfg-rh--- + * property: dhcp-hostname + * variable: DHCP_HOSTNAME + * description: Hostname to send the DHCP server. + * ---end--- + */ + + /* ---ifcfg-rh--- + * property: never-default + * variable: IPV6_DEFROUTE(+), (and IPV6_DEFAULTGW, IPV6_DEFAULTDEV in /etc/sysconfig/network) + * default: IPV6_DEFROUTE=yes (when no variable specified) + * description: IPV6_DEFROUTE=no tells NetworkManager that this connection + * should not be assigned the default IPv6 route. IPV6_DEFROUTE has the opposite + * meaning as 'never-default' property. + * ---end--- + */ + + /* ---ifcfg-rh--- + * property: may-fail + * variable: IPV6_FAILURE_FATAL(+) + * default: no + * description: IPV6_FAILURE_FATAL has the opposite meaning as 'may-fail' property. + * ---end--- + */ + /** * NMSettingIP6Config:ip6-privacy: * @@ -379,6 +482,12 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *ip6_class) * 1: enabled (prefer public address), 2: enabled (prefer temporary * addresses). **/ + /* ---ifcfg-rh--- + * property: ip6-privacy + * variable: IPV6_PRIVACY, IPV6_PRIVACY_PREFER_PUBLIC_IP(+) + * description: Configure IPv6 Privacy Extensions for SLAAC (RFC4941). + * ---end--- + */ g_object_class_install_property (object_class, PROP_IP6_PRIVACY, g_param_spec_enum (NM_SETTING_IP6_CONFIG_IP6_PRIVACY, "", "", diff --git a/libnm-core/nm-setting-serial.c b/libnm-core/nm-setting-serial.c index 2ca96edbfa..9a7b7f26c3 100644 --- a/libnm-core/nm-setting-serial.c +++ b/libnm-core/nm-setting-serial.c @@ -293,6 +293,15 @@ nm_setting_serial_class_init (NMSettingSerialClass *setting_class) * * Parity setting of the serial port. **/ + /* ---keyfile--- + * property: parity + * format: 'e', 'o', or 'n' + * description: The connection parity; even, odd, or none. Note that older + * versions of NetworkManager stored this as an integer: 69 ('E') for even, + * 111 ('o') for odd, or 110 ('n') for none. + * example: parity=n + * ---end--- + */ g_object_class_install_property (object_class, PROP_PARITY, g_param_spec_enum (NM_SETTING_SERIAL_PARITY, "", "", diff --git a/libnm-core/nm-setting-team-port.c b/libnm-core/nm-setting-team-port.c index db765b948c..b5125753c3 100644 --- a/libnm-core/nm-setting-team-port.c +++ b/libnm-core/nm-setting-team-port.c @@ -176,6 +176,12 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *setting_class) * directly to teamd. If not specified, the default configuration is * used. See man teamd.conf for the format details. **/ + /* ---ifcfg-rh--- + * property: config + * variable: TEAM_PORT_CONFIG + * description: Team port configuration in JSON. See man teamd.conf for details. + * ---end--- + */ g_object_class_install_property (object_class, PROP_CONFIG, g_param_spec_string (NM_SETTING_TEAM_PORT_CONFIG, "", "", diff --git a/libnm-core/nm-setting-team.c b/libnm-core/nm-setting-team.c index dec6a8f6fb..3027810486 100644 --- a/libnm-core/nm-setting-team.c +++ b/libnm-core/nm-setting-team.c @@ -157,6 +157,12 @@ nm_setting_team_class_init (NMSettingTeamClass *setting_class) * the value is passed directly to teamd. If not specified, the default * configuration is used. See man teamd.conf for the format details. **/ + /* ---ifcfg-rh--- + * property: config + * variable: TEAM_CONFIG + * description: Team configuration in JSON. See man teamd.conf for details. + * ---end--- + */ g_object_class_install_property (object_class, PROP_CONFIG, g_param_spec_string (NM_SETTING_TEAM_CONFIG, "", "", diff --git a/libnm-core/nm-setting-vlan.c b/libnm-core/nm-setting-vlan.c index c1b9940ff1..5a348211e9 100644 --- a/libnm-core/nm-setting-vlan.c +++ b/libnm-core/nm-setting-vlan.c @@ -692,6 +692,12 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) * not specified, the connection must contain an #NMSettingWired setting * with a #NMSettingWired:mac-address property. **/ + /* ---ifcfg-rh--- + * property: parent + * variable: DEVICE or PHYSDEV + * description: Parent interface of the VLAN. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PARENT, g_param_spec_string (NM_SETTING_VLAN_PARENT, "", "", @@ -707,6 +713,12 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) * The VLAN identifier that the interface created by this connection should * be assigned. **/ + /* ---ifcfg-rh--- + * property: id + * variable: VLAN_ID or DEVICE + * description: VLAN identifier. + * ---end--- + */ g_object_class_install_property (object_class, PROP_ID, g_param_spec_uint (NM_SETTING_VLAN_ID, "", "", @@ -725,6 +737,13 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) * and %NM_VLAN_FLAG_LOOSE_BINDING (loose binding of the interface to its * master device's operating state). **/ + /* ---ifcfg-rh--- + * property: flags + * variable: VLAN_FLAGS, REORDER_HDR + * values: "GVRP", "LOOSE_BINDING" for VLAN_FLAGS; 0 or 1 for REORDER_HDR + * description: Parent interface of the VLAN. + * ---end--- + */ g_object_class_install_property (object_class, PROP_FLAGS, g_param_spec_flags (NM_SETTING_VLAN_FLAGS, "", "", @@ -742,6 +761,13 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) * SKB priorities. The mapping is given in the format "from:to" where both * "from" and "to" are unsigned integers, ie "7:3". **/ + /* ---ifcfg-rh--- + * property: ingress-property-map + * variable: VLAN_INGRESS_PRIORITY_MAP + * description: Ingress priority mapping. + * example: VLAN_INGRESS_PRIORITY_MAP=4:2,3:5 + * ---end--- + */ g_object_class_install_property (object_class, PROP_INGRESS_PRIORITY_MAP, g_param_spec_boxed (NM_SETTING_VLAN_INGRESS_PRIORITY_MAP, "", "", @@ -757,6 +783,13 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) * 802.1p priorities. The mapping is given in the format "from:to" where * both "from" and "to" are unsigned integers, ie "7:3". **/ + /* ---ifcfg-rh--- + * property: egress-property-map + * variable: VLAN_EGRESS_PRIORITY_MAP + * description: Egress priority mapping. + * example: VLAN_EGRESS_PRIORITY_MAP=5:4,4:1,3:7 + * ---end--- + */ g_object_class_install_property (object_class, PROP_EGRESS_PRIORITY_MAP, g_param_spec_boxed (NM_SETTING_VLAN_EGRESS_PRIORITY_MAP, "", "", @@ -765,6 +798,15 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) NM_SETTING_PARAM_INFERRABLE | G_PARAM_STATIC_STRINGS)); + /* ---ifcfg-rh--- + * property: interface-name + * variable: PHYSDEV and VLAN_ID, or DEVICE + * description: VLAN interface name. + * If all variables are set, parent device from PHYSDEV takes precedence over DEVICE, + * but VLAN id from DEVICE takes precedence over VLAN_ID. + * example: PHYSDEV=eth0, VLAN_ID=12; or DEVICE=eth0.12 + * ---end--- + */ _nm_setting_class_add_dbus_only_property (parent_class, "interface-name", G_VARIANT_TYPE_STRING, _nm_setting_get_deprecated_virtual_interface_name, diff --git a/libnm-core/nm-setting-vpn.c b/libnm-core/nm-setting-vpn.c index b317a72a48..e6fffa8797 100644 --- a/libnm-core/nm-setting-vpn.c +++ b/libnm-core/nm-setting-vpn.c @@ -864,6 +864,14 @@ nm_setting_vpn_class_init (NMSettingVpnClass *setting_class) * * Type: GHashTable(utf8,utf8) **/ + /* ---keyfile--- + * property: data + * variable: separate variables named after keys of the dictionary + * description: The keys of the data dictionary are used as variable names directly + * under [vpn] section. + * example: remote=ovpn.corp.com cipher=AES-256-CBC username=joe + * ---end--- + */ g_object_class_install_property (object_class, PROP_DATA, g_param_spec_boxed (NM_SETTING_VPN_DATA, "", "", @@ -883,6 +891,14 @@ nm_setting_vpn_class_init (NMSettingVpnClass *setting_class) * * Type: GHashTable(utf8,utf8) **/ + /* ---keyfile--- + * property: secrets + * variable: separate variables named after keys of the dictionary + * description: The keys of the secrets dictionary are used as variable names directly + * under [vpn-secrets] section. + * example: password=Popocatepetl + * ---end--- + */ g_object_class_install_property (object_class, PROP_SECRETS, g_param_spec_boxed (NM_SETTING_VPN_SECRETS, "", "", diff --git a/libnm-core/nm-setting-wired.c b/libnm-core/nm-setting-wired.c index 37e2dfe5e4..ac143e45df 100644 --- a/libnm-core/nm-setting-wired.c +++ b/libnm-core/nm-setting-wired.c @@ -835,6 +835,12 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * Interface), "bnc" (Thin Ethernet) or "mii" (Media Independent Interface. * If the device supports only one port type, this setting is ignored. **/ + /* ---ifcfg-rh--- + * property: port + * variable: (none) + * description: The property is not saved by the plugin. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PORT, g_param_spec_string (NM_SETTING_WIRED_PORT, "", "", @@ -848,6 +854,12 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * If non-zero, request that the device use only the specified speed. In * Mbit/s, ie 100 == 100Mbit/s. **/ + /* ---ifcfg-rh--- + * property: speed + * variable: (none) + * description: The property is not saved by the plugin. + * ---end--- + */ g_object_class_install_property (object_class, PROP_SPEED, g_param_spec_uint (NM_SETTING_WIRED_SPEED, "", "", @@ -862,6 +874,12 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * If specified, request that the device only use the specified duplex mode. * Either "half" or "full". **/ + /* ---ifcfg-rh--- + * property: duplex + * variable: (none) + * description: The property is not saved by the plugin. + * ---end--- + */ g_object_class_install_property (object_class, PROP_DUPLEX, g_param_spec_string (NM_SETTING_WIRED_DUPLEX, "", "", @@ -876,6 +894,12 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * %FALSE, do not allow auto-negotiation, in which case the "speed" and * "duplex" properties should be set. **/ + /* ---ifcfg-rh--- + * property: auto-negotiate + * variable: (none) + * description: The property is not saved by the plugin. + * ---end--- + */ g_object_class_install_property (object_class, PROP_AUTO_NEGOTIATE, g_param_spec_boolean (NM_SETTING_WIRED_AUTO_NEGOTIATE, "", "", @@ -891,6 +915,20 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * whose permanent MAC address matches. This property does not change the * MAC address of the device (i.e. MAC spoofing). **/ + /* ---keyfile--- + * property: mac-address + * format: ususal hex-digits-and-colons notation + * description: MAC address in traditional hex-digits-and-colons notation + * (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) + * (e.g. 0;34;104;18;121;162) + * ---end--- + * ---ifcfg-rh--- + * property: mac-address + * variable: HWADDR + * description: Hardware address of the device in traditional hex-digits-and-colons + * notation (e.g. 00:22:68:14:5A:05). + * ---end--- + */ g_object_class_install_property (object_class, PROP_MAC_ADDRESS, g_param_spec_string (NM_SETTING_WIRED_MAC_ADDRESS, "", "", @@ -909,6 +947,20 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * If specified, request that the device use this MAC address instead of its * permanent MAC address. This is known as MAC cloning or spoofing. **/ + /* ---keyfile--- + * property: cloned-mac-address + * format: ususal hex-digits-and-colons notation + * description: Cloned MAC address in traditional hex-digits-and-colons notation + * (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) + * (e.g. 0;34;104;18;121;178). + * ---end--- + * ---ifcfg-rh--- + * property: cloned-mac-address + * variable: MACADDR + * description: Cloned (spoofed) MAC address in traditional hex-digits-and-colons + * notation (e.g. 00:22:68:14:5A:99). + * ---end--- + */ g_object_class_install_property (object_class, PROP_CLONED_MAC_ADDRESS, g_param_spec_string (NM_SETTING_WIRED_CLONED_MAC_ADDRESS, "", "", @@ -929,6 +981,20 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * address is in the standard hex-digits-and-colons notation * (00:11:22:33:44:55). **/ + /* ---keyfile--- + * property: mac-address-blacklist + * format: list of MACs (separated with semicolons) + * description: MAC address blacklist. + * example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78 + * ---end--- + * ---ifcfg-rh--- + * property: mac-address-blacklist + * variable: HWADDR_BLACKLIST(+) + * description: It denies usage of the connection for any device whose address + * is listed. + * example: HWADDR_BLACKLIST="00:22:68:11:69:08 00:11:22:11:44:55" + * ---end--- + */ g_object_class_install_property (object_class, PROP_MAC_ADDRESS_BLACKLIST, g_param_spec_boxed (NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST, "", "", @@ -943,6 +1009,12 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * If non-zero, only transmit packets of the specified size or smaller, * breaking larger packets up into multiple Ethernet frames. **/ + /* ---ifcfg-rh--- + * property: mtu + * variable: MTU + * description: MTU of the interface. + * ---end--- + */ g_object_class_install_property (object_class, PROP_MTU, g_param_spec_uint (NM_SETTING_WIRED_MTU, "", "", @@ -963,6 +1035,13 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * and each string may only be composed of hexadecimal characters and the * period (.) character. **/ + /* ---ifcfg-rh--- + * property: s390-subchannels + * variable: SUBCHANNELS + * description: Subchannels for IBM S390 hosts. + * example: SUBCHANNELS=0.0.b00a,0.0.b00b,0.0.b00c + * ---end--- + */ g_object_class_install_property (object_class, PROP_S390_SUBCHANNELS, g_param_spec_boxed (NM_SETTING_WIRED_S390_SUBCHANNELS, "", "", @@ -977,6 +1056,14 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * s390 network device type; one of "qeth", "lcs", or "ctc", representing * the different types of virtual network devices available on s390 systems. **/ + /* ---ifcfg-rh--- + * property: s390-nettype + * variable: NETTYPE + * values: "qeth", "lcs" or "ctc" + * description: Network type of the S390 host. + * example: NETTYPE=qeth + * ---end--- + */ g_object_class_install_property (object_class, PROP_S390_NETTYPE, g_param_spec_string (NM_SETTING_WIRED_S390_NETTYPE, "", "", @@ -995,6 +1082,13 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * * Type: GHashTable(utf8,utf8) **/ + /* ---ifcfg-rh--- + * property: s390-options + * variable: OPTIONS and PORTNAME, CTCPROTO, + * description: S390 device options. All options go to OPTIONS, except for + * "portname" and "ctcprot" that have their own variables. + * ---end--- + */ g_object_class_install_property (object_class, PROP_S390_OPTIONS, g_param_spec_boxed (NM_SETTING_WIRED_S390_OPTIONS, "", "", diff --git a/libnm-core/nm-setting-wireless-security.c b/libnm-core/nm-setting-wireless-security.c index 9a7b5a591d..b3ca0a01f7 100644 --- a/libnm-core/nm-setting-wireless-security.c +++ b/libnm-core/nm-setting-wireless-security.c @@ -1330,6 +1330,13 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * WPA-PSK), or "wpa-eap" (WPA-Enterprise). This property must be set for * any Wi-Fi connection that uses security. **/ + /* ---ifcfg-rh--- + * property: key-mgmt + * variable: KEY_MGMT(+) + * values: IEEE8021X, WPA-PSK, WPA-EAP + * description: Key management menthod. + * ---end--- + */ g_object_class_install_property (object_class, PROP_KEY_MGMT, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "", "", @@ -1346,6 +1353,14 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * (default key) through 3. Note that some consumer access points (like the * Linksys WRT54G) number the keys 1 - 4. **/ + /* ---ifcfg-rh--- + * property: wep-tx-keyidx + * variable: DEFAULTKEY + * values: 1, 2, 3, 4 + * default: 1 + * description: Index of active WEP key. + * ---end--- + */ g_object_class_install_property (object_class, PROP_WEP_TX_KEYIDX, g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, "", "", @@ -1363,6 +1378,13 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * using Cisco LEAP (ie, key-mgmt = "ieee8021x" and auth-alg = "leap") the * "leap-username" and "leap-password" properties must be specified. **/ + /* ---ifcfg-rh--- + * property: auth-alg + * variable: SECURITYMODE(+) + * values: restricted, open, leap + * description: Authentication algorithm for WEP. + * ---end--- + */ g_object_class_install_property (object_class, PROP_AUTH_ALG, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "", "", @@ -1377,6 +1399,14 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * Each element may be one "wpa" (allow WPA) or "rsn" (allow WPA2/RSN). If * not specified, both WPA and RSN connections are allowed. **/ + /* ---ifcfg-rh--- + * property: proto + * variable: WPA_ALLOW_WPA(+), WPA_ALLOW_WPA2(+) + * values: yes, no + * default: no + * description: Allowed WPA protocols, WPA and WPA2 (RSN). + * ---end--- + */ g_object_class_install_property (object_class, PROP_PROTO, g_param_spec_boxed (NM_SETTING_WIRELESS_SECURITY_PROTO, "", "", @@ -1392,6 +1422,14 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * For maximum compatibility leave this property empty. Each list element * may be one of "tkip" or "ccmp". **/ + /* ---ifcfg-rh--- + * property: pairwise + * variable: CIPHER_PAIRWISE(+) + * values: CCMP, TKIP + * description: Restrict pairwise encryption algorithms, specified as a space + * separated list. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PAIRWISE, g_param_spec_boxed (NM_SETTING_WIRELESS_SECURITY_PAIRWISE, "", "", @@ -1407,6 +1445,14 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * in the list. For maximum compatibility leave this property empty. Each * list element may be one of "wep40", "wep104", "tkip", or "ccmp". **/ + /* ---ifcfg-rh--- + * property: group + * variable: CIPHER_GROUP(+) + * values: CCMP, TKIP, WEP40, WEP104 + * description: Restrict group/broadcast encryption algorithms, specified as a space + * separated list. + * ---end--- + */ g_object_class_install_property (object_class, PROP_GROUP, g_param_spec_boxed (NM_SETTING_WIRELESS_SECURITY_GROUP, "", "", @@ -1420,6 +1466,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * The login username for legacy LEAP connections (ie, key-mgmt = * "ieee8021x" and auth-alg = "leap"). **/ + /* ---ifcfg-rh--- + * property: leap-username + * variable: IEEE_8021X_IDENTITY(+) + * description: Login name for LEAP. + * ---end--- + */ g_object_class_install_property (object_class, PROP_LEAP_USERNAME, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, "", "", @@ -1433,6 +1485,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * Index 0 WEP key. This is the WEP key used in most networks. See the * "wep-key-type" property for a description of how this key is interpreted. **/ + /* ---ifcfg-rh--- + * property: wep-key0 + * variable: KEY1, KEY_PASSPHRASE1(+) + * description: The first WEP key (used in most networks). See also DEFAULTKEY for key index. + * ---end--- + */ g_object_class_install_property (object_class, PROP_WEP_KEY0, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, "", "", @@ -1447,6 +1505,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * Index 1 WEP key. This WEP index is not used by most networks. See the * "wep-key-type" property for a description of how this key is interpreted. **/ + /* ---ifcfg-rh--- + * property: wep-key1 + * variable: KEY2, KEY_PASSPHRASE2(+) + * description: WEP key with index 1. See also DEFAULTKEY for key index. + * ---end--- + */ g_object_class_install_property (object_class, PROP_WEP_KEY1, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY1, "", "", @@ -1461,6 +1525,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * Index 2 WEP key. This WEP index is not used by most networks. See the * "wep-key-type" property for a description of how this key is interpreted. **/ + /* ---ifcfg-rh--- + * property: wep-key2 + * variable: KEY3, KEY_PASSPHRASE3(+) + * description: WEP key with index 2. See also DEFAULTKEY for key index. + * ---end--- + */ g_object_class_install_property (object_class, PROP_WEP_KEY2, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY2, "", "", @@ -1475,6 +1545,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * Index 3 WEP key. This WEP index is not used by most networks. See the * "wep-key-type" property for a description of how this key is interpreted. **/ + /* ---ifcfg-rh--- + * property: wep-key3 + * variable: KEY4, KEY_PASSPHRASE4(+) + * description: WEP key with index 3. See also DEFAULTKEY for key index. + * ---end--- + */ g_object_class_install_property (object_class, PROP_WEP_KEY3, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY3, "", "", @@ -1490,6 +1566,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * #NMSettingWirelessSecurity:wep-key1, #NMSettingWirelessSecurity:wep-key2, * and #NMSettingWirelessSecurity:wep-key3 properties. **/ + /* ---ifcfg-rh--- + * property: wep-key-flags + * variable: WEP_KEY_FLAGS(+) + * description: Password flags for KEY<i>, KEY_PASSPHRASE<i> password. + * ---end--- + */ g_object_class_install_property (object_class, PROP_WEP_KEY_FLAGS, g_param_spec_flags (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, "", "", @@ -1508,6 +1590,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * WPA passphrase, and is hashed to derive the actual WPA-PSK used when * connecting to the Wi-Fi network. **/ + /* ---ifcfg-rh--- + * property: psk + * variable: WPA_PSK + * description: Pre-Shared-Key for WPA networks. + * ---end--- + */ g_object_class_install_property (object_class, PROP_PSK, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_PSK, "", "", @@ -1522,6 +1610,13 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * Flags indicating how to handle the #NMSettingWirelessSecurity:psk * property. **/ + /* ---ifcfg-rh--- + * property: psk-flags + * variable: WPA_PSK_FLAGS(+) + * description: Password flags for WPA_PSK_FLAGS. + * example: WPA_PSK_FLAGS=user + * ---end--- + */ g_object_class_install_property (object_class, PROP_PSK_FLAGS, g_param_spec_flags (NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, "", "", @@ -1536,6 +1631,13 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * The login password for legacy LEAP connections (ie, key-mgmt = * "ieee8021x" and auth-alg = "leap"). **/ + /* ---ifcfg-rh--- + * property: leap-password + * variable: IEEE_8021X_PASSWORD(+) + * description: Password for LEAP. It can also go to "key-" + * lookaside file, or it can be owned by a secret agent. + * ---end--- + */ g_object_class_install_property (object_class, PROP_LEAP_PASSWORD, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD, "", "", @@ -1550,6 +1652,12 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * Flags indicating how to handle the * #NMSettingWirelessSecurity:leap-password property. **/ + /* ---ifcfg-rh--- + * property: leap-password-flags + * variable: IEEE_8021X_PASSWORD_FLAGS(+) + * description: Password flags for IEEE_8021X_PASSWORD_FLAGS. + * ---end--- + */ g_object_class_install_property (object_class, PROP_LEAP_PASSWORD_FLAGS, g_param_spec_flags (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS, "", "", @@ -1568,6 +1676,15 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * as a string and will be hashed using the de-facto MD5 method to derive * the actual WEP key. **/ + /* ---ifcfg-rh--- + * property: wep-key-type + * variable: KEY<i> or KEY_PASSPHRASE<i>(+) + * description: KEY is used for "key" type (10 or 26 hexadecimal characters, + * or 5 or 13 character string prefixed with "s:"). KEY_PASSPHRASE is used + * for WEP passphrases. + * example: KEY1=s:ahoj, KEY1=0a1c45bc02, KEY_PASSPHRASE1=mysupersecretkey + * ---end--- + */ g_object_class_install_property (object_class, PROP_WEP_KEY_TYPE, g_param_spec_enum (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, "", "", diff --git a/libnm-core/nm-setting-wireless.c b/libnm-core/nm-setting-wireless.c index d501bf38a6..678c786c5e 100644 --- a/libnm-core/nm-setting-wireless.c +++ b/libnm-core/nm-setting-wireless.c @@ -995,6 +995,19 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * * SSID of the Wi-Fi network. Must be specified. **/ + /* ---keyfile--- + * property: ssid + * format: string (or decimal-byte list - obsolete) + * description: SSID of Wi-Fi network. + * example: ssid=Quick Net + * ---end--- + * ---ifcfg-rh--- + * property: ssid + * variable: ESSID + * description: SSID of Wi-Fi network. + * example: ESSID="Quick Net" + * ---end--- + */ g_object_class_install_property (object_class, PROP_SSID, g_param_spec_boxed (NM_SETTING_WIRELESS_SSID, "", "", @@ -1012,6 +1025,13 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * Wi-Fi network mode; one of "infrastructure", "adhoc" or "ap". If blank, * infrastructure is assumed. **/ + /* ---ifcfg-rh--- + * property: mode + * variable: MODE + * values: Ad-Hoc, Managed (Auto) [case insensitive] + * description: Wi-Fi network mode. + * ---end--- + */ g_object_class_install_property (object_class, PROP_MODE, g_param_spec_string (NM_SETTING_WIRELESS_MODE, "", "", @@ -1029,6 +1049,13 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * settings are compatible. This setting depends on specific driver * capability and may not work with all drivers. **/ + /* ---ifcfg-rh--- + * property: band + * variable: CHANNEL + * description: Channels greater than 14 mean "a" band, otherwise the band is "bg". + * example: CHANNEL=6 + * ---end--- + */ g_object_class_install_property (object_class, PROP_BAND, g_param_spec_string (NM_SETTING_WIRELESS_BAND, "", "", @@ -1044,6 +1071,13 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * channel. Because channel numbers overlap between bands, this property * also requires the "band" property to be set. **/ + /* ---ifcfg-rh--- + * property: channel + * variable: CHANNEL + * description: Channel used for the Wi-Fi communication. + * example: CHANNEL=6 + * ---end--- + */ g_object_class_install_property (object_class, PROP_CHANNEL, g_param_spec_uint (NM_SETTING_WIRELESS_CHANNEL, "", "", @@ -1060,6 +1094,13 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * all devices. Note: this property does not control the BSSID used when * creating an Ad-Hoc network and is unlikely to in the future. **/ + /* ---ifcfg-rh--- + * property: bssid + * variable: BSSID(+) + * description: Restricts association only to a single AP. + * example: BSSID=00:1E:BD:64:83:21 + * ---end--- + */ g_object_class_install_property (object_class, PROP_BSSID, g_param_spec_string (NM_SETTING_WIRELESS_BSSID, "", "", @@ -1079,6 +1120,12 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * Mbit/s. This property is highly driver dependent and not all devices * support setting a static bitrate. **/ + /* ---ifcfg-rh--- + * property: rate + * variable: (none) + * description: This property is not handled by ifcfg-rh plugin. + * ---end--- + */ g_object_class_install_property (object_class, PROP_RATE, g_param_spec_uint (NM_SETTING_WIRELESS_RATE, "", "", @@ -1095,6 +1142,12 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * Units are dBm. This property is highly driver dependent and not all * devices support setting a static transmit power. **/ + /* ---ifcfg-rh--- + * property: tx-power + * variable: (none) + * description: This property is not handled by ifcfg-rh plugin. + * ---end--- + */ g_object_class_install_property (object_class, PROP_TX_POWER, g_param_spec_uint (NM_SETTING_WIRELESS_TX_POWER, "", "", @@ -1111,6 +1164,20 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * permanent MAC address matches. This property does not change the MAC * address of the device (i.e. MAC spoofing). **/ + /* ---keyfile--- + * property: mac-address + * format: ususal hex-digits-and-colons notation + * description: MAC address in traditional hex-digits-and-colons notation + * (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) + * (e.g. 0;34;104;18;121;162). + * ---end--- + * ---ifcfg-rh--- + * property: mac-address + * variable: HWADDR + * description: Hardware address of the device in traditional hex-digits-and-colons + * notation (e.g. 00:22:68:14:5A:05). + * ---end--- + */ g_object_class_install_property (object_class, PROP_MAC_ADDRESS, g_param_spec_string (NM_SETTING_WIRELESS_MAC_ADDRESS, "", "", @@ -1128,6 +1195,20 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * If specified, request that the Wi-Fi device use this MAC address instead * of its permanent MAC address. This is known as MAC cloning or spoofing. **/ + /* ---keyfile--- + * property: cloned-mac-address + * format: ususal hex-digits-and-colons notation + * description: Cloned MAC address in traditional hex-digits-and-colons notation + * (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) + * (e.g. 0;34;104;18;121;178). + * ---end--- + * ---ifcfg-rh--- + * property: cloned-mac-address + * variable: MACADDR + * description: Cloned (spoofed) MAC address in traditional hex-digits-and-colons + * notation (e.g. 00:22:68:14:5A:99). + * ---end--- + */ g_object_class_install_property (object_class, PROP_CLONED_MAC_ADDRESS, g_param_spec_string (NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS, "", "", @@ -1146,6 +1227,19 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * connection should never apply. Each MAC address should be given in the * standard hex-digits-and-colons notation (eg "00:11:22:33:44:55"). **/ + /* ---keyfile--- + * property: mac-address-blacklist + * format: list of MACs (separated with semicolons) + * description: MAC address blacklist. + * example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78 + * ---end--- + * ---ifcfg-rh--- + * property: mac-address-blacklist + * variable: HWADDR_BLACKLIST(+) + * description: It denies usage of the connection for any device whose address + * is listed. + * ---end--- + */ g_object_class_install_property (object_class, PROP_MAC_ADDRESS_BLACKLIST, g_param_spec_boxed (NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST, "", "", @@ -1164,6 +1258,12 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * NetworkManager. The changes you make to this property will not be * preserved. **/ + /* ---ifcfg-rh--- + * property: seen-bssids + * variable: (none) + * description: This property is not handled by ifcfg-rh plugin. + * ---end--- + */ g_object_class_install_property (object_class, PROP_SEEN_BSSIDS, g_param_spec_boxed (NM_SETTING_WIRELESS_SEEN_BSSIDS, "", "", @@ -1178,6 +1278,12 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * If non-zero, only transmit packets of the specified size or smaller, * breaking larger packets up into multiple Ethernet frames. **/ + /* ---ifcfg-rh--- + * property: mtu + * variable: MTU + * description: MTU of the wireless interface. + * ---end--- + */ g_object_class_install_property (object_class, PROP_MTU, g_param_spec_uint (NM_SETTING_WIRELESS_MTU, "", "", @@ -1196,6 +1302,12 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * these workarounds expose inherent insecurities with hidden SSID networks, * and thus hidden SSID networks should be used with caution. **/ + /* ---ifcfg-rh--- + * property: hidden + * variable: SSID_HIDDEN(+) + * description: Whether the network hides the SSID. + * ---end--- + */ g_object_class_install_property (object_class, PROP_HIDDEN, g_param_spec_boolean (NM_SETTING_WIRELESS_HIDDEN, "", "", @@ -1204,6 +1316,12 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) G_PARAM_STATIC_STRINGS)); /* Compatibility for deprecated property */ + /* ---ifcfg-rh--- + * property: security + * variable: (none) + * description: This property is deprecated and not handled by ifcfg-rh-plugin. + * ---end--- + */ _nm_setting_class_add_dbus_only_property (parent_class, "security", G_VARIANT_TYPE_STRING, nm_setting_wireless_get_security, NULL); diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index 51864df15e..9649118444 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -187,31 +187,6 @@ CLEANFILES += $(gir_DATA) $(typelib_DATA) endif -if BUILD_SETTING_DOCS - -noinst_DATA = nm-setting-docs.xml nm-keyfile-docs.xml nm-ifcfg-rh-docs.xml - -docs_sources = $(filter-out $(BUILT_SOURCES),$(libnm_util_la_csources)) - -nm-setting-docs.xml: generate-setting-docs.py $(docs_sources) | NetworkManager-1.0.gir NetworkManager-1.0.typelib libnm-util.la - export GI_TYPELIB_PATH=$(abs_builddir)$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}; \ - export LD_LIBRARY_PATH=$(abs_builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}; \ - $(srcdir)/generate-setting-docs.py \ - --gir $(builddir)/NetworkManager-1.0.gir \ - --output $@ - -nm-keyfile-docs.xml: generate-plugin-docs.pl $(docs_sources) - $(srcdir)/generate-plugin-docs.pl keyfile $(srcdir) $@ -nm-ifcfg-rh-docs.xml: generate-plugin-docs.pl $(docs_sources) - $(srcdir)/generate-plugin-docs.pl ifcfg-rh $(srcdir) $@ - -CLEANFILES += $(noinst_DATA) -EXTRA_DIST += $(noinst_DATA) - -endif - -EXTRA_DIST += generate-setting-docs.py generate-plugin-docs.pl - if ENABLE_TESTS check-local: diff --git a/libnm-util/nm-setting-8021x.c b/libnm-util/nm-setting-8021x.c index c11ce0fe57..53d59a07d7 100644 --- a/libnm-util/nm-setting-8021x.c +++ b/libnm-util/nm-setting-8021x.c @@ -3145,15 +3145,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * properties of this setting; refer to wpa_supplicant documentation for the * allowed combinations. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: eap - * variable: IEEE_8021X_EAP_METHODS(+) - * values: "LEAP", "PWD", "TLS", "PEAP", "TTLS", "FAST" - * description: EAP method for 802.1X authentication. - * example: IEEE_8021X_EAP_METHODS=PEAP - * ---end--- - */ g_object_class_install_property (object_class, PROP_EAP, _nm_param_spec_specialized (NM_SETTING_802_1X_EAP, "", "", @@ -3167,14 +3158,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * Identity string for EAP authentication methods. Often the user's user or * login name. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: identity - * variable: IEEE_8021X_IDENTITY(+) - * description: Identity for EAP authentication methods. - * example: IEEE_8021X_IDENTITY=itsme - * ---end--- - */ g_object_class_install_property (object_class, PROP_IDENTITY, g_param_spec_string (NM_SETTING_802_1X_IDENTITY, "", "", @@ -3189,13 +3172,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * unencrypted identity with EAP types that support different tunneled * identity like EAP-TTLS. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: anonymous-identity - * variable: IEEE_8021X_ANON_IDENTITY(+) - * description: Anonymous identity for EAP authentication methods. - * ---end--- - */ g_object_class_install_property (object_class, PROP_ANONYMOUS_IDENTITY, g_param_spec_string (NM_SETTING_802_1X_ANONYMOUS_IDENTITY, "", "", @@ -3208,14 +3184,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * * UTF-8 encoded file path containing PAC for EAP-FAST. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: pac-file - * variable: IEEE_8021X_PAC_FILE(+) - * description: File with PAC (Protected Access Credential) for EAP-FAST. - * example: IEEE_8021X_PAC_FILE=/home/joe/my-fast.pac - * ---end--- - */ g_object_class_install_property (object_class, PROP_PAC_FILE, g_param_spec_string (NM_SETTING_802_1X_PAC_FILE, "", "", @@ -3241,14 +3209,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * Setting this property directly is discouraged; use the * nm_setting_802_1x_set_ca_cert() function instead. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: ca-cert - * variable: IEEE_8021X_CA_CERT(+) - * description: CA certificate for EAP. - * example: IEEE_8021X_CA_CERT=/home/joe/cacert.crt - * ---end--- - */ g_object_class_install_property (object_class, PROP_CA_CERT, _nm_param_spec_specialized (NM_SETTING_802_1X_CA_CERT, "", "", @@ -3263,13 +3223,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * certificates to be added to the verification chain in addition to the * certificate specified in the #NMSetting8021x:ca-cert property. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: ca-path - * variable: (none) - * description: The property is not handled by ifcfg-rh plugin. - * ---end--- - */ g_object_class_install_property (object_class, PROP_CA_PATH, g_param_spec_string (NM_SETTING_802_1X_CA_PATH, "", "", @@ -3284,14 +3237,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * by the authentication server. When unset, no verification of the * authentication server certificate's subject is performed. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: subject-match - * variable: IEEE_8021X_SUBJECT_MATCH(+) - * description: Substring to match subject of server certificate against. - * example: IEEE_8021X_SUBJECT_MATCH="Red Hat" - * ---end--- - */ g_object_class_install_property (object_class, PROP_SUBJECT_MATCH, g_param_spec_string (NM_SETTING_802_1X_SUBJECT_MATCH, "", "", @@ -3306,14 +3251,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * certificate presented by the authentication server. If the list is empty, * no verification of the server certificate's altSubjectName is performed. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: altubject-matches - * variable: IEEE_8021X_AlTSUBJECT_MATCHES(+) - * description: List of strings to be matched against the altSubjectName. - * example: IEEE_8021X_ALTSUBJECT_MATCHES="s1.domain.cc" - * ---end--- - */ g_object_class_install_property (object_class, PROP_ALTSUBJECT_MATCHES, _nm_param_spec_specialized (NM_SETTING_802_1X_ALTSUBJECT_MATCHES, "", "", @@ -3337,14 +3274,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * Setting this property directly is discouraged; use the * nm_setting_802_1x_set_client_cert() function instead. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: client-cert - * variable: IEEE_8021X_CLIENT_CERT(+) - * description: Client certificate for EAP. - * example: IEEE_8021X_CLIENT_CERT=/home/joe/mycert.crt - * ---end--- - */ g_object_class_install_property (object_class, PROP_CLIENT_CERT, _nm_param_spec_specialized (NM_SETTING_802_1X_CLIENT_CERT, "", "", @@ -3362,14 +3291,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * so, this property may be set to "0" or "1" to force that specific PEAP * version. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: phase1-peapver - * variable: IEEE_8021X_PEAP_VERSION(+) - * values: 0, 1 - * description: Use to force a specific PEAP version. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PHASE1_PEAPVER, g_param_spec_string (NM_SETTING_802_1X_PHASE1_PEAPVER, "", "", @@ -3385,15 +3306,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * PEAPv1. Set to "1" to force use of the new PEAP label. See the * wpa_supplicant documentation for more details. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: phase1-peaplabel - * variable: IEEE_8021X_PEAP_FORCE_NEW_LABEL(+) - * values: yes, no - * default: no - * description: Use to force the new PEAP label during key derivation. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PHASE1_PEAPLABEL, g_param_spec_string (NM_SETTING_802_1X_PHASE1_PEAPLABEL, "", "", @@ -3411,15 +3323,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * both authenticated and unauthenticated provisioning). See the * wpa_supplicant documentation for more details. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: phase1-fast-provisioning - * variable: IEEE_8021X_FAST_PROVISIONING(+) - * values: space-separated list of these values [allow-auth, allow-unauth] - * description: Enable in-line provisioning of EAP-FAST credentials. - * example: IEEE_8021X_FAST_PROVISIONING="allow-auth allow-unauth" - * ---end--- - */ g_object_class_install_property (object_class, PROP_PHASE1_FAST_PROVISIONING, g_param_spec_string (NM_SETTING_802_1X_PHASE1_FAST_PROVISIONING, "", "", @@ -3437,16 +3340,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * Each "phase 2" inner method requires specific parameters for successful * authentication; see the wpa_supplicant documentation for more details. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: phase2-auth - * variable: IEEE_8021X_INNER_AUTH_METHODS(+) - * values: "PAP", "CHAP", "MSCHAP", "MSCHAPV2", "GTC", "OTP", "MD5" and "TLS" - * description: Inner non-EAP authentication methods. IEEE_8021X_INNER_AUTH_METHODS - * can contain values both for 'phase2-auth' and 'phase2-autheap' properties. - * example: IEEE_8021X_INNER_AUTH_METHODS=PAP - * ---end--- - */ g_object_class_install_property (object_class, PROP_PHASE2_AUTH, g_param_spec_string (NM_SETTING_802_1X_PHASE2_AUTH, "", "", @@ -3464,16 +3357,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * requires specific parameters for successful authentication; see the * wpa_supplicant documentation for more details. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: phase2-autheap - * variable: IEEE_8021X_INNER_AUTH_METHODS(+) - * values: "EAP-MD5", "EAP-MSCHAPV2", "EAP-GTC", "EAP-OTP" and "EAP-TLS" - * description: Inner EAP-based authentication methods. Note that - * IEEE_8021X_INNER_AUTH_METHODS is also used for 'phase2-auth' values. - * example: IEEE_8021X_INNER_AUTH_METHODS="MSCHAPV2 EAP-TLS" - * ---end--- - */ g_object_class_install_property (object_class, PROP_PHASE2_AUTHEAP, g_param_spec_string (NM_SETTING_802_1X_PHASE2_AUTHEAP, "", "", @@ -3529,14 +3412,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * authentication. When unset, no verification of the authentication server * certificate's subject is performed. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: phase2-subject-match - * variable: IEEE_8021X_PHASE2_SUBJECT_MATCH(+) - * description: Substring to match subject of server certificate against. - * example: IEEE_8021X_PHASE2_SUBJECT_MATCH="Red Hat" - * ---end--- - */ g_object_class_install_property (object_class, PROP_PHASE2_SUBJECT_MATCH, g_param_spec_string (NM_SETTING_802_1X_PHASE2_SUBJECT_MATCH, "", "", @@ -3552,12 +3427,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * "phase 2" authentication. If the list is empty, no verification of the * server certificate's altSubjectName is performed. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: phase2-altsubject-matches - * variable: IEEE_8021X_PHASE2_ALTSUBJECT_MATCHES(+) - * ---end--- - */ g_object_class_install_property (object_class, PROP_PHASE2_ALTSUBJECT_MATCHES, _nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_ALTSUBJECT_MATCHES, "", "", @@ -3584,14 +3453,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * Setting this property directly is discouraged; use the * nm_setting_802_1x_set_phase2_client_cert() function instead. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: phase2-client-cert - * variable: IEEE_8021X_INNER_CLIENT_CERT(+) - * description: Client certificate for inner EAP method. - * example: IEEE_8021X_INNER_CLIENT_CERT=/home/joe/mycert.crt - * ---end--- - */ g_object_class_install_property (object_class, PROP_PHASE2_CLIENT_CERT, _nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_CLIENT_CERT, "", "", @@ -3606,14 +3467,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * #NMSetting8021x:password property and the #NMSetting8021x:password-raw * property are specified, #NMSetting8021x:password is preferred. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: password - * variable: IEEE_8021X_PASSWORD(+) - * description: UTF-8 encoded password used for EAP. It can also go to "key-" - * lookaside file, or it can be owned by a secret agent. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PASSWORD, g_param_spec_string (NM_SETTING_802_1X_PASSWORD, "", "", @@ -3627,13 +3480,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * * Flags indicating how to handle the #NMSetting8021x:password property. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: password-flags - * variable: IEEE_8021X_PASSWORD_FLAGS(+) - * description: Password flags for IEEE_8021X_PASSWORD password. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PASSWORD_FLAGS, g_param_spec_uint (NM_SETTING_802_1X_PASSWORD_FLAGS, "", "", @@ -3651,13 +3497,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * #NMSetting8021x:password property and the #NMSetting8021x:password-raw * property are specified, #NMSetting8021x:password is preferred. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: password-raw - * variable: (none) - * description: The property is not handled by ifcfg-rh plugin. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PASSWORD_RAW, _nm_param_spec_specialized (NM_SETTING_802_1X_PASSWORD_RAW, "", "", @@ -3671,13 +3510,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * * Flags indicating how to handle the #NMSetting8021x:password-raw property. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: password-raw-flags - * variable: (none) - * description: The property is not handled by ifcfg-rh plugin. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PASSWORD_RAW_FLAGS, g_param_spec_uint (NM_SETTING_802_1X_PASSWORD_RAW_FLAGS, "", "", @@ -3717,14 +3549,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * private key password to prevent unauthorized access to unencrypted * private key data. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: private-key - * variable: IEEE_8021X_PRIVATE_KEY(+) - * description: Private key for EAP-TLS. - * example: IEEE_8021X_PRIVATE_KEY=/home/joe/mykey.p12 - * ---end--- - */ g_object_class_install_property (object_class, PROP_PRIVATE_KEY, _nm_param_spec_specialized (NM_SETTING_802_1X_PRIVATE_KEY, "", "", @@ -3742,14 +3566,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * secrets to NetworkManager; it is generally set automatically when setting * the private key by the nm_setting_802_1x_set_private_key() function. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: private-key-password - * variable: IEEE_8021X_PRIVATE_KEY_PASSWORD(+) - * description: Password for IEEE_8021X_PRIVATE_KEY. It can also go to "key-" - * lookaside file, or it can be owned by a secret agent. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PRIVATE_KEY_PASSWORD, g_param_spec_string (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD, "", "", @@ -3764,13 +3580,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * Flags indicating how to handle the #NMSetting8021x:private-key-password * property. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: private-key-password-flags - * variable: IEEE_8021X_PRIVATE_KEY_PASSWORD_FLAGS(+) - * description: Password flags for IEEE_8021X_PRIVATE_KEY_PASSWORD password. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PRIVATE_KEY_PASSWORD_FLAGS, g_param_spec_uint (NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD_FLAGS, "", "", @@ -3805,13 +3614,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * Setting this property directly is discouraged; use the * nm_setting_802_1x_set_phase2_private_key() function instead. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: phase2-private-key - * variable: IEEE_8021X_INNER_PRIVATE_KEY(+) - * description: Private key for inner authentication method for EAP-TLS. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PHASE2_PRIVATE_KEY, _nm_param_spec_specialized (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, "", "", @@ -3829,14 +3631,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * NetworkManager; it is generally set automatically when setting the * private key by the nm_setting_802_1x_set_phase2_private_key() function. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: phase2-private-key-password - * variable: IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD(+) - * description: Password for IEEE_8021X_INNER_PRIVATE_KEY. It can also go to "key-" - * lookaside file, or it can be owned by a secret agent. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PHASE2_PRIVATE_KEY_PASSWORD, g_param_spec_string (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD, "", "", @@ -3851,13 +3645,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * Flags indicating how to handle the * #NMSetting8021x:phase2-private-key-password property. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: phase2-private-key-password-flags - * variable: IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD_FLAGS(+) - * description: Password flags for IEEE_8021X_INNER_PRIVATE_KEY_PASSWORD password. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS, g_param_spec_uint (NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD_FLAGS, "", "", @@ -3872,13 +3659,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * * PIN used for EAP authentication methods. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: pin - * variable: (none) - * description: The property is not handled by ifcfg-rh plugin. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PIN, g_param_spec_string (NM_SETTING_802_1X_PIN, "", "", @@ -3892,13 +3672,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * * Flags indicating how to handle the #NMSetting8021x:pin property. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: pin-flags - * variable: (none) - * description: The property is not handled by ifcfg-rh plugin. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PIN_FLAGS, g_param_spec_uint (NM_SETTING_802_1X_PIN_FLAGS, "", "", @@ -3918,13 +3691,6 @@ nm_setting_802_1x_class_init (NMSetting8021xClass *setting_class) * addition to any certificates specified by the #NMSetting8021x:ca-cert and * #NMSetting8021x:phase2-ca-cert properties. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: system-ca-certs - * variable: (none) - * description: The property is not handled by ifcfg-rh plugin. - * ---end--- - */ g_object_class_install_property (object_class, PROP_SYSTEM_CA_CERTS, g_param_spec_boolean (NM_SETTING_802_1X_SYSTEM_CA_CERTS, "", "", diff --git a/libnm-util/nm-setting-bond.c b/libnm-util/nm-setting-bond.c index 6d6210886d..fa12cf0ea1 100644 --- a/libnm-util/nm-setting-bond.c +++ b/libnm-util/nm-setting-bond.c @@ -797,13 +797,6 @@ nm_setting_bond_class_init (NMSettingBondClass *setting_class) * * The name of the virtual in-kernel bonding network interface **/ - /* plugins docs - * ---ifcfg-rh--- - * property: interface-name - * variable: DEVICE - * description: Bonding interface name. - * ---end--- - */ g_object_class_install_property (object_class, PROP_INTERFACE_NAME, g_param_spec_string (NM_SETTING_BOND_INTERFACE_NAME, "", "", @@ -819,14 +812,6 @@ nm_setting_bond_class_init (NMSettingBondClass *setting_class) * must be strings. Option names must contain only alphanumeric characters * (ie, [a-zA-Z0-9]). **/ - /* plugins docs - * ---ifcfg-rh--- - * property: options - * variable: BONDING_OPTS - * description: Bonding options. - * example: BONDING_OPTS="miimon=100 mode=broadcast" - * ---end--- - */ g_object_class_install_property (object_class, PROP_OPTIONS, _nm_param_spec_specialized (NM_SETTING_BOND_OPTIONS, "", "", diff --git a/libnm-util/nm-setting-bridge-port.c b/libnm-util/nm-setting-bridge-port.c index ae38a8e8ba..b3afa50050 100644 --- a/libnm-util/nm-setting-bridge-port.c +++ b/libnm-util/nm-setting-bridge-port.c @@ -262,15 +262,6 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *setting_class) * * Since: 0.9.8 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: priority - * variable: BRIDGING_OPTS: priority= - * values: 0 - 63 - * default: 32 - * description: STP priority. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PRIORITY, g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PRIORITY, "", "", @@ -288,15 +279,6 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *setting_class) * * Since: 0.9.8 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: path-cost - * variable: BRIDGING_OPTS: path_cost= - * values: 1 - 65535 - * default: 100 - * description: STP cost. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PATH_COST, g_param_spec_uint (NM_SETTING_BRIDGE_PORT_PATH_COST, "", "", @@ -314,14 +296,6 @@ nm_setting_bridge_port_class_init (NMSettingBridgePortClass *setting_class) * * Since: 0.9.8 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: hairpin-mode - * variable: BRIDGING_OPTS: hairpin_mode= - * default: yes - * description: Hairpin mode of the bridge port. - * ---end--- - */ g_object_class_install_property (object_class, PROP_HAIRPIN_MODE, g_param_spec_boolean (NM_SETTING_BRIDGE_PORT_HAIRPIN_MODE, "", "", diff --git a/libnm-util/nm-setting-bridge.c b/libnm-util/nm-setting-bridge.c index 86d1e781e0..bdaa75f977 100644 --- a/libnm-util/nm-setting-bridge.c +++ b/libnm-util/nm-setting-bridge.c @@ -453,13 +453,6 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * * Since: 0.9.8 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: interface-name - * variable: DEVICE - * description: Bridge interface name. - * ---end--- - */ g_object_class_install_property (object_class, PROP_INTERFACE_NAME, g_param_spec_string (NM_SETTING_BRIDGE_INTERFACE_NAME, "", "", @@ -477,23 +470,6 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * * Since: 0.9.10 **/ - /* plugins docs - * ---keyfile--- - * property: mac-address - * format: ususal hex-digits-and-colons notation - * description: MAC address in traditional hex-digits-and-colons notation, - * or semicolon separated list of 6 decimal bytes (obsolete) - * example: mac-address=00:22:68:12:79:A2 - * mac-address=0;34;104;18;121;162; - * ---end--- - * ---ifcfg-rh--- - * property: mac-address - * variable: MACADDR(+) - * description: MAC address of the bridge. Note that this requires a recent - * kernel support, originally introduced in 3.15 upstream kernel) - * MACADDR for bridges is an NM extension. - * ---end--- - */ g_object_class_install_property (object_class, PROP_MAC_ADDRESS, _nm_param_spec_specialized (NM_SETTING_BRIDGE_MAC_ADDRESS, "", "", @@ -509,14 +485,6 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * * Since: 0.9.8 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: stp - * variable: STP - * default: no - * description: Span tree protocol participation. - * ---end--- - */ g_object_class_install_property (object_class, PROP_STP, g_param_spec_boolean (NM_SETTING_BRIDGE_STP, "", "", @@ -535,15 +503,6 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * * Since: 0.9.8 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: priority - * variable: BRIDGING_OPTS: priority= - * values: 0 - 32768 - * default: 32768 - * description: STP priority. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PRIORITY, g_param_spec_uint (NM_SETTING_BRIDGE_PRIORITY, "", "", @@ -560,15 +519,6 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * * Since: 0.9.8 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: forward-delay - * variable: DELAY - * values: 2 - 30 - * default: 15 - * description: STP forwarding delay. - * ---end--- - */ g_object_class_install_property (object_class, PROP_FORWARD_DELAY, g_param_spec_uint (NM_SETTING_BRIDGE_FORWARD_DELAY, "", "", @@ -585,15 +535,6 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * * Since: 0.9.8 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: hello-time - * variable: BRIDGING_OPTS: hello_time= - * values: 1 - 10 - * default: 2 - * description: STP hello time. - * ---end--- - */ g_object_class_install_property (object_class, PROP_HELLO_TIME, g_param_spec_uint (NM_SETTING_BRIDGE_HELLO_TIME, "", "", @@ -610,15 +551,6 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * * Since: 0.9.8 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: max-age - * variable: BRIDGING_OPTS: max_age= - * values: 6 - 40 - * default: 20 - * description: STP maximum message age. - * ---end--- - */ g_object_class_install_property (object_class, PROP_MAX_AGE, g_param_spec_uint (NM_SETTING_BRIDGE_MAX_AGE, "", "", @@ -635,15 +567,6 @@ nm_setting_bridge_class_init (NMSettingBridgeClass *setting_class) * * Since: 0.9.8 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: ageing-time - * variable: BRIDGING_OPTS: ageing_time= - * values: 0 - 1000000 - * default: 300 - * description: Ethernet MAC ageing time. - * ---end--- - */ g_object_class_install_property (object_class, PROP_AGEING_TIME, g_param_spec_uint (NM_SETTING_BRIDGE_AGEING_TIME, "", "", diff --git a/libnm-util/nm-setting-connection.c b/libnm-util/nm-setting-connection.c index 80e225b91b..162ae7cb02 100644 --- a/libnm-util/nm-setting-connection.c +++ b/libnm-util/nm-setting-connection.c @@ -1104,13 +1104,6 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * A human readable unique identifier for the connection, like "Work Wi-Fi" * or "T-Mobile 3G". **/ - /* plugins docs - * ---ifcfg-rh--- - * property: id - * variable: NAME(+) - * description: User friendly name for the connection profile. - * ---end--- - */ g_object_class_install_property (object_class, PROP_ID, g_param_spec_string (NM_SETTING_CONNECTION_ID, "", "", @@ -1135,14 +1128,6 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * be generated by nm_utils_uuid_generate() or * nm_utils_uuid_generate_from_string(). **/ - /* plugins docs - * ---ifcfg-rh--- - * property: uuid - * variable: UUID(+) - * description: UUID for the connetcion profile. When missing NetworkManager - * creates the UUID itself (by hashing the file). - * ---end--- - */ g_object_class_install_property (object_class, PROP_UUID, g_param_spec_string (NM_SETTING_CONNECTION_UUID, "", "", @@ -1168,15 +1153,6 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * * Since: 0.9.10 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: interface-name - * variable: DEVICE - * description: Interface name of the device this profile is bound to. The variable - * can be left out when the profile should apply for more devices. Note that DEVICE - * can be required for some connection types. - * ---end--- - */ g_object_class_install_property (object_class, PROP_INTERFACE_NAME, g_param_spec_string (NM_SETTING_CONNECTION_INTERFACE_NAME, "", "", @@ -1194,16 +1170,6 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * non-hardware dependent connections like VPN or otherwise, should contain * the setting name of that setting type (ie, "vpn" or "bridge", etc). **/ - /* plugins docs - * ---ifcfg-rh--- - * property: type - * variable: TYPE (DEVICETYPE, DEVICE) - * values: Ethernet, Wireless, InfiniBand, Bridge, Bond, Vlan, Team, TeamPort - * description: Base type of the connection. DEVICETYPE is used for teaming - * connections. - * example: TYPE=Ethernet; TYPE=Bond; TYPE=Bridge; DEVICETYPE=TeamPort - * ---end--- - */ g_object_class_install_property (object_class, PROP_TYPE, g_param_spec_string (NM_SETTING_CONNECTION_TYPE, "", "", @@ -1227,15 +1193,6 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * [reserved] information present must be ignored and is reserved for future * use. All of [type], [id], and [reserved] must be valid UTF-8. */ - /* plugins docs - * ---ifcfg-rh--- - * property: permissions - * variable: USERS(+) - * description: USERS restrict the access for this conenction to certain - * users only. - * example: USERS="joe bob" - * ---end--- - */ g_object_class_install_property (object_class, PROP_PERMISSIONS, _nm_param_spec_specialized (NM_SETTING_CONNECTION_PERMISSIONS, "", "", @@ -1251,14 +1208,6 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * %TRUE to automatically activate the connection, %FALSE to require manual * intervention to activate the connection. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: autoconnect - * variable: ONBOOT - * default: yes - * description: Whether the connection should be autoconnected (not only while booting). - * ---end--- - */ g_object_class_install_property (object_class, PROP_AUTOCONNECT, g_param_spec_boolean (NM_SETTING_CONNECTION_AUTOCONNECT, "", "", @@ -1312,15 +1261,6 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * the connection will be placed in the default zone as defined by the * firewall. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: zone - * variable: ZONE(+) - * description: Trust level of this connection. The string is usually used - * for a firewall. - * example: ZONE=Work - * ---end--- - */ g_object_class_install_property (object_class, PROP_ZONE, g_param_spec_string (NM_SETTING_CONNECTION_ZONE, "", "", @@ -1335,14 +1275,6 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * * Interface name of the master device or UUID of the master connection. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: master - * variable: MASTER, TEAM_MASTER, BRIDGE - * description: Reference to master connection. The variable used depends on - * the connection type. - * ---end--- - */ g_object_class_install_property (object_class, PROP_MASTER, g_param_spec_string (NM_SETTING_CONNECTION_MASTER, "", "", @@ -1359,15 +1291,6 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * %NM_SETTING_BOND_SETTING_NAME), or %NULL if this connection is not a * slave. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: slave-type - * variable: MASTER, TEAM_MASTER, DEVICETYPE, BRIDGE - * description: Slave type doesn't map directly to a variable, but it is - * recognized using different variables. MASTER for bonding, - * TEAM_MASTER and DEVICETYPE for teaming, BRIDGE for bridging. - * ---end--- - */ g_object_class_install_property (object_class, PROP_SLAVE_TYPE, g_param_spec_string (NM_SETTING_CONNECTION_SLAVE_TYPE, "", "", @@ -1386,14 +1309,6 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * * Since: 0.9.8 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: secondaries - * variable: SECONDARY_UUIDS(+) - * description: UUID of VPN connections that should be activated - * together with this connection. - * ---end--- - */ g_object_class_install_property (object_class, PROP_SECONDARIES, _nm_param_spec_specialized (NM_SETTING_CONNECTION_SECONDARIES, "", "", @@ -1410,16 +1325,6 @@ nm_setting_connection_class_init (NMSettingConnectionClass *setting_class) * * Since: 0.9.10 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: gateway-ping-timeout - * variable: GATEWAY_PING_TIMEOUT(+) - * default: 0 - * description: If greater than zero, the IP connectivity will be checked by - * pinging the gateway and waiting for the specified timeout (in seconds). - * example: GATEWAY_PING_TIMEOUT=5 - * ---end--- - */ g_object_class_install_property (object_class, PROP_GATEWAY_PING_TIMEOUT, g_param_spec_uint (NM_SETTING_CONNECTION_GATEWAY_PING_TIMEOUT, "", "", diff --git a/libnm-util/nm-setting-dcb.c b/libnm-util/nm-setting-dcb.c index 45661b4bf2..2376581e76 100644 --- a/libnm-util/nm-setting-dcb.c +++ b/libnm-util/nm-setting-dcb.c @@ -967,15 +967,6 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Since: 0.9.10 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: app-fcoe-flags - * variable: DCB_APP_FCOE_ENABLE, DCB_APP_FCOE_ADVERTISE, DCB_APP_FCOE_WILLING - * description: FCOE flags. - * default: no - * example: DCB_APP_FCOE_ENABLE=yes DCB_APP_FCOE_ADVERTISE=yes - * ---end--- - */ g_object_class_install_property (object_class, PROP_APP_FCOE_FLAGS, g_param_spec_uint (NM_SETTING_DCB_APP_FCOE_FLAGS, "", "", @@ -992,14 +983,6 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Since: 0.9.10 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: app-fcoe-priority - * variable: DCB_APP_FCOE_PRIORITY - * values: 0 - 7 - * description: Priority of FCoE frames. - * ---end--- - */ g_object_class_install_property (object_class, PROP_APP_FCOE_PRIORITY, g_param_spec_int (NM_SETTING_DCB_APP_FCOE_PRIORITY, "", "", @@ -1016,15 +999,6 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Since: 0.9.10 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: app-fcoe-mode - * variable: DCB_APP_FCOE_MODE - * values: fabric, vn2vn - * default: fabric - * description: FCoE controller mode. - * ---end--- - */ g_object_class_install_property (object_class, PROP_APP_FCOE_MODE, g_param_spec_string (NM_SETTING_DCB_APP_FCOE_MODE, "", "", @@ -1042,14 +1016,6 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Since: 0.9.10 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: app-iscsi-flags - * variable: DCB_APP_ISCSI_ENABLE, DCB_APP_ISCSI_ADVERTISE, DCB_APP_ISCSI_WILLING - * default: no - * description: iSCSI flags. - * ---end--- - */ g_object_class_install_property (object_class, PROP_APP_ISCSI_FLAGS, g_param_spec_uint (NM_SETTING_DCB_APP_ISCSI_FLAGS, "", "", @@ -1066,14 +1032,6 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Since: 0.9.10 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: app-iscsi-priority - * variable: DCB_APP_ISCSI_PRIORITY - * values: 0 - 7 - * description: Priority of iSCSI frames. - * ---end--- - */ g_object_class_install_property (object_class, PROP_APP_ISCSI_PRIORITY, g_param_spec_int (NM_SETTING_DCB_APP_ISCSI_PRIORITY, "", "", @@ -1091,14 +1049,6 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Since: 0.9.10 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: app-fip-flags - * variable: DCB_APP_FIP_ENABLE, DCB_APP_FIP_ADVERTISE, DCB_APP_FIP_WILLING - * default: no - * description: FIP flags. - * ---end--- - */ g_object_class_install_property (object_class, PROP_APP_FIP_FLAGS, g_param_spec_uint (NM_SETTING_DCB_APP_FIP_FLAGS, "", "", @@ -1115,14 +1065,6 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Since: 0.9.10 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: app-fip-priority - * variable: DCB_APP_FIP_PRIORITY - * values: 0 - 7 - * description: Priority of FIP frames. - * ---end--- - */ g_object_class_install_property (object_class, PROP_APP_FIP_PRIORITY, g_param_spec_int (NM_SETTING_DCB_APP_FIP_PRIORITY, "", "", @@ -1140,14 +1082,6 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Since: 0.9.10 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: priority-flow-control-flags - * variable: DCB_PFC_ENABLE, DCB_PFC_ADVERTISE, DCB_PFC_WILLING - * default: no - * description: Priority flow control flags. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PFC_FLAGS, g_param_spec_uint (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL_FLAGS, "", "", @@ -1165,15 +1099,6 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Since: 0.9.10 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: priority-flow-control - * variable: DCB_PFC_UP - * description: Priority flow control values. String of 8 "0" and "1", where "0". - * means "do not transmit priority pause", "1" means "transmit pause". - * example: DCB_PFC_UP=01101110 - * ---end--- - */ g_object_class_install_property (object_class, PROP_PFC, _nm_param_spec_specialized (NM_SETTING_DCB_PRIORITY_FLOW_CONTROL, "", "", @@ -1190,14 +1115,6 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Since: 0.9.10 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: priority-group-flags - * variable: DCB_PG_ENABLE, DCB_PG_ADVERTISE, DCB_PG_WILLING - * default: no - * description: Priority groups flags. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PRIORITY_GROUP_FLAGS, g_param_spec_uint (NM_SETTING_DCB_PRIORITY_GROUP_FLAGS, "", "", @@ -1214,15 +1131,6 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Since: 0.9.10 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: priority-group-id - * variable: DCB_PG_ID - * description: Priority groups values. String of eight priorities (0 - 7) or "f" - * (unrestricted). - * example: DCB_PG_ID=1205f173 - * ---end--- - */ g_object_class_install_property (object_class, PROP_PRIORITY_GROUP_ID, _nm_param_spec_specialized (NM_SETTING_DCB_PRIORITY_GROUP_ID, "", "", @@ -1240,14 +1148,6 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Since: 0.9.10 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: priority-group-bandwidth - * variable: DCB_PG_PCT - * description: Priority groups values. Eight bandwidths (in percent), separated with commas. - * example: DCB_PG_PCT=10,5,10,15,10,10,10,30 - * ---end--- - */ g_object_class_install_property (object_class, PROP_PRIORITY_GROUP_BANDWIDTH, _nm_param_spec_specialized (NM_SETTING_DCB_PRIORITY_GROUP_BANDWIDTH, "", "", @@ -1266,15 +1166,6 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Since: 0.9.10 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: priority-bandwidth - * variable: DCB_PG_UPPCT - * description: Priority values. Eight bandwidths (in percent), separated with commas. - * The sum of the numbers must be 100. - * example: DCB_PG_UPPCT=7,13,10,10,15,15,10,20 - * ---end--- - */ g_object_class_install_property (object_class, PROP_PRIORITY_BANDWIDTH, _nm_param_spec_specialized (NM_SETTING_DCB_PRIORITY_BANDWIDTH, "", "", @@ -1293,15 +1184,6 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Since: 0.9.10 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: priority-strict-bandwidth - * variable: DCB_PG_STRICT - * description: Priority values. String of eight "0" or "1", where "0" means - * "may not utilize all bandwidth", "1" means "may utilize all bandwidth". - * example: DCB_PG_STRICT=01101110 - * ---end--- - */ g_object_class_install_property (object_class, PROP_PRIORITY_STRICT, _nm_param_spec_specialized (NM_SETTING_DCB_PRIORITY_STRICT_BANDWIDTH, "", "", @@ -1318,14 +1200,6 @@ nm_setting_dcb_class_init (NMSettingDcbClass *setting_class) * * Since: 0.9.10 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: priority-traffic-class - * variable: DCB_PG_UP2TC - * description: Priority values. String of eight trafic class values (0 - 7). - * example: DCB_PG_UP2TC=01623701 - * ---end--- - */ g_object_class_install_property (object_class, PROP_PRIORITY_TRAFFIC_CLASS, _nm_param_spec_specialized (NM_SETTING_DCB_PRIORITY_TRAFFIC_CLASS, "", "", diff --git a/libnm-util/nm-setting-infiniband.c b/libnm-util/nm-setting-infiniband.c index cc7a8bfd91..1036702fec 100644 --- a/libnm-util/nm-setting-infiniband.c +++ b/libnm-util/nm-setting-infiniband.c @@ -400,22 +400,6 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) * permanent MAC address matches. This property does not change the MAC * address of the device (i.e. MAC spoofing). **/ - /* plugins docs - * ---keyfile--- - * property: mac-address - * format: ususal hex-digits-and-colons notation - * description: MAC address in traditional hex-digits-and-colons notation, or - * or semicolon separated list of 20 decimal bytes (obsolete) - * example: mac-address= 80:00:00:6d:fe:80:00:00:00:00:00:00:00:02:55:00:70:33:cf:01 - * ---end--- - * ---ifcfg-rh--- - * property: mac-address - * variable: HWADDR - * description: IBoIP 20-byte hardware address of the device (in traditional - * hex-digits-and-colons notation). - * example: HWADDR=01:02:03:04:05:06:07:08:09:0A:01:02:03:04:05:06:07:08:09:11 - * ---end--- - */ g_object_class_install_property (object_class, PROP_MAC_ADDRESS, _nm_param_spec_specialized (NM_SETTING_INFINIBAND_MAC_ADDRESS, "", "", @@ -430,13 +414,6 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) * If non-zero, only transmit packets of the specified size or smaller, * breaking larger packets up into multiple frames. **/ - /* = plugins docs = - * ---ifcfg-rh--- - * property: mtu - * variable: MTU - * description: MTU of the interface. - * ---end--- - */ g_object_class_install_property (object_class, PROP_MTU, g_param_spec_uint (NM_SETTING_INFINIBAND_MTU, "", "", @@ -452,15 +429,6 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) * The IP-over-InfiniBand transport mode. Either "datagram" or * "connected". **/ - /* = plugins docs = - * ---ifcfg-rh--- - * property: transport-mode - * variable: CONNECTED_MODE - * default: CONNECTED_MODE=no - * description: CONNECTED_MODE=yes for "connected" mode, CONNECTED_MODE=no for - * "datagram" mode - * ---end--- - */ g_object_class_install_property (object_class, PROP_TRANSPORT_MODE, g_param_spec_string (NM_SETTING_INFINIBAND_TRANSPORT_MODE, "", "", @@ -478,17 +446,6 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) * unsigned integer, whose high bit is set if it is a "full membership" * P_Key. **/ - /* = plugins docs = - * ---ifcfg-rh--- - * property: p-key - * variable: PKEY_ID (and PKEY=yes) - * default: PKEY=no - * description: InfiniBand P_Key. The value can be a hex number prefixed with "0x" - * or a decimal number. - * When PKEY_ID is specified, PHYSDEV and DEVICE also must be specified. - * example: PKEY=yes PKEY_ID=2 PHYSDEV=mlx4_ib0 DEVICE=mlx4_ib0.8002 - * ---end--- - */ g_object_class_install_property (object_class, PROP_P_KEY, g_param_spec_int (NM_SETTING_INFINIBAND_P_KEY, "", "", @@ -506,15 +463,6 @@ nm_setting_infiniband_class_init (NMSettingInfinibandClass *setting_class) * specify the base device by setting either this property or * #NMSettingInfiniband:mac-address. **/ - /* = plugins docs = - * ---ifcfg-rh--- - * property: parent - * variable: PHYSDEV (PKEY=yes) - * default: PKEY=no - * description: InfiniBand parent device. - * example: PHYSDEV=ib0 - * ---end--- - */ g_object_class_install_property (object_class, PROP_PARENT, g_param_spec_string (NM_SETTING_INFINIBAND_PARENT, "", "", diff --git a/libnm-util/nm-setting-ip4-config.c b/libnm-util/nm-setting-ip4-config.c index c5115c5950..532231ab4a 100644 --- a/libnm-util/nm-setting-ip4-config.c +++ b/libnm-util/nm-setting-ip4-config.c @@ -1158,16 +1158,6 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) * connection. "disabled" means IPv4 will not be used on this connection. * This property must be set. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: method - * variable: BOOTPROTO - * format: string - * values: none, dhcp (bootp), static, ibft, autoip, shared - * default: none - * description: Method used for IPv4 protocol configuration. - * ---end--- - */ g_object_class_install_property (object_class, PROP_METHOD, g_param_spec_string (NM_SETTING_IP4_CONFIG_METHOD, "", "", @@ -1186,22 +1176,6 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) * all other methods, these DNS servers are used as the only DNS servers for * this connection. **/ - /* plugins docs - * ---keyfile--- - * property: dns - * format: list of DNS IP addresses - * description: List of DNS servers. - * example: dns=1.2.3.4;8.8.8.8;8.8.4.4; - * ---end--- - * ---ifcfg-rh--- - * property: dns - * variable: DNS1, DNS2, ... - * format: string - * description: List of DNS servers. Even if NetworkManager supports many DNS - * servers, initscripts and resolver only care about the first three, usually. - * example: DNS1=1.2.3.4 DNS2=10.0.0.254 DNS3=8.8.8.8 - * ---end--- - */ g_object_class_install_property (object_class, PROP_DNS, _nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_DNS, "", "", @@ -1218,14 +1192,6 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) * there is no upstream network. In all other methods, these search domains * are used as the only search domains for this connection. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: dns-search - * variable: DOMAIN - * format: string (space-separated domains) - * description: List of DNS search domains. - * ---end--- - */ g_object_class_install_property (object_class, PROP_DNS_SEARCH, _nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_DNS_SEARCH, "", "", @@ -1245,22 +1211,6 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) * with the "shared", "link-local", or "disabled" methods as addressing is * either automatic or disabled with these methods. **/ - /* plugins docs - * ---keyfile--- - * property: addresses - * variable: address1, address2, ... - * format: address/plen[,gateway] - * description: List of static IP addresses. - * example: address1=192.168.100.100/24,192.168.100.1 - * address2=10.1.1.5/24 - * ---end--- - * ---ifcfg-rh--- - * property: addresses - * variable: IPADDR, PREFIX, GATEWAY, IPADDR1, PREFIX1, GATEWAY1, ... - * description: List of static IP addresses. - * example: IPADDR 10.5.5.23 PREFIX=24 GATEWAY=10.5.5.1 - * ---end--- - */ g_object_class_install_property (object_class, PROP_ADDRESSES, _nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_ADDRESSES, "", "", @@ -1281,22 +1231,6 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) * Routes cannot be used with the "shared", "link-local", or "disabled" * methods because there is no upstream network. **/ - /* plugins docs - * ---keyfile--- - * property: routes - * variable: route1, route2, ... - * format: route/plen[,gateway,metric] - * description: List of IP routes. - * example: route1=8.8.8.0/24,10.1.1.1,77 - * route2=7.7.0.0/16 - * ---end--- - * ---ifcfg-rh--- - * property: routes - * variable: ADDRESS1, NETMASK1, GATEWAY1, METRIC1, ... - * description: List of static routes. They are not stored in ifcfg-* file, - * but in route-* file instead. - * ---end--- - */ g_object_class_install_property (object_class, PROP_ROUTES, _nm_param_spec_specialized (NM_SETTING_IP4_CONFIG_ROUTES, "", "", @@ -1334,14 +1268,6 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) * automatically configured routes are ignored and only routes specified in * the #NMSettingIP4Config:routes property, if any, are used. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: ignore-auto-routes - * variable: PEERROUTES(+) - * default: yes - * description: PEERROUTES has the opposite meaning as 'ignore-auto-routes' property. - * ---end--- - */ g_object_class_install_property (object_class, PROP_IGNORE_AUTO_ROUTES, g_param_spec_boolean (NM_SETTING_IP4_CONFIG_IGNORE_AUTO_ROUTES, "", "", @@ -1359,14 +1285,6 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) * #NMSettingIP4Config:dns and #NMSettingIP4Config:dns-search properties, if * any, are used. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: ignore-auto-dns - * variable: PEERDNS - * default: yes - * description: PEERDNS has the opposite meaning as 'ignore-auto-dns' property. - * ---end--- - */ g_object_class_install_property (object_class, PROP_IGNORE_AUTO_DNS, g_param_spec_boolean (NM_SETTING_IP4_CONFIG_IGNORE_AUTO_DNS, "", "", @@ -1381,14 +1299,6 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) * A string sent to the DHCP server to identify the local machine which the * DHCP server may use to customize the DHCP lease and options. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: dhcp-client-id - * variable: DHCP_CLIENT_ID(+) - * description: A string sent to the DHCP server to identify the local machine. - * example: DHCP_CLIENT_ID=ax-srv-1 - * ---end--- - */ g_object_class_install_property (object_class, PROP_DHCP_CLIENT_ID, g_param_spec_string (NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, "", "", @@ -1405,14 +1315,6 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) * #NMSettingIP4Config:dhcp-hostname property is empty and this property is * %TRUE, the current persistent hostname of the computer is sent. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: dhcp-send-hostname - * variable: DHCP_SEND_HOSTNAME(+) - * default: yes - * description: Whether DHCP_HOSTNAME should be sent to the DHCP server. - * ---end--- - */ g_object_class_install_property (object_class, PROP_DHCP_SEND_HOSTNAME, g_param_spec_boolean (NM_SETTING_IP4_CONFIG_DHCP_SEND_HOSTNAME, "", "", @@ -1427,13 +1329,6 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) * If the #NMSettingIP4Config:dhcp-send-hostname property is %TRUE, then the * specified name will be sent to the DHCP server when acquiring a lease. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: dhcp-hostname - * variable: DHCP_HOSTNAME - * description: Hostname to send to the DHCP server. - * ---end--- - */ g_object_class_install_property (object_class, PROP_DHCP_HOSTNAME, g_param_spec_string (NM_SETTING_IP4_CONFIG_DHCP_HOSTNAME, "", "", @@ -1448,16 +1343,6 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) * If %TRUE, this connection will never be the default IPv4 connection, * meaning it will never be assigned the default route by NetworkManager. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: never-default - * variable: DEFROUTE (GATEWAYDEV in /etc/sysconfig/network) - * default: yes - * description: DEFROUTE=no tells NetworkManager that this connection - * should not be assigned the default route. DEFROUTE has the opposite - * meaning as 'never-default' property. - * ---end--- - */ g_object_class_install_property (object_class, PROP_NEVER_DEFAULT, g_param_spec_boolean (NM_SETTING_IP4_CONFIG_NEVER_DEFAULT, "", "", @@ -1476,14 +1361,6 @@ nm_setting_ip4_config_class_init (NMSettingIP4ConfigClass *setting_class) * network configuration to succeed if IPv4 configuration fails but IPv6 * configuration completes successfully. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: may-fail - * variable: IPV4_FAILURE_FATAL(+) - * default: no - * description: IPV4_FAILURE_FATAL has the opposite meaning as 'may-fail' property. - * ---end--- - */ g_object_class_install_property (object_class, PROP_MAY_FAIL, g_param_spec_boolean (NM_SETTING_IP4_CONFIG_MAY_FAIL, "", "", diff --git a/libnm-util/nm-setting-ip6-config.c b/libnm-util/nm-setting-ip6-config.c index 7d0ed33e22..654f04962a 100644 --- a/libnm-util/nm-setting-ip6-config.c +++ b/libnm-util/nm-setting-ip6-config.c @@ -1057,15 +1057,6 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) * not done. This property must be set. Note: the "shared" method is not * yet supported. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: method - * variable: IPV6INIT, IPV6FORWARDING, IPV6_AUTOCONF, DHCPV6C - * default: IPV6INIT=yes; IPV6FORWARDING=no; IPV6_AUTOCONF=!IPV6FORWARDING, DHCPV6=no - * description: Method used for IPv6 protocol configuration. - * ignore ~ IPV6INIT=no; auto ~ IPV6_AUTOCONF=yes; dhcp ~ IPV6_AUTOCONF=no and DHCPV6C=yes - * ---end--- - */ g_object_class_install_property (object_class, PROP_METHOD, g_param_spec_string (NM_SETTING_IP6_CONFIG_METHOD, "", "", @@ -1082,13 +1073,6 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) * * Since: 0.9.8 **/ - /* plugins docs - * ---ifcfg-rh--- - * property: dhcp-hostname - * variable: DHCP_HOSTNAME - * description: Hostname to send the DHCP server. - * ---end--- - */ g_object_class_install_property (object_class, PROP_DHCP_HOSTNAME, g_param_spec_string (NM_SETTING_IP6_CONFIG_DHCP_HOSTNAME, "", "", @@ -1107,21 +1091,6 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) * other methods, these DNS servers are used as the only DNS servers for * this connection. **/ - /* plugins docs - * ---keyfile--- - * property: dns - * format: list of DNS IP addresses - * description: List of DNS servers. - * example: dns=2001:4860:4860::8888;2001:4860:4860::8844; - * ---end--- - * ---ifcfg-rh--- - * property: dns - * variable: DNS1, DNS2, ... - * format: string - * description: List of DNS servers. NetworkManager uses the variables both - * for IPv4 and IPv6. - * ---end--- - */ g_object_class_install_property (object_class, PROP_DNS, _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_DNS, "", "", @@ -1159,20 +1128,6 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) * "shared" or "link-local" methods as the interface is automatically * assigned an address with these methods. **/ - /* plugins docs - * ---keyfile--- - * property: addresses - * variable: address1, address2, ... - * format: address/plen[,gateway] - * description: List of static IP addresses. - * example: address1=abbe::cafe/96,abbe::1 - * ---end--- - * ---ifcfg-rh--- - * property: addresses - * variable: IPV6ADDR, IPV6_DEFAULTGW, IPV6ADDR_SECONDARIES - * description: List of static IP addresses. - * ---end--- - */ g_object_class_install_property (object_class, PROP_ADDRESSES, _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_ADDRESSES, "", "", @@ -1193,21 +1148,6 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) * automatic configuration. Routes cannot be used with the "shared" or * "link-local" methods because there is no upstream network. **/ - /* plugins docs - * ---keyfile--- - * property: routes - * variable: route1, route2, ... - * format: route/plen[,gateway,metric] - * description: List of IP routes. - * example: route1=2001:4860:4860::/64,2620:52:0:2219:222:68ff:fe11:5403 - * ---end--- - * ---ifcfg-rh--- - * property: routes - * variable: (none) - * description: List of static routes. They are not stored in ifcfg-* file, - * but in route6-* file instead in the form of command line for 'ip route add'. - * ---end--- - */ g_object_class_install_property (object_class, PROP_ROUTES, _nm_param_spec_specialized (NM_SETTING_IP6_CONFIG_ROUTES, "", "", @@ -1245,14 +1185,6 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) * %TRUE, automatically configured routes are ignored and only routes * specified in the #NMSettingIP6Config:routes property, if any, are used. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: ignore-auto-routes - * variable: IPV6_PEERROUTES(+) - * default: yes - * description: IPV6_PEERROUTES has the opposite meaning as 'ignore-auto-routes' property. - * ---end--- - */ g_object_class_install_property (object_class, PROP_IGNORE_AUTO_ROUTES, g_param_spec_boolean (NM_SETTING_IP6_CONFIG_IGNORE_AUTO_ROUTES, "", "", @@ -1270,14 +1202,6 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) * #NMSettingIP6Config:dns and #NMSettingIP6Config:dns-search properties, if * any, are used. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: ignore-auto-dns - * variable: IPV6_PEERDNS(+) - * default: yes - * description: IPV6_PEERDNS has the opposite meaning as 'ignore-auto-dns' property. - * ---end--- - */ g_object_class_install_property (object_class, PROP_IGNORE_AUTO_DNS, g_param_spec_boolean (NM_SETTING_IP6_CONFIG_IGNORE_AUTO_DNS, "", "", @@ -1293,16 +1217,6 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) * meaning it will never be assigned the default IPv6 route by * NetworkManager. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: never-default - * variable: IPV6_DEFROUTE(+), (and IPV6_DEFAULTGW, IPV6_DEFAULTDEV in /etc/sysconfig/network) - * default: IPV6_DEFROUTE=yes (when no variable specified) - * description: IPV6_DEFROUTE=no tells NetworkManager that this connection - * should not be assigned the default IPv6 route. IPV6_DEFROUTE has the opposite - * meaning as 'never-default' property. - * ---end--- - */ g_object_class_install_property (object_class, PROP_NEVER_DEFAULT, g_param_spec_boolean (NM_SETTING_IP6_CONFIG_NEVER_DEFAULT, "", "", @@ -1321,14 +1235,6 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) * network configuration to succeed if IPv6 configuration fails but IPv4 * configuration completes successfully. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: may-fail - * variable: IPV6_FAILURE_FATAL(+) - * default: no - * description: IPV6_FAILURE_FATAL has the opposite meaning as 'may-fail' property. - * ---end--- - */ g_object_class_install_property (object_class, PROP_MAY_FAIL, g_param_spec_boolean (NM_SETTING_IP6_CONFIG_MAY_FAIL, "", "", @@ -1348,13 +1254,6 @@ nm_setting_ip6_config_class_init (NMSettingIP6ConfigClass *setting_class) * 1: enabled (prefer public address), 2: enabled (prefer temporary * addresses). **/ - /* plugins docs - * ---ifcfg-rh--- - * property: ip6-privacy - * variable: IPV6_PRIVACY, IPV6_PRIVACY_PREFER_PUBLIC_IP(+) - * description: Configure IPv6 Privacy Extensions for SLAAC (RFC4941). - * ---end--- - */ g_object_class_install_property (object_class, PROP_IP6_PRIVACY, g_param_spec_int (NM_SETTING_IP6_CONFIG_IP6_PRIVACY, "", "", diff --git a/libnm-util/nm-setting-serial.c b/libnm-util/nm-setting-serial.c index 20b1a01036..24f2c89807 100644 --- a/libnm-util/nm-setting-serial.c +++ b/libnm-util/nm-setting-serial.c @@ -285,16 +285,6 @@ nm_setting_serial_class_init (NMSettingSerialClass *setting_class) * Parity setting of the serial port. Either 'E' for even parity, 'o' for * odd parity, or 'n' for no parity. **/ - /* plugins docs - * ---keyfile--- - * property: parity - * format: 'e', 'o', or 'n' - * description: The connection parity; even, odd, or none. Note that older - * versions of NetworkManager stored this as an integer: 69 ('E') for even, - * 111 ('o') for odd, or 110 ('n') for none. - * example: parity=n - * ---end--- - */ g_object_class_install_property (object_class, PROP_PARITY, g_param_spec_char (NM_SETTING_SERIAL_PARITY, "", "", diff --git a/libnm-util/nm-setting-team-port.c b/libnm-util/nm-setting-team-port.c index 878b29720f..6bc71c981d 100644 --- a/libnm-util/nm-setting-team-port.c +++ b/libnm-util/nm-setting-team-port.c @@ -176,13 +176,6 @@ nm_setting_team_port_class_init (NMSettingTeamPortClass *setting_class) * directly to teamd. If not specified, the default configuration is * used. See man teamd.conf for the format details. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: config - * variable: TEAM_PORT_CONFIG - * description: Team port configuration in JSON. See man teamd.conf for details. - * ---end--- - */ g_object_class_install_property (object_class, PROP_CONFIG, g_param_spec_string (NM_SETTING_TEAM_PORT_CONFIG, "", "", diff --git a/libnm-util/nm-setting-team.c b/libnm-util/nm-setting-team.c index 9efb39321b..19bc959652 100644 --- a/libnm-util/nm-setting-team.c +++ b/libnm-util/nm-setting-team.c @@ -230,13 +230,6 @@ nm_setting_team_class_init (NMSettingTeamClass *setting_class) * * The name of the virtual in-kernel team network interface **/ - /* plugins docs - * ---ifcfg-rh--- - * property: interface-name - * variable: DEVICE - * description: Teaming interface name. - * ---end--- - */ g_object_class_install_property (object_class, PROP_INTERFACE_NAME, g_param_spec_string (NM_SETTING_TEAM_INTERFACE_NAME, "", "", @@ -253,13 +246,6 @@ nm_setting_team_class_init (NMSettingTeamClass *setting_class) * the value is passed directly to teamd. If not specified, the default * configuration is used. See man teamd.conf for the format details. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: config - * variable: TEAM_CONFIG - * description: Team configuration in JSON. See man teamd.conf for details. - * ---end--- - */ g_object_class_install_property (object_class, PROP_CONFIG, g_param_spec_string (NM_SETTING_TEAM_CONFIG, "", "", diff --git a/libnm-util/nm-setting-vlan.c b/libnm-util/nm-setting-vlan.c index f5e14558fd..f009629242 100644 --- a/libnm-util/nm-setting-vlan.c +++ b/libnm-util/nm-setting-vlan.c @@ -752,16 +752,6 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) * parent interface may be given by the #NMSettingVlan:parent property or by * the #NMSettingWired:mac-address property of an #NMSettingWired setting. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: interface-name - * variable: PHYSDEV and VLAN_ID, or DEVICE - * description: VLAN interface name. - * If all variables are set, parent device from PHYSDEV takes precedence over DEVICE, - * but VLAN id from DEVICE takes precedence over VLAN_ID. - * example: PHYSDEV=eth0, VLAN_ID=12; or DEVICE=eth0.12 - * ---end--- - */ g_object_class_install_property (object_class, PROP_INTERFACE_NAME, g_param_spec_string (NM_SETTING_VLAN_INTERFACE_NAME, "", "", @@ -779,13 +769,6 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) * not specified, the connection must contain an #NMSettingWired setting * with a #NMSettingWired:mac-address property. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: parent - * variable: DEVICE or PHYSDEV - * description: Parent interface of the VLAN. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PARENT, g_param_spec_string (NM_SETTING_VLAN_PARENT, "", "", @@ -801,13 +784,6 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) * The VLAN identifier that the interface created by this connection should * be assigned. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: id - * variable: VLAN_ID or DEVICE - * description: VLAN identifier. - * ---end--- - */ g_object_class_install_property (object_class, PROP_ID, g_param_spec_uint (NM_SETTING_VLAN_ID, "", "", @@ -826,14 +802,6 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) * and %NM_VLAN_FLAG_LOOSE_BINDING (loose binding of the interface to its * master device's operating state). **/ - /* plugins docs - * ---ifcfg-rh--- - * property: flags - * variable: VLAN_FLAGS, REORDER_HDR - * values: "GVRP", "LOOSE_BINDING" for VLAN_FLAGS; 0 or 1 for REORDER_HDR - * description: Parent interface of the VLAN. - * ---end--- - */ g_object_class_install_property (object_class, PROP_FLAGS, g_param_spec_uint (NM_SETTING_VLAN_FLAGS, "", "", @@ -850,14 +818,6 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) * SKB priorities. The mapping is given in the format "from:to" where both * "from" and "to" are unsigned integers, ie "7:3". **/ - /* plugins docs - * ---ifcfg-rh--- - * property: ingress-property-map - * variable: VLAN_INGRESS_PRIORITY_MAP - * description: Ingress priority mapping. - * example: VLAN_INGRESS_PRIORITY_MAP=4:2,3:5 - * ---end--- - */ g_object_class_install_property (object_class, PROP_INGRESS_PRIORITY_MAP, _nm_param_spec_specialized (NM_SETTING_VLAN_INGRESS_PRIORITY_MAP, "", "", @@ -873,14 +833,6 @@ nm_setting_vlan_class_init (NMSettingVlanClass *setting_class) * 802.1p priorities. The mapping is given in the format "from:to" where * both "from" and "to" are unsigned integers, ie "7:3". **/ - /* plugins docs - * ---ifcfg-rh--- - * property: egress-property-map - * variable: VLAN_EGRESS_PRIORITY_MAP - * description: Egress priority mapping. - * example: VLAN_EGRESS_PRIORITY_MAP=5:4,4:1,3:7 - * ---end--- - */ g_object_class_install_property (object_class, PROP_EGRESS_PRIORITY_MAP, _nm_param_spec_specialized (NM_SETTING_VLAN_EGRESS_PRIORITY_MAP, "", "", diff --git a/libnm-util/nm-setting-vpn.c b/libnm-util/nm-setting-vpn.c index 472ebbc3f3..1feeb588a0 100644 --- a/libnm-util/nm-setting-vpn.c +++ b/libnm-util/nm-setting-vpn.c @@ -891,15 +891,6 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class) * Dictionary of key/value pairs of VPN plugin specific data. Both keys and * values must be strings. **/ - /* plugins docs - * ---keyfile--- - * property: data - * variable: separate variables named after keys of the dictionary - * description: The keys of the data dictionary are used as variable names directly - * under [vpn] section. - * example: remote=ovpn.corp.com cipher=AES-256-CBC username=joe - * ---end--- - */ g_object_class_install_property (object_class, PROP_DATA, _nm_param_spec_specialized (NM_SETTING_VPN_DATA, "", "", @@ -913,15 +904,6 @@ nm_setting_vpn_class_init (NMSettingVPNClass *setting_class) * Dictionary of key/value pairs of VPN plugin specific secrets like * passwords or private keys. Both keys and values must be strings. **/ - /* plugins docs - * ---keyfile--- - * property: secrets - * variable: separate variables named after keys of the dictionary - * description: The keys of the secrets dictionary are used as variable names directly - * under [vpn-secrets] section. - * example: password=Popocatepetl - * ---end--- - */ g_object_class_install_property (object_class, PROP_SECRETS, _nm_param_spec_specialized (NM_SETTING_VPN_SECRETS, "", "", diff --git a/libnm-util/nm-setting-wired.c b/libnm-util/nm-setting-wired.c index 5a90d7ddec..8d927921db 100644 --- a/libnm-util/nm-setting-wired.c +++ b/libnm-util/nm-setting-wired.c @@ -874,13 +874,6 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * Interface), "bnc" (Thin Ethernet) or "mii" (Media Independent Interface. * If the device supports only one port type, this setting is ignored. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: port - * variable: (none) - * description: The property is not saved by the plugin. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PORT, g_param_spec_string (NM_SETTING_WIRED_PORT, "", "", @@ -894,13 +887,6 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * If non-zero, request that the device use only the specified speed. In * Mbit/s, ie 100 == 100Mbit/s. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: speed - * variable: (none) - * description: The property is not saved by the plugin. - * ---end--- - */ g_object_class_install_property (object_class, PROP_SPEED, g_param_spec_uint (NM_SETTING_WIRED_SPEED, "", "", @@ -915,13 +901,6 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * If specified, request that the device only use the specified duplex mode. * Either "half" or "full". **/ - /* plugins docs - * ---ifcfg-rh--- - * property: duplex - * variable: (none) - * description: The property is not saved by the plugin. - * ---end--- - */ g_object_class_install_property (object_class, PROP_DUPLEX, g_param_spec_string (NM_SETTING_WIRED_DUPLEX, "", "", @@ -936,13 +915,6 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * %FALSE, do not allow auto-negotiation, in which case the "speed" and * "duplex" properties should be set. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: auto-negotiate - * variable: (none) - * description: The property is not saved by the plugin. - * ---end--- - */ g_object_class_install_property (object_class, PROP_AUTO_NEGOTIATE, g_param_spec_boolean (NM_SETTING_WIRED_AUTO_NEGOTIATE, "", "", @@ -958,21 +930,6 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * whose permanent MAC address matches. This property does not change the * MAC address of the device (i.e. MAC spoofing). **/ - /* plugins docs - * ---keyfile--- - * property: mac-address - * format: ususal hex-digits-and-colons notation - * description: MAC address in traditional hex-digits-and-colons notation - * (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) - * (e.g. 0;34;104;18;121;162) - * ---end--- - * ---ifcfg-rh--- - * property: mac-address - * variable: HWADDR - * description: Hardware address of the device in traditional hex-digits-and-colons - * notation (e.g. 00:22:68:14:5A:05). - * ---end--- - */ g_object_class_install_property (object_class, PROP_MAC_ADDRESS, _nm_param_spec_specialized (NM_SETTING_WIRED_MAC_ADDRESS, "", "", @@ -987,21 +944,6 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * If specified, request that the device use this MAC address instead of its * permanent MAC address. This is known as MAC cloning or spoofing. **/ - /* plugins docs - * ---keyfile--- - * property: cloned-mac-address - * format: ususal hex-digits-and-colons notation - * description: Cloned MAC address in traditional hex-digits-and-colons notation - * (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) - * (e.g. 0;34;104;18;121;178). - * ---end--- - * ---ifcfg-rh--- - * property: cloned-mac-address - * variable: MACADDR - * description: Cloned (spoofed) MAC address in traditional hex-digits-and-colons - * notation (e.g. 00:22:68:14:5A:99). - * ---end--- - */ g_object_class_install_property (object_class, PROP_CLONED_MAC_ADDRESS, _nm_param_spec_specialized (NM_SETTING_WIRED_CLONED_MAC_ADDRESS, "", "", @@ -1018,21 +960,6 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * address is in the standard hex-digits-and-colons notation * (00:11:22:33:44:55). **/ - /* plugins docs - * ---keyfile--- - * property: mac-address-blacklist - * format: list of MACs (separated with semicolons) - * description: MAC address blacklist. - * example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78 - * ---end--- - * ---ifcfg-rh--- - * property: mac-address-blacklist - * variable: HWADDR_BLACKLIST(+) - * description: It denies usage of the connection for any device whose address - * is listed. - * example: HWADDR_BLACKLIST="00:22:68:11:69:08 00:11:22:11:44:55" - * ---end--- - */ g_object_class_install_property (object_class, PROP_MAC_ADDRESS_BLACKLIST, _nm_param_spec_specialized (NM_SETTING_WIRED_MAC_ADDRESS_BLACKLIST, "", "", @@ -1047,13 +974,6 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * If non-zero, only transmit packets of the specified size or smaller, * breaking larger packets up into multiple Ethernet frames. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: mtu - * variable: MTU - * description: MTU of the interface. - * ---end--- - */ g_object_class_install_property (object_class, PROP_MTU, g_param_spec_uint (NM_SETTING_WIRED_MTU, "", "", @@ -1074,14 +994,6 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * and each string may only be composed of hexadecimal characters and the * period (.) character. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: s390-subchannels - * variable: SUBCHANNELS - * description: Subchannels for IBM S390 hosts. - * example: SUBCHANNELS=0.0.b00a,0.0.b00b,0.0.b00c - * ---end--- - */ g_object_class_install_property (object_class, PROP_S390_SUBCHANNELS, _nm_param_spec_specialized (NM_SETTING_WIRED_S390_SUBCHANNELS, "", "", @@ -1096,15 +1008,6 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * s390 network device type; one of "qeth", "lcs", or "ctc", representing * the different types of virtual network devices available on s390 systems. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: s390-nettype - * variable: NETTYPE - * values: "qeth", "lcs" or "ctc" - * description: Network type of the S390 host. - * example: NETTYPE=qeth - * ---end--- - */ g_object_class_install_property (object_class, PROP_S390_NETTYPE, g_param_spec_string (NM_SETTING_WIRED_S390_NETTYPE, "", "", @@ -1121,14 +1024,6 @@ nm_setting_wired_class_init (NMSettingWiredClass *setting_class) * "portname", "protocol", among others. Key names must contain only * alphanumeric characters (ie, [a-zA-Z0-9]). **/ - /* plugins docs - * ---ifcfg-rh--- - * property: s390-options - * variable: OPTIONS and PORTNAME, CTCPROTO, - * description: S390 device options. All options go to OPTIONS, except for - * "portname" and "ctcprot" that have their own variables. - * ---end--- - */ g_object_class_install_property (object_class, PROP_S390_OPTIONS, _nm_param_spec_specialized (NM_SETTING_WIRED_S390_OPTIONS, "", "", diff --git a/libnm-util/nm-setting-wireless-security.c b/libnm-util/nm-setting-wireless-security.c index 052a9327ba..5e3456cebc 100644 --- a/libnm-util/nm-setting-wireless-security.c +++ b/libnm-util/nm-setting-wireless-security.c @@ -1351,14 +1351,6 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * WPA-PSK), or "wpa-eap" (WPA-Enterprise). This property must be set for * any Wi-Fi connection that uses security. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: key-mgmt - * variable: KEY_MGMT(+) - * values: IEEE8021X, WPA-PSK, WPA-EAP - * description: Key management menthod. - * ---end--- - */ g_object_class_install_property (object_class, PROP_KEY_MGMT, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "", "", @@ -1375,15 +1367,6 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * (default key) through 3. Note that some consumer access points (like the * Linksys WRT54G) number the keys 1 - 4. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: wep-tx-keyidx - * variable: DEFAULTKEY - * values: 1, 2, 3, 4 - * default: 1 - * description: Index of active WEP key. - * ---end--- - */ g_object_class_install_property (object_class, PROP_WEP_TX_KEYIDX, g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_WEP_TX_KEYIDX, "", "", @@ -1401,14 +1384,6 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * using Cisco LEAP (ie, key-mgmt = "ieee8021x" and auth-alg = "leap") the * "leap-username" and "leap-password" properties must be specified. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: auth-alg - * variable: SECURITYMODE(+) - * values: restricted, open, leap - * description: Authentication algorithm for WEP. - * ---end--- - */ g_object_class_install_property (object_class, PROP_AUTH_ALG, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_AUTH_ALG, "", "", @@ -1423,15 +1398,6 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * Each element may be one "wpa" (allow WPA) or "rsn" (allow WPA2/RSN). If * not specified, both WPA and RSN connections are allowed. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: proto - * variable: WPA_ALLOW_WPA(+), WPA_ALLOW_WPA2(+) - * values: yes, no - * default: no - * description: Allowed WPA protocols, WPA and WPA2 (RSN). - * ---end--- - */ g_object_class_install_property (object_class, PROP_PROTO, _nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_PROTO, "", "", @@ -1447,15 +1413,6 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * For maximum compatibility leave this property empty. Each list element * may be one of "tkip" or "ccmp". **/ - /* plugins docs - * ---ifcfg-rh--- - * property: pairwise - * variable: CIPHER_PAIRWISE(+) - * values: CCMP, TKIP - * description: Restrict pairwise encryption algorithms, specified as a space - * separated list. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PAIRWISE, _nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_PAIRWISE, "", "", @@ -1471,15 +1428,6 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * in the list. For maximum compatibility leave this property empty. Each * list element may be one of "wep40", "wep104", "tkip", or "ccmp". **/ - /* plugins docs - * ---ifcfg-rh--- - * property: group - * variable: CIPHER_GROUP(+) - * values: CCMP, TKIP, WEP40, WEP104 - * description: Restrict group/broadcast encryption algorithms, specified as a space - * separated list. - * ---end--- - */ g_object_class_install_property (object_class, PROP_GROUP, _nm_param_spec_specialized (NM_SETTING_WIRELESS_SECURITY_GROUP, "", "", @@ -1493,13 +1441,6 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * The login username for legacy LEAP connections (ie, key-mgmt = * "ieee8021x" and auth-alg = "leap"). **/ - /* plugins docs - * ---ifcfg-rh--- - * property: leap-username - * variable: IEEE_8021X_IDENTITY(+) - * description: Login name for LEAP. - * ---end--- - */ g_object_class_install_property (object_class, PROP_LEAP_USERNAME, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, "", "", @@ -1513,13 +1454,6 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * Index 0 WEP key. This is the WEP key used in most networks. See the * "wep-key-type" property for a description of how this key is interpreted. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: wep-key0 - * variable: KEY1, KEY_PASSPHRASE1(+) - * description: The first WEP key (used in most networks). See also DEFAULTKEY for key index. - * ---end--- - */ g_object_class_install_property (object_class, PROP_WEP_KEY0, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, "", "", @@ -1534,13 +1468,6 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * Index 1 WEP key. This WEP index is not used by most networks. See the * "wep-key-type" property for a description of how this key is interpreted. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: wep-key1 - * variable: KEY2, KEY_PASSPHRASE2(+) - * description: WEP key with index 1. See also DEFAULTKEY for key index. - * ---end--- - */ g_object_class_install_property (object_class, PROP_WEP_KEY1, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY1, "", "", @@ -1555,13 +1482,6 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * Index 2 WEP key. This WEP index is not used by most networks. See the * "wep-key-type" property for a description of how this key is interpreted. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: wep-key2 - * variable: KEY3, KEY_PASSPHRASE3(+) - * description: WEP key with index 2. See also DEFAULTKEY for key index. - * ---end--- - */ g_object_class_install_property (object_class, PROP_WEP_KEY2, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY2, "", "", @@ -1576,13 +1496,6 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * Index 3 WEP key. This WEP index is not used by most networks. See the * "wep-key-type" property for a description of how this key is interpreted. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: wep-key3 - * variable: KEY4, KEY_PASSPHRASE4(+) - * description: WEP key with index 3. See also DEFAULTKEY for key index. - * ---end--- - */ g_object_class_install_property (object_class, PROP_WEP_KEY3, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_WEP_KEY3, "", "", @@ -1598,13 +1511,6 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * #NMSettingWirelessSecurity:wep-key1, #NMSettingWirelessSecurity:wep-key2, * and #NMSettingWirelessSecurity:wep-key3 properties. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: wep-key-flags - * variable: WEP_KEY_FLAGS(+) - * description: Password flags for KEY<i>, KEY_PASSPHRASE<i> password. - * ---end--- - */ g_object_class_install_property (object_class, PROP_WEP_KEY_FLAGS, g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_FLAGS, "", "", @@ -1624,13 +1530,6 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * WPA passphrase, and is hashed to derive the actual WPA-PSK used when * connecting to the Wi-Fi network. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: psk - * variable: WPA_PSK - * description: Pre-Shared-Key for WPA networks. - * ---end--- - */ g_object_class_install_property (object_class, PROP_PSK, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_PSK, "", "", @@ -1645,14 +1544,6 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * Flags indicating how to handle the #NMSettingWirelessSecurity:psk * property. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: psk-flags - * variable: WPA_PSK_FLAGS(+) - * description: Password flags for WPA_PSK_FLAGS. - * example: WPA_PSK_FLAGS=user - * ---end--- - */ g_object_class_install_property (object_class, PROP_PSK_FLAGS, g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, "", "", @@ -1668,14 +1559,6 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * The login password for legacy LEAP connections (ie, key-mgmt = * "ieee8021x" and auth-alg = "leap"). **/ - /* plugins docs - * ---ifcfg-rh--- - * property: leap-password - * variable: IEEE_8021X_PASSWORD(+) - * description: Password for LEAP. It can also go to "key-" - * lookaside file, or it can be owned by a secret agent. - * ---end--- - */ g_object_class_install_property (object_class, PROP_LEAP_PASSWORD, g_param_spec_string (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD, "", "", @@ -1690,13 +1573,6 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * Flags indicating how to handle the * #NMSettingWirelessSecurity:leap-password property. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: leap-password-flags - * variable: IEEE_8021X_PASSWORD_FLAGS(+) - * description: Password flags for IEEE_8021X_PASSWORD_FLAGS. - * ---end--- - */ g_object_class_install_property (object_class, PROP_LEAP_PASSWORD_FLAGS, g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_LEAP_PASSWORD_FLAGS, "", "", @@ -1716,16 +1592,6 @@ nm_setting_wireless_security_class_init (NMSettingWirelessSecurityClass *setting * as a string and will be hashed using the de-facto MD5 method to derive * the actual WEP key. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: wep-key-type - * variable: KEY<i> or KEY_PASSPHRASE<i>(+) - * description: KEY is used for "key" type (10 or 26 hexadecimal characters, - * or 5 or 13 character string prefixed with "s:"). KEY_PASSPHRASE is used - * for WEP passphrases. - * example: KEY1=s:ahoj, KEY1=0a1c45bc02, KEY_PASSPHRASE1=mysupersecretkey - * ---end--- - */ g_object_class_install_property (object_class, PROP_WEP_KEY_TYPE, g_param_spec_uint (NM_SETTING_WIRELESS_SECURITY_WEP_KEY_TYPE, "", "", diff --git a/libnm-util/nm-setting-wireless.c b/libnm-util/nm-setting-wireless.c index d6693cb9f5..99f4c9b14c 100644 --- a/libnm-util/nm-setting-wireless.c +++ b/libnm-util/nm-setting-wireless.c @@ -1034,20 +1034,6 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * * SSID of the Wi-Fi network. Must be specified. **/ - /* plugins docs - * ---keyfile--- - * property: ssid - * format: string (or decimal-byte list - obsolete) - * description: SSID of Wi-Fi network. - * example: ssid=Quick Net - * ---end--- - * ---ifcfg-rh--- - * property: ssid - * variable: ESSID - * description: SSID of Wi-Fi network. - * example: ESSID="Quick Net" - * ---end--- - */ g_object_class_install_property (object_class, PROP_SSID, _nm_param_spec_specialized (NM_SETTING_WIRELESS_SSID, "", "", @@ -1061,14 +1047,6 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * Wi-Fi network mode; one of "infrastructure", "adhoc" or "ap". If blank, * infrastructure is assumed. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: mode - * variable: MODE - * values: Ad-Hoc, Managed (Auto) [case insensitive] - * description: Wi-Fi network mode. - * ---end--- - */ g_object_class_install_property (object_class, PROP_MODE, g_param_spec_string (NM_SETTING_WIRELESS_MODE, "", "", @@ -1086,14 +1064,6 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * settings are compatible. This setting depends on specific driver * capability and may not work with all drivers. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: band - * variable: CHANNEL - * description: Channels greater than 14 mean "a" band, otherwise the band is "bg". - * example: CHANNEL=6 - * ---end--- - */ g_object_class_install_property (object_class, PROP_BAND, g_param_spec_string (NM_SETTING_WIRELESS_BAND, "", "", @@ -1109,14 +1079,6 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * channel. Because channel numbers overlap between bands, this property * also requires the "band" property to be set. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: channel - * variable: CHANNEL - * description: Channel used for the Wi-Fi communication. - * example: CHANNEL=6 - * ---end--- - */ g_object_class_install_property (object_class, PROP_CHANNEL, g_param_spec_uint (NM_SETTING_WIRELESS_CHANNEL, "", "", @@ -1133,14 +1095,6 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * all devices. Note: this property does not control the BSSID used when * creating an Ad-Hoc network and is unlikely to in the future. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: bssid - * variable: BSSID(+) - * description: Restricts association only to a single AP. - * example: BSSID=00:1E:BD:64:83:21 - * ---end--- - */ g_object_class_install_property (object_class, PROP_BSSID, _nm_param_spec_specialized (NM_SETTING_WIRELESS_BSSID, "", "", @@ -1156,13 +1110,6 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * Mbit/s. This property is highly driver dependent and not all devices * support setting a static bitrate. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: rate - * variable: (none) - * description: This property is not handled by ifcfg-rh plugin. - * ---end--- - */ g_object_class_install_property (object_class, PROP_RATE, g_param_spec_uint (NM_SETTING_WIRELESS_RATE, "", "", @@ -1179,13 +1126,6 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * Units are dBm. This property is highly driver dependent and not all * devices support setting a static transmit power. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: tx-power - * variable: (none) - * description: This property is not handled by ifcfg-rh plugin. - * ---end--- - */ g_object_class_install_property (object_class, PROP_TX_POWER, g_param_spec_uint (NM_SETTING_WIRELESS_TX_POWER, "", "", @@ -1202,21 +1142,6 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * permanent MAC address matches. This property does not change the MAC * address of the device (i.e. MAC spoofing). **/ - /* plugins docs - * ---keyfile--- - * property: mac-address - * format: ususal hex-digits-and-colons notation - * description: MAC address in traditional hex-digits-and-colons notation - * (e.g. 00:22:68:12:79:A2), or semicolon separated list of 6 bytes (obsolete) - * (e.g. 0;34;104;18;121;162). - * ---end--- - * ---ifcfg-rh--- - * property: mac-address - * variable: HWADDR - * description: Hardware address of the device in traditional hex-digits-and-colons - * notation (e.g. 00:22:68:14:5A:05). - * ---end--- - */ g_object_class_install_property (object_class, PROP_MAC_ADDRESS, _nm_param_spec_specialized (NM_SETTING_WIRELESS_MAC_ADDRESS, "", "", @@ -1230,21 +1155,6 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * If specified, request that the Wi-Fi device use this MAC address instead * of its permanent MAC address. This is known as MAC cloning or spoofing. **/ - /* plugins docs - * ---keyfile--- - * property: cloned-mac-address - * format: ususal hex-digits-and-colons notation - * description: Cloned MAC address in traditional hex-digits-and-colons notation - * (e.g. 00:22:68:12:79:B2), or semicolon separated list of 6 bytes (obsolete) - * (e.g. 0;34;104;18;121;178). - * ---end--- - * ---ifcfg-rh--- - * property: cloned-mac-address - * variable: MACADDR - * description: Cloned (spoofed) MAC address in traditional hex-digits-and-colons - * notation (e.g. 00:22:68:14:5A:99). - * ---end--- - */ g_object_class_install_property (object_class, PROP_CLONED_MAC_ADDRESS, _nm_param_spec_specialized (NM_SETTING_WIRELESS_CLONED_MAC_ADDRESS, "", "", @@ -1259,20 +1169,6 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * connection should never apply. Each MAC address should be given in the * standard hex-digits-and-colons notation (eg "00:11:22:33:44:55"). **/ - /* plugins docs - * ---keyfile--- - * property: mac-address-blacklist - * format: list of MACs (separated with semicolons) - * description: MAC address blacklist. - * example: mac-address-blacklist= 00:22:68:12:79:A6;00:22:68:12:79:78 - * ---end--- - * ---ifcfg-rh--- - * property: mac-address-blacklist - * variable: HWADDR_BLACKLIST(+) - * description: It denies usage of the connection for any device whose address - * is listed. - * ---end--- - */ g_object_class_install_property (object_class, PROP_MAC_ADDRESS_BLACKLIST, _nm_param_spec_specialized (NM_SETTING_WIRELESS_MAC_ADDRESS_BLACKLIST, "", "", @@ -1291,13 +1187,6 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * NetworkManager. The changes you make to this property will not be * preserved. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: seen-bssids - * variable: (none) - * description: This property is not handled by ifcfg-rh plugin. - * ---end--- - */ g_object_class_install_property (object_class, PROP_SEEN_BSSIDS, _nm_param_spec_specialized (NM_SETTING_WIRELESS_SEEN_BSSIDS, "", "", @@ -1312,13 +1201,6 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * If non-zero, only transmit packets of the specified size or smaller, * breaking larger packets up into multiple Ethernet frames. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: mtu - * variable: MTU - * description: MTU of the wireless interface. - * ---end--- - */ g_object_class_install_property (object_class, PROP_MTU, g_param_spec_uint (NM_SETTING_WIRELESS_MTU, "", "", @@ -1340,13 +1222,6 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * by the presence of a #NMSettingWirelessSecurity setting in the * connection. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: security - * variable: (none) - * description: This property is deprecated and not handled by ifcfg-rh-plugin. - * ---end--- - */ g_object_class_install_property (object_class, PROP_SEC, g_param_spec_string (NM_SETTING_WIRELESS_SEC, "", "", @@ -1363,13 +1238,6 @@ nm_setting_wireless_class_init (NMSettingWirelessClass *setting_class) * these workarounds expose inherent insecurities with hidden SSID networks, * and thus hidden SSID networks should be used with caution. **/ - /* plugins docs - * ---ifcfg-rh--- - * property: hidden - * variable: SSID_HIDDEN(+) - * description: Whether the network hides the SSID. - * ---end--- - */ g_object_class_install_property (object_class, PROP_HIDDEN, g_param_spec_boolean (NM_SETTING_WIRELESS_HIDDEN, "", "", diff --git a/libnm/Makefile.am b/libnm/Makefile.am index f911d86e66..e00aa87392 100644 --- a/libnm/Makefile.am +++ b/libnm/Makefile.am @@ -181,3 +181,28 @@ endif check-local: $(top_srcdir)/tools/check-exports.sh $(builddir)/.libs/libnm.so $(SYMBOL_VIS_FILE) + +if BUILD_SETTING_DOCS + +noinst_DATA = nm-setting-docs.xml nm-keyfile-docs.xml nm-ifcfg-rh-docs.xml + +docs_sources = $(filter-out nm-core-enum-types.c,$(libnm_core_sources)) + +nm-setting-docs.xml: generate-setting-docs.py $(docs_sources) | NM-1.0.gir NM-1.0.typelib libnm.la + export GI_TYPELIB_PATH=$(abs_builddir)$${GI_TYPELIB_PATH:+:$$GI_TYPELIB_PATH}; \ + export LD_LIBRARY_PATH=$(abs_builddir)/.libs$${LD_LIBRARY_PATH:+:$$LD_LIBRARY_PATH}; \ + $(srcdir)/generate-setting-docs.py \ + --gir $(builddir)/NM-1.0.gir \ + --output $@ + +nm-keyfile-docs.xml: generate-plugin-docs.pl $(docs_sources) + $(srcdir)/generate-plugin-docs.pl keyfile $(top_srcdir)/libnm-core $@ +nm-ifcfg-rh-docs.xml: generate-plugin-docs.pl $(docs_sources) + $(srcdir)/generate-plugin-docs.pl ifcfg-rh $(top_srcdir)/libnm-core $@ + +CLEANFILES += $(noinst_DATA) +EXTRA_DIST += $(noinst_DATA) + +endif + +EXTRA_DIST += generate-setting-docs.py generate-plugin-docs.pl diff --git a/libnm-util/generate-plugin-docs.pl b/libnm/generate-plugin-docs.pl index 0ded9f6204..53edb48cd2 100755 --- a/libnm-util/generate-plugin-docs.pl +++ b/libnm/generate-plugin-docs.pl @@ -61,11 +61,11 @@ my $start_tag = "---$plugin---\\s*\$"; my $end_tag = '---end---'; # get source files to scan for documentation comments (nm-setting-<something>.c) -my $file = "$srcdir/Makefile.am"; +my $file = "$srcdir/Makefile.libnm-core"; open my $fh, '<', $file or die "Can't open $file: $!"; while (my $line = <$fh>) { chomp $line; - my @strings = $line =~ /(?:^|\s)(nm-setting-[^.]*\.c)(?:\s|$)/g; + my @strings = $line =~ /\/(nm-setting-[^.]*\.c)(?:\s|$)/g; push @source_files, @strings } close $fh; diff --git a/libnm-util/generate-setting-docs.py b/libnm/generate-setting-docs.py index 463d0f2ec7..ef2918ec55 100755 --- a/libnm-util/generate-setting-docs.py +++ b/libnm/generate-setting-docs.py @@ -18,7 +18,7 @@ from __future__ import print_function -from gi.repository import NetworkManager, GObject +from gi.repository import NM, GObject import argparse, datetime, re, sys import xml.etree.ElementTree as ET @@ -55,7 +55,7 @@ constants = { 'NULL': 'NULL' } setting_names = {} -def init_constants(girxml): +def init_constants(girxml, settings): for const in girxml.findall('./gi:namespace/gi:constant', ns_map): cname = const.attrib['{%s}type' % ns_map['c']] cvalue = const.attrib['value'] @@ -64,21 +64,23 @@ def init_constants(girxml): constants[cname] = cvalue for enum in girxml.findall('./gi:namespace/gi:enumeration', ns_map): - flag = enum.attrib['name'].endswith('Flags') for enumval in enum.findall('./gi:member', ns_map): cname = enumval.attrib[identifier_key] - cvalue = enumval.attrib['value'] - if flag: - cvalue = '%s (0x%x)' % (cname, int(cvalue)) - else: - cvalue = '%s (%s)' % (cname, cvalue) + cvalue = '%s (%s)' % (cname, enumval.attrib['value']) constants[cname] = cvalue - for setting in girxml.findall('./gi:namespace/gi:class[@parent="Setting"]', ns_map): + for enum in girxml.findall('./gi:namespace/gi:bitfield', ns_map): + for enumval in enum.findall('./gi:member', ns_map): + cname = enumval.attrib[identifier_key] + cvalue = '%s (0x%x)' % (cname, int(enumval.attrib['value'])) + constants[cname] = cvalue + + for setting in settings: setting_type_name = 'NM' + setting.attrib['name']; - symbol_prefix = setting.attrib[symbol_prefix_key] - setting_name = constants['NM_' + symbol_prefix.upper() + '_SETTING_NAME'] - setting_names[setting_type_name] = setting_name + setting_name_symbol = 'NM_' + setting.attrib[symbol_prefix_key].upper() + '_SETTING_NAME' + if constants.has_key(setting_name_symbol): + setting_name = constants[setting_name_symbol] + setting_names[setting_type_name] = setting_name def get_prop_type(setting, pspec, propxml): prop_type = pspec.value_type.name @@ -110,6 +112,8 @@ def get_docs(setting, pspec, propxml): # remaining gtk-doc cleanup doc = doc.replace('%%', '%') + doc = doc.replace('<!-- -->', '') + doc = re.sub(r' Element-.ype:.*', '', doc) doc = re.sub(r'#([A-Z]\w*)', r'\1', doc) # Remove sentences that refer to functions @@ -144,24 +148,27 @@ def usage(): exit() parser = argparse.ArgumentParser() -parser.add_argument('-g', '--gir', metavar='FILE', help='NetworkManager-1.0.gir file') +parser.add_argument('-g', '--gir', metavar='FILE', help='NM-1.0.gir file') parser.add_argument('-o', '--output', metavar='FILE', help='output file') args = parser.parse_args() if args.gir is None or args.output is None: usage() -NetworkManager.utils_init() +NM.utils_init() girxml = ET.parse(args.gir).getroot() outfile = open(args.output, mode='w') -init_constants(girxml) - basexml = girxml.find('./gi:namespace/gi:class[@name="Setting"]', ns_map) settings = girxml.findall('./gi:namespace/gi:class[@parent="Setting"]', ns_map) +# Hack. Need a better way to do this +ipxml = girxml.find('./gi:namespace/gi:class[@name="SettingIPConfig"]', ns_map) +settings.extend(girxml.findall('./gi:namespace/gi:class[@parent="SettingIPConfig"]', ns_map)) settings = sorted(settings, key=lambda setting: setting.attrib['{%s}symbol-prefix' % ns_map['c']]) +init_constants(girxml, settings) + outfile.write("""<?xml version=\"1.0\"?> <!DOCTYPE nm-setting-docs [ <!ENTITY quot """> @@ -170,7 +177,10 @@ outfile.write("""<?xml version=\"1.0\"?> """) for settingxml in settings: - new_func = NetworkManager.__getattr__(settingxml.attrib['name']) + if settingxml.attrib.has_key('abstract'): + continue + + new_func = NM.__getattr__(settingxml.attrib['name']) setting = new_func() outfile.write(" <setting name=\"%s\">\n" % setting.props.name) @@ -180,6 +190,8 @@ for settingxml in settings: propxml = settingxml.find('./gi:property[@name="%s"]' % pspec.name, ns_map) if propxml is None: propxml = basexml.find('./gi:property[@name="%s"]' % pspec.name, ns_map) + if propxml is None: + propxml = ipxml.find('./gi:property[@name="%s"]' % pspec.name, ns_map) value_type = get_prop_type(setting, pspec, propxml) value_desc = get_docs(setting, pspec, propxml) diff --git a/man/Makefile.am b/man/Makefile.am index 589a3325ff..c5f33f1959 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -27,21 +27,21 @@ endif if BUILD_SETTING_DOCS -nm-settings.xml: nm-settings.xsl $(top_builddir)/libnm-util/nm-setting-docs.xml +nm-settings.xml: nm-settings.xsl $(top_builddir)/libnm/nm-setting-docs.xml $(AM_V_GEN) xsltproc \ --output $@ \ --stringparam version $(NM_VERSION) \ --stringparam date "`date +'%d %B %Y'`" \ $^ -nm-settings-keyfile.xml: nm-settings-keyfile.xsl $(top_builddir)/libnm-util/nm-keyfile-docs.xml +nm-settings-keyfile.xml: nm-settings-keyfile.xsl $(top_builddir)/libnm/nm-keyfile-docs.xml $(AM_V_GEN) xsltproc \ --output $@ \ --stringparam version $(NM_VERSION) \ --stringparam date "`date +'%d %B %Y'`" \ $^ -nm-settings-ifcfg-rh.xml: nm-settings-ifcfg-rh.xsl $(top_builddir)/libnm-util/nm-ifcfg-rh-docs.xml +nm-settings-ifcfg-rh.xml: nm-settings-ifcfg-rh.xsl $(top_builddir)/libnm/nm-ifcfg-rh-docs.xml $(AM_V_GEN) xsltproc \ --output $@ \ --stringparam version $(NM_VERSION) \ |