struct ipt_account_table *ipt_account_tables = NULL;
struct ipt_account_handle *ipt_account_handles = NULL;
+void *ipt_account_tmpbuf = NULL;
+// Spinlock used for manipulating the current accounting tables/data
static spinlock_t ipt_account_lock = SPIN_LOCK_UNLOCKED;
+// Spinlock used for manipulating userspace handles/snapshot data
+static spinlock_t ipt_account_userspace_lock = SPIN_LOCK_UNLOCKED;
+
/* Recursive free of all data structures */
void ipt_account_data_free(void *data, unsigned char depth)
if (depth == 1)
{
struct ipt_account_mask_16 *mask_16 = (struct ipt_account_mask_16 *)data;
- unsigned char b;
- for (b=0; b < 255; b++)
+ unsigned int b;
+ for (b=0; b <= 255; b++)
{
if (mask_16->mask_24[b] != 0)
{
// Free for 24 bit network
if (depth == 3)
{
- unsigned char a, b;
- for (a=0; a < 255; a++)
+ unsigned int a, b;
+ for (a=0; a <= 255; a++)
{
if (((struct ipt_account_mask_8 *)data)->mask_16[a])
{
struct ipt_account_mask_16 *mask_16 = (struct ipt_account_mask_16*)((struct ipt_account_mask_8 *)data)->mask_16[a];
- for (b=0; b < 255; b++)
+ for (b=0; b <= 255; b++)
{
if (mask_16->mask_24[b]) {
free_page((unsigned long)mask_16->mask_24[b]);
printk("ACCOUNT: calculated netsize: %u -> ipt_account_table depth %u\n", netsize, ipt_account_tables[i].depth);
ipt_account_tables[i].refcount++;
- if (!(ipt_account_tables[i].data = (void *)get_zeroed_page(GFP_KERNEL)))
+ if ((ipt_account_tables[i].data = (void *)get_zeroed_page(GFP_KERNEL)) == NULL)
{
printk("ACCOUNT: out of memory for data of table: %s\n", name);
memset(&ipt_account_tables[i], 0, sizeof(struct ipt_account_table));
if (is_src)
{
// Calculate network slot
- DEBUGP("ACCOUNT: Calculated SRC 8 bit network slot: %d\n", slot);
+ DEBUGP("ACCOUNT: Calculated SRC 8 bit network slot: %d\n", src_slot);
if (!mask_24->ip[src_slot].src_packets && !mask_24->ip[src_slot].dst_packets)
is_src_new_ip = 1;
}
if (is_dst)
{
- DEBUGP("ACCOUNT: Calculated DST 8 bit network slot: %d\n", slot);
+ DEBUGP("ACCOUNT: Calculated DST 8 bit network slot: %d\n", dst_slot);
if (!mask_24->ip[dst_slot].src_packets && !mask_24->ip[dst_slot].dst_packets)
is_dst_new_ip = 1;
}
// Increase itemcounter
+ DEBUGP("ACCOUNT: Itemcounter before: %d\n", *itemcount);
if (src_slot == dst_slot)
{
- if (is_src_new_ip || is_dst_new_ip)
+ if (is_src_new_ip || is_dst_new_ip) {
+ DEBUGP("ACCOUNT: src_slot == dst_slot: %d, %d\n", is_src_new_ip, is_dst_new_ip);
(*itemcount)++;
+ }
} else {
- if (is_src_new_ip)
+ if (is_src_new_ip) {
+ DEBUGP("ACCOUNT: New src_ip: %u.%u.%u.%u\n", NIPQUAD(src_ip));
(*itemcount)++;
- if (is_dst_new_ip)
+ }
+ if (is_dst_new_ip) {
+ DEBUGP("ACCOUNT: New dst_ip: %u.%u.%u.%u\n", NIPQUAD(dst_ip));
(*itemcount)++;
+ }
}
+ DEBUGP("ACCOUNT: Itemcounter after: %d\n", *itemcount);
}
void ipt_account_depth1_insert(struct ipt_account_mask_16 *mask_16, unsigned int net_ip, unsigned int netmask,
DEBUGP("ACCOUNT: Calculated SRC 16 bit network slot: %d\n", slot);
// Do we need to create a new mask_24 bucket?
- if (!mask_16->mask_24[slot] && !(mask_16->mask_24[slot] = (void *)get_zeroed_page(GFP_KERNEL)))
+ if (!mask_16->mask_24[slot] && (mask_16->mask_24[slot] = (void *)get_zeroed_page(GFP_KERNEL)) == NULL)
{
printk("ACCOUNT: Can't process packet because out of memory!\n");
return;
}
ipt_account_depth0_insert((struct ipt_account_mask_24 *)mask_16->mask_24[slot], net_ip, netmask,
- src_ip, dst_ip, size, itemcount);
+ src_ip, 0, size, itemcount);
}
// Do we need to process dst IP?
DEBUGP("ACCOUNT: Calculated DST 16 bit network slot: %d\n", slot);
// Do we need to create a new mask_24 bucket?
- if (!mask_16->mask_24[slot] && !(mask_16->mask_24[slot] = (void *)get_zeroed_page(GFP_KERNEL)))
+ if (!mask_16->mask_24[slot] && (mask_16->mask_24[slot] = (void *)get_zeroed_page(GFP_KERNEL)) == NULL)
{
printk("ACCOUT: Can't process packet because out of memory!\n");
return;
}
ipt_account_depth0_insert((struct ipt_account_mask_24 *)mask_16->mask_24[slot], net_ip, netmask,
- src_ip, dst_ip, size, itemcount);
+ 0, dst_ip, size, itemcount);
}
}
DEBUGP("ACCOUNT: Calculated SRC 24 bit network slot: %d\n", slot);
// Do we need to create a new mask_24 bucket?
- if (!mask_8->mask_16[slot] && !(mask_8->mask_16[slot] = (void *)get_zeroed_page(GFP_KERNEL)))
+ if (!mask_8->mask_16[slot] && (mask_8->mask_16[slot] = (void *)get_zeroed_page(GFP_KERNEL)) == NULL)
{
printk("ACCOUNT: Can't process packet because out of memory!\n");
return;
}
ipt_account_depth1_insert((struct ipt_account_mask_16 *)mask_8->mask_16[slot], net_ip, netmask,
- src_ip, dst_ip, size, itemcount);
+ src_ip, 0, size, itemcount);
}
// Do we need to process dst IP?
DEBUGP("ACCOUNT: Calculated DST 24 bit network slot: %d\n", slot);
// Do we need to create a new mask_24 bucket?
- if (!mask_8->mask_16[slot] && !(mask_8->mask_16[slot] = (void *)get_zeroed_page(GFP_KERNEL)))
+ if (!mask_8->mask_16[slot] && (mask_8->mask_16[slot] = (void *)get_zeroed_page(GFP_KERNEL)) == NULL)
{
printk("ACCOUNT: Can't process packet because out of memory!\n");
return;
}
ipt_account_depth1_insert((struct ipt_account_mask_16 *)mask_8->mask_16[slot], net_ip, netmask,
- src_ip, dst_ip, size, itemcount);
+ 0, dst_ip, size, itemcount);
}
}
ipt_account_handles[handle].itemcount = ipt_account_tables[table_nr].itemcount;
// allocate "root" table
- if (!(ipt_account_handles[handle].data = (void*)get_zeroed_page(GFP_KERNEL)))
+ if ((ipt_account_handles[handle].data = (void*)get_zeroed_page(GFP_KERNEL)) == NULL)
{
printk("ACCOUNT: out of memory for root table in ipt_account_handle_prepare_read()\n");
memset (&ipt_account_handles[handle], 0, sizeof(struct ipt_account_handle));
} else if (depth == 1) {
struct ipt_account_mask_16 *src_16 = (struct ipt_account_mask_16 *)ipt_account_tables[table_nr].data;
struct ipt_account_mask_16 *network_16 = (struct ipt_account_mask_16 *)ipt_account_handles[handle].data;
- unsigned char b;
+ unsigned int b;
- for (b = 0; b < 255; b++)
+ for (b = 0; b <= 255; b++)
{
if (src_16->mask_24[b])
{
- if (!(network_16->mask_24[b] = (void*)get_zeroed_page(GFP_KERNEL)))
+ if ((network_16->mask_24[b] = (void*)get_zeroed_page(GFP_KERNEL)) == NULL)
{
printk("ACCOUNT: out of memory during copy of 16 bit network in ipt_account_handle_prepare_read()\n");
ipt_account_data_free(ipt_account_handles[handle].data, depth);
} else if(depth == 2) {
struct ipt_account_mask_8 *src_8 = (struct ipt_account_mask_8 *)ipt_account_tables[table_nr].data;
struct ipt_account_mask_8 *network_8 = (struct ipt_account_mask_8 *)ipt_account_handles[handle].data;
- unsigned char a;
+ unsigned int a;
- for (a = 0; a < 255; a++)
+ for (a = 0; a <= 255; a++)
{
if (src_8->mask_16[a])
{
- if (!(network_8->mask_16[a] = (void*)get_zeroed_page(GFP_KERNEL)))
+ if ((network_8->mask_16[a] = (void*)get_zeroed_page(GFP_KERNEL)) == NULL)
{
printk("ACCOUNT: out of memory during copy of 24 bit network in ipt_account_handle_prepare_read()\n");
ipt_account_data_free(ipt_account_handles[handle].data, depth);
struct ipt_account_mask_16 *src_16 = src_8->mask_16[a];
struct ipt_account_mask_16 *network_16 = network_8->mask_16[a];
- unsigned char b;
+ unsigned int b;
- for (b = 0; b < 255; b++)
+ for (b = 0; b <= 255; b++)
{
if (src_16->mask_24[b])
{
- if (!(network_16->mask_24[b] = (void*)get_zeroed_page(GFP_KERNEL)))
+ if ((network_16->mask_24[b] = (void*)get_zeroed_page(GFP_KERNEL)) == NULL)
{
printk("ACCOUNT: out of memory during copy of 16 bit network in ipt_account_handle_prepare_read()\n");
ipt_account_data_free(ipt_account_handles[handle].data, depth);
{
struct ipt_account_handle_ip handle_ip;
unsigned int handle_ip_size = sizeof (struct ipt_account_handle_ip);
- unsigned char i;
+ unsigned int i, tmpbuf_pos=0;
if (handle >= ACCOUNT_MAX_HANDLES)
{
return -1;
}
- // Check if at least packet src/dst matches ip/netmask
unsigned int net_ip = ipt_account_handles[handle].ip;
unsigned int depth = ipt_account_handles[handle].depth;
if (depth == 0)
{
struct ipt_account_mask_24 *network = (struct ipt_account_mask_24*)ipt_account_handles[handle].data;
- for (i = 0; i < 255; i++)
+ for (i = 0; i <= 255; i++)
{
if (network->ip[i].src_packets || network->ip[i].dst_packets)
{
handle_ip.dst_packets = network->ip[i].dst_packets;
handle_ip.dst_bytes = network->ip[i].dst_bytes;
- copy_to_user(buffer, &handle_ip, handle_ip_size);
- buffer += handle_ip_size;
+ // Temporary buffer full? Flush to userspace
+ if (tmpbuf_pos+handle_ip_size >= PAGE_SIZE)
+ {
+ copy_to_user(buffer, ipt_account_tmpbuf, tmpbuf_pos);
+ tmpbuf_pos = 0;
+ }
+ memcpy(ipt_account_tmpbuf+tmpbuf_pos, &handle_ip, handle_ip_size);
+ tmpbuf_pos += handle_ip_size;
}
}
+
+ // Flush remaining data to userspace
+ if (tmpbuf_pos)
+ copy_to_user(buffer, ipt_account_tmpbuf, tmpbuf_pos);
return 0;
}
if (depth == 1)
{
struct ipt_account_mask_16 *network_16 = (struct ipt_account_mask_16*)ipt_account_handles[handle].data;
- unsigned char b;
- for (b = 0; b < 255; b++)
+ unsigned int b;
+ for (b = 0; b <= 255; b++)
{
if (network_16->mask_24[b])
{
struct ipt_account_mask_24 *network = (struct ipt_account_mask_24*)network_16->mask_24[b];
- for (i = 0; i < 255; i++)
+ for (i = 0; i <= 255; i++)
{
if (network->ip[i].src_packets || network->ip[i].dst_packets)
{
handle_ip.dst_packets = network->ip[i].dst_packets;
handle_ip.dst_bytes = network->ip[i].dst_bytes;
- copy_to_user(buffer, &handle_ip, handle_ip_size);
- buffer += handle_ip_size;
+ // Temporary buffer full? Flush to userspace
+ if (tmpbuf_pos+handle_ip_size >= PAGE_SIZE)
+ {
+ copy_to_user(buffer, ipt_account_tmpbuf, tmpbuf_pos);
+ tmpbuf_pos = 0;
+ }
+ memcpy(ipt_account_tmpbuf+tmpbuf_pos, &handle_ip, handle_ip_size);
+ tmpbuf_pos += handle_ip_size;
}
}
}
}
+ // Flush remaining data to userspace
+ if (tmpbuf_pos)
+ copy_to_user(buffer, ipt_account_tmpbuf, tmpbuf_pos);
+
return 0;
}
if (depth == 2)
{
struct ipt_account_mask_8 *network_8 = (struct ipt_account_mask_8*)ipt_account_handles[handle].data;
- unsigned char a, b;
- for (a = 0; a < 255; a++)
+ unsigned int a, b;
+ for (a = 0; a <= 255; a++)
{
if (network_8->mask_16[a])
{
struct ipt_account_mask_16 *network_16 = (struct ipt_account_mask_16*)network_8->mask_16[a];
- for (b = 0; b < 255; b++)
+ for (b = 0; b <= 255; b++)
{
if (network_16->mask_24[b])
{
struct ipt_account_mask_24 *network = (struct ipt_account_mask_24*)network_16->mask_24[b];
- for (i = 0; i < 255; i++)
+ for (i = 0; i <= 255; i++)
{
if (network->ip[i].src_packets || network->ip[i].dst_packets)
{
handle_ip.dst_packets = network->ip[i].dst_packets;
handle_ip.dst_bytes = network->ip[i].dst_bytes;
- copy_to_user(buffer, &handle_ip, handle_ip_size);
- buffer += handle_ip_size;
+ // Temporary buffer full? Flush to userspace
+ if (tmpbuf_pos+handle_ip_size >= PAGE_SIZE)
+ {
+ copy_to_user(buffer, ipt_account_tmpbuf, tmpbuf_pos);
+ tmpbuf_pos = 0;
+ }
+ memcpy(ipt_account_tmpbuf+tmpbuf_pos, &handle_ip, handle_ip_size);
+ tmpbuf_pos += handle_ip_size;
}
}
}
}
}
+ // Flush remaining data to userspace
+ if (tmpbuf_pos)
+ copy_to_user(buffer, ipt_account_tmpbuf, tmpbuf_pos);
+
return 0;
}
-
+
return -1;
}
break;
}
- spin_lock_bh(&ipt_account_lock);
+ spin_lock_bh(&ipt_account_userspace_lock);
ret = ipt_account_handle_free(handle.handle_nr);
- spin_unlock_bh(&ipt_account_lock);
+ spin_unlock_bh(&ipt_account_userspace_lock);
break;
default:
printk("ACCOUNT: ipt_account_set_ctl: unknown request %i\n", cmd);
}
spin_lock_bh(&ipt_account_lock);
+ spin_lock_bh(&ipt_account_userspace_lock);
if (cmd == IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH)
handle.handle_nr = ipt_account_handle_prepare_read_flush(handle.name, &handle.itemcount);
else
handle.handle_nr = ipt_account_handle_prepare_read(handle.name, &handle.itemcount);
+ spin_unlock_bh(&ipt_account_userspace_lock);
spin_unlock_bh(&ipt_account_lock);
if (handle.handle_nr == -1)
break;
}
- spin_lock_bh(&ipt_account_lock);
+ spin_lock_bh(&ipt_account_userspace_lock);
ret = ipt_account_handle_get_data(handle.handle_nr, user);
- spin_unlock_bh(&ipt_account_lock);
+ spin_unlock_bh(&ipt_account_userspace_lock);
if (ret)
{
printk("ACCOUNT: ipt_account_get_ctl: ipt_account_handle_get_data failed for handle %u\n", handle.handle_nr);
return -EINVAL;
}
- if (!(ipt_account_tables = kmalloc(ACCOUNT_MAX_TABLES*sizeof(struct ipt_account_table), GFP_KERNEL)))
+ if ((ipt_account_tables = kmalloc(ACCOUNT_MAX_TABLES*sizeof(struct ipt_account_table), GFP_KERNEL)) == NULL)
{
printk("ACCOUNT: Out of memory allocating account_tables structure");
return -EINVAL;
}
memset(ipt_account_tables, 0, ACCOUNT_MAX_TABLES*sizeof(struct ipt_account_table));
- if (!(ipt_account_handles = kmalloc(ACCOUNT_MAX_HANDLES*sizeof(struct ipt_account_handle), GFP_KERNEL)))
+ if ((ipt_account_handles = kmalloc(ACCOUNT_MAX_HANDLES*sizeof(struct ipt_account_handle), GFP_KERNEL)) == NULL)
{
printk("ACCOUNT: Out of memory allocating account_handles structure");
kfree (ipt_account_tables);
}
memset(ipt_account_handles, 0, ACCOUNT_MAX_HANDLES*sizeof(struct ipt_account_handle));
+ // Allocate one page as temporary storage
+ if ((ipt_account_tmpbuf = (void*)__get_free_page(GFP_KERNEL)) == NULL)
+ {
+ printk("ACCOUNT: Out of memory for temporary buffer page\n");
+ kfree(ipt_account_tables);
+ kfree(ipt_account_handles);
+ ipt_account_tables = NULL;
+ ipt_account_handles = NULL;
+ return -EINVAL;
+ }
+
/* Register setsockopt */
if (nf_register_sockopt(&ipt_account_sockopts) < 0)
{
printk("ACCOUNT: Can't register sockopts. Aborting\n");
- kfree (ipt_account_tables);
- ipt_account_tables = NULL;
+ kfree(ipt_account_tables);
kfree(ipt_account_handles);
+ kfree(ipt_account_tmpbuf);
+ ipt_account_tables = NULL;
ipt_account_handles = NULL;
+ ipt_account_tmpbuf = NULL;
return -EINVAL;
}
nf_unregister_sockopt(&ipt_account_sockopts);
kfree(ipt_account_tables);
- ipt_account_tables = NULL;
-
kfree(ipt_account_handles);
+ kfree(ipt_account_tmpbuf);
+
+ ipt_account_tables = NULL;
ipt_account_handles = NULL;
+ ipt_account_tmpbuf = NULL;
}
module_init(init);
git://developer.intra2net.com / ipt_ACCOUNT / blobdiff