if (((struct ipt_acc_mask_8 *)data)->mask_16[a]) {
struct ipt_acc_mask_16 *mask_16 = (struct ipt_acc_mask_16*)
((struct ipt_acc_mask_8 *)data)->mask_16[a];
-
+
for (b=0; b <= 255; b++) {
if (mask_16->mask_24[b]) {
free_page((unsigned long)mask_16->mask_24[b]);
if (ipt_acc_tables[i].name[0] == 0) {
u_int32_t calc_mask, netsize=0;
int j; /* needs to be signed, otherwise we risk endless loop */
-
+
DEBUGP("ACCOUNT: Found free slot: %d\n", i);
strncpy (ipt_acc_tables[i].name, name, ACCOUNT_TABLE_NAME_LEN-1);
}
static int ipt_acc_checkentry(const char *tablename,
- const struct ipt_entry *e,
- void *targinfo,
- unsigned int targinfosize,
- unsigned int hook_mask)
+ const void *e,
+ const struct xt_target *target,
+ void *targinfo,
+ unsigned int targinfosize,
+ unsigned int hook_mask)
{
struct ipt_acc_info *info = targinfo;
int table_nr;
- if (targinfosize != IPT_ALIGN(sizeof(struct ipt_acc_info))) {
- DEBUGP("ACCOUNT: targinfosize %u != %u\n",
- targinfosize, IPT_ALIGN(sizeof(struct ipt_acc_info)));
- return 0;
- }
-
spin_lock_bh(&ipt_acc_lock);
table_nr = ipt_acc_table_insert(info->table_name, info->net_ip,
info->net_mask);
spin_unlock_bh(&ipt_acc_lock);
-
+
if (table_nr == -1) {
printk("ACCOUNT: Table insert problem. Aborting\n");
return 0;
return 1;
}
-static void ipt_acc_deleteentry(void *targinfo, unsigned int targinfosize)
+static void ipt_acc_destroy(const struct xt_target *target, void *targinfo, unsigned int targinfosize)
{
u_int32_t i;
struct ipt_acc_info *info = targinfo;
}
static unsigned int ipt_acc_target(struct sk_buff **pskb,
- const struct net_device *in,
- const struct net_device *out,
- unsigned int hooknum,
- const void *targinfo,
- void *userinfo)
+ const struct net_device *in,
+ const struct net_device *out,
+ unsigned int hooknum,
+ const struct xt_target *target,
+ const void *targinfo,
+ void *userinfo)
{
const struct ipt_acc_info *info =
(const struct ipt_acc_info *)targinfo;
case IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH:
case IPT_SO_GET_ACCOUNT_PREPARE_READ: {
struct ipt_acc_handle dest;
-
+
if (*len < sizeof(struct ipt_acc_handle_sockopt)) {
printk("ACCOUNT: ipt_acc_get_ctl: wrong data size (%u != %u) "
"for IPT_SO_GET_ACCOUNT_PREPARE_READ/READ_FLUSH\n",
*len, sizeof(struct ipt_acc_handle_sockopt));
break;
}
-
+
if (copy_from_user (&handle, user,
sizeof(struct ipt_acc_handle_sockopt))) {
return -EFAULT;
break;
}
-
+
spin_lock_bh(&ipt_acc_lock);
if (cmd == IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH)
ret = ipt_acc_handle_prepare_read_flush(
// Error occured during prepare_read?
if (ret == -1)
return -EINVAL;
-
+
/* Allocate a userspace handle */
down(&ipt_acc_userspace_mutex);
if ((handle.handle_nr = ipt_acc_handle_find_slot()) == -1) {
memcpy(&ipt_acc_handles[handle.handle_nr], &dest,
sizeof(struct ipt_acc_handle));
up(&ipt_acc_userspace_mutex);
-
+
if (copy_to_user(user, &handle,
sizeof(struct ipt_acc_handle_sockopt))) {
return -EFAULT;
}
}
spin_unlock_bh(&ipt_acc_lock);
-
+
/* Terminating NULL character */
*tnames = 0;
-
- /* Transfer to userspace */
+
+ /* Transfer to userspace */
if (copy_to_user(user, ipt_acc_tmpbuf, size))
return -EFAULT;
-
+
ret = 0;
break;
}
static struct ipt_target ipt_acc_reg = {
.name = "ACCOUNT",
.target = ipt_acc_target,
+ .targetsize = sizeof(struct ipt_acc_info),
.checkentry = ipt_acc_checkentry,
- .destroy = ipt_acc_deleteentry,
+ .destroy = ipt_acc_destroy,
.me = THIS_MODULE
};
static int __init init(void)
{
- init_MUTEX(&ipt_acc_userspace_mutex);
+ init_MUTEX(&ipt_acc_userspace_mutex);
if ((ipt_acc_tables =
kmalloc(ACCOUNT_MAX_TABLES *
if (ipt_register_target(&ipt_acc_reg))
goto error_cleanup;
-
+
return 0;
-
+
error_cleanup:
if(ipt_acc_tables)
kfree(ipt_acc_tables);
kfree(ipt_acc_handles);
if (ipt_acc_tmpbuf)
free_page((unsigned long)ipt_acc_tmpbuf);
-
+
return -EINVAL;
}