X-Git-Url: http://developer.intra2net.com/git/?p=ipt_ACCOUNT;a=blobdiff_plain;f=linux%2Finclude%2Flinux%2Fnetfilter_ipv4%2Fipt_ACCOUNT.h;h=af420d862d7d9f5bca44f68d7a8b308318d51892;hp=d2edac019d6960ed46d8bf565a1c4f4bdf7c946b;hb=ac83062b3338533e35d5fab7f8132d1646bcb9c0;hpb=013fcc809c120b223ce5679f4f3f815104f2e23c

diff --git a/linux/include/linux/netfilter_ipv4/ipt_ACCOUNT.h b/linux/include/linux/netfilter_ipv4/ipt_ACCOUNT.h
index d2edac0..af420d8 100644
--- a/linux/include/linux/netfilter_ipv4/ipt_ACCOUNT.h
+++ b/linux/include/linux/netfilter_ipv4/ipt_ACCOUNT.h
@@ -11,12 +11,12 @@
 #ifndef _IPT_ACCOUNT_H
 #define _IPT_ACCOUNT_H
 
-#define ACCOUNT_MAX_TABLES 32
+#define ACCOUNT_MAX_TABLES 128
 #define ACCOUNT_TABLE_NAME_LEN 32
 #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,59 +24,59 @@ struct ipt_account_info {
 };
 
 /* Internal table structure, generated by check_entry() */
-struct ipt_account_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 */
-    unsigned char depth;                      /* size of network: 
+struct ipt_acc_table {
+    char name[ACCOUNT_TABLE_NAME_LEN];     /* name of the table */
+    u_int32_t ip;                          /* base IP of network */
+    u_int32_t netmask;                     /* netmask of the network */
+    unsigned char depth;                   /* size of network: 
                                                  0: 8 bit, 1: 16bit, 2: 24 bit */
-    unsigned int refcount;                    /* refcount of this table. 
+    u_int32_t refcount;                    /* refcount of this table. 
                                                  if zero, destroy it */
-    unsigned int itemcount;                   /* number of IPs in this table */
-    void *data;                               /* pointer to the actual data, 
+    u_int32_t itemcount;                   /* number of IPs in this table */
+    void *data;                            /* pointer to the actual data, 
                                                  depending on netmask */
 };
 
 /* Internal handle structure */
-struct ipt_account_handle {
-    unsigned int ip;                          /* base IP of network. Used for 
+struct ipt_acc_handle {
+    u_int32_t ip;                          /* base IP of network. Used for 
                                                  caculating the final IP during
                                                  get_data() */
-    unsigned char depth;                      /* size of network. See above for 
+    unsigned char depth;                   /* size of network. See above for 
                                                  details */
-    unsigned int itemcount;                   /* number of IPs in this table */
-    void *data;                               /* pointer to the actual data, 
+    u_int32_t itemcount;                   /* number of IPs in this table */
+    void *data;                            /* pointer to the actual data, 
                                                  depending on size */
 };
 
 /* Handle structure for communication with the userspace library */
-struct ipt_account_handle_sockopt {
-    unsigned int handle_nr;                   /* Used for HANDLE_FREE */
-    char name[ACCOUNT_TABLE_NAME_LEN];        /* Used for HANDLE_PREPARE_READ/
+struct ipt_acc_handle_sockopt {
+    u_int32_t handle_nr;                   /* Used for HANDLE_FREE */
+    char name[ACCOUNT_TABLE_NAME_LEN];     /* Used for HANDLE_PREPARE_READ/
                                                  HANDLE_READ_FLUSH */
-    unsigned int itemcount;                   /* Used for HANDLE_PREPARE_READ/
+    u_int32_t itemcount;                   /* Used for HANDLE_PREPARE_READ/
                                                  HANDLE_READ_FLUSH */
 };
 
 /* 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 {
-    unsigned int src_packets;
-    unsigned int src_bytes;
-    unsigned int dst_packets;
-    unsigned int dst_bytes;
+struct ipt_acc_ip {
+    u_int32_t src_packets;
+    u_int32_t src_bytes;
+    u_int32_t dst_packets;
+    u_int32_t dst_bytes;
 };
 
 /*
     Used for every IP when returning data
 */
-struct ipt_account_handle_ip {
-    unsigned int ip;
-    unsigned int src_packets;
-    unsigned int src_bytes;
-    unsigned int dst_packets;
-    unsigned int dst_bytes;
+struct ipt_acc_handle_ip {
+    u_int32_t ip;
+    u_int32_t src_packets;
+    u_int32_t src_bytes;
+    u_int32_t dst_packets;
+    u_int32_t dst_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*/