From 8b7c64d6ba156a99008fcd810cba874c73294333 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 15 Apr 2008 11:48:25 +0200 Subject: Remove old functions, constants --- ip6tables.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) (limited to 'ip6tables.c') diff --git a/ip6tables.c b/ip6tables.c index 908700e2..8bcce0e0 100644 --- a/ip6tables.c +++ b/ip6tables.c @@ -273,7 +273,7 @@ static void exit_printhelp(struct ip6tables_rule_match *matches) { struct ip6tables_rule_match *matchp = NULL; - struct ip6tables_target *t = NULL; + struct xtables_target *t = NULL; printf("%s v%s\n\n" "Usage: %s -[AD] chain rule-specification [options]\n" @@ -467,7 +467,7 @@ check_inverse(const char option[], int *invert, int *my_optind, int argc) */ /* Christophe Burki wants `-p 6' to imply `-m tcp'. */ -static struct ip6tables_match * +static struct xtables_match * find_proto(const char *pname, enum ip6t_tryload tryload, int nolookup, struct ip6tables_rule_match **matches) { unsigned int proto; @@ -612,18 +612,6 @@ merge_options(struct option *oldopts, const struct option *newopts, return merge; } -void register_match6(struct ip6tables_match *me) -{ - me->family = AF_INET6; - xtables_register_match(me); -} - -void register_target6(struct ip6tables_target *me) -{ - me->family = AF_INET6; - xtables_register_target(me); -} - static void print_num(u_int64_t number, unsigned int format) { @@ -705,7 +693,7 @@ print_match(const struct ip6t_entry_match *m, const struct ip6t_ip6 *ip, int numeric) { - struct ip6tables_match *match = find_match(m->u.user.name, TRY_LOAD, NULL); + struct xtables_match *match = find_match(m->u.user.name, TRY_LOAD, NULL); if (match) { if (match->print) @@ -728,7 +716,7 @@ print_firewall(const struct ip6t_entry *fw, unsigned int format, const ip6tc_handle_t handle) { - struct ip6tables_target *target = NULL; + struct xtables_target *target = NULL; const struct ip6t_entry_target *t; u_int8_t flags; char buf[BUFSIZ]; @@ -1182,11 +1170,11 @@ int do_command6(int argc, char *argv[], char **table, ip6tc_handle_t *handle) unsigned int rulenum = 0, options = 0, command = 0; const char *pcnt = NULL, *bcnt = NULL; int ret = 1; - struct ip6tables_match *m; + struct xtables_match *m; struct ip6tables_rule_match *matches = NULL; struct ip6tables_rule_match *matchp; - struct ip6tables_target *target = NULL; - struct ip6tables_target *t; + struct xtables_target *target = NULL; + struct xtables_target *t; const char *jumpto = ""; char *protocol = NULL; int proto_used = 0; -- cgit v1.2.3