anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-20 19:44:56 +02:00
Code Issues Releases Wiki Activity

xt_mp2t: fix mtcheck convention

Browse Source 
Xt-a/compat_xtables has its own API that is independent from the
kernel.
This commit is contained in:
Jan Engelhardt
2010-11-04 00:24:56 +01:00
parent 305af4210b
commit b44af767e8
1 changed files with 5 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
extensions/xt_mp2t.c
View File

@@ -637,20 +637,6 @@ mp2t_stream_alloc_init(struct xt_rule_mp2t_conn_htable *ht,
return entry; return entry;
} }
/*
* The xt_mp2t_mt_check(), return type changed, which is quite
* confusing as the return logic gets turned around.
*
* TODO: Think change happend in 2.6.35, need to check the exact
* kernel version this changed in!
*/
#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 34)
enum RETURNVALS { error = 0 /*false*/, success = 1 /*true*/, };
#endif
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 35)
enum RETURNVALS { error = -EINVAL, success = 0, };
#endif
static int static int
xt_mp2t_mt_check(const struct xt_mtchk_param *par) xt_mp2t_mt_check(const struct xt_mtchk_param *par)
{ {
@@ -664,13 +650,13 @@ xt_mp2t_mt_check(const struct xt_mtchk_param *par)
/* Debugging, this should not be possible */ /* Debugging, this should not be possible */
if (!info) { if (!info) {
msg_err(DRV, "ERROR info is NULL"); msg_err(DRV, "ERROR info is NULL");
return error; return -EINVAL;
} }
/* Debugging, this should not be possible */ /* Debugging, this should not be possible */
if (IS_ERR_VALUE((unsigned long)(info->hinfo))) { if (IS_ERR_VALUE((unsigned long)(info->hinfo))) {
msg_err(DRV, "ERROR info->hinfo is an invalid pointer!!!"); msg_err(DRV, "ERROR info->hinfo is an invalid pointer!!!");
return error; return -EINVAL;
} }
/* TODO/FIXME: Add a check to NOT allow proc files with same /* TODO/FIXME: Add a check to NOT allow proc files with same
@@ -685,15 +671,15 @@ xt_mp2t_mt_check(const struct xt_mtchk_param *par)
atomic_inc(&info->hinfo->use); atomic_inc(&info->hinfo->use);
msg_info(DEBUG, "ReUsing info->hinfo ptr:[%p] htable id:%d", msg_info(DEBUG, "ReUsing info->hinfo ptr:[%p] htable id:%d",
info->hinfo, info->hinfo->id); info->hinfo, info->hinfo->id);
return success; return 0;
} }
if (mp2t_htable_create(info) == false) { if (mp2t_htable_create(info) == false) {
msg_err(DRV, "Error creating hash table"); msg_err(DRV, "Error creating hash table");
return error; return -ENOMEM;
} }
return success; return 0;
} }
static void static void