diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rwxr-xr-x | extensions/.pool-test | 2 | ||||
| -rw-r--r-- | extensions/libipt_POOL.c | 152 | ||||
| -rw-r--r-- | extensions/libipt_pool.c | 141 | ||||
| -rw-r--r-- | include/libippool/ip_pool_support.h | 26 |
5 files changed, 2 insertions, 323 deletions
@@ -14,8 +14,8 @@ TOPLEVEL_INCLUDED=YES ifndef KERNEL_DIR KERNEL_DIR=/usr/src/linux endif -IPTABLES_VERSION:=1.3.4 -OLD_IPTABLES_VERSION:=1.3.3 +IPTABLES_VERSION:=1.3.5 +OLD_IPTABLES_VERSION:=1.3.4 PREFIX:=/usr/local LIBDIR:=$(PREFIX)/lib diff --git a/extensions/.pool-test b/extensions/.pool-test deleted file mode 100755 index 54d04bfb..00000000 --- a/extensions/.pool-test +++ /dev/null @@ -1,2 +0,0 @@ -#! /bin/sh -[ -f $KERNEL_DIR/include/linux/netfilter_ipv4/ip_pool.h ] && echo pool POOL diff --git a/extensions/libipt_POOL.c b/extensions/libipt_POOL.c deleted file mode 100644 index 95756bc5..00000000 --- a/extensions/libipt_POOL.c +++ /dev/null @@ -1,152 +0,0 @@ -/* Shared library add-on to iptables to add IP pool mangling target. */ -#include <stdio.h> -#include <netdb.h> -#include <string.h> -#include <stdlib.h> -#include <getopt.h> -#include <ctype.h> - -#include <iptables.h> -#include <linux/netfilter_ipv4/ip_tables.h> -#include <linux/netfilter_ipv4/ip_nat_rule.h> -#include <linux/netfilter_ipv4/ip_pool.h> -#include <linux/netfilter_ipv4/ipt_pool.h> - -#include <libippool/ip_pool_support.h> - -/* FIXME --RR */ -#define ip_pool_init ip_POOL_init -#define ip_pool_get_index ip_POOL_get_index -#define ip_pool_get_name ip_POOL_get_name -#include "../ippool/libippool.c" - -/* Function which prints out usage message. */ -static void -help(void) -{ - printf( -"POOL v%s options:\n" -" --add-srcip <pool>\n" -" --del-srcip <pool>\n" -" --add-dstip <pool>\n" -" --del-dstip <pool>\n" -" add/del src/dst IP from pool.\n\n", -IPTABLES_VERSION); -} - -static struct option opts[] = { - { "add-srcip", 1, 0, '1' }, - { "del-srcip", 1, 0, '2' }, - { "add-dstip", 1, 0, '3' }, - { "del-dstip", 1, 0, '4' }, - { 0 } -}; - -/* Initialize the target. */ -static void -init(struct ipt_entry_target *target, unsigned int *nfcache) -{ - struct ipt_pool_info *ipi = (struct ipt_pool_info *) target->data; - - ipi->src = ipi->dst = IP_POOL_NONE; - ipi->flags = 0; - -} - -/* 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 struct ipt_entry *entry, - struct ipt_entry_target **target) -{ - struct ipt_pool_info *ipi = (struct ipt_pool_info *) (*target)->data; - switch (c) { - case '1': /* --add-srcip <pool> */ - ipi->src = ip_pool_get_index(optarg); - ipi->flags &= ~IPT_POOL_DEL_SRC; - break; - case '2': /* --del-srcip <pool> */ - ipi->src = ip_pool_get_index(optarg); - ipi->flags |= IPT_POOL_DEL_SRC; - break; - case '3': /* --add-dstip <pool> */ - ipi->dst = ip_pool_get_index(optarg); - ipi->flags &= ~IPT_POOL_DEL_DST; - break; - case '4': /* --del-dstip <pool> */ - ipi->dst = ip_pool_get_index(optarg); - ipi->flags |= IPT_POOL_DEL_DST; - break; - default: - return 0; - } - return 1; -} - -/* Final check; don't care. */ -static void final_check(unsigned int flags) -{ -} - -/* Prints out the targinfo. */ -static void -print(const struct ipt_ip *ip, - const struct ipt_entry_target *target, - int numeric) -{ - char buf[256]; - struct ipt_pool_info *ipi = (struct ipt_pool_info *) target->data; - - printf("POOL"); - if (ipi->src != IP_POOL_NONE) { - printf(" --%s-srcip %s", - (ipi->flags & IPT_POOL_DEL_SRC) ? "del" : "add", - ip_pool_get_name(buf, sizeof(buf), ipi->src, numeric)); - } - if (ipi->dst != IP_POOL_NONE) { - printf(" --%s-dstip %s", - (ipi->flags & IPT_POOL_DEL_DST) ? "del" : "add", - ip_pool_get_name(buf, sizeof(buf), ipi->dst, numeric)); - } -} - -/* Saves the union ipt_targinfo in parsable form to stdout. */ -static void -save(const struct ipt_ip *ip, const struct ipt_entry_target *target) -{ - char buf[256]; - struct ipt_pool_info *ipi = (struct ipt_pool_info *) target->data; - - printf("-j POOL"); - if (ipi->src != IP_POOL_NONE) { - printf(" --%s-srcip %s", - (ipi->flags & IPT_POOL_DEL_SRC) ? "del" : "add", - ip_pool_get_name(buf, sizeof(buf), ipi->src, 0)); - } - if (ipi->dst != IP_POOL_NONE) { - printf(" --%s-dstip %s", - (ipi->flags & IPT_POOL_DEL_DST) ? "del" : "add", - ip_pool_get_name(buf, sizeof(buf), ipi->dst, 0)); - } -} - -static struct iptables_target ipt_pool_target = { - .next = NULL, - .name = "POOL", - .version = IPTABLES_VERSION, - .size = IPT_ALIGN(sizeof(struct ipt_pool_info)), - .userspacesize = IPT_ALIGN(sizeof(struct ipt_pool_info)), - .help = &help, - .init = &init, - .parse = &parse, - .final_check = &final_check, - .print = &print, - .save = &save, - .extra_opts = opts -}; - -void _init(void) -{ - register_target(&ipt_pool_target); -} diff --git a/extensions/libipt_pool.c b/extensions/libipt_pool.c deleted file mode 100644 index 0d649203..00000000 --- a/extensions/libipt_pool.c +++ /dev/null @@ -1,141 +0,0 @@ -/* Shared library add-on to iptables to add IP address pool matching. */ -#include <stdio.h> -#include <netdb.h> -#include <string.h> -#include <stdlib.h> -#include <getopt.h> -#include <ctype.h> - -#include <iptables.h> -#include <linux/netfilter_ipv4/ip_conntrack.h> -#include <linux/netfilter_ipv4/ipt_pool.h> - -#include <libippool/ip_pool_support.h> - -/* FIXME --RR */ -#include "../ippool/libippool.c" - -/* Function which prints out usage message. */ -static void -help(void) -{ - printf( -"pool v%s options:\n" -" [!] --srcpool NAME|INDEX\n" -" [!] --dstpool NAME|INDEX\n" -" Pool index (or name from %s) to match\n" -"\n", IPTABLES_VERSION, IPPOOL_CONF); -} - -static struct option opts[] = { - { "srcpool", 1, 0, '1' }, - { "dstpool", 1, 0, '2' }, - {0} -}; - -/* Initialize the match. */ -static void -init(struct ipt_entry_match *match, unsigned int *nfcache) -{ - struct ipt_pool_info *info = - (struct ipt_pool_info *)match->data; - - info->src = IP_POOL_NONE; - info->dst = IP_POOL_NONE; - info->flags = 0; -} - -/* 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 struct ipt_entry *entry, - unsigned int *nfcache, - struct ipt_entry_match **match) -{ - struct ipt_pool_info *info = - (struct ipt_pool_info *)(*match)->data; - - switch (c) { - case '1': - check_inverse(optarg, &invert, &optind, 0); - info->src = ip_pool_get_index(argv[optind-1]); - if (invert) info->flags |= IPT_POOL_INV_SRC; - *flags = 1; - break; - case '2': - check_inverse(optarg, &invert, &optind, 0); - info->dst = ip_pool_get_index(argv[optind-1]); - if (invert) info->flags |= IPT_POOL_INV_DST; - *flags = 1; - break; - - default: - return 0; - } - - return 1; -} - -/* Final check; must have specified --srcpool or --dstpool. */ -static void final_check(unsigned int flags) -{ - if (!flags) - exit_error(PARAMETER_PROBLEM, "You must specify either `--srcpool or --dstpool'"); -} - -/* Prints out the matchinfo. */ -static void -print(const struct ipt_ip *ip, - const struct ipt_entry_match *match, - int numeric) -{ - char buf[256]; - struct ipt_pool_info *info = - (struct ipt_pool_info *)match->data; - - if (info->src != IP_POOL_NONE) - printf("%ssrcpool %s ", - (info->flags & IPT_POOL_INV_SRC) ? "!" : "", - ip_pool_get_name(buf, sizeof(buf), info->src, 0)); - if (info->dst != IP_POOL_NONE) - printf("%sdstpool %s ", - (info->flags & IPT_POOL_INV_DST) ? "!" : "", - ip_pool_get_name(buf, sizeof(buf), info->dst, 0)); -} - -/* Saves the matchinfo in parsable form to stdout. */ -static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match) -{ - char buf[256]; - struct ipt_pool_info *info = - (struct ipt_pool_info *)match->data; - - if (info->src != IP_POOL_NONE) - printf("%s--srcpool %s ", - (info->flags & IPT_POOL_INV_SRC) ? "! " : "", - ip_pool_get_name(buf, sizeof(buf), info->src, 0)); - if (info->dst != IP_POOL_NONE) - printf("%s--dstpool %s ", - (info->flags & IPT_POOL_INV_DST) ? "! " : "", - ip_pool_get_name(buf, sizeof(buf), info->dst, 0)); -} - -static struct iptables_match pool = { - .next = NULL, - .name = "pool", - .version = IPTABLES_VERSION, - .size = IPT_ALIGN(sizeof(struct ipt_pool_info)), - .userspacesize = IPT_ALIGN(sizeof(struct ipt_pool_info)), - .help = &help, - .init = &init, - .parse = &parse, - .final_check = &final_check, - .print = &print, - .save = &save, - .extra_opts = opts -}; - -void _init(void) -{ - register_match(&pool); -} diff --git a/include/libippool/ip_pool_support.h b/include/libippool/ip_pool_support.h deleted file mode 100644 index 4a87f026..00000000 --- a/include/libippool/ip_pool_support.h +++ /dev/null @@ -1,26 +0,0 @@ -/* support function prototypes for IP pool management (config file, mostly) */ -#ifndef _IP_POOL_SUPPORT_H -#define _IP_POOL_SUPPORT_H - -#include <iptables.h> -#include <linux/netfilter_ipv4/ip_conntrack.h> -#include <linux/netfilter_ipv4/ip_pool.h> - -#ifndef IPPOOL_CONF -#define IPPOOL_CONF "/etc/ippool.conf" -#endif - -/* called just to draw in this support .o */ -void ip_pool_init(void); - -/* given a pool name (or number), return pool index, possibly reading .conf */ -ip_pool_t ip_pool_get_index(char *name); - -/* given a pool index, and a buffer to store a name, search for the index - * in the .conf file, and give the textual name, if present; if not, the - * numeric index is returned. If numeric_flag == 1, the numeric index is - * always returned - */ -char *ip_pool_get_name(char *buf, int size, ip_pool_t index, int numeric_flag); - -#endif /*_IP_POOL_SUPPORT_H*/ |