anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-07 21:25:12 +02:00
Code Issues Releases Wiki Activity

condition: use new structure type

Browse Source 
Use __u8 for the invert flag instead of int. Reduce CONDITION_NAME_LEN
from 32 to 31 so that the entire structure can fit into a cacheline.
This commit is contained in:
Jan Engelhardt
2008-04-02 04:42:37 +02:00
parent 7d0efafdb3
commit 24dad368dd
3 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/libxt_condition.c
View File

@@ -21,7 +21,7 @@ static const struct option condition_opts[] = {
static int condition_parse(int c, char **argv, int invert, unsigned int *flags, static int condition_parse(int c, char **argv, int invert, unsigned int *flags,
const void *entry, struct xt_entry_match **match) const void *entry, struct xt_entry_match **match)
{ {
struct condition_info *info = (void *)(*match)->data; struct xt_condition_mtinfo *info = (void *)(*match)->data;
if (c == 'X') { if (c == 'X') {
if (*flags) if (*flags)
@@ -54,7 +54,7 @@ static void condition_check(unsigned int flags)
static void condition_print(const void *ip, const struct xt_entry_match *match, static void condition_print(const void *ip, const struct xt_entry_match *match,
int numeric) int numeric)
{ {
const struct condition_info *info = (const void *)match->data; const struct xt_condition_mtinfo *info = (const void *)match->data;
printf("condition %s%s ", (info->invert) ? "!" : "", info->name); printf("condition %s%s ", (info->invert) ? "!" : "", info->name);
} }
@@ -62,7 +62,7 @@ static void condition_print(const void *ip, const struct xt_entry_match *match,
static void condition_save(const void *ip, const struct xt_entry_match *match) static void condition_save(const void *ip, const struct xt_entry_match *match)
{ {
const struct condition_info *info = (const void *)match->data; const struct xt_condition_mtinfo *info = (const void *)match->data;
printf("--condition %s\"%s\" ", (info->invert) ? "! " : "", info->name); printf("--condition %s\"%s\" ", (info->invert) ? "! " : "", info->name);
} }
@@ -70,8 +70,8 @@ static void condition_save(const void *ip, const struct xt_entry_match *match)
static struct xtables_match condition_match = { static struct xtables_match condition_match = {
.name = "condition", .name = "condition",
.version = XTABLES_VERSION, .version = XTABLES_VERSION,
.size = XT_ALIGN(sizeof(struct condition_info)), .size = XT_ALIGN(sizeof(struct xt_condition_mtinfo)),
.userspacesize = XT_ALIGN(sizeof(struct condition_info)), .userspacesize = XT_ALIGN(sizeof(struct xt_condition_mtinfo)),
.help = condition_help, .help = condition_help,
.parse = condition_parse, .parse = condition_parse,
.final_check = condition_check, .final_check = condition_check,

10
extensions/xt_condition.c
View File

@@ -118,7 +118,7 @@ condition_mt(const struct sk_buff *skb, const struct net_device *in,
const void *matchinfo, int offset, unsigned int protoff, const void *matchinfo, int offset, unsigned int protoff,
bool *hotdrop) bool *hotdrop)
{ {
const struct condition_info *info = matchinfo; const struct xt_condition_mtinfo *info = matchinfo;
struct condition_variable *var; struct condition_variable *var;
int condition_status = 0; int condition_status = 0;
@@ -140,7 +140,7 @@ condition_mt_check(const char *tablename, const void *entry,
unsigned int hook_mask) unsigned int hook_mask)
{ {
static const char * const forbidden_names[]={ "", ".", ".." }; static const char * const forbidden_names[]={ "", ".", ".." };
const struct condition_info *info = matchinfo; const struct xt_condition_mtinfo *info = matchinfo;
struct list_head *pos; struct list_head *pos;
struct condition_variable *var, *newvar; struct condition_variable *var, *newvar;
@@ -211,7 +211,7 @@ condition_mt_check(const char *tablename, const void *entry,
static void condition_mt_destroy(const struct xt_match *match, void *matchinfo) static void condition_mt_destroy(const struct xt_match *match, void *matchinfo)
{ {
const struct condition_info *info = matchinfo; const struct xt_condition_mtinfo *info = matchinfo;
struct list_head *pos; struct list_head *pos;
struct condition_variable *var; struct condition_variable *var;
@@ -241,7 +241,7 @@ static void condition_mt_destroy(const struct xt_match *match, void *matchinfo)
static struct xt_match condition_match = { static struct xt_match condition_match = {
.name = "condition", .name = "condition",
.family = PF_INET, .family = PF_INET,
.matchsize = sizeof(struct condition_info), .matchsize = XT_ALIGN(sizeof(struct xt_condition_mtinfo)),
.match = condition_mt, .match = condition_mt,
.checkentry = condition_mt_check, .checkentry = condition_mt_check,
.destroy = condition_mt_destroy, .destroy = condition_mt_destroy,
@@ -251,7 +251,7 @@ static struct xt_match condition_match = {
static struct xt_match condition6_match = { static struct xt_match condition6_match = {
.name = "condition", .name = "condition",
.family = PF_INET6, .family = PF_INET6,
.matchsize = sizeof(struct condition_info), .matchsize = XT_ALIGN(sizeof(struct xt_condition_mtinfo)),
.match = condition_mt, .match = condition_mt,
.checkentry = condition_mt_check, .checkentry = condition_mt_check,
.destroy = condition_mt_destroy, .destroy = condition_mt_destroy,

8
extensions/xt_condition.h
View File

@@ -1,11 +1,13 @@
#ifndef _XT_CONDITION_H #ifndef _XT_CONDITION_H
#define _XT_CONDITION_H #define _XT_CONDITION_H
#define CONDITION_NAME_LEN 32 enum {
CONDITION_NAME_LEN = 31,
};
struct condition_info { struct xt_condition_mtinfo {
char name[CONDITION_NAME_LEN]; char name[CONDITION_NAME_LEN];
int invert; __u8 invert;
}; };
#endif /* _XT_CONDITION_H */ #endif /* _XT_CONDITION_H */