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

Jump to bottom

[Aclorch] hard code table name separator to make it compatible with 201803 branch #517

Closed
wants to merge 5 commits into from
Closed

[Aclorch] hard code table name separator to make it compatible with 201803 branch #517

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3bf6269
Merge pull request #1 from Azure/master
keboliu Jan 12, 2018
bf93016
Merge branch 'master' of https://github.com/Azure/sonic-swss
keboliu May 4, 2018
d32c1c1
Merge branch 'master' of https://github.com/Azure/sonic-swss
keboliu May 20, 2018
0cffa28
Merge branch 'master' of https://github.com/Azure/sonic-swss
keboliu Jun 5, 2018
dc50e18
[Aclorch] hardcode the table name separator to avoid issue on the 201…
keboliu Jun 7, 2018
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
8 changes: 5 additions & 3 deletions orchagent/aclorch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
using namespace std;
using namespace swss;

#define DB_TABLE_NAME_SEPARATOR_VBAR '|'

mutex AclOrch::m_countersMutex;
map<acl_range_properties_t, AclRange*> AclRange::m_ranges;
condition_variable AclOrch::m_sleepGuard;
Expand Down Expand Up @@ -1550,7 +1552,7 @@ void AclOrch::doAclTableTask(Consumer &consumer)
{
KeyOpFieldsValuesTuple t = it->second;
string key = kfvKey(t);
size_t found = key.find(consumer.getConsumerTable()->getTableNameSeparator().c_str());
size_t found = key.find(DB_TABLE_NAME_SEPARATOR_VBAR);
string table_id = key.substr(0, found);
string op = kfvOp(t);

Expand Down Expand Up @@ -1650,7 +1652,7 @@ void AclOrch::doAclRuleTask(Consumer &consumer)
{
KeyOpFieldsValuesTuple t = it->second;
string key = kfvKey(t);
size_t found = key.find(consumer.getConsumerTable()->getTableNameSeparator().c_str());
size_t found = key.find(DB_TABLE_NAME_SEPARATOR_VBAR);
string table_id = key.substr(0, found);
string rule_id = key.substr(found + 1);
string op = kfvOp(t);
Expand Down Expand Up @@ -1739,7 +1741,7 @@ void AclOrch::doAclTablePortUpdateTask(Consumer &consumer)
{
KeyOpFieldsValuesTuple t = it->second;
string key = kfvKey(t);
size_t found = key.find(consumer.getConsumerTable()->getTableNameSeparator().c_str());
size_t found = key.find(DB_TABLE_NAME_SEPARATOR_VBAR);
string port_alias = key.substr(0, found);
string op = kfvOp(t);

Expand Down