From ff587205009a0d49e2d086765de87dc619b028bb Mon Sep 17 00:00:00 2001 From: Bart De Schuymer Date: Tue, 8 Feb 2005 20:02:28 +0000 Subject: general cleanup + add -C and -c --- extensions/ebt_mark.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) (limited to 'extensions/ebt_mark.c') diff --git a/extensions/ebt_mark.c b/extensions/ebt_mark.c index 11bcc12..c7c79aa 100644 --- a/extensions/ebt_mark.c +++ b/extensions/ebt_mark.c @@ -1,3 +1,11 @@ +/* ebt_mark + * + * Authors: + * Bart De Schuymer + * + * July, 2002 + */ + #include #include #include @@ -49,15 +57,15 @@ static int parse(int c, char **argv, int argc, switch (c) { case MARK_TARGET: - ebt_check_option(flags, OPT_MARK_TARGET); + ebt_check_option2(flags, OPT_MARK_TARGET); if (FILL_TARGET(optarg, markinfo->target)) - ebt_print_error("Illegal --mark-target target"); + ebt_print_error2("Illegal --mark-target target"); break; case MARK_SETMARK: - ebt_check_option(flags, OPT_MARK_SETMARK); + ebt_check_option2(flags, OPT_MARK_SETMARK); markinfo->mark = strtoul(optarg, &end, 0); if (*end != '\0' || end == optarg) - ebt_print_error("Bad MARK value '%s'", optarg); + ebt_print_error2("Bad MARK value '%s'", optarg); mark_supplied = 1; break; default: @@ -73,11 +81,10 @@ static void final_check(const struct ebt_u_entry *entry, struct ebt_mark_t_info *markinfo = (struct ebt_mark_t_info *)target->data; - if (time == 0 && mark_supplied == 0) + if (time == 0 && mark_supplied == 0) { ebt_print_error("No mark value supplied"); - if (BASE_CHAIN && markinfo->target == EBT_RETURN) - ebt_print_error("--mark-target RETURN not allowed on base " - "chain"); + } else if (BASE_CHAIN && markinfo->target == EBT_RETURN) + ebt_print_error("--mark-target RETURN not allowed on base chain"); } static void print(const struct ebt_u_entry *entry, -- cgit v1.2.3