From 181dead3f13befe02769ef479bcbb51801b7fc4e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 4 Oct 2007 16:27:07 +0000 Subject: 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_sctp.c | 52 ++++++++++++++++++++++--------------------------- 1 file changed, 23 insertions(+), 29 deletions(-) (limited to 'extensions/libxt_sctp.c') diff --git a/extensions/libxt_sctp.c b/extensions/libxt_sctp.c index 634862b6..68189747 100644 --- a/extensions/libxt_sctp.c +++ b/extensions/libxt_sctp.c @@ -41,8 +41,7 @@ static void print_chunk(u_int32_t chunknum, int numeric); /* Initialize the match. */ -static void -init(struct xt_entry_match *m) +static void sctp_init(struct xt_entry_match *m) { int i; struct xt_sctp_info *einfo = (struct xt_sctp_info *)m->data; @@ -54,7 +53,7 @@ init(struct xt_entry_match *m) } } -static void help(void) +static void sctp_help(void) { printf( "SCTP match v%s options\n" @@ -68,7 +67,7 @@ static void help(void) IPTABLES_VERSION); } -static const struct option opts[] = { +static const struct option sctp_opts[] = { { .name = "source-port", .has_arg = 1, .val = '1' }, { .name = "sport", .has_arg = 1, .val = '1' }, { .name = "destination-port", .has_arg = 1, .val = '2' }, @@ -260,9 +259,8 @@ parse_sctp_chunks(struct xt_sctp_info *einfo, } static int -parse(int c, char **argv, int invert, unsigned int *flags, - const void *entry, - struct xt_entry_match **match) +sctp_parse(int c, char **argv, int invert, unsigned int *flags, + const void *entry, struct xt_entry_match **match) { struct xt_sctp_info *einfo = (struct xt_sctp_info *)(*match)->data; @@ -450,9 +448,7 @@ out: /* Prints out the matchinfo. */ static void -print(const void *ip, - const struct xt_entry_match *match, - int numeric) +sctp_print(const void *ip, const struct xt_entry_match *match, int numeric) { const struct xt_sctp_info *einfo = (const struct xt_sctp_info *)match->data; @@ -483,9 +479,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) +static void sctp_save(const void *ip, const struct xt_entry_match *match) { const struct xt_sctp_info *einfo = (const struct xt_sctp_info *)match->data; @@ -520,37 +514,37 @@ save(const void *ip, } } -static struct xtables_match sctp = { +static struct xtables_match sctp_match = { .name = "sctp", .family = AF_INET, .version = IPTABLES_VERSION, .size = XT_ALIGN(sizeof(struct xt_sctp_info)), .userspacesize = XT_ALIGN(sizeof(struct xt_sctp_info)), - .help = &help, - .init = &init, - .parse = &parse, - .print = &print, - .save = &save, - .extra_opts = opts + .help = sctp_help, + .init = sctp_init, + .parse = sctp_parse, + .print = sctp_print, + .save = sctp_save, + .extra_opts = sctp_opts, }; -static struct xtables_match sctp6 = { +static struct xtables_match sctp_match6 = { .name = "sctp", .family = AF_INET6, .version = IPTABLES_VERSION, .size = XT_ALIGN(sizeof(struct xt_sctp_info)), .userspacesize = XT_ALIGN(sizeof(struct xt_sctp_info)), - .help = &help, - .init = &init, - .parse = &parse, - .print = &print, - .save = &save, - .extra_opts = opts + .help = sctp_help, + .init = sctp_init, + .parse = sctp_parse, + .print = sctp_print, + .save = sctp_save, + .extra_opts = sctp_opts, }; void _init(void) { - xtables_register_match(&sctp); - xtables_register_match(&sctp6); + xtables_register_match(&sctp_match); + xtables_register_match(&sctp_match6); } -- cgit v1.2.3