X-Git-Url: http://developer.intra2net.com/git/?p=ipt_ACCOUNT;a=blobdiff_plain;f=linux-2.6%2Fnet%2Fipv4%2Fnetfilter%2Fipt_ACCOUNT.c;h=3cd8a61e2c9fe7ac2535d18a27be6bf61bde6621;hp=8482f5a9516b77c0d5bed7b41a15d2320a8f240f;hb=146aa6772bdd87b14a91ac0a50df80a79a0ab7f8;hpb=cb2f56dc58a271ecb0fccd6d474cf46b59d2f999 diff --git a/linux-2.6/net/ipv4/netfilter/ipt_ACCOUNT.c b/linux-2.6/net/ipv4/netfilter/ipt_ACCOUNT.c index 8482f5a..3cd8a61 100644 --- a/linux-2.6/net/ipv4/netfilter/ipt_ACCOUNT.c +++ b/linux-2.6/net/ipv4/netfilter/ipt_ACCOUNT.c @@ -65,9 +65,9 @@ static void ipt_acc_data_free(void *data, unsigned char depth) /* 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]); } } @@ -77,7 +77,7 @@ static void ipt_acc_data_free(void *data, unsigned char depth) /* 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*) @@ -104,7 +104,7 @@ static void ipt_acc_data_free(void *data, unsigned char depth) 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)); @@ -137,7 +137,8 @@ static int ipt_acc_table_insert(char *name, u_int32_t ip, u_int32_t 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); @@ -187,15 +188,31 @@ static int ipt_acc_table_insert(char *name, u_int32_t ip, u_int32_t netmask) } static int ipt_acc_checkentry(const char *tablename, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16) const void *e, +#else + const struct ipt_entry *e, +#endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) const struct xt_target *target, +#endif void *targinfo, +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19) unsigned int targinfosize, +#endif unsigned int hook_mask) { struct ipt_acc_info *info = targinfo; int table_nr; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17) + 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; + } +#endif + spin_lock_bh(&ipt_acc_lock); table_nr = ipt_acc_table_insert(info->table_name, info->net_ip, info->net_mask); @@ -212,15 +229,26 @@ static int ipt_acc_checkentry(const char *tablename, return 1; } -static void ipt_acc_destroy(const struct xt_target *target, void *targinfo, unsigned int targinfosize) +static void ipt_acc_destroy( +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) + const struct xt_target *target, +#endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) + void *targinfo) +#else + void *targinfo, + unsigned int targinfosize) +#endif { - u_int32_t i; + unsigned int i; struct ipt_acc_info *info = targinfo; +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17) if (targinfosize != IPT_ALIGN(sizeof(struct ipt_acc_info))) { DEBUGP("ACCOUNT: targinfosize %u != %u\n", targinfosize, IPT_ALIGN(sizeof(struct ipt_acc_info))); } +#endif spin_lock_bh(&ipt_acc_lock); @@ -412,9 +440,15 @@ static unsigned int ipt_acc_target(struct sk_buff **pskb, const struct net_device *in, const struct net_device *out, unsigned int hooknum, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) const struct xt_target *target, +#endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,19) + const void *targinfo) +#else const void *targinfo, void *userinfo) +#endif { const struct ipt_acc_info *info = (const struct ipt_acc_info *)targinfo; @@ -493,7 +527,7 @@ static unsigned int ipt_acc_target(struct sk_buff **pskb, */ 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 */ @@ -511,7 +545,7 @@ static int ipt_acc_handle_find_slot(void) 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:" @@ -567,7 +601,7 @@ static int ipt_acc_handle_prepare_read(char *tablename, (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]) { @@ -589,7 +623,7 @@ static int ipt_acc_handle_prepare_read(char *tablename, 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]) { @@ -672,14 +706,14 @@ static int ipt_acc_handle_prepare_read_flush(char *tablename, /* 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) { @@ -712,7 +746,8 @@ static int ipt_acc_handle_copy_data(void *to_user, u_int32_t *to_user_pos, */ 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) { @@ -749,7 +784,7 @@ static int ipt_acc_handle_get_data(u_int32_t handle, void *to_user) 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 = @@ -772,7 +807,7 @@ static int ipt_acc_handle_get_data(u_int32_t handle, void *to_user) 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 = @@ -802,7 +837,7 @@ static int ipt_acc_handle_get_data(u_int32_t handle, void *to_user) } 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; @@ -813,7 +848,7 @@ static int ipt_acc_set_ctl(struct sock *sk, int cmd, 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; @@ -830,7 +865,7 @@ static int ipt_acc_set_ctl(struct sock *sk, int cmd, 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); @@ -859,7 +894,7 @@ static int ipt_acc_get_ctl(struct sock *sk, int cmd, void *user, int *len) 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; @@ -904,7 +939,7 @@ static int ipt_acc_get_ctl(struct sock *sk, int cmd, void *user, int *len) } 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; @@ -923,7 +958,7 @@ static int ipt_acc_get_ctl(struct sock *sk, int cmd, void *user, int *len) 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)); @@ -943,9 +978,9 @@ static int ipt_acc_get_ctl(struct sock *sk, int cmd, void *user, int *len) 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; @@ -1018,7 +1053,9 @@ static int ipt_acc_get_ctl(struct sock *sk, int cmd, void *user, int *len) static struct ipt_target ipt_acc_reg = { .name = "ACCOUNT", .target = ipt_acc_target, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17) .targetsize = sizeof(struct ipt_acc_info), +#endif .checkentry = ipt_acc_checkentry, .destroy = ipt_acc_destroy, .me = THIS_MODULE