/* Recursive free of all data structures */
-void ipt_acc_data_free(void *data, unsigned char depth)
+static void ipt_acc_data_free(void *data, unsigned char depth)
{
/* Empty data set */
if (!data)
/* Look for existing table / insert new one.
Return internal ID or -1 on error */
-int ipt_acc_table_insert(char *name, u_int32_t ip, u_int32_t netmask)
+static int ipt_acc_table_insert(char *name, u_int32_t ip, u_int32_t netmask)
{
u_int32_t i;
for (i = 0; i < ACCOUNT_MAX_TABLES; i++) {
/* Found free slot */
if (ipt_acc_tables[i].name[0] == 0) {
+ u_int32_t j, calc_mask, netsize=0;
+
DEBUGP("ACCOUNT: Found free slot: %d\n", i);
-
strncpy (ipt_acc_tables[i].name, name, ACCOUNT_TABLE_NAME_LEN-1);
ipt_acc_tables[i].ip = ip;
ipt_acc_tables[i].netmask = netmask;
/* Calculate netsize */
- u_int32_t j, calc_mask, netsize=0;
calc_mask = htonl(netmask);
for (j = 31; j >= 0; j--) {
if (calc_mask&(1<<j))
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",
}
spin_lock_bh(&ipt_acc_lock);
- int table_nr = ipt_acc_table_insert(info->table_name, info->net_ip,
- info->net_mask);
+ 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_acc_lock);
return 1;
}
-void ipt_acc_deleteentry(void *targinfo, unsigned int targinfosize)
+static void ipt_acc_deleteentry(void *targinfo, unsigned int targinfosize)
{
u_int32_t i;
struct ipt_acc_info *info = targinfo;
spin_unlock_bh(&ipt_acc_lock);
}
-void ipt_acc_depth0_insert(struct ipt_acc_mask_24 *mask_24,
+static void ipt_acc_depth0_insert(struct ipt_acc_mask_24 *mask_24,
u_int32_t net_ip, u_int32_t netmask,
u_int32_t src_ip, u_int32_t dst_ip,
u_int32_t size, u_int32_t *itemcount)
{
- unsigned char is_src = 0, is_dst = 0;
+ unsigned char is_src = 0, is_dst = 0, src_slot, dst_slot;
+ char is_src_new_ip = 0, is_dst_new_ip = 0; /* Check if this entry is new */
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),
return;
}
- /* 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);
+ src_slot = (unsigned char)((src_ip&0xFF000000) >> 24);
+ dst_slot = (unsigned char)((dst_ip&0xFF000000) >> 24);
/* Increase size counters */
if (is_src) {
DEBUGP("ACCOUNT: Itemcounter after: %d\n", *itemcount);
}
-void ipt_acc_depth1_insert(struct ipt_acc_mask_16 *mask_16,
+static void ipt_acc_depth1_insert(struct ipt_acc_mask_16 *mask_16,
u_int32_t net_ip, u_int32_t netmask,
u_int32_t src_ip, u_int32_t dst_ip,
u_int32_t size, u_int32_t *itemcount)
}
}
-void ipt_acc_depth2_insert(struct ipt_acc_mask_8 *mask_8,
+static void ipt_acc_depth2_insert(struct ipt_acc_mask_8 *mask_8,
u_int32_t net_ip, u_int32_t netmask,
u_int32_t src_ip, u_int32_t dst_ip,
u_int32_t size, u_int32_t *itemcount)
but there could be two or more applications accessing the data
at the same time.
*/
-int ipt_acc_handle_find_slot(void)
+static int ipt_acc_handle_find_slot(void)
{
u_int32_t i;
/* Insert new table */
return -1;
}
-int ipt_acc_handle_free(u_int32_t handle)
+static int ipt_acc_handle_free(u_int32_t handle)
{
if (handle >= ACCOUNT_MAX_HANDLES) {
printk("ACCOUNT: Invalid handle for ipt_acc_handle_free() specified:"
/* Prepare data for read without flush. Use only for debugging!
Real applications should use read&flush as it's way more efficent */
-int ipt_acc_handle_prepare_read(char *tablename, u_int32_t *count)
+static int ipt_acc_handle_prepare_read(char *tablename, u_int32_t *count)
{
int handle, i, table_nr=-1;
+ unsigned char depth;
for (i = 0; i < ACCOUNT_MAX_TABLES; i++)
if (strncmp(ipt_acc_tables[i].name, tablename,
}
/* Recursive copy of complete data structure */
- u_int32_t depth = ipt_acc_handles[handle].depth;
+ depth = ipt_acc_handles[handle].depth;
if (depth == 0) {
memcpy(ipt_acc_handles[handle].data,
ipt_acc_tables[table_nr].data,
}
/* Prepare data for read and flush it */
-int ipt_acc_handle_prepare_read_flush(char *tablename, u_int32_t *count)
+static int ipt_acc_handle_prepare_read_flush(char *tablename, u_int32_t *count)
{
int handle, i, table_nr=-1;
+ void *new_data_page;
for (i = 0; i < ACCOUNT_MAX_TABLES; i++)
if (strncmp(ipt_acc_tables[i].name, tablename,
return -1;
/* Try to allocate memory */
- void *new_data_page = (void*)get_zeroed_page(GFP_ATOMIC);
- if (!new_data_page)
- {
+ if (!(new_data_page = (void*)get_zeroed_page(GFP_ATOMIC))) {
printk("ACCOUNT: ipt_acc_handle_prepare_read_flush(): "
"Out of memory!\n");
return -1;
/* Copy 8 bit network data into a prepared buffer.
We only copy entries != 0 to increase performance.
*/
-void ipt_acc_handle_copy_data(void *to_user, int *pos,
+static int ipt_acc_handle_copy_data(void *to_user, u_int32_t *to_user_pos,
+ u_int32_t *tmpbuf_pos,
struct ipt_acc_mask_24 *data,
u_int32_t net_ip, u_int32_t net_OR_mask)
{
struct ipt_acc_handle_ip handle_ip;
u_int32_t handle_ip_size = sizeof (struct ipt_acc_handle_ip);
-
u_int32_t i;
for (i = 0; i <= 255; i++) {
handle_ip.dst_bytes = data->ip[i].dst_bytes;
/* Temporary buffer full? Flush to userspace */
- if (*pos+handle_ip_size >= PAGE_SIZE) {
- *pos = 0;
- if (copy_to_user(to_user, ipt_acc_tmpbuf, *pos))
- return;
+ if (*tmpbuf_pos+handle_ip_size >= PAGE_SIZE) {
+ if (copy_to_user(to_user + *to_user_pos, ipt_acc_tmpbuf,
+ *tmpbuf_pos))
+ return -EFAULT;
+ *to_user_pos = *to_user_pos + *tmpbuf_pos;
+ *tmpbuf_pos = 0;
}
- memcpy(ipt_acc_tmpbuf+*pos, &handle_ip, handle_ip_size);
- *pos += handle_ip_size;
+ memcpy(ipt_acc_tmpbuf+*tmpbuf_pos, &handle_ip, handle_ip_size);
+ *tmpbuf_pos += handle_ip_size;
}
}
+
+ return 0;
}
/* Copy the data from our internal structure
We only copy entries != 0 to increase performance.
Overwrites ipt_acc_tmpbuf.
*/
-int ipt_acc_handle_get_data(u_int32_t handle, void *to_user)
+static int ipt_acc_handle_get_data(u_int32_t handle, void *to_user)
{
- u_int32_t tmpbuf_pos=0;
+ u_int32_t to_user_pos = 0, tmpbuf_pos=0, net_ip;
+ unsigned char depth;
if (handle >= ACCOUNT_MAX_HANDLES) {
printk("ACCOUNT: invalid handle for ipt_acc_handle_get_data() "
return -1;
}
- u_int32_t net_ip = ipt_acc_handles[handle].ip;
- u_int32_t depth = ipt_acc_handles[handle].depth;
+ net_ip = ipt_acc_handles[handle].ip;
+ depth = ipt_acc_handles[handle].depth;
/* 8 bit network */
if (depth == 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);
+ if (ipt_acc_handle_copy_data(to_user, &to_user_pos, &tmpbuf_pos,
+ network, net_ip, 0))
+ return -1;
/* Flush remaining data to userspace */
if (tmpbuf_pos)
- if (copy_to_user(to_user, ipt_acc_tmpbuf, tmpbuf_pos))
+ if (copy_to_user(to_user+to_user_pos, ipt_acc_tmpbuf, tmpbuf_pos))
return -1;
return 0;
if (network_16->mask_24[b]) {
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));
+ if (ipt_acc_handle_copy_data(to_user+to_user_pos, &to_user_pos,
+ &tmpbuf_pos, network, net_ip, (b << 16)))
+ return -1;
}
}
/* Flush remaining data to userspace */
if (tmpbuf_pos)
- if (copy_to_user(to_user, ipt_acc_tmpbuf, tmpbuf_pos))
+ if (copy_to_user(to_user+to_user_pos, ipt_acc_tmpbuf, tmpbuf_pos))
return -1;
return 0;
if (network_16->mask_24[b]) {
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));
+ if (ipt_acc_handle_copy_data(to_user+to_user_pos,
+ &to_user_pos, &tmpbuf_pos,
+ network, net_ip, (a << 8) | (b << 16)))
+ return -1;
}
}
}
/* Flush remaining data to userspace */
if (tmpbuf_pos)
- if (copy_to_user(to_user, ipt_acc_tmpbuf, tmpbuf_pos))
+ if (copy_to_user(to_user+to_user_pos, ipt_acc_tmpbuf, tmpbuf_pos))
return -1;
return 0;
ret = 0;
break;
case IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE: {
+ u_int32_t i;
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",
}
/* Find out how many handles are in use */
- u_int32_t i;
handle.itemcount = 0;
spin_lock_bh(&ipt_acc_userspace_lock);
for (i = 0; i < ACCOUNT_MAX_HANDLES; i++)
break;
}
case IPT_SO_GET_ACCOUNT_GET_TABLE_NAMES: {
+ u_int32_t size = 0, i;
+ char *tnames;
+
spin_lock_bh(&ipt_acc_lock);
/* Determine size of table names */
- u_int32_t size = 0, i;
for (i = 0; i < ACCOUNT_MAX_TABLES; i++) {
if (ipt_acc_tables[i].name[0] != 0)
size += strlen (ipt_acc_tables[i].name) + 1;
break;
}
/* Copy table names to userspace */
- char *tnames = user;
+ tnames = user;
for (i = 0; i < ACCOUNT_MAX_TABLES; i++) {
if (ipt_acc_tables[i].name[0] != 0) {
int len = strlen (ipt_acc_tables[i].name) + 1;
git://developer.intra2net.com / ipt_ACCOUNT / blobdiff