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

compat_xtables: correct compile errors

Browse Source
This commit is contained in:
Jan Engelhardt
2010-04-09 12:24:19 +02:00
parent ad146dbeef
commit 11ab4d0acc
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
extensions/compat_xtables.c
View File

@@ -88,7 +88,7 @@ static bool xtnu_match_check(const char *table, const void *entry,
LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34) LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
static bool xtnu_match_check(const struct xt_mtchk_param *par) static bool xtnu_match_check(const struct xt_mtchk_param *par)
{ {
struct xtnu_match *nm = xtcompat_numatch(cm); struct xtnu_match *nm = xtcompat_numatch(par->match);
if (nm == NULL) if (nm == NULL)
return false; return false;
@@ -98,20 +98,6 @@ static bool xtnu_match_check(const struct xt_mtchk_param *par)
} }
#endif #endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) && \
LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34)
static bool xtnu_match_check(const struct xt_mtchk_param *par)
{
struct xtnu_match *nm = xtcompat_numatch(cm);
if (nm == NULL)
return false;
if (nm->checkentry == NULL)
return true;
return nm->checkentry(par);
}
#endif
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18) #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 18)
static void xtnu_match_destroy(const struct xt_match *cm, void *matchinfo, static void xtnu_match_destroy(const struct xt_match *cm, void *matchinfo,
unsigned int matchinfosize) unsigned int matchinfosize)
@@ -154,9 +140,15 @@ int xtnu_register_match(struct xtnu_match *nt)
ct->table = (char *)nt->table; ct->table = (char *)nt->table;
ct->hooks = nt->hooks; ct->hooks = nt->hooks;
ct->proto = nt->proto; ct->proto = nt->proto;
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 27)
ct->match = xtnu_match_run; ct->match = xtnu_match_run;
ct->checkentry = xtnu_match_check; ct->checkentry = xtnu_match_check;
ct->destroy = xtnu_match_destroy; ct->destroy = xtnu_match_destroy;
#else
ct->match = nt->match;
ct->checkentry = xtnu_match_check;
ct->destroy = nt->destroy;
#endif
ct->matchsize = nt->matchsize; ct->matchsize = nt->matchsize;
ct->me = nt->me; ct->me = nt->me;
@@ -281,7 +273,7 @@ static bool xtnu_target_check(const char *table, const void *entry,
LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34) LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 34)
static bool xtnu_target_check(const struct xt_tgchk_param *par) static bool xtnu_target_check(const struct xt_tgchk_param *par)
{ {
struct xtnu_target *nt = xtcompat_nutarget(cm); struct xtnu_target *nt = xtcompat_nutarget(par->target);
if (nt == NULL) if (nt == NULL)
return false; return false;
@@ -333,9 +325,12 @@ int xtnu_register_target(struct xtnu_target *nt)
ct->hooks = nt->hooks; ct->hooks = nt->hooks;
ct->proto = nt->proto; ct->proto = nt->proto;
ct->target = xtnu_target_run; ct->target = xtnu_target_run;
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34) #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 27)
ct->checkentry = xtnu_target_check; ct->checkentry = xtnu_target_check;
ct->destroy = xtnu_target_destroy; ct->destroy = xtnu_target_destroy;
#elif LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
ct->checkentry = xtnu_target_check;
ct->destroy = nt->destroy;
#else #else
ct->checkentry = nt->checkentry; ct->checkentry = nt->checkentry;
ct->destroy = nt->destroy; ct->destroy = nt->destroy;