diff options
Diffstat (limited to 'extensions/libipt_SAME.c')
| -rw-r--r-- | extensions/libipt_SAME.c | 23 |
1 files changed, 3 insertions, 20 deletions
diff --git a/extensions/libipt_SAME.c b/extensions/libipt_SAME.c index 4bbed908..1a379580 100644 --- a/extensions/libipt_SAME.c +++ b/extensions/libipt_SAME.c @@ -23,11 +23,8 @@ help(void) " --nodst\n" " Don't use destination-ip in\n" " source selection\n" - -#ifdef IP_NAT_RANGE_PROTO_RANDOM " --random\n" " Randomize source port\n" -#endif , IPTABLES_VERSION); } @@ -35,9 +32,7 @@ IPTABLES_VERSION); static struct option opts[] = { { "to", 1, 0, '1' }, { "nodst", 0, 0, '2'}, -#ifdef IP_NAT_RANGE_PROTO_RANDOM { "random", 0, 0, '3' }, -#endif { 0 } }; @@ -88,9 +83,7 @@ parse_to(char *arg, struct ip_nat_range *range) #define IPT_SAME_OPT_TO 0x01 #define IPT_SAME_OPT_NODST 0x02 -#ifdef IP_NAT_RANGE_PROTO_RANDOM -# define IPT_SAME_OPT_RANDOM 0x04 -#endif +#define IPT_SAME_OPT_RANDOM 0x04 /* Function which parses command options; returns true if it ate an option */ @@ -101,9 +94,7 @@ parse(int c, char **argv, int invert, unsigned int *flags, { struct ipt_same_info *mr = (struct ipt_same_info *)(*target)->data; -#ifdef IP_NAT_RANGE_PROTO_RANDOM int count; -#endif switch (c) { case '1': @@ -117,11 +108,10 @@ parse(int c, char **argv, int invert, unsigned int *flags, "Unexpected `!' after --to"); parse_to(optarg, &mr->range[mr->rangesize]); -#ifdef IP_NAT_RANGE_PROTO_RANDOM + /* WTF do we need this for? */ if (*flags & IPT_SAME_OPT_RANDOM) mr->range[mr->rangesize].flags |= IP_NAT_RANGE_PROTO_RANDOM; -#endif mr->rangesize++; *flags |= IPT_SAME_OPT_TO; break; @@ -135,13 +125,12 @@ parse(int c, char **argv, int invert, unsigned int *flags, *flags |= IPT_SAME_OPT_NODST; break; -#ifdef IP_NAT_RANGE_PROTO_RANDOM case '3': *flags |= IPT_SAME_OPT_RANDOM; for (count=0; count < mr->rangesize; count++) mr->range[count].flags |= IP_NAT_RANGE_PROTO_RANDOM; break; -#endif + default: return 0; } @@ -166,9 +155,7 @@ print(const struct ipt_ip *ip, int count; struct ipt_same_info *mr = (struct ipt_same_info *)target->data; -#ifdef IP_NAT_RANGE_PROTO_RANDOM int random = 0; -#endif printf("same:"); @@ -185,19 +172,15 @@ print(const struct ipt_ip *ip, printf(" "); else printf("-%s ", addr_to_dotted(&a)); -#ifdef IP_NAT_RANGE_PROTO_RANDOM if (r->flags & IP_NAT_RANGE_PROTO_RANDOM) random = 1; -#endif } if (mr->info & IPT_SAME_NODST) printf("nodst "); -#ifdef IP_NAT_RANGE_PROTO_RANDOM if (random) printf("random "); -#endif } /* Saves the union ipt_targinfo in parsable form to stdout. */ |