From: Thomas Jarosch Date: Sat, 29 May 2004 09:47:01 +0000 (+0000) Subject: ipt_ACCOUNT, libipt_ACCOUNT: (tomj) changed ipt_account_ structure names to ipt_acc X-Git-Tag: v1.9~26 X-Git-Url: http://developer.intra2net.com/git/?p=ipt_ACCOUNT;a=commitdiff_plain;h=6803acfc83b4fcb55bd9836cc6c4208b5c6fa504;hp=013fcc809c120b223ce5679f4f3f815104f2e23c ipt_ACCOUNT, libipt_ACCOUNT: (tomj) changed ipt_account_ structure names to ipt_acc --- diff --git a/linux/include/linux/netfilter_ipv4/ipt_ACCOUNT.h b/linux/include/linux/netfilter_ipv4/ipt_ACCOUNT.h index d2edac0..7d4e555 100644 --- a/linux/include/linux/netfilter_ipv4/ipt_ACCOUNT.h +++ b/linux/include/linux/netfilter_ipv4/ipt_ACCOUNT.h @@ -16,7 +16,7 @@ #define ACCOUNT_MAX_HANDLES 10 /* Structure for the userspace part of ipt_ACCOUNT */ -struct ipt_account_info { +struct ipt_acc_info { u_int32_t net_ip; u_int32_t net_mask; char table_name[ACCOUNT_TABLE_NAME_LEN]; @@ -24,7 +24,7 @@ struct ipt_account_info { }; /* Internal table structure, generated by check_entry() */ -struct ipt_account_table { +struct ipt_acc_table { char name[ACCOUNT_TABLE_NAME_LEN]; /* name of the table */ unsigned int ip; /* base IP of network */ unsigned int netmask; /* netmask of the network */ @@ -38,7 +38,7 @@ struct ipt_account_table { }; /* Internal handle structure */ -struct ipt_account_handle { +struct ipt_acc_handle { unsigned int ip; /* base IP of network. Used for caculating the final IP during get_data() */ @@ -50,7 +50,7 @@ struct ipt_account_handle { }; /* Handle structure for communication with the userspace library */ -struct ipt_account_handle_sockopt { +struct ipt_acc_handle_sockopt { unsigned int handle_nr; /* Used for HANDLE_FREE */ char name[ACCOUNT_TABLE_NAME_LEN]; /* Used for HANDLE_PREPARE_READ/ HANDLE_READ_FLUSH */ @@ -61,7 +61,7 @@ struct ipt_account_handle_sockopt { /* Used for every IP entry Size is 16 bytes so that 256 (class C network) * 16 fits in one kernel (zero) page */ -struct ipt_account_ip { +struct ipt_acc_ip { unsigned int src_packets; unsigned int src_bytes; unsigned int dst_packets; @@ -71,7 +71,7 @@ struct ipt_account_ip { /* Used for every IP when returning data */ -struct ipt_account_handle_ip { +struct ipt_acc_handle_ip { unsigned int ip; unsigned int src_packets; unsigned int src_bytes; @@ -85,16 +85,16 @@ struct ipt_account_handle_ip { Only 8 bit networks are preallocated, 16/24 bit networks allocate their slots when needed -> very efficent. */ -struct ipt_account_mask_24 { - struct ipt_account_ip ip[256]; +struct ipt_acc_mask_24 { + struct ipt_acc_ip ip[256]; }; -struct ipt_account_mask_16 { - struct ipt_account_mask_24 *mask_24[256]; +struct ipt_acc_mask_16 { + struct ipt_acc_mask_24 *mask_24[256]; }; -struct ipt_account_mask_8 { - struct ipt_account_mask_16 *mask_16[256]; +struct ipt_acc_mask_8 { + struct ipt_acc_mask_16 *mask_16[256]; }; #endif /*_IPT_ACCOUNT_H*/ diff --git a/linux/net/ipv4/netfilter/ipt_ACCOUNT.c b/linux/net/ipv4/netfilter/ipt_ACCOUNT.c index 575b1c0..0e4f612 100644 --- a/linux/net/ipv4/netfilter/ipt_ACCOUNT.c +++ b/linux/net/ipv4/netfilter/ipt_ACCOUNT.c @@ -35,18 +35,18 @@ struct in_device; #error "ipt_ACCOUNT needs at least a PAGE_SIZE of 4096" #endif -struct ipt_account_table *ipt_account_tables = NULL; -struct ipt_account_handle *ipt_account_handles = NULL; -void *ipt_account_tmpbuf = NULL; +struct ipt_acc_table *ipt_acc_tables = NULL; +struct ipt_acc_handle *ipt_acc_handles = NULL; +void *ipt_acc_tmpbuf = NULL; /* Spinlock used for manipulating the current accounting tables/data */ -static spinlock_t ipt_account_lock = SPIN_LOCK_UNLOCKED; +static spinlock_t ipt_acc_lock = SPIN_LOCK_UNLOCKED; /* Spinlock used for manipulating userspace handles/snapshot data */ -static spinlock_t ipt_account_userspace_lock = SPIN_LOCK_UNLOCKED; +static spinlock_t ipt_acc_userspace_lock = SPIN_LOCK_UNLOCKED; /* Recursive free of all data structures */ -void ipt_account_data_free(void *data, unsigned char depth) +void ipt_acc_data_free(void *data, unsigned char depth) { /* Empty data set */ if (!data) @@ -61,7 +61,7 @@ void ipt_account_data_free(void *data, unsigned char depth) /* Free for 16 bit network */ if (depth == 1) { - struct ipt_account_mask_16 *mask_16 = (struct ipt_account_mask_16 *)data; + struct ipt_acc_mask_16 *mask_16 = (struct ipt_acc_mask_16 *)data; unsigned int b; for (b=0; b <= 255; b++) { if (mask_16->mask_24[b] != 0) { @@ -78,9 +78,9 @@ void ipt_account_data_free(void *data, unsigned char depth) if (depth == 2) { 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]; + 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]) { @@ -97,40 +97,40 @@ void ipt_account_data_free(void *data, unsigned char depth) return; } - printk("ACCOUNT: ipt_account_data_free called with unknown depth: %d\n", + printk("ACCOUNT: ipt_acc_data_free called with unknown depth: %d\n", depth); return; } /* Look for existing table / insert new one. Return internal ID or -1 on error */ -int ipt_account_table_insert(char *name, unsigned int ip, unsigned int netmask) +int ipt_acc_table_insert(char *name, unsigned int ip, unsigned int netmask) { unsigned int i; - DEBUGP("ACCOUNT: ipt_account_table_insert: %s, %u.%u.%u.%u/%u.%u.%u.%u\n", + DEBUGP("ACCOUNT: ipt_acc_table_insert: %s, %u.%u.%u.%u/%u.%u.%u.%u\n", name, NIPQUAD(ip), NIPQUAD(netmask)); /* Look for existing table */ for (i = 0; i < ACCOUNT_MAX_TABLES; i++) { - if (strncmp(ipt_account_tables[i].name, name, + if (strncmp(ipt_acc_tables[i].name, name, ACCOUNT_TABLE_NAME_LEN) == 0) { DEBUGP("ACCOUNT: Found existing slot: %d - " "%u.%u.%u.%u/%u.%u.%u.%u\n", i, - NIPQUAD(ipt_account_tables[i].ip), - NIPQUAD(ipt_account_tables[i].netmask)); + NIPQUAD(ipt_acc_tables[i].ip), + NIPQUAD(ipt_acc_tables[i].netmask)); - if (ipt_account_tables[i].ip != ip - || ipt_account_tables[i].netmask != netmask) { + if (ipt_acc_tables[i].ip != ip + || ipt_acc_tables[i].netmask != netmask) { printk("ACCOUNT: Table %s found, but IP/netmask mismatch. " "IP/netmask found: %u.%u.%u.%u/%u.%u.%u.%u\n", - name, NIPQUAD(ipt_account_tables[i].ip), - NIPQUAD(ipt_account_tables[i].netmask)); + name, NIPQUAD(ipt_acc_tables[i].ip), + NIPQUAD(ipt_acc_tables[i].netmask)); return -1; } - ipt_account_tables[i].refcount++; - DEBUGP("ACCOUNT: Refcount: %d\n", ipt_account_tables[i].refcount); + ipt_acc_tables[i].refcount++; + DEBUGP("ACCOUNT: Refcount: %d\n", ipt_acc_tables[i].refcount); return i; } } @@ -138,13 +138,13 @@ int ipt_account_table_insert(char *name, unsigned int ip, unsigned int netmask) /* Insert new table */ for (i = 0; i < ACCOUNT_MAX_TABLES; i++) { /* Found free slot */ - if (ipt_account_tables[i].name[0] == 0) { + if (ipt_acc_tables[i].name[0] == 0) { DEBUGP("ACCOUNT: Found free slot: %d\n", i); - strncpy (ipt_account_tables[i].name, name, ACCOUNT_TABLE_NAME_LEN-1); + strncpy (ipt_acc_tables[i].name, name, ACCOUNT_TABLE_NAME_LEN-1); - ipt_account_tables[i].ip = ip; - ipt_account_tables[i].netmask = netmask; + ipt_acc_tables[i].ip = ip; + ipt_acc_tables[i].netmask = netmask; /* Calculate netsize */ unsigned int j, calc_mask, netsize=0; @@ -158,22 +158,22 @@ int ipt_account_table_insert(char *name, unsigned int ip, unsigned int netmask) /* Calculate depth from netsize */ if (netsize >= 24) - ipt_account_tables[i].depth = 0; + ipt_acc_tables[i].depth = 0; else if (netsize >= 16) - ipt_account_tables[i].depth = 1; + ipt_acc_tables[i].depth = 1; else if(netsize >= 8) - ipt_account_tables[i].depth = 2; + ipt_acc_tables[i].depth = 2; DEBUGP("ACCOUNT: calculated netsize: %u -> " - "ipt_account_table depth %u\n", netsize, - ipt_account_tables[i].depth); + "ipt_acc_table depth %u\n", netsize, + ipt_acc_tables[i].depth); - ipt_account_tables[i].refcount++; - if ((ipt_account_tables[i].data + ipt_acc_tables[i].refcount++; + if ((ipt_acc_tables[i].data = (void *)get_zeroed_page(GFP_ATOMIC)) == NULL) { printk("ACCOUNT: out of memory for data of table: %s\n", name); - memset(&ipt_account_tables[i], 0, - sizeof(struct ipt_account_table)); + memset(&ipt_acc_tables[i], 0, + sizeof(struct ipt_acc_table)); return -1; } @@ -187,91 +187,91 @@ int ipt_account_table_insert(char *name, unsigned int ip, unsigned int netmask) return -1; } -static int ipt_account_checkentry(const char *tablename, +static int ipt_acc_checkentry(const char *tablename, const struct ipt_entry *e, void *targinfo, unsigned int targinfosize, unsigned int hook_mask) { - struct ipt_account_info *info = targinfo; + struct ipt_acc_info *info = targinfo; - if (targinfosize != IPT_ALIGN(sizeof(struct ipt_account_info))) { + if (targinfosize != IPT_ALIGN(sizeof(struct ipt_acc_info))) { DEBUGP("ACCOUNT: targinfosize %u != %u\n", - targinfosize, IPT_ALIGN(sizeof(struct ipt_account_info))); + targinfosize, IPT_ALIGN(sizeof(struct ipt_acc_info))); return 0; } - spin_lock_bh(&ipt_account_lock); - int table_nr = ipt_account_table_insert(info->table_name, info->net_ip, + spin_lock_bh(&ipt_acc_lock); + int table_nr = ipt_acc_table_insert(info->table_name, info->net_ip, info->net_mask); if (table_nr == -1) { printk("ACCOUNT: Table insert problem. Aborting\n"); - spin_unlock_bh(&ipt_account_lock); + spin_unlock_bh(&ipt_acc_lock); return 0; } /* Table nr caching so we don't have to do an extra string compare for every packet */ info->table_nr = table_nr; - spin_unlock_bh(&ipt_account_lock); + spin_unlock_bh(&ipt_acc_lock); return 1; } -void ipt_account_deleteentry(void *targinfo, unsigned int targinfosize) +void ipt_acc_deleteentry(void *targinfo, unsigned int targinfosize) { unsigned int i; - struct ipt_account_info *info = targinfo; + struct ipt_acc_info *info = targinfo; - if (targinfosize != IPT_ALIGN(sizeof(struct ipt_account_info))) { + if (targinfosize != IPT_ALIGN(sizeof(struct ipt_acc_info))) { DEBUGP("ACCOUNT: targinfosize %u != %u\n", - targinfosize, IPT_ALIGN(sizeof(struct ipt_account_info))); + targinfosize, IPT_ALIGN(sizeof(struct ipt_acc_info))); } - spin_lock_bh(&ipt_account_lock); + spin_lock_bh(&ipt_acc_lock); - DEBUGP("ACCOUNT: ipt_account_deleteentry called for table: %s (#%d)\n", + DEBUGP("ACCOUNT: ipt_acc_deleteentry called for table: %s (#%d)\n", info->table_name, info->table_nr); info->table_nr = -1; /* Set back to original state */ /* Look for table */ for (i = 0; i < ACCOUNT_MAX_TABLES; i++) { - if (strncmp(ipt_account_tables[i].name, info->table_name, + if (strncmp(ipt_acc_tables[i].name, info->table_name, ACCOUNT_TABLE_NAME_LEN) == 0) { DEBUGP("ACCOUNT: Found table at slot: %d\n", i); - ipt_account_tables[i].refcount--; + ipt_acc_tables[i].refcount--; DEBUGP("ACCOUNT: Refcount left: %d\n", - ipt_account_tables[i].refcount); + ipt_acc_tables[i].refcount); /* Table not needed anymore? */ - if (ipt_account_tables[i].refcount == 0) { + if (ipt_acc_tables[i].refcount == 0) { DEBUGP("ACCOUNT: Destroying table at slot: %d\n", i); - ipt_account_data_free(ipt_account_tables[i].data, - ipt_account_tables[i].depth); - memset(&ipt_account_tables[i], 0, - sizeof(struct ipt_account_table)); + ipt_acc_data_free(ipt_acc_tables[i].data, + ipt_acc_tables[i].depth); + memset(&ipt_acc_tables[i], 0, + sizeof(struct ipt_acc_table)); } - spin_unlock_bh(&ipt_account_lock); + spin_unlock_bh(&ipt_acc_lock); return; } } /* Table not found */ printk("ACCOUNT: Table %s not found for destroy\n", info->table_name); - spin_unlock_bh(&ipt_account_lock); + spin_unlock_bh(&ipt_acc_lock); } -void ipt_account_depth0_insert(struct ipt_account_mask_24 *mask_24, +void ipt_acc_depth0_insert(struct ipt_acc_mask_24 *mask_24, unsigned int net_ip, unsigned int netmask, unsigned int src_ip, unsigned int dst_ip, unsigned int size, unsigned int *itemcount) { unsigned char is_src = 0, is_dst = 0; - DEBUGP("ACCOUNT: ipt_account_depth0_insert: %u.%u.%u.%u/%u.%u.%u.%u " + DEBUGP("ACCOUNT: ipt_acc_depth0_insert: %u.%u.%u.%u/%u.%u.%u.%u " "for net %u.%u.%u.%u/%u.%u.%u.%u, size: %u\n", NIPQUAD(src_ip), NIPQUAD(dst_ip), NIPQUAD(net_ip), NIPQUAD(netmask), size); @@ -340,7 +340,7 @@ void ipt_account_depth0_insert(struct ipt_account_mask_24 *mask_24, DEBUGP("ACCOUNT: Itemcounter after: %d\n", *itemcount); } -void ipt_account_depth1_insert(struct ipt_account_mask_16 *mask_16, +void ipt_acc_depth1_insert(struct ipt_acc_mask_16 *mask_16, unsigned int net_ip, unsigned int netmask, unsigned int src_ip, unsigned int dst_ip, unsigned int size, unsigned int *itemcount) @@ -357,7 +357,7 @@ void ipt_account_depth1_insert(struct ipt_account_mask_16 *mask_16, return; } - ipt_account_depth0_insert((struct ipt_account_mask_24 *)mask_16->mask_24[slot], + ipt_acc_depth0_insert((struct ipt_acc_mask_24 *)mask_16->mask_24[slot], net_ip, netmask, src_ip, 0, size, itemcount); } @@ -373,12 +373,12 @@ void ipt_account_depth1_insert(struct ipt_account_mask_16 *mask_16, return; } - ipt_account_depth0_insert((struct ipt_account_mask_24 *)mask_16->mask_24[slot], + ipt_acc_depth0_insert((struct ipt_acc_mask_24 *)mask_16->mask_24[slot], net_ip, netmask, 0, dst_ip, size, itemcount); } } -void ipt_account_depth2_insert(struct ipt_account_mask_8 *mask_8, +void ipt_acc_depth2_insert(struct ipt_acc_mask_8 *mask_8, unsigned int net_ip, unsigned int netmask, unsigned int src_ip, unsigned int dst_ip, unsigned int size, unsigned int *itemcount) @@ -395,7 +395,7 @@ void ipt_account_depth2_insert(struct ipt_account_mask_8 *mask_8, return; } - ipt_account_depth1_insert((struct ipt_account_mask_16 *)mask_8->mask_16[slot], + ipt_acc_depth1_insert((struct ipt_acc_mask_16 *)mask_8->mask_16[slot], net_ip, netmask, src_ip, 0, size, itemcount); } @@ -411,73 +411,73 @@ void ipt_account_depth2_insert(struct ipt_account_mask_8 *mask_8, return; } - ipt_account_depth1_insert((struct ipt_account_mask_16 *)mask_8->mask_16[slot], + ipt_acc_depth1_insert((struct ipt_acc_mask_16 *)mask_8->mask_16[slot], net_ip, netmask, 0, dst_ip, size, itemcount); } } -static unsigned int ipt_account_target(struct sk_buff **pskb, +static unsigned int ipt_acc_target(struct sk_buff **pskb, unsigned int hooknum, const struct net_device *in, const struct net_device *out, const void *targinfo, void *userinfo) { - const struct ipt_account_info *info = - (const struct ipt_account_info *)targinfo; + const struct ipt_acc_info *info = + (const struct ipt_acc_info *)targinfo; unsigned int src_ip = (*pskb)->nh.iph->saddr; unsigned int dst_ip = (*pskb)->nh.iph->daddr; unsigned int size = ntohs((*pskb)->nh.iph->tot_len); - spin_lock_bh(&ipt_account_lock); + spin_lock_bh(&ipt_acc_lock); - if (ipt_account_tables[info->table_nr].name[0] == 0) { - printk("ACCOUNT: ipt_account_target: Invalid table id %u. " + if (ipt_acc_tables[info->table_nr].name[0] == 0) { + printk("ACCOUNT: ipt_acc_target: Invalid table id %u. " "IPs %u.%u.%u.%u/%u.%u.%u.%u\n", info->table_nr, NIPQUAD(src_ip), NIPQUAD(dst_ip)); - spin_unlock_bh(&ipt_account_lock); + spin_unlock_bh(&ipt_acc_lock); return IPT_CONTINUE; } /* 8 bit network or "any" network */ - if (ipt_account_tables[info->table_nr].depth == 0) { + if (ipt_acc_tables[info->table_nr].depth == 0) { /* Count packet and check if the IP is new */ - ipt_account_depth0_insert( - (struct ipt_account_mask_24 *)ipt_account_tables[info->table_nr].data, - ipt_account_tables[info->table_nr].ip, - ipt_account_tables[info->table_nr].netmask, - src_ip, dst_ip, size, &ipt_account_tables[info->table_nr].itemcount); - spin_unlock_bh(&ipt_account_lock); + ipt_acc_depth0_insert( + (struct ipt_acc_mask_24 *)ipt_acc_tables[info->table_nr].data, + ipt_acc_tables[info->table_nr].ip, + ipt_acc_tables[info->table_nr].netmask, + src_ip, dst_ip, size, &ipt_acc_tables[info->table_nr].itemcount); + spin_unlock_bh(&ipt_acc_lock); return IPT_CONTINUE; } /* 16 bit network */ - if (ipt_account_tables[info->table_nr].depth == 1) { - ipt_account_depth1_insert( - (struct ipt_account_mask_16 *)ipt_account_tables[info->table_nr].data, - ipt_account_tables[info->table_nr].ip, - ipt_account_tables[info->table_nr].netmask, - src_ip, dst_ip, size, &ipt_account_tables[info->table_nr].itemcount); - spin_unlock_bh(&ipt_account_lock); + if (ipt_acc_tables[info->table_nr].depth == 1) { + ipt_acc_depth1_insert( + (struct ipt_acc_mask_16 *)ipt_acc_tables[info->table_nr].data, + ipt_acc_tables[info->table_nr].ip, + ipt_acc_tables[info->table_nr].netmask, + src_ip, dst_ip, size, &ipt_acc_tables[info->table_nr].itemcount); + spin_unlock_bh(&ipt_acc_lock); return IPT_CONTINUE; } /* 24 bit network */ - if (ipt_account_tables[info->table_nr].depth == 2) { - ipt_account_depth2_insert( - (struct ipt_account_mask_8 *)ipt_account_tables[info->table_nr].data, - ipt_account_tables[info->table_nr].ip, - ipt_account_tables[info->table_nr].netmask, - src_ip, dst_ip, size, &ipt_account_tables[info->table_nr].itemcount); - spin_unlock_bh(&ipt_account_lock); + if (ipt_acc_tables[info->table_nr].depth == 2) { + ipt_acc_depth2_insert( + (struct ipt_acc_mask_8 *)ipt_acc_tables[info->table_nr].data, + ipt_acc_tables[info->table_nr].ip, + ipt_acc_tables[info->table_nr].netmask, + src_ip, dst_ip, size, &ipt_acc_tables[info->table_nr].itemcount); + spin_unlock_bh(&ipt_acc_lock); return IPT_CONTINUE; } - printk("ACCOUNT: ipt_account_target: Unable to process packet. " + printk("ACCOUNT: ipt_acc_target: Unable to process packet. " "Table id %u. IPs %u.%u.%u.%u/%u.%u.%u.%u\n", info->table_nr, NIPQUAD(src_ip), NIPQUAD(dst_ip)); - spin_unlock_bh(&ipt_account_lock); + spin_unlock_bh(&ipt_acc_lock); return IPT_CONTINUE; } @@ -498,13 +498,13 @@ static unsigned int ipt_account_target(struct sk_buff **pskb, but there could be two or more applications accessing the data at the same time. */ -int ipt_account_handle_find_slot(void) +int ipt_acc_handle_find_slot(void) { unsigned int i; /* Insert new table */ for (i = 0; i < ACCOUNT_MAX_HANDLES; i++) { /* Found free slot */ - if (ipt_account_handles[i].data == NULL) { + if (ipt_acc_handles[i].data == NULL) { /* Don't "mark" data as used as we are protected by a spinlock by the calling function. handle_find_slot() is only a function to prevent code duplication. */ @@ -518,69 +518,69 @@ int ipt_account_handle_find_slot(void) return -1; } -int ipt_account_handle_free(unsigned int handle) +int ipt_acc_handle_free(unsigned int handle) { if (handle >= ACCOUNT_MAX_HANDLES) { - printk("ACCOUNT: Invalid handle for ipt_account_handle_free() specified:" + printk("ACCOUNT: Invalid handle for ipt_acc_handle_free() specified:" " %u\n", handle); return -EINVAL; } - ipt_account_data_free(ipt_account_handles[handle].data, - ipt_account_handles[handle].depth); - memset (&ipt_account_handles[handle], 0, sizeof (struct ipt_account_handle)); + ipt_acc_data_free(ipt_acc_handles[handle].data, + ipt_acc_handles[handle].depth); + memset (&ipt_acc_handles[handle], 0, sizeof (struct ipt_acc_handle)); return 0; } /* Prepare data for read without flush. Use only for debugging! Real applications should use read&flush as it's way more efficent */ -int ipt_account_handle_prepare_read(char *tablename, unsigned int *count) +int ipt_acc_handle_prepare_read(char *tablename, unsigned int *count) { int handle, i, table_nr=-1; for (i = 0; i < ACCOUNT_MAX_TABLES; i++) - if (strncmp(ipt_account_tables[i].name, tablename, + if (strncmp(ipt_acc_tables[i].name, tablename, ACCOUNT_TABLE_NAME_LEN) == 0) { table_nr = i; break; } if (table_nr == -1) { - printk("ACCOUNT: ipt_account_handle_prepare_read(): " + printk("ACCOUNT: ipt_acc_handle_prepare_read(): " "Table %s not found\n", tablename); return -1; } /* Can't find a free handle slot? */ - if ((handle = ipt_account_handle_find_slot()) == -1) + if ((handle = ipt_acc_handle_find_slot()) == -1) return -1; /* Fill up handle structure */ - ipt_account_handles[handle].ip = ipt_account_tables[table_nr].ip; - ipt_account_handles[handle].depth = ipt_account_tables[table_nr].depth; - ipt_account_handles[handle].itemcount = ipt_account_tables[table_nr].itemcount; + ipt_acc_handles[handle].ip = ipt_acc_tables[table_nr].ip; + ipt_acc_handles[handle].depth = ipt_acc_tables[table_nr].depth; + ipt_acc_handles[handle].itemcount = ipt_acc_tables[table_nr].itemcount; /* allocate "root" table */ - if ((ipt_account_handles[handle].data = + if ((ipt_acc_handles[handle].data = (void*)get_zeroed_page(GFP_ATOMIC)) == 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)); + "in ipt_acc_handle_prepare_read()\n"); + memset (&ipt_acc_handles[handle], 0, + sizeof(struct ipt_acc_handle)); return -1; } /* Recursive copy of complete data structure */ - unsigned int depth = ipt_account_handles[handle].depth; + unsigned int depth = ipt_acc_handles[handle].depth; if (depth == 0) { - memcpy(ipt_account_handles[handle].data, - ipt_account_tables[table_nr].data, - sizeof(struct ipt_account_mask_24)); + memcpy(ipt_acc_handles[handle].data, + ipt_acc_tables[table_nr].data, + sizeof(struct ipt_acc_mask_24)); } 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; + struct ipt_acc_mask_16 *src_16 = + (struct ipt_acc_mask_16 *)ipt_acc_tables[table_nr].data; + struct ipt_acc_mask_16 *network_16 = + (struct ipt_acc_mask_16 *)ipt_acc_handles[handle].data; unsigned int b; for (b = 0; b <= 255; b++) { @@ -588,22 +588,22 @@ int ipt_account_handle_prepare_read(char *tablename, unsigned int *count) if ((network_16->mask_24[b] = (void*)get_zeroed_page(GFP_ATOMIC)) == 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); - memset (&ipt_account_handles[handle], 0, - sizeof(struct ipt_account_handle)); + "network in ipt_acc_handle_prepare_read()\n"); + ipt_acc_data_free(ipt_acc_handles[handle].data, depth); + memset (&ipt_acc_handles[handle], 0, + sizeof(struct ipt_acc_handle)); return -1; } memcpy(network_16->mask_24[b], src_16->mask_24[b], - sizeof(struct ipt_account_mask_24)); + sizeof(struct ipt_acc_mask_24)); } } } 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; + struct ipt_acc_mask_8 *src_8 = + (struct ipt_acc_mask_8 *)ipt_acc_tables[table_nr].data; + struct ipt_acc_mask_8 *network_8 = + (struct ipt_acc_mask_8 *)ipt_acc_handles[handle].data; unsigned int a; for (a = 0; a <= 255; a++) { @@ -611,18 +611,18 @@ int ipt_account_handle_prepare_read(char *tablename, unsigned int *count) if ((network_8->mask_16[a] = (void*)get_zeroed_page(GFP_ATOMIC)) == 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); - memset (&ipt_account_handles[handle], 0, - sizeof(struct ipt_account_handle)); + " in ipt_acc_handle_prepare_read()\n"); + ipt_acc_data_free(ipt_acc_handles[handle].data, depth); + memset (&ipt_acc_handles[handle], 0, + sizeof(struct ipt_acc_handle)); return -1; } memcpy(network_8->mask_16[a], src_8->mask_16[a], - sizeof(struct ipt_account_mask_16)); + sizeof(struct ipt_acc_mask_16)); - struct ipt_account_mask_16 *src_16 = src_8->mask_16[a]; - struct ipt_account_mask_16 *network_16 = network_8->mask_16[a]; + struct ipt_acc_mask_16 *src_16 = src_8->mask_16[a]; + struct ipt_acc_mask_16 *network_16 = network_8->mask_16[a]; unsigned int b; for (b = 0; b <= 255; b++) { @@ -630,67 +630,67 @@ int ipt_account_handle_prepare_read(char *tablename, unsigned int *count) if ((network_16->mask_24[b] = (void*)get_zeroed_page(GFP_ATOMIC)) == 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, + " network in ipt_acc_handle_prepare_read()\n"); + ipt_acc_data_free(ipt_acc_handles[handle].data, depth); - memset (&ipt_account_handles[handle], 0, - sizeof(struct ipt_account_handle)); + memset (&ipt_acc_handles[handle], 0, + sizeof(struct ipt_acc_handle)); return -1; } memcpy(network_16->mask_24[b], src_16->mask_24[b], - sizeof(struct ipt_account_mask_24)); + sizeof(struct ipt_acc_mask_24)); } } } } } - *count = ipt_account_tables[table_nr].itemcount; + *count = ipt_acc_tables[table_nr].itemcount; return handle; } /* Prepare data for read and flush it */ -int ipt_account_handle_prepare_read_flush(char *tablename, unsigned int *count) +int ipt_acc_handle_prepare_read_flush(char *tablename, unsigned int *count) { int handle, i, table_nr=-1; for (i = 0; i < ACCOUNT_MAX_TABLES; i++) - if (strncmp(ipt_account_tables[i].name, tablename, + if (strncmp(ipt_acc_tables[i].name, tablename, ACCOUNT_TABLE_NAME_LEN) == 0) { table_nr = i; break; } if (table_nr == -1) { - printk("ACCOUNT: ipt_account_handle_prepare_read_flush(): " + printk("ACCOUNT: ipt_acc_handle_prepare_read_flush(): " "Table %s not found\n", tablename); return -1; } /* Can't find a free handle slot? */ - if ((handle = ipt_account_handle_find_slot()) == -1) + if ((handle = ipt_acc_handle_find_slot()) == -1) return -1; /* Try to allocate memory */ void *new_data_page = (void*)get_zeroed_page(GFP_ATOMIC); if (!new_data_page) { - printk("ACCOUNT: ipt_account_handle_prepare_read_flush(): " + printk("ACCOUNT: ipt_acc_handle_prepare_read_flush(): " "Out of memory!\n"); return -1; } /* Fill up handle structure */ - ipt_account_handles[handle].ip = ipt_account_tables[table_nr].ip; - ipt_account_handles[handle].depth = ipt_account_tables[table_nr].depth; - ipt_account_handles[handle].itemcount = ipt_account_tables[table_nr].itemcount; - ipt_account_handles[handle].data = ipt_account_tables[table_nr].data; - *count = ipt_account_tables[table_nr].itemcount; + ipt_acc_handles[handle].ip = ipt_acc_tables[table_nr].ip; + ipt_acc_handles[handle].depth = ipt_acc_tables[table_nr].depth; + ipt_acc_handles[handle].itemcount = ipt_acc_tables[table_nr].itemcount; + ipt_acc_handles[handle].data = ipt_acc_tables[table_nr].data; + *count = ipt_acc_tables[table_nr].itemcount; /* "Flush" table data */ - ipt_account_tables[table_nr].data = new_data_page; - ipt_account_tables[table_nr].itemcount = 0; + ipt_acc_tables[table_nr].data = new_data_page; + ipt_acc_tables[table_nr].itemcount = 0; return handle; } @@ -698,12 +698,12 @@ int ipt_account_handle_prepare_read_flush(char *tablename, unsigned int *count) /* Copy 8 bit network data into a prepared buffer. We only copy entries != 0 to increase performance. */ -void ipt_account_handle_copy_data(void *to_user, int *pos, - struct ipt_account_mask_24 *data, +void ipt_acc_handle_copy_data(void *to_user, int *pos, + struct ipt_acc_mask_24 *data, unsigned int net_ip, unsigned int net_OR_mask) { - struct ipt_account_handle_ip handle_ip; - unsigned int handle_ip_size = sizeof (struct ipt_account_handle_ip); + struct ipt_acc_handle_ip handle_ip; + unsigned int handle_ip_size = sizeof (struct ipt_acc_handle_ip); unsigned int i; @@ -718,10 +718,10 @@ void ipt_account_handle_copy_data(void *to_user, int *pos, /* Temporary buffer full? Flush to userspace */ if (*pos+handle_ip_size >= PAGE_SIZE) { - copy_to_user(to_user, ipt_account_tmpbuf, *pos); + copy_to_user(to_user, ipt_acc_tmpbuf, *pos); *pos = 0; } - memcpy(ipt_account_tmpbuf+*pos, &handle_ip, handle_ip_size); + memcpy(ipt_acc_tmpbuf+*pos, &handle_ip, handle_ip_size); *pos += handle_ip_size; } } @@ -729,75 +729,75 @@ void ipt_account_handle_copy_data(void *to_user, int *pos, /* Copy the data from our internal structure We only copy entries != 0 to increase performance. - Overwrites ipt_account_tmpbuf. + Overwrites ipt_acc_tmpbuf. */ -int ipt_account_handle_get_data(unsigned int handle, void *to_user) +int ipt_acc_handle_get_data(unsigned int handle, void *to_user) { unsigned int tmpbuf_pos=0; if (handle >= ACCOUNT_MAX_HANDLES) { - printk("ACCOUNT: invalid handle for ipt_account_handle_get_data() " + printk("ACCOUNT: invalid handle for ipt_acc_handle_get_data() " "specified: %u\n", handle); return -1; } - if (ipt_account_handles[handle].data == NULL) { + if (ipt_acc_handles[handle].data == NULL) { printk("ACCOUNT: handle %u is BROKEN: Contains no data\n", handle); return -1; } - unsigned int net_ip = ipt_account_handles[handle].ip; - unsigned int depth = ipt_account_handles[handle].depth; + unsigned int net_ip = ipt_acc_handles[handle].ip; + unsigned int depth = ipt_acc_handles[handle].depth; /* 8 bit network */ if (depth == 0) { - struct ipt_account_mask_24 *network = - (struct ipt_account_mask_24*)ipt_account_handles[handle].data; - ipt_account_handle_copy_data(to_user, &tmpbuf_pos, network, net_ip, 0); + struct ipt_acc_mask_24 *network = + (struct ipt_acc_mask_24*)ipt_acc_handles[handle].data; + ipt_acc_handle_copy_data(to_user, &tmpbuf_pos, network, net_ip, 0); /* Flush remaining data to userspace */ if (tmpbuf_pos) - copy_to_user(to_user, ipt_account_tmpbuf, tmpbuf_pos); + copy_to_user(to_user, ipt_acc_tmpbuf, tmpbuf_pos); return 0; } /* 16 bit network */ if (depth == 1) { - struct ipt_account_mask_16 *network_16 = - (struct ipt_account_mask_16*)ipt_account_handles[handle].data; + struct ipt_acc_mask_16 *network_16 = + (struct ipt_acc_mask_16*)ipt_acc_handles[handle].data; 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]; - ipt_account_handle_copy_data(to_user, &tmpbuf_pos, network, + struct ipt_acc_mask_24 *network = + (struct ipt_acc_mask_24*)network_16->mask_24[b]; + ipt_acc_handle_copy_data(to_user, &tmpbuf_pos, network, net_ip, (b << 16)); } } /* Flush remaining data to userspace */ if (tmpbuf_pos) - copy_to_user(to_user, ipt_account_tmpbuf, tmpbuf_pos); + copy_to_user(to_user, ipt_acc_tmpbuf, tmpbuf_pos); return 0; } /* 24 bit network */ if (depth == 2) { - struct ipt_account_mask_8 *network_8 = - (struct ipt_account_mask_8*)ipt_account_handles[handle].data; + struct ipt_acc_mask_8 *network_8 = + (struct ipt_acc_mask_8*)ipt_acc_handles[handle].data; 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]; + struct ipt_acc_mask_16 *network_16 = + (struct ipt_acc_mask_16*)network_8->mask_16[a]; 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]; - ipt_account_handle_copy_data(to_user, &tmpbuf_pos, network, - net_ip, (a << 8) | (b << 16)); + struct ipt_acc_mask_24 *network = + (struct ipt_acc_mask_24*)network_16->mask_24[b]; + ipt_acc_handle_copy_data(to_user, &tmpbuf_pos, network, + net_ip, (a << 8) | (b << 16)); } } } @@ -805,7 +805,7 @@ int ipt_account_handle_get_data(unsigned int handle, void *to_user) /* Flush remaining data to userspace */ if (tmpbuf_pos) - copy_to_user(to_user, ipt_account_tmpbuf, tmpbuf_pos); + copy_to_user(to_user, ipt_acc_tmpbuf, tmpbuf_pos); return 0; } @@ -813,10 +813,10 @@ int ipt_account_handle_get_data(unsigned int handle, void *to_user) return -1; } -static int ipt_account_set_ctl(struct sock *sk, int cmd, +static int ipt_acc_set_ctl(struct sock *sk, int cmd, void *user, unsigned int len) { - struct ipt_account_handle_sockopt handle; + struct ipt_acc_handle_sockopt handle; int ret = -EINVAL; if (!capable(CAP_NET_ADMIN)) @@ -824,42 +824,42 @@ static int ipt_account_set_ctl(struct sock *sk, int cmd, switch (cmd) { case IPT_SO_SET_ACCOUNT_HANDLE_FREE: - if (len != sizeof(struct ipt_account_handle_sockopt)) { - printk("ACCOUNT: ipt_account_set_ctl: wrong data size (%u != %u) " + if (len != sizeof(struct ipt_acc_handle_sockopt)) { + printk("ACCOUNT: ipt_acc_set_ctl: wrong data size (%u != %u) " "for IPT_SO_SET_HANDLE_FREE\n", - len, sizeof(struct ipt_account_handle_sockopt)); + len, sizeof(struct ipt_acc_handle_sockopt)); break; } if (copy_from_user (&handle, user, len)) { - printk("ACCOUNT: ipt_account_set_ctl: copy_from_user failed for " + printk("ACCOUNT: ipt_acc_set_ctl: copy_from_user failed for " "IPT_SO_SET_HANDLE_FREE\n"); break; } - spin_lock_bh(&ipt_account_userspace_lock); - ret = ipt_account_handle_free(handle.handle_nr); - spin_unlock_bh(&ipt_account_userspace_lock); + spin_lock_bh(&ipt_acc_userspace_lock); + ret = ipt_acc_handle_free(handle.handle_nr); + spin_unlock_bh(&ipt_acc_userspace_lock); break; case IPT_SO_SET_ACCOUNT_HANDLE_FREE_ALL: { unsigned int i; - spin_lock_bh(&ipt_account_userspace_lock); + spin_lock_bh(&ipt_acc_userspace_lock); for (i = 0; i < ACCOUNT_MAX_HANDLES; i++) - ipt_account_handle_free(i); - spin_unlock_bh(&ipt_account_userspace_lock); + ipt_acc_handle_free(i); + spin_unlock_bh(&ipt_acc_userspace_lock); ret = 0; break; } default: - printk("ACCOUNT: ipt_account_set_ctl: unknown request %i\n", cmd); + printk("ACCOUNT: ipt_acc_set_ctl: unknown request %i\n", cmd); } return ret; } -static int ipt_account_get_ctl(struct sock *sk, int cmd, void *user, int *len) +static int ipt_acc_get_ctl(struct sock *sk, int cmd, void *user, int *len) { - struct ipt_account_handle_sockopt handle; + struct ipt_acc_handle_sockopt handle; int ret = -EINVAL; if (!capable(CAP_NET_ADMIN)) @@ -868,29 +868,29 @@ static int ipt_account_get_ctl(struct sock *sk, int cmd, void *user, int *len) switch (cmd) { case IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH: case IPT_SO_GET_ACCOUNT_PREPARE_READ: - if (*len < sizeof(struct ipt_account_handle_sockopt)) { - printk("ACCOUNT: ipt_account_get_ctl: wrong data size (%u != %u) " + 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_account_handle_sockopt)); + *len, sizeof(struct ipt_acc_handle_sockopt)); break; } if (copy_from_user (&handle, user, - sizeof(struct ipt_account_handle_sockopt))) { + sizeof(struct ipt_acc_handle_sockopt))) { return -EFAULT; break; } - spin_lock_bh(&ipt_account_lock); - spin_lock_bh(&ipt_account_userspace_lock); + spin_lock_bh(&ipt_acc_lock); + spin_lock_bh(&ipt_acc_userspace_lock); if (cmd == IPT_SO_GET_ACCOUNT_PREPARE_READ_FLUSH) - handle.handle_nr = ipt_account_handle_prepare_read_flush( + handle.handle_nr = ipt_acc_handle_prepare_read_flush( handle.name, &handle.itemcount); else - handle.handle_nr = ipt_account_handle_prepare_read( + handle.handle_nr = ipt_acc_handle_prepare_read( handle.name, &handle.itemcount); - spin_unlock_bh(&ipt_account_userspace_lock); - spin_unlock_bh(&ipt_account_lock); + spin_unlock_bh(&ipt_acc_userspace_lock); + spin_unlock_bh(&ipt_acc_lock); if (handle.handle_nr == -1) { return -EINVAL; @@ -898,22 +898,22 @@ static int ipt_account_get_ctl(struct sock *sk, int cmd, void *user, int *len) } if (copy_to_user(user, &handle, - sizeof(struct ipt_account_handle_sockopt))) { + sizeof(struct ipt_acc_handle_sockopt))) { return -EFAULT; break; } ret = 0; break; case IPT_SO_GET_ACCOUNT_GET_DATA: - if (*len < sizeof(struct ipt_account_handle_sockopt)) { - printk("ACCOUNT: ipt_account_get_ctl: wrong data size (%u != %u)" + 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_account_handle_sockopt)); + *len, sizeof(struct ipt_acc_handle_sockopt)); break; } if (copy_from_user (&handle, user, - sizeof(struct ipt_account_handle_sockopt))) { + sizeof(struct ipt_acc_handle_sockopt))) { return -EFAULT; break; } @@ -923,21 +923,21 @@ static int ipt_account_get_ctl(struct sock *sk, int cmd, void *user, int *len) break; } - if (*len < ipt_account_handles[handle.handle_nr].itemcount - * sizeof(struct ipt_account_handle_ip)) { - printk("ACCOUNT: ipt_account_get_ctl: not enough space (%u < %u)" + if (*len < ipt_acc_handles[handle.handle_nr].itemcount + * sizeof(struct ipt_acc_handle_ip)) { + printk("ACCOUNT: ipt_acc_get_ctl: not enough space (%u < %u)" " to store data from IPT_SO_GET_ACCOUNT_GET_DATA\n", - *len, ipt_account_handles[handle.handle_nr].itemcount - * sizeof(struct ipt_account_handle_ip)); + *len, ipt_acc_handles[handle.handle_nr].itemcount + * sizeof(struct ipt_acc_handle_ip)); ret = -ENOMEM; break; } - spin_lock_bh(&ipt_account_userspace_lock); - ret = ipt_account_handle_get_data(handle.handle_nr, user); - spin_unlock_bh(&ipt_account_userspace_lock); + spin_lock_bh(&ipt_acc_userspace_lock); + ret = ipt_acc_handle_get_data(handle.handle_nr, user); + spin_unlock_bh(&ipt_acc_userspace_lock); if (ret) { - printk("ACCOUNT: ipt_account_get_ctl: ipt_account_handle_get_data" + printk("ACCOUNT: ipt_acc_get_ctl: ipt_acc_handle_get_data" " failed for handle %u\n", handle.handle_nr); break; } @@ -945,24 +945,24 @@ static int ipt_account_get_ctl(struct sock *sk, int cmd, void *user, int *len) ret = 0; break; case IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE: { - if (*len < sizeof(struct ipt_account_handle_sockopt)) { - printk("ACCOUNT: ipt_account_get_ctl: wrong data size (%u != %u)" + if (*len < sizeof(struct ipt_acc_handle_sockopt)) { + printk("ACCOUNT: ipt_acc_get_ctl: wrong data size (%u != %u)" " for IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE\n", - *len, sizeof(struct ipt_account_handle_sockopt)); + *len, sizeof(struct ipt_acc_handle_sockopt)); break; } /* Find out how many handles are in use */ unsigned int i; handle.itemcount = 0; - spin_lock_bh(&ipt_account_userspace_lock); + spin_lock_bh(&ipt_acc_userspace_lock); for (i = 0; i < ACCOUNT_MAX_HANDLES; i++) - if (ipt_account_handles[i].data) + if (ipt_acc_handles[i].data) handle.itemcount++; - spin_unlock_bh(&ipt_account_userspace_lock); + spin_unlock_bh(&ipt_acc_userspace_lock); if (copy_to_user(user, &handle, - sizeof(struct ipt_account_handle_sockopt))) { + sizeof(struct ipt_acc_handle_sockopt))) { return -EFAULT; break; } @@ -970,19 +970,19 @@ static int ipt_account_get_ctl(struct sock *sk, int cmd, void *user, int *len) break; } case IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES: { - spin_lock_bh(&ipt_account_lock); + spin_lock_bh(&ipt_acc_lock); /* Determine size of table names */ unsigned int size = 0, i; for (i = 0; i < ACCOUNT_MAX_TABLES; i++) { - if (ipt_account_tables[i].name[0] != 0) - size += strlen (ipt_account_tables[i].name) + 1; + if (ipt_acc_tables[i].name[0] != 0) + size += strlen (ipt_acc_tables[i].name) + 1; } size += 1; /* Terminating NULL character */ if (*len < size) { - spin_unlock_bh(&ipt_account_lock); - printk("ACCOUNT: ipt_account_get_ctl: not enough space (%u < %u)" + spin_unlock_bh(&ipt_acc_lock); + printk("ACCOUNT: ipt_acc_get_ctl: not enough space (%u < %u)" " to store table names\n", *len, size); ret = -ENOMEM; break; @@ -990,100 +990,100 @@ static int ipt_account_get_ctl(struct sock *sk, int cmd, void *user, int *len) /* Copy table names to userspace */ char *tnames = user; for (i = 0; i < ACCOUNT_MAX_TABLES; i++) { - if (ipt_account_tables[i].name[0] != 0) { - int len = strlen (ipt_account_tables[i].name) + 1; + if (ipt_acc_tables[i].name[0] != 0) { + int len = strlen (ipt_acc_tables[i].name) + 1; /* copy string + terminating zero */ - copy_to_user(tnames, ipt_account_tables[i].name, len); + copy_to_user(tnames, ipt_acc_tables[i].name, len); tnames += len; } } /* Append terminating zero */ i = 0; copy_to_user(tnames, &i, 1); - spin_unlock_bh(&ipt_account_lock); + spin_unlock_bh(&ipt_acc_lock); ret = 0; break; } default: - printk("ACCOUNT: ipt_account_get_ctl: unknown request %i\n", cmd); + printk("ACCOUNT: ipt_acc_get_ctl: unknown request %i\n", cmd); } return ret; } -static struct ipt_target ipt_account_reg = { +static struct ipt_target ipt_acc_reg = { { NULL, NULL }, "ACCOUNT", - ipt_account_target, - ipt_account_checkentry, - ipt_account_deleteentry, + ipt_acc_target, + ipt_acc_checkentry, + ipt_acc_deleteentry, THIS_MODULE }; -static struct nf_sockopt_ops ipt_account_sockopts = { +static struct nf_sockopt_ops ipt_acc_sockopts = { { NULL, NULL }, PF_INET, IPT_SO_SET_ACCOUNT_HANDLE_FREE, IPT_SO_SET_ACCOUNT_MAX+1, - ipt_account_set_ctl, + ipt_acc_set_ctl, IPT_SO_GET_ACCOUNT_PREPARE_READ, IPT_SO_GET_ACCOUNT_MAX+1, - ipt_account_get_ctl, + ipt_acc_get_ctl, 0, NULL }; static int __init init(void) { - if ((ipt_account_tables = + if ((ipt_acc_tables = kmalloc(ACCOUNT_MAX_TABLES * - sizeof(struct ipt_account_table), GFP_KERNEL)) == NULL) { + sizeof(struct ipt_acc_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)); + memset(ipt_acc_tables, 0, + ACCOUNT_MAX_TABLES * sizeof(struct ipt_acc_table)); - if ((ipt_account_handles = + if ((ipt_acc_handles = kmalloc(ACCOUNT_MAX_HANDLES * - sizeof(struct ipt_account_handle), GFP_KERNEL)) == NULL) { + sizeof(struct ipt_acc_handle), GFP_KERNEL)) == NULL) { printk("ACCOUNT: Out of memory allocating account_handles structure"); - kfree (ipt_account_tables); - ipt_account_tables = NULL; + kfree (ipt_acc_tables); + ipt_acc_tables = NULL; return -EINVAL; } - memset(ipt_account_handles, 0, - ACCOUNT_MAX_HANDLES * sizeof(struct ipt_account_handle)); + memset(ipt_acc_handles, 0, + ACCOUNT_MAX_HANDLES * sizeof(struct ipt_acc_handle)); /* Allocate one page as temporary storage */ - if ((ipt_account_tmpbuf = (void*)__get_free_page(GFP_KERNEL)) == NULL) { + if ((ipt_acc_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; + kfree(ipt_acc_tables); + kfree(ipt_acc_handles); + ipt_acc_tables = NULL; + ipt_acc_handles = NULL; return -EINVAL; } /* Register setsockopt */ - if (nf_register_sockopt(&ipt_account_sockopts) < 0) { + if (nf_register_sockopt(&ipt_acc_sockopts) < 0) { printk("ACCOUNT: Can't register sockopts. Aborting\n"); - kfree(ipt_account_tables); - kfree(ipt_account_handles); - free_page((unsigned long)ipt_account_tmpbuf); - ipt_account_tables = NULL; - ipt_account_handles = NULL; - ipt_account_tmpbuf = NULL; + kfree(ipt_acc_tables); + kfree(ipt_acc_handles); + free_page((unsigned long)ipt_acc_tmpbuf); + ipt_acc_tables = NULL; + ipt_acc_handles = NULL; + ipt_acc_tmpbuf = NULL; return -EINVAL; } - if (ipt_register_target(&ipt_account_reg)) + if (ipt_register_target(&ipt_acc_reg)) return -EINVAL; return 0; @@ -1091,17 +1091,17 @@ static int __init init(void) static void __exit fini(void) { - ipt_unregister_target(&ipt_account_reg); + ipt_unregister_target(&ipt_acc_reg); - nf_unregister_sockopt(&ipt_account_sockopts); + nf_unregister_sockopt(&ipt_acc_sockopts); - kfree(ipt_account_tables); - kfree(ipt_account_handles); - free_page((unsigned long)ipt_account_tmpbuf); + kfree(ipt_acc_tables); + kfree(ipt_acc_handles); + free_page((unsigned long)ipt_acc_tmpbuf); - ipt_account_tables = NULL; - ipt_account_handles = NULL; - ipt_account_tmpbuf = NULL; + ipt_acc_tables = NULL; + ipt_acc_handles = NULL; + ipt_acc_tmpbuf = NULL; } module_init(init);