ipt_ACCOUNT: (tomj) done Patrick McHardy fixes (except "won't compile on older gccs"?)

[ipt_ACCOUNT] / linux / include / linux / netfilter_ipv4 / ipt_ACCOUNT.h

diff --git a/linux/include/linux/netfilter_ipv4/ipt_ACCOUNT.h b/linux/include/linux/netfilter_ipv4/ipt_ACCOUNT.h
index 7d4e555..8657795 100644 (file)
--- a/linux/include/linux/netfilter_ipv4/ipt_ACCOUNT.h
+++ b/linux/include/linux/netfilter_ipv4/ipt_ACCOUNT.h
@@ -25,36 +25,36 @@ struct ipt_acc_info {
 
 /* Internal table structure, generated by check_entry() */
 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 */
-    unsigned char depth;                      /* size of network: 
+    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_acc_handle {
-    unsigned int ip;                          /* base IP of network. Used for 
+    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_acc_handle_sockopt {
-    unsigned int handle_nr;                   /* Used for HANDLE_FREE */
-    char name[ACCOUNT_TABLE_NAME_LEN];        /* Used for HANDLE_PREPARE_READ/
+    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 */
 };
 
@@ -62,21 +62,21 @@ struct ipt_acc_handle_sockopt {
    Size is 16 bytes so that 256 (class C network) * 16 
    fits in one kernel (zero) page */
 struct ipt_acc_ip {
-    unsigned int src_packets;
-    unsigned int src_bytes;
-    unsigned int dst_packets;
-    unsigned int dst_bytes;
+    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_acc_handle_ip {
-    unsigned int ip;
-    unsigned int src_packets;
-    unsigned int src_bytes;
-    unsigned int dst_packets;
-    unsigned int dst_bytes;
+    u_int32_t ip;
+    u_int32_t src_packets;
+    u_int32_t src_bytes;
+    u_int32_t dst_packets;
+    u_int32_t dst_bytes;
 };
 
 /*