Skip to content

Fix everflow for SAI 1.0 #282

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qiluo-msft merged 2 commits into from
Aug 9, 2017
Merged

Fix everflow for SAI 1.0 #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7542921
[mirrororch]: Set the VLAN header only when the packet is mirrored to…
Aug 8, 2017
b3cf385
Fix aclfield.mask (#1)
qiluo-msft Aug 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions orchagent/aclorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,8 @@ bool AclRule::validateAddMatch(string attr_name, string attr_value)
}
else if(attr_name == MATCH_DSCP)
{
value.aclfield.data.u8 = to_uint<uint8_t>(attr_value, 0, 63);
value.aclfield.mask.u8 = 0xFF;
value.aclfield.data.u8 = to_uint<uint8_t>(attr_value, 0, 0x3F);
value.aclfield.mask.u8 = 0x3F;
}
else if(attr_name == MATCH_IP_PROTOCOL)
{
Expand Down
34 changes: 19 additions & 15 deletions orchagent/mirrororch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -396,25 +396,29 @@ bool MirrorOrch::activateSession(const string& name, MirrorEntry& session)
attr.value.s32 = SAI_MIRROR_SESSION_TYPE_ENHANCED_REMOTE;
attrs.push_back(attr);

attr.id = SAI_MIRROR_SESSION_ATTR_VLAN_HEADER_VALID;
attr.value.booldata = true;
attrs.push_back(attr);
/* Add the VLAN header when the packet is sent out from a VLAN */
if (session.neighborInfo.vlanId)
{
attr.id = SAI_MIRROR_SESSION_ATTR_VLAN_HEADER_VALID;
attr.value.booldata = true;
attrs.push_back(attr);

attr.id =SAI_MIRROR_SESSION_ATTR_VLAN_TPID;
attr.value.u16 = ETH_P_8021Q;
attrs.push_back(attr);
attr.id =SAI_MIRROR_SESSION_ATTR_VLAN_TPID;
attr.value.u16 = ETH_P_8021Q;
attrs.push_back(attr);

attr.id =SAI_MIRROR_SESSION_ATTR_VLAN_ID;
attr.value.u16 = session.neighborInfo.vlanId;
attrs.push_back(attr);
attr.id =SAI_MIRROR_SESSION_ATTR_VLAN_ID;
attr.value.u16 = session.neighborInfo.vlanId;
attrs.push_back(attr);

attr.id = SAI_MIRROR_SESSION_ATTR_VLAN_PRI;
attr.value.u8 = MIRROR_SESSION_DEFAULT_VLAN_PRI;
attrs.push_back(attr);
attr.id = SAI_MIRROR_SESSION_ATTR_VLAN_PRI;
attr.value.u8 = MIRROR_SESSION_DEFAULT_VLAN_PRI;
attrs.push_back(attr);

attr.id = SAI_MIRROR_SESSION_ATTR_VLAN_CFI;
attr.value.u8 = MIRROR_SESSION_DEFAULT_VLAN_CFI;
attrs.push_back(attr);
attr.id = SAI_MIRROR_SESSION_ATTR_VLAN_CFI;
attr.value.u8 = MIRROR_SESSION_DEFAULT_VLAN_CFI;
attrs.push_back(attr);
}

attr.id = SAI_MIRROR_SESSION_ATTR_ERSPAN_ENCAPSULATION_TYPE;
attr.value.s32 = SAI_ERSPAN_ENCAPSULATION_TYPE_MIRROR_L3_GRE_TUNNEL;
Expand Down