From 0a0a8dbc129729e0028b64b2e9cc8f099f13c4dd Mon Sep 17 00:00:00 2001 From: "/C=EU/ST=EU/CN=Patrick McHardy/emailAddress=kaber@trash.net" Date: Thu, 4 Oct 2007 16:27:07 +0000 Subject: [PATCH 07/13] Unique symbols 1/6 Give symbols of libxt matches unique names (1/3). Adds unique prefixes to all functions (most of them - especially the hook functions) so that debugging programs can unambiguously map a symbol to an address. Also unifies the names of the xtables_match/xtables_target structs, (based upon libxt_connmark.c/libip6t_*.c). Signed-off-by: Jan Engelhardt --- extensions/libxt_mark.c | 51 ++++++++++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 28 deletions(-) (limited to 'extensions/libxt_mark.c') diff --git a/extensions/libxt_mark.c b/extensions/libxt_mark.c index 8456621..b7f007b 100644 --- a/extensions/libxt_mark.c +++ b/extensions/libxt_mark.c @@ -10,8 +10,7 @@ #include "../include/linux/netfilter/xt_mark.h" /* Function which prints out usage message. */ -static void -help(void) +static void mark_help(void) { printf( "MARK match v%s options:\n" @@ -20,7 +19,7 @@ help(void) IPTABLES_VERSION); } -static const struct option opts[] = { +static const struct option mark_opts[] = { { "mark", 1, NULL, '1' }, { } }; @@ -28,9 +27,8 @@ static const struct option opts[] = { /* Function which parses command options; returns true if it ate an option */ static int -parse(int c, char **argv, int invert, unsigned int *flags, - const void *entry, - struct xt_entry_match **match) +mark_parse(int c, char **argv, int invert, unsigned int *flags, + const void *entry, struct xt_entry_match **match) { struct xt_mark_info *markinfo = (struct xt_mark_info *)(*match)->data; @@ -66,8 +64,7 @@ print_mark(unsigned long mark, unsigned long mask, int numeric) } /* Final check; must have specified --mark. */ -static void -final_check(unsigned int flags) +static void mark_check(unsigned int flags) { if (!flags) exit_error(PARAMETER_PROBLEM, @@ -76,9 +73,7 @@ final_check(unsigned int flags) /* Prints out the matchinfo. */ static void -print(const void *ip, - const struct xt_entry_match *match, - int numeric) +mark_print(const void *ip, const struct xt_entry_match *match, int numeric) { struct xt_mark_info *info = (struct xt_mark_info *)match->data; @@ -92,7 +87,7 @@ print(const void *ip, /* Saves the union ipt_matchinfo in parsable form to stdout. */ static void -save(const void *ip, const struct xt_entry_match *match) +mark_save(const void *ip, const struct xt_entry_match *match) { struct xt_mark_info *info = (struct xt_mark_info *)match->data; @@ -103,36 +98,36 @@ save(const void *ip, const struct xt_entry_match *match) print_mark(info->mark, info->mask, 0); } -static struct xtables_match mark = { +static struct xtables_match mark_match = { .family = AF_INET, .name = "mark", .version = IPTABLES_VERSION, .size = XT_ALIGN(sizeof(struct xt_mark_info)), .userspacesize = XT_ALIGN(sizeof(struct xt_mark_info)), - .help = &help, - .parse = &parse, - .final_check = &final_check, - .print = &print, - .save = &save, - .extra_opts = opts + .help = mark_help, + .parse = mark_parse, + .final_check = mark_check, + .print = mark_print, + .save = mark_save, + .extra_opts = mark_opts, }; -static struct xtables_match mark6 = { +static struct xtables_match mark_match6 = { .family = AF_INET6, .name = "mark", .version = IPTABLES_VERSION, .size = XT_ALIGN(sizeof(struct xt_mark_info)), .userspacesize = XT_ALIGN(sizeof(struct xt_mark_info)), - .help = &help, - .parse = &parse, - .final_check = &final_check, - .print = &print, - .save = &save, - .extra_opts = opts + .help = mark_help, + .parse = mark_parse, + .final_check = mark_check, + .print = mark_print, + .save = mark_save, + .extra_opts = mark_opts, }; void _init(void) { - xtables_register_match(&mark); - xtables_register_match(&mark6); + xtables_register_match(&mark_match); + xtables_register_match(&mark_match6); } -- cgit v1.2.3