From b9f8667c366415051abe9f147385bd92562701b5 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:29:00 +0000 Subject: [PATCH 10/13] Unique names 4/6 Give symbols of libxt targets unique names (2/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/libipt_MASQUERADE.c | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) (limited to 'extensions/libipt_MASQUERADE.c') diff --git a/extensions/libipt_MASQUERADE.c b/extensions/libipt_MASQUERADE.c index c502667..5b4787d 100644 --- a/extensions/libipt_MASQUERADE.c +++ b/extensions/libipt_MASQUERADE.c @@ -9,8 +9,7 @@ #include /* Function which prints out usage message. */ -static void -help(void) +static void MASQUERADE_help(void) { printf( "MASQUERADE v%s options:\n" @@ -23,15 +22,14 @@ help(void) IPTABLES_VERSION); } -static const struct option opts[] = { +static const struct option MASQUERADE_opts[] = { { "to-ports", 1, NULL, '1' }, { "random", 0, NULL, '2' }, { } }; /* Initialize the target. */ -static void -init(struct xt_entry_target *t) +static void MASQUERADE_init(struct xt_entry_target *t) { struct ip_nat_multi_range *mr = (struct ip_nat_multi_range *)t->data; @@ -76,10 +74,8 @@ parse_ports(const char *arg, struct ip_nat_multi_range *mr) /* 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 *e, - struct xt_entry_target **target) +static int MASQUERADE_parse(int c, char **argv, int invert, unsigned int *flags, + const void *e, struct xt_entry_target **target) { const struct ipt_entry *entry = e; int portok; @@ -117,9 +113,8 @@ parse(int c, char **argv, int invert, unsigned int *flags, /* Prints out the targinfo. */ static void -print(const void *ip, - const struct xt_entry_target *target, - int numeric) +MASQUERADE_print(const void *ip, const struct xt_entry_target *target, + int numeric) { struct ip_nat_multi_range *mr = (struct ip_nat_multi_range *)target->data; @@ -139,7 +134,7 @@ print(const void *ip, /* Saves the union ipt_targinfo in parsable form to stdout. */ static void -save(const void *ip, const struct xt_entry_target *target) +MASQUERADE_save(const void *ip, const struct xt_entry_target *target) { struct ip_nat_multi_range *mr = (struct ip_nat_multi_range *)target->data; @@ -156,20 +151,20 @@ save(const void *ip, const struct xt_entry_target *target) printf("--random "); } -static struct iptables_target masq = { +static struct iptables_target masquerade_target = { .name = "MASQUERADE", .version = IPTABLES_VERSION, .size = IPT_ALIGN(sizeof(struct ip_nat_multi_range)), .userspacesize = IPT_ALIGN(sizeof(struct ip_nat_multi_range)), - .help = &help, - .init = &init, - .parse = &parse, - .print = &print, - .save = &save, - .extra_opts = opts + .help = MASQUERADE_help, + .init = MASQUERADE_init, + .parse = MASQUERADE_parse, + .print = MASQUERADE_print, + .save = MASQUERADE_save, + .extra_opts = MASQUERADE_opts, }; void _init(void) { - register_target(&masq); + register_target(&masquerade_target); } -- cgit v1.2.3