X-Git-Url: http://developer.intra2net.com/git/?p=ipt_ACCOUNT;a=blobdiff_plain;f=linux%2Fnet%2Fipv4%2Fnetfilter%2Fipt_ACCOUNT.c;h=e1a52622cea9881b44b98900fee5f95699aeae8d;hp=3c406f4977054d894c4700351f3151a55b8c5266;hb=9c44d30ef5eee6b780f55edc24e322abd06174d5;hpb=fa9124c265389ae7dc7390a7ad66c48dba7a294f diff --git a/linux/net/ipv4/netfilter/ipt_ACCOUNT.c b/linux/net/ipv4/netfilter/ipt_ACCOUNT.c index 3c406f4..e1a5262 100644 --- a/linux/net/ipv4/netfilter/ipt_ACCOUNT.c +++ b/linux/net/ipv4/netfilter/ipt_ACCOUNT.c @@ -22,8 +22,13 @@ struct in_device; 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) @@ -44,8 +49,8 @@ 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) { @@ -61,13 +66,13 @@ void ipt_account_data_free(void *data, unsigned char depth) // 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]); @@ -266,41 +271,51 @@ void ipt_account_depth0_insert(struct ipt_account_mask_24 *mask_24, unsigned int // Check if this entry is new char is_src_new_ip = 0, is_dst_new_ip = 0; + + // Calculate array positions + unsigned char src_slot = (unsigned char)((src_ip&0xFF000000) >> 24); + unsigned char dst_slot = (unsigned char)((dst_ip&0xFF000000) >> 24); // Increase size counters if (is_src) { // Calculate network slot - unsigned char slot = (unsigned char)((src_ip&0xFF000000) >> 24); - DEBUGP("ACCOUNT: Calculated SRC 8 bit network slot: %d\n", slot); - if (!mask_24->ip[slot].src_packets && !mask_24->ip[slot].dst_packets) + 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; - mask_24->ip[slot].src_packets++; - mask_24->ip[slot].src_bytes+=size; + mask_24->ip[src_slot].src_packets++; + mask_24->ip[src_slot].src_bytes+=size; } if (is_dst) { - unsigned char slot = (unsigned char)((dst_ip&0xFF000000) >> 24); - DEBUGP("ACCOUNT: Calculated DST 8 bit network slot: %d\n", slot); - if (!mask_24->ip[slot].src_packets && !mask_24->ip[slot].dst_packets) + 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; - mask_24->ip[slot].dst_packets++; - mask_24->ip[slot].dst_bytes+=size; + mask_24->ip[dst_slot].dst_packets++; + mask_24->ip[dst_slot].dst_bytes+=size; } // Increase itemcounter - if (src_ip == dst_ip) + 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, @@ -320,7 +335,7 @@ void ipt_account_depth1_insert(struct ipt_account_mask_16 *mask_16, unsigned int } 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? @@ -337,7 +352,7 @@ void ipt_account_depth1_insert(struct ipt_account_mask_16 *mask_16, unsigned int } 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); } } @@ -358,7 +373,7 @@ void ipt_account_depth2_insert(struct ipt_account_mask_8 *mask_8, unsigned int n } 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? @@ -375,7 +390,7 @@ void ipt_account_depth2_insert(struct ipt_account_mask_8 *mask_8, unsigned int n } 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); } } @@ -533,9 +548,9 @@ int ipt_account_handle_prepare_read(char *tablename, unsigned int *count) } 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]) { @@ -553,9 +568,9 @@ int ipt_account_handle_prepare_read(char *tablename, unsigned int *count) } 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]) { @@ -571,9 +586,9 @@ int ipt_account_handle_prepare_read(char *tablename, unsigned int *count) 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]) { @@ -640,7 +655,7 @@ int ipt_account_handle_get_data(unsigned int handle, void *buffer) { 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) { @@ -654,7 +669,6 @@ int ipt_account_handle_get_data(unsigned int handle, void *buffer) 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; @@ -662,7 +676,7 @@ int ipt_account_handle_get_data(unsigned int handle, void *buffer) 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) { @@ -672,10 +686,20 @@ int ipt_account_handle_get_data(unsigned int handle, void *buffer) 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; } @@ -684,13 +708,13 @@ int ipt_account_handle_get_data(unsigned int handle, void *buffer) 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) { @@ -700,13 +724,23 @@ int ipt_account_handle_get_data(unsigned int handle, void *buffer) 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; } @@ -714,18 +748,18 @@ int ipt_account_handle_get_data(unsigned int handle, void *buffer) 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) { @@ -735,8 +769,14 @@ int ipt_account_handle_get_data(unsigned int handle, void *buffer) 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; } } } @@ -744,9 +784,13 @@ int ipt_account_handle_get_data(unsigned int handle, void *buffer) } } + // Flush remaining data to userspace + if (tmpbuf_pos) + copy_to_user(buffer, ipt_account_tmpbuf, tmpbuf_pos); + return 0; } - + return -1; } @@ -773,9 +817,9 @@ static int ipt_account_set_ctl(struct sock *sk, int cmd, void *user, unsigned in 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); @@ -810,10 +854,12 @@ static int ipt_account_get_ctl(struct sock *sk, int cmd, void *user, int *len) } 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) @@ -856,9 +902,9 @@ static int ipt_account_get_ctl(struct sock *sk, int cmd, void *user, int *len) 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); @@ -907,6 +953,17 @@ static int __init init(void) } 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) {