From 449cdd6bcc8d1867bbd26ecbcae9832ab01eb04a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 12 May 2011 12:21:59 +0200 Subject: src: combine default_command functions --- ip6tables.c | 69 +------------------------------------------------------------ 1 file changed, 1 insertion(+), 68 deletions(-) (limited to 'ip6tables.c') diff --git a/ip6tables.c b/ip6tables.c index 58c7e2df..a74238cc 100644 --- a/ip6tables.c +++ b/ip6tables.c @@ -1272,73 +1272,6 @@ static void clear_rule_matches(struct xtables_rule_match **matches) *matches = NULL; } -static void command_default(struct iptables_command_state *cs) -{ - struct xtables_rule_match *matchp; - struct xtables_match *m; - - if (cs->target != NULL && - (cs->target->parse != NULL || cs->target->x6_parse != NULL) && - cs->c >= cs->target->option_offset && - cs->c < cs->target->option_offset + XT_OPTION_OFFSET_SCALE) { - xtables_option_tpcall(cs->c, cs->argv, cs->invert, - cs->target, &cs->fw); - return; - } - - for (matchp = cs->matches; matchp; matchp = matchp->next) { - m = matchp->match; - - if (matchp->completed || - (m->x6_parse == NULL && m->parse == NULL)) - continue; - if (cs->c < matchp->match->option_offset || - cs->c >= matchp->match->option_offset + XT_OPTION_OFFSET_SCALE) - continue; - xtables_option_mpcall(cs->c, cs->argv, cs->invert, m, &cs->fw); - return; - } - - /* Try loading protocol */ - m = load_proto(cs); - if (m != NULL) { - size_t size; - - cs->proto_used = 1; - - size = XT_ALIGN(sizeof(struct ip6t_entry_match)) + m->size; - - m->m = xtables_calloc(1, size); - m->m->u.match_size = size; - strcpy(m->m->u.user.name, m->name); - m->m->u.user.revision = m->revision; - if (m->init != NULL) - m->init(m->m); - - if (m->x6_options != NULL) - opts = xtables_options_xfrm(ip6tables_globals.orig_opts, - opts, m->x6_options, - &m->option_offset); - else - opts = xtables_merge_options(ip6tables_globals.orig_opts, - opts, - m->extra_opts, - &m->option_offset); - if (opts == NULL) - xtables_error(OTHER_PROBLEM, "can't alloc memory!"); - optind--; - return; - } - - if (cs->c == ':') - xtables_error(PARAMETER_PROBLEM, "option \"%s\" " - "requires an argument", cs->argv[optind-1]); - if (cs->c == '?') - xtables_error(PARAMETER_PROBLEM, "unknown option " - "\"%s\"", cs->argv[optind-1]); - xtables_error(PARAMETER_PROBLEM, "Unknown arg \"%s\"", optarg); -} - static void command_jump(struct iptables_command_state *cs) { size_t size; @@ -1785,7 +1718,7 @@ int do_command6(int argc, char *argv[], char **table, struct ip6tc_handle **hand exit_tryhelp(2); default: - command_default(&cs); + command_default(&cs, &ip6tables_globals); break; } cs.invert = FALSE; -- cgit v1.2.3