SOURCES: iptables-account.patch - updated for iptables 1.4.0

[zbyniu]

Author: zbyniu                       Date: Sat Feb  2 17:34:21 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for iptables 1.4.0

---- Files affected:
SOURCES:
   iptables-account.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/iptables-account.patch
diff -u SOURCES/iptables-account.patch:1.1 SOURCES/iptables-account.patch:1.2
--- SOURCES/iptables-account.patch:1.1	Sun Sep  9 02:27:46 2007
+++ SOURCES/iptables-account.patch	Sat Feb  2 18:34:15 2008
@@ -1,6 +1,6 @@
 --- /dev/null	2005-12-16 15:49:47.000000000 +0100
 +++ iptables-1.3.8/extensions/libipt_account.c	2007-07-21 19:13:28.000000000 +0200
-@@ -0,0 +1,278 @@
+@@ -0,0 +1,275 @@
 +/* Copyright (c) 2004-2007 Piotr 'QuakeR' Gasidlo <quaker at barbara.eu.org>
 + *
 + * This program is free software; you can redistribute it and/or modify
@@ -165,8 +165,7 @@
 +
 +
 +/* Function initializes match */
-+static void init(struct ipt_entry_match *match, 
-+     unsigned int *nfcache) {
++static void init(struct xt_entry_match *match) {
 +  
 +  struct t_ipt_account_info *info = (struct t_ipt_account_info *)(match)->data;
 +
@@ -182,9 +181,8 @@
 +static int parse(int c, char **argv, 
 +      int invert, 
 +      unsigned int *flags,
-+                  const struct ipt_entry *entry,
-+                  unsigned int *nfcache,
-+                  struct ipt_entry_match **match) {
++                  const void *entry,
++                  struct xt_entry_match **match) {
 +  
 +  struct t_ipt_account_info *info = (struct t_ipt_account_info *)(*match)->data;
 +
@@ -223,8 +221,8 @@
 +}
 +
 +/* Function used for printing rule with account match for iptables -L */
-+static void print(const struct ipt_ip *ip,
-+                  const struct ipt_entry_match *match, 
++static void print(const void *ip,
++                  const struct xt_entry_match *match, 
 +      int numeric) {
 +  
 +  struct t_ipt_account_info *info = (struct t_ipt_account_info *)match->data;
@@ -242,8 +240,8 @@
 +}
 +
 +/* Function used for saving rule containing account match */
-+static void save(const struct ipt_ip *ip, 
-+     const struct ipt_entry_match *match) {
++static void save(const void *ip, 
++     const struct xt_entry_match *match) {
 +
 +  struct t_ipt_account_info *info = (struct t_ipt_account_info *)match->data;
 +  
@@ -278,7 +276,6 @@
 +{
 +  register_match(&account);
 +}
-+  
 --- /dev/null	2005-12-16 15:49:47.000000000 +0100
 +++ iptables-1.3.8/extensions/.account-test	2007-09-09 02:11:13.530174250 +0200
 @@ -0,0 +1,2 @@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/iptables-account.patch?r1=1.1&r2=1.2&f=u