iptables: (tomj) implemented code for userspace communication

[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 9c36238..3d59241 100644 (file)
--- a/linux/include/linux/netfilter_ipv4/ipt_ACCOUNT.h
+++ b/linux/include/linux/netfilter_ipv4/ipt_ACCOUNT.h
@@ -17,20 +17,29 @@ struct ipt_account_info {
 struct ipt_account_table
 {
     char name[ACCOUNT_TABLE_NAME_LEN];        /* name of the table */
-    unsigned int ip;                          /* base IP of network (-a option) */
-    unsigned char netmask;                    /* netmask of the network (-a option) */
+    unsigned int ip;                          /* base IP of network */
+    unsigned int 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. if zero, destroy it */
     unsigned int itemcount;                   /* number of IPs in this table */
     void *data;                               /* pointer to the actual data, depending on netmask */
 };
 
-/* Handle structure for communication with the userspace library */
+/* Internal handle structure */
 struct ipt_account_handle
 {
-    unsigned int ip;                          /* base IP of network */
-    unsigned char netmask;                    /* netmask of the network */
+    unsigned int ip;                          /* base IP of network. Used for caculating the final IP during get_data() */
+    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, depending on netmask */
+    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/READ_FLUSH */
+    unsigned int itemcount;                   /* Used for HANDLE_PREPARE_READ/READ_FLUSH */
 };
 
 /* Used for every IP entry */
@@ -66,7 +75,7 @@ struct ipt_account_mask_24
     struct ipt_account_ip ip[256];    
 };
 
-struct iptt_account_mask_16
+struct ipt_account_mask_16
 {
     struct ipt_account_mask_24 *mask_24[256];
 };