/* Free for 16 bit network */
if (depth == 1) {
struct ipt_acc_mask_16 *mask_16 = (struct ipt_acc_mask_16 *)data;
- u_int32_t b;
+ unsigned int b;
for (b=0; b <= 255; b++) {
- if (mask_16->mask_24[b] != 0) {
+ if (mask_16->mask_24[b]) {
free_page((unsigned long)mask_16->mask_24[b]);
}
}
/* Free for 24 bit network */
if (depth == 2) {
- u_int32_t a, b;
+ unsigned int a, b;
for (a=0; a <= 255; 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]) {
free_page((unsigned long)mask_16->mask_24[b]);
Return internal ID or -1 on error */
static int ipt_acc_table_insert(char *name, u_int32_t ip, u_int32_t netmask)
{
- u_int32_t i;
+ unsigned int i;
DEBUGP("ACCOUNT: ipt_acc_table_insert: %s, %u.%u.%u.%u/%u.%u.%u.%u\n",
name, NIPQUAD(ip), NIPQUAD(netmask));
for (i = 0; i < ACCOUNT_MAX_TABLES; i++) {
/* Found free slot */
if (ipt_acc_tables[i].name[0] == 0) {
- u_int32_t calc_mask, netsize=0;
+ unsigned int netsize=0;
+ u_int32_t calc_mask;
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;
+ unsigned int i;
struct ipt_acc_info *info = targinfo;
if (targinfosize != IPT_ALIGN(sizeof(struct ipt_acc_info))) {
}
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;
*/
static int ipt_acc_handle_find_slot(void)
{
- u_int32_t i;
+ unsigned int i;
/* Insert new table */
for (i = 0; i < ACCOUNT_MAX_HANDLES; i++) {
/* Found free slot */
return -1;
}
-static int ipt_acc_handle_free(u_int32_t handle)
+static int ipt_acc_handle_free(unsigned int handle)
{
if (handle >= ACCOUNT_MAX_HANDLES) {
printk("ACCOUNT: Invalid handle for ipt_acc_handle_free() specified:"
(struct ipt_acc_mask_16 *)ipt_acc_tables[table_nr].data;
struct ipt_acc_mask_16 *network_16 =
(struct ipt_acc_mask_16 *)dest->data;
- u_int32_t b;
+ unsigned int b;
for (b = 0; b <= 255; b++) {
if (src_16->mask_24[b]) {
struct ipt_acc_mask_8 *network_8 =
(struct ipt_acc_mask_8 *)dest->data;
struct ipt_acc_mask_16 *src_16, *network_16;
- u_int32_t a, b;
+ unsigned int a, b;
for (a = 0; a <= 255; a++) {
if (src_8->mask_16[a]) {
/* Copy 8 bit network data into a prepared buffer.
We only copy entries != 0 to increase performance.
*/
-static int ipt_acc_handle_copy_data(void *to_user, u_int32_t *to_user_pos,
- u_int32_t *tmpbuf_pos,
+static int ipt_acc_handle_copy_data(void *to_user, unsigned long *to_user_pos,
+ unsigned long *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;
+ size_t handle_ip_size = sizeof (struct ipt_acc_handle_ip);
+ unsigned int i;
for (i = 0; i <= 255; i++) {
if (data->ip[i].src_packets || data->ip[i].dst_packets) {
*/
static int ipt_acc_handle_get_data(u_int32_t handle, void *to_user)
{
- u_int32_t to_user_pos=0, tmpbuf_pos=0, net_ip;
+ unsigned long to_user_pos=0, tmpbuf_pos=0;
+ u_int32_t net_ip;
unsigned char depth;
if (handle >= ACCOUNT_MAX_HANDLES) {
if (depth == 1) {
struct ipt_acc_mask_16 *network_16 =
(struct ipt_acc_mask_16*)ipt_acc_handles[handle].data;
- u_int32_t b;
+ unsigned int b;
for (b = 0; b <= 255; b++) {
if (network_16->mask_24[b]) {
struct ipt_acc_mask_24 *network =
if (depth == 2) {
struct ipt_acc_mask_8 *network_8 =
(struct ipt_acc_mask_8*)ipt_acc_handles[handle].data;
- u_int32_t a, b;
+ unsigned int a, b;
for (a = 0; a <= 255; a++) {
if (network_8->mask_16[a]) {
struct ipt_acc_mask_16 *network_16 =
}
static int ipt_acc_set_ctl(struct sock *sk, int cmd,
- void *user, u_int32_t len)
+ void *user, unsigned int len)
{
struct ipt_acc_handle_sockopt handle;
int ret = -EINVAL;
switch (cmd) {
case IPT_SO_SET_ACCOUNT_HANDLE_FREE:
if (len != sizeof(struct ipt_acc_handle_sockopt)) {
- printk("ACCOUNT: ipt_acc_set_ctl: wrong data size (%u != %u) "
+ printk("ACCOUNT: ipt_acc_set_ctl: wrong data size (%u != %lu) "
"for IPT_SO_SET_HANDLE_FREE\n",
len, sizeof(struct ipt_acc_handle_sockopt));
break;
up(&ipt_acc_userspace_mutex);
break;
case IPT_SO_SET_ACCOUNT_HANDLE_FREE_ALL: {
- u_int32_t i;
+ unsigned int i;
down(&ipt_acc_userspace_mutex);
for (i = 0; i < ACCOUNT_MAX_HANDLES; i++)
ipt_acc_handle_free(i);
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) "
+ printk("ACCOUNT: ipt_acc_get_ctl: wrong data size (%u != %lu) "
"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;
}
case IPT_SO_GET_ACCOUNT_GET_DATA:
if (*len < sizeof(struct ipt_acc_handle_sockopt)) {
- printk("ACCOUNT: ipt_acc_get_ctl: wrong data size (%u != %u)"
+ printk("ACCOUNT: ipt_acc_get_ctl: wrong data size (%u != %lu)"
" for IPT_SO_GET_ACCOUNT_PREPARE_READ/READ_FLUSH\n",
*len, sizeof(struct ipt_acc_handle_sockopt));
break;
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)"
+ printk("ACCOUNT: ipt_acc_get_ctl: not enough space (%u < %lu)"
" to store data from IPT_SO_GET_ACCOUNT_GET_DATA\n",
*len, ipt_acc_handles[handle.handle_nr].itemcount
* sizeof(struct ipt_acc_handle_ip));
ret = 0;
break;
case IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE: {
- u_int32_t i;
+ unsigned int i;
if (*len < sizeof(struct ipt_acc_handle_sockopt)) {
- printk("ACCOUNT: ipt_acc_get_ctl: wrong data size (%u != %u)"
+ printk("ACCOUNT: ipt_acc_get_ctl: wrong data size (%u != %lu)"
" for IPT_SO_GET_ACCOUNT_GET_HANDLE_USAGE\n",
*len, sizeof(struct ipt_acc_handle_sockopt));
break;
}
}
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;
}
git://developer.intra2net.com / ipt_ACCOUNT / blobdiff