Skip to content

Commit

Permalink
Add MACsec meta methods (sonic-net#704)
Browse files Browse the repository at this point in the history 
Add MACsec meta methods
  • Loading branch information
@Pterosaur
Pterosaur committed Nov 11, 2020
1 parent 3778673 commit 1bd090c
Show file tree
Hide file tree
Showing 3 changed files with 153 additions and 0 deletions.
24 changes: 24 additions & 0 deletions meta/Meta.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3286,6 +3286,7 @@ void Meta::meta_generic_validation_post_remove(
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_INT16:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_INT32:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT32:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT64:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_MAC:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_IPV4:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_IPV6:
Expand Down Expand Up @@ -3351,6 +3352,13 @@ void Meta::meta_generic_validation_post_remove(
// no special action required
break;

case SAI_ATTR_VALUE_TYPE_MACSEC_SAK:
case SAI_ATTR_VALUE_TYPE_MACSEC_AUTH_KEY:
case SAI_ATTR_VALUE_TYPE_MACSEC_SALT:
case SAI_ATTR_VALUE_TYPE_MACSEC_SCI:
case SAI_ATTR_VALUE_TYPE_MACSEC_SSCI:
break;

case SAI_ATTR_VALUE_TYPE_SYSTEM_PORT_CONFIG:
case SAI_ATTR_VALUE_TYPE_SYSTEM_PORT_CONFIG_LIST:
// no special action required
Expand Down Expand Up @@ -4404,6 +4412,7 @@ sai_status_t Meta::meta_generic_validation_create(
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_INT16:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_INT32:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT32:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT64:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_MAC:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_IPV4:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_IPV6:
Expand Down Expand Up @@ -4570,6 +4579,13 @@ sai_status_t Meta::meta_generic_validation_create(
break;
}

case SAI_ATTR_VALUE_TYPE_MACSEC_SAK:
case SAI_ATTR_VALUE_TYPE_MACSEC_AUTH_KEY:
case SAI_ATTR_VALUE_TYPE_MACSEC_SALT:
case SAI_ATTR_VALUE_TYPE_MACSEC_SCI:
case SAI_ATTR_VALUE_TYPE_MACSEC_SSCI:
break;

case SAI_ATTR_VALUE_TYPE_SYSTEM_PORT_CONFIG_LIST:
VALIDATION_LIST(md, value.sysportconfiglist);
break;
Expand Down Expand Up @@ -6645,6 +6661,7 @@ void Meta::meta_generic_validation_post_create(
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_INT16:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_INT32:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT32:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT64:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_MAC:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_IPV4:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_IPV6:
Expand Down Expand Up @@ -6712,6 +6729,13 @@ void Meta::meta_generic_validation_post_create(
// no special action required
break;

case SAI_ATTR_VALUE_TYPE_MACSEC_SAK:
case SAI_ATTR_VALUE_TYPE_MACSEC_AUTH_KEY:
case SAI_ATTR_VALUE_TYPE_MACSEC_SALT:
case SAI_ATTR_VALUE_TYPE_MACSEC_SCI:
case SAI_ATTR_VALUE_TYPE_MACSEC_SSCI:
break;

case SAI_ATTR_VALUE_TYPE_SYSTEM_PORT_CONFIG:
case SAI_ATTR_VALUE_TYPE_SYSTEM_PORT_CONFIG_LIST:
// no special action required
Expand Down
13 changes: 13 additions & 0 deletions meta/sai_serialize.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,19 @@ std::string sai_serialize_tunnel_stat(
std::string sai_serialize_queue_attr(
_In_ const sai_queue_attr_t attr);

std::string sai_serialize_hex_binary(
_In_ const void *buffer,
_In_ size_t length);

template <typename T>
std::string sai_serialize_hex_binary(
_In_ const T &value)
{
SWSS_LOG_ENTER();

return sai_serialize_hex_binary(&value, sizeof(T));
}

std::string sai_serialize_macsec_sa_attr(
_In_ const sai_macsec_sa_attr_t &attr);

Expand Down
116 changes: 116 additions & 0 deletions meta/saiserialize.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,12 @@ sai_status_t transfer_attribute(
transfer_primitive(src_attr.value.aclfield.data.s32, dst_attr.value.aclfield.data.s32);
break;

case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT64:
transfer_primitive(src_attr.value.aclfield.enable, dst_attr.value.aclfield.enable);
transfer_primitive(src_attr.value.aclfield.mask.u64, dst_attr.value.aclfield.mask.u64);
transfer_primitive(src_attr.value.aclfield.data.u64, dst_attr.value.aclfield.data.u64);
break;

case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_MAC:
transfer_primitive(src_attr.value.aclfield.enable, dst_attr.value.aclfield.enable);
transfer_primitive(src_attr.value.aclfield.mask.mac, dst_attr.value.aclfield.mask.mac);
Expand Down Expand Up @@ -1377,6 +1383,9 @@ std::string sai_serialize_acl_field(
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_INT32:
return sai_serialize_enum(field.data.s32, meta.enummetadata) + "&mask:" + sai_serialize_number(field.mask.s32, true);

case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT64:
return sai_serialize_number(field.data.u64) + "&mask:" + sai_serialize_number(field.mask.u64, true);

case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_MAC:
return sai_serialize_mac(field.data.mac) +"&mask:" + sai_serialize_mac(field.mask.mac);

Expand Down Expand Up @@ -1414,6 +1423,31 @@ std::string sai_serialize_acl_capability(
return mandatory + ":" + list;
}

std::string sai_serialize_hex_binary(
_In_ const void *buffer,
_In_ size_t length)
{
SWSS_LOG_ENTER();

std::string s;

if (buffer == NULL || length == 0)
{
return s;
}

s.resize(2 * length, '0');
const unsigned char *input = static_cast<const unsigned char *>(buffer);
char *output = &s[0];

for (size_t i = 0; i < length; i++)
{
snprintf(&output[i * 2], 3, "%02X", input[i]);
}

return s;
}

std::string sai_serialize_system_port_config(
_In_ const sai_attr_metadata_t &meta,
_In_ const sai_system_port_config_t &sysportconfig)
Expand Down Expand Up @@ -1589,6 +1623,7 @@ std::string sai_serialize_attr_value(
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_INT16:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT32:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_INT32:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT64:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_MAC:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_IPV4:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_IPV6:
Expand Down Expand Up @@ -1616,6 +1651,17 @@ std::string sai_serialize_attr_value(
case SAI_ATTR_VALUE_TYPE_ACL_CAPABILITY:
return sai_serialize_acl_capability(meta, attr.value.aclcapability, countOnly);

// MACsec Attributions

case SAI_ATTR_VALUE_TYPE_MACSEC_SAK:
return sai_serialize_hex_binary(attr.value.macsecsak);

case SAI_ATTR_VALUE_TYPE_MACSEC_AUTH_KEY:
return sai_serialize_hex_binary(attr.value.macsecauthkey);

case SAI_ATTR_VALUE_TYPE_MACSEC_SALT:
return sai_serialize_hex_binary(attr.value.macsecsalt);

case SAI_ATTR_VALUE_TYPE_SYSTEM_PORT_CONFIG:
return sai_serialize_system_port_config(meta, attr.value.sysportconfig);

Expand Down Expand Up @@ -2547,6 +2593,11 @@ void sai_deserialize_acl_field(
sai_deserialize_number(smask, field.mask.s32, true);
return;

case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT64:
sai_deserialize_number(sfield, field.data.u64);
sai_deserialize_number(smask, field.mask.u64, true);
return;

case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_MAC:
sai_deserialize_mac(sfield, field.data.mac);
sai_deserialize_mac(smask, field.mask.mac);
Expand Down Expand Up @@ -2655,6 +2706,53 @@ void sai_deserialize_acl_capability(
sai_deserialize_enum_list(list, &sai_metadata_enum_sai_acl_action_type_t, cap.action_list, false);
}

void sai_deserialize_hex_binary(
_In_ const std::string &s,
_Out_ void *buffer,
_In_ size_t length)
{
SWSS_LOG_ENTER();

if (s.length() % 2 != 0)
{
SWSS_LOG_THROW("Invalid hex string %s", s.c_str());
}

if (s.length() > (length * 2))
{
SWSS_LOG_THROW("Buffer length isn't sufficient.");
}

size_t buffer_cur = 0;
size_t hex_cur = 0;
unsigned char *output = static_cast<unsigned char *>(buffer);

while (hex_cur < s.length())
{
const char temp_buffer[] = {s[hex_cur], s[hex_cur + 1], 0};
unsigned int value = -1;

if (sscanf(temp_buffer, "%X", &value) <= 0 || value > 0xff)
{
SWSS_LOG_THROW("Invalid hex string %s", temp_buffer);
}

output[buffer_cur] = static_cast<unsigned char>(value);
hex_cur += 2;
buffer_cur += 1;
}
}

template<typename T>
void sai_deserialize_hex_binary(
_In_ const std::string &s,
_Out_ T &value)
{
SWSS_LOG_ENTER();

return sai_deserialize_hex_binary(s, &value, sizeof(T));
}

void sai_deserialize_system_port_config(
_In_ const std::string& s,
_Out_ sai_system_port_config_t& sysportconfig)
Expand Down Expand Up @@ -2837,6 +2935,7 @@ void sai_deserialize_attr_value(
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_INT16:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT32:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_INT32:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT64:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_MAC:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_IPV4:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_IPV6:
Expand Down Expand Up @@ -2864,6 +2963,15 @@ void sai_deserialize_attr_value(
case SAI_ATTR_VALUE_TYPE_ACL_CAPABILITY:
return sai_deserialize_acl_capability(s, attr.value.aclcapability);

case SAI_ATTR_VALUE_TYPE_MACSEC_SAK:
return sai_deserialize_hex_binary(s, attr.value.macsecsak);

case SAI_ATTR_VALUE_TYPE_MACSEC_AUTH_KEY:
return sai_deserialize_hex_binary(s, attr.value.macsecauthkey);

case SAI_ATTR_VALUE_TYPE_MACSEC_SALT:
return sai_deserialize_hex_binary(s, attr.value.macsecsalt);

case SAI_ATTR_VALUE_TYPE_SYSTEM_PORT_CONFIG:
return sai_deserialize_system_port_config(s, attr.value.sysportconfig);

Expand Down Expand Up @@ -3398,6 +3506,7 @@ void sai_deserialize_free_attribute_value(
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_INT16:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT32:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_INT32:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_UINT64:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_MAC:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_IPV4:
case SAI_ATTR_VALUE_TYPE_ACL_FIELD_DATA_IPV6:
Expand Down Expand Up @@ -3435,6 +3544,13 @@ void sai_deserialize_free_attribute_value(
sai_free_list(attr.value.aclcapability.action_list);
break;

case SAI_ATTR_VALUE_TYPE_MACSEC_SAK:
case SAI_ATTR_VALUE_TYPE_MACSEC_AUTH_KEY:
case SAI_ATTR_VALUE_TYPE_MACSEC_SALT:
case SAI_ATTR_VALUE_TYPE_MACSEC_SCI:
case SAI_ATTR_VALUE_TYPE_MACSEC_SSCI:
break;

case SAI_ATTR_VALUE_TYPE_SYSTEM_PORT_CONFIG:
break;

Expand Down

0 comments on commit 1bd090c

Please sign in to comment.