Skip to content
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

[aclorch]: Simplify the TCP flags matching code and support exact value match #1072

Merged
merged 1 commit into from
Oct 10, 2019
Merged

[aclorch]: Simplify the TCP flags matching code and support exact value match #1072

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 7 additions & 40 deletions orchagent/aclorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,18 +129,6 @@ static acl_ip_type_lookup_t aclIpTypeLookup =
{ IP_TYPE_ARP_REPLY, SAI_ACL_IP_TYPE_ARP_REPLY }
};

inline string trim(const std::string& str, const std::string& whitespace = " \t")
{
const auto strBegin = str.find_first_not_of(whitespace);
if (strBegin == std::string::npos)
return "";

const auto strEnd = str.find_last_not_of(whitespace);
const auto strRange = strEnd - strBegin + 1;

return str.substr(strBegin, strRange);
}

AclRule::AclRule(AclOrch *aclOrch, string rule, string table, acl_table_type_t type, bool createCounter) :
m_pAclOrch(aclOrch),
m_id(rule),
Expand Down Expand Up @@ -246,40 +234,19 @@ bool AclRule::validateAddMatch(string attr_name, string attr_value)
}
else if (attr_name == MATCH_TCP_FLAGS)
{
vector<string> flagsData;
string flags, mask;
int val;
char *endp = NULL;
errno = 0;
// Support both exact value match and value/mask match
auto flag_data = tokenize(attr_value, '/');

split(attr_value, flagsData, '/');
value.aclfield.data.u8 = to_uint<uint8_t>(flag_data[0], 0, 0x3F);

if (flagsData.size() != 2) // expect two parts flags and mask separated with '/'
if (flag_data.size() == 2)
{
SWSS_LOG_ERROR("Invalid TCP flags format %s", attr_value.c_str());
return false;
value.aclfield.mask.u8 = to_uint<uint8_t>(flag_data[1], 0, 0x3F);
}

flags = trim(flagsData[0]);
mask = trim(flagsData[1]);

val = (uint32_t)strtol(flags.c_str(), &endp, 0);
if (errno || (endp != flags.c_str() + flags.size()) ||
(val < 0) || (val > UCHAR_MAX))
{
SWSS_LOG_ERROR("TCP flags parse error, value: %s(=%d), errno: %d", flags.c_str(), val, errno);
return false;
}
value.aclfield.data.u8 = (uint8_t)val;

val = (uint32_t)strtol(mask.c_str(), &endp, 0);
if (errno || (endp != mask.c_str() + mask.size()) ||
(val < 0) || (val > UCHAR_MAX))
else
{
SWSS_LOG_ERROR("TCP mask parse error, value: %s(=%d), errno: %d", mask.c_str(), val, errno);
return false;
value.aclfield.mask.u8 = 0x3F;
}
value.aclfield.mask.u8 = (uint8_t)val;
}
else if (attr_name == MATCH_ETHER_TYPE || attr_name == MATCH_L4_SRC_PORT || attr_name == MATCH_L4_DST_PORT)
{
Expand Down
13 changes: 0 additions & 13 deletions orchagent/aclorch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,19 +372,6 @@ class AclTable {
void update(SubjectType, void *);
};

template <class Iterable>
inline void split(string str, Iterable& out, char delim = ' ')
{
string val;

istringstream input(str);

while (getline(input, val, delim))
{
out.push_back(val);
}
}

class AclOrch : public Orch, public Observer
{
public:
Expand Down