Skip to content

helpers: remove test_module() #2

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

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

helpers: remove test_module() #2

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
24 changes: 0 additions & 24 deletions helpers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,6 @@ const struct fw3_option fw3_cthelper_opts[] = {
};


static bool
test_module(struct fw3_cthelper *helper)
{
struct stat s;
char path[sizeof("/sys/module/nf_conntrack_xxxxxxxxxxxxxxxx")];

snprintf(path, sizeof(path), "/sys/module/%s", helper->module);

if (stat(path, &s) || !S_ISDIR(s.st_mode))
return false;

return true;
}

static bool
check_cthelper_proto(const struct fw3_cthelper *helper)
{
Expand Down Expand Up @@ -288,9 +274,6 @@ fw3_print_cthelpers(struct fw3_ipt_handle *handle, struct fw3_state *state,
if (!fw3_is_family(helper, handle->family))
continue;

if (!test_module(helper))
continue;

expand_helper_rule(handle, helper, zone);
}
}
Expand All @@ -306,13 +289,6 @@ fw3_print_cthelpers(struct fw3_ipt_handle *handle, struct fw3_state *state,
if (!fw3_is_family(helper, handle->family))
continue;

if (!test_module(helper))
{
info(" ! Conntrack module '%s' for helper '%s' is not loaded",
helper->module, helper->name);
continue;
}

expand_helper_rule(handle, helper, zone);
}
}
Expand Down