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

DelEntry() fix in WildcardMatch module. #983

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

DelEntry() fix in WildcardMatch module. #983

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
14 changes: 7 additions & 7 deletions core/modules/wildcard_match.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,19 +299,19 @@ int WildcardMatch::AddTuple(wm_hkey_t *mask) {
return int(tuples_.size() - 1);
}

int WildcardMatch::DelEntry(int idx, wm_hkey_t *key) {
bool WildcardMatch::DelEntry(int idx, wm_hkey_t *key) {
struct WmTuple &tuple = tuples_[idx];
int ret =
bool ret =
tuple.ht.Remove(*key, wm_hash(total_key_size_), wm_eq(total_key_size_));
if (ret) {
if (ret == false) {
return ret;
}

if (tuple.ht.Count() == 0) {
tuples_.erase(tuples_.begin() + idx);
}

return 0;
return true;
}

CommandResponse WildcardMatch::CommandAdd(
Expand Down Expand Up @@ -368,9 +368,9 @@ CommandResponse WildcardMatch::CommandDelete(
return CommandFailure(-idx, "failed to delete a rule");
}

int ret = DelEntry(idx, &key);
if (ret < 0) {
return CommandFailure(-ret, "failed to delete a rule");
bool ret = DelEntry(idx, &key);
if (ret == false) {
return CommandFailure(-ENOENT, "failed to delete a rule");
}

return CommandSuccess();
Expand Down
2 changes: 1 addition & 1 deletion core/modules/wildcard_match.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ class WildcardMatch final : public Module {

int FindTuple(wm_hkey_t *mask);
int AddTuple(wm_hkey_t *mask);
int DelEntry(int idx, wm_hkey_t *key);
bool DelEntry(int idx, wm_hkey_t *key);

void Clear();

Expand Down