Skip to content

Fix bugs for removing gatehook by classname #826

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
chris3torek merged 1 commit into from
Aug 6, 2018
Merged

Fix bugs for removing gatehook by classname #826

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
29 changes: 22 additions & 7 deletions core/bessctl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ static Status enable_hook_for_module(ConfigureGateHookResponse* response,
}

static Status disable_hook_for_module(ConfigureGateHookResponse* response,
const std::string& class_name,
const std::string& hook_name,
const Module* m, gate_idx_t gate_idx,
bool is_igate, bool use_gate) {
Expand All @@ -184,7 +185,11 @@ static Status disable_hook_for_module(ConfigureGateHookResponse* response,
response, EINVAL, "'%s': %cgate '%hu' does not exist",
m->name().c_str(), is_igate ? 'i' : 'o', gate_idx);
}
gate->RemoveHook(hook_name);
if (hook_name != "") {
gate->RemoveHook(hook_name);
} else {
gate->RemoveHookByClass(class_name);
}
return Status::OK;
}

Expand All @@ -193,14 +198,22 @@ static Status disable_hook_for_module(ConfigureGateHookResponse* response,
if (!gate) {
continue;
}
gate->RemoveHook(hook_name);
if (hook_name != "") {
gate->RemoveHook(hook_name);
} else {
gate->RemoveHookByClass(class_name);
}
}
} else {
for (auto& gate : m->ogates()) {
if (!gate) {
continue;
}
gate->RemoveHook(hook_name);
if (hook_name != "") {
gate->RemoveHook(hook_name);
} else {
gate->RemoveHookByClass(class_name);
}
}
}
return Status::OK;
Expand Down Expand Up @@ -1524,8 +1537,9 @@ class BESSControlImpl final : public BESSControl::Service {
it.second, gate_idx, is_igate, use_gate,
builder->second, request->hook().arg());
} else {
disable_hook_for_module(response, request->hook().hook_name(),
it.second, gate_idx, is_igate, use_gate);
disable_hook_for_module(response, request->hook().class_name(),
request->hook().hook_name(), it.second,
gate_idx, is_igate, use_gate);
}
if (response->error().code() != 0) {
return Status::OK;
Expand All @@ -1546,8 +1560,9 @@ class BESSControlImpl final : public BESSControl::Service {
gate_idx, is_igate, use_gate, builder->second,
request->hook().arg());
} else {
disable_hook_for_module(response, request->hook().hook_name(), it->second,
gate_idx, is_igate, use_gate);
disable_hook_for_module(response, request->hook().class_name(),
request->hook().hook_name(), it->second, gate_idx,
is_igate, use_gate);
}

return Status::OK;
Expand Down