diff options
author | Patrick McHardy <kaber@trash.net> | 2009-02-12 07:09:55 +0100 |
---|---|---|
committer | Patrick McHardy <kaber@trash.net> | 2009-02-12 07:09:55 +0100 |
commit | 6f3c30059d9cf73c438db08998c58cd1b502eb44 (patch) | |
tree | d81ab345883d439f4519031728f59e79b0178d59 /iptables.c | |
parent | 8b7baebc93989106fd5d26b262d0ce191f8ef7c0 (diff) | |
parent | 47a6fd9ec9891a8040eb8fd6db3c5012c1056061 (diff) |
Merge branch 'master' of git://dev.medozas.de/iptables
Diffstat (limited to 'iptables.c')
-rw-r--r-- | iptables.c | 24 |
1 files changed, 12 insertions, 12 deletions
@@ -260,9 +260,9 @@ exit_tryhelp(int status) } static void -exit_printhelp(struct iptables_rule_match *matches) +exit_printhelp(struct xtables_rule_match *matches) { - struct iptables_rule_match *matchp = NULL; + struct xtables_rule_match *matchp = NULL; struct xtables_target *t = NULL; printf("%s v%s\n\n" @@ -447,7 +447,7 @@ add_command(unsigned int *cmd, const int newcmd, const int othercmds, /* Christophe Burki wants `-p 6' to imply `-m tcp'. */ static struct xtables_match * find_proto(const char *pname, enum xtables_tryload tryload, - int nolookup, struct iptables_rule_match **matches) + int nolookup, struct xtables_rule_match **matches) { unsigned int proto; @@ -851,11 +851,11 @@ insert_entry(const ipt_chainlabel chain, } static unsigned char * -make_delete_mask(struct ipt_entry *fw, struct iptables_rule_match *matches) +make_delete_mask(struct ipt_entry *fw, struct xtables_rule_match *matches) { /* Establish mask for comparison */ unsigned int size; - struct iptables_rule_match *matchp; + struct xtables_rule_match *matchp; unsigned char *mask, *mptr; size = sizeof(struct ipt_entry); @@ -892,7 +892,7 @@ delete_entry(const ipt_chainlabel chain, const struct in_addr daddrs[], int verbose, struct iptc_handle *handle, - struct iptables_rule_match *matches) + struct xtables_rule_match *matches) { unsigned int i, j; int ret = 1; @@ -1289,11 +1289,11 @@ list_rules(const ipt_chainlabel chain, int rulenum, int counters, static struct ipt_entry * generate_entry(const struct ipt_entry *fw, - struct iptables_rule_match *matches, + struct xtables_rule_match *matches, struct ipt_entry_target *target) { unsigned int size; - struct iptables_rule_match *matchp; + struct xtables_rule_match *matchp; struct ipt_entry *e; size = sizeof(struct ipt_entry); @@ -1315,9 +1315,9 @@ generate_entry(const struct ipt_entry *fw, return e; } -static void clear_rule_matches(struct iptables_rule_match **matches) +static void clear_rule_matches(struct xtables_rule_match **matches) { - struct iptables_rule_match *matchp, *tmp; + struct xtables_rule_match *matchp, *tmp; for (matchp = *matches; matchp;) { tmp = matchp->next; @@ -1374,8 +1374,8 @@ int do_command(int argc, char *argv[], char **table, struct iptc_handle **handle const char *pcnt = NULL, *bcnt = NULL; int ret = 1; struct xtables_match *m; - struct iptables_rule_match *matches = NULL; - struct iptables_rule_match *matchp; + struct xtables_rule_match *matches = NULL; + struct xtables_rule_match *matchp; struct xtables_target *target = NULL; struct xtables_target *t; const char *jumpto = ""; |