diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2018-06-06 15:26:17 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2018-06-14 15:13:11 +0200 |
| commit | bb20f2eb612a25c8a9b046d967c801a736f4dcc2 (patch) | |
| tree | 8bd590dd917357787fbf889a25bf7754a90a3ee5 /clients | |
| parent | ed638b71260d106d0a465d520d854fb44ca915f0 (diff) | |
| download | NetworkManager-bb20f2eb612a25c8a9b046d967c801a736f4dcc2.tar.gz | |
macsec: enable send-sci by default and make the option configurable
It is safer to enable send-sci by default because, at the cost of
8-byte overhead, it makes MACsec work over bridges (note that kernel
also enables it by default). While at it, also make the option
configurable.
https://bugzilla.redhat.com/show_bug.cgi?id=1588041
Diffstat (limited to 'clients')
| -rw-r--r-- | clients/common/nm-meta-setting-desc.c | 3 | ||||
| -rw-r--r-- | clients/common/settings-docs.h.in | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/clients/common/nm-meta-setting-desc.c b/clients/common/nm-meta-setting-desc.c index 1154fabfb6..6f0183492e 100644 --- a/clients/common/nm-meta-setting-desc.c +++ b/clients/common/nm-meta-setting-desc.c @@ -6224,6 +6224,9 @@ static const NMMetaPropertyInfo *const property_infos_MACSEC[] = { | NM_META_PROPERTY_TYP_FLAG_ENUM_GET_PRETTY_TEXT, ), ), + PROPERTY_INFO_WITH_DESC (NM_SETTING_MACSEC_SEND_SCI, + .property_type = &_pt_gobject_bool, + ), NULL }; diff --git a/clients/common/settings-docs.h.in b/clients/common/settings-docs.h.in index c4b15b4cc2..7beed42964 100644 --- a/clients/common/settings-docs.h.in +++ b/clients/common/settings-docs.h.in @@ -261,6 +261,7 @@ #define DESCRIBE_DOC_NM_SETTING_MACSEC_NAME N_("The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example \"ppp\" or \"wireless\" or \"wired\".") #define DESCRIBE_DOC_NM_SETTING_MACSEC_PARENT N_("If given, specifies the parent interface name or parent connection UUID from which this MACSEC interface should be created. If this property is not specified, the connection must contain an \"802-3-ethernet\" setting with a \"mac-address\" property.") #define DESCRIBE_DOC_NM_SETTING_MACSEC_PORT N_("The port component of the SCI (Secure Channel Identifier), between 1 and 65534.") +#define DESCRIBE_DOC_NM_SETTING_MACSEC_SEND_SCI N_("Specifies whether the SCI (Secure Channel Identifier) is included in every packet.") #define DESCRIBE_DOC_NM_SETTING_MACSEC_VALIDATION N_("Specifies the validation mode for incoming frames.") #define DESCRIBE_DOC_NM_SETTING_MACVLAN_MODE N_("The macvlan mode, which specifies the communication mechanism between multiple macvlans on the same lower device.") #define DESCRIBE_DOC_NM_SETTING_MACVLAN_NAME N_("The setting's name, which uniquely identifies the setting within the connection. Each setting type has a name unique to that type, for example \"ppp\" or \"wireless\" or \"wired\".") |