From ed342edd98456bd4f23d230481854be160fad1dc Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 13 Feb 2008 21:35:59 +0100 Subject: Remove support for compilation of conditional extensions --- extensions/.condition-test | 4 -- extensions/.condition-test6 | 4 -- extensions/.set-test | 4 -- extensions/GNUmakefile.in | 27 ++---------- extensions/libip6t_condition.c | 95 ---------------------------------------- extensions/libip6t_condition.man | 4 -- extensions/libipt_condition.c | 94 --------------------------------------- extensions/libipt_condition.man | 4 -- 8 files changed, 3 insertions(+), 233 deletions(-) delete mode 100755 extensions/.condition-test delete mode 100755 extensions/.condition-test6 delete mode 100755 extensions/.set-test delete mode 100644 extensions/libip6t_condition.c delete mode 100644 extensions/libip6t_condition.man delete mode 100644 extensions/libipt_condition.c delete mode 100644 extensions/libipt_condition.man (limited to 'extensions') diff --git a/extensions/.condition-test b/extensions/.condition-test deleted file mode 100755 index 2470a188..00000000 --- a/extensions/.condition-test +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -[ "$1" == "provides" -o \ --f "$KERNEL_DIR/include/linux/netfilter_ipv4/ipt_condition.h" ] && \ -echo "condition"; diff --git a/extensions/.condition-test6 b/extensions/.condition-test6 deleted file mode 100755 index 15a0f042..00000000 --- a/extensions/.condition-test6 +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -[ "$1" == "provides" -o \ --f "$KERNEL_DIR/include/linux/netfilter_ipv6/ip6t_condition.h" ] && \ -echo "condition"; diff --git a/extensions/.set-test b/extensions/.set-test deleted file mode 100755 index 754abfde..00000000 --- a/extensions/.set-test +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/sh -[ "$1" == "provides" -o \ --f "$KERNEL_DIR/include/linux/netfilter_ipv4/ip_set.h" ] && \ -echo "set SET"; diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in index ee204697..31e6fb77 100644 --- a/extensions/GNUmakefile.in +++ b/extensions/GNUmakefile.in @@ -32,30 +32,9 @@ endif # # Wildcard module list # -pfx_all_mod := $(patsubst ${srcdir}/libxt_%.c,%,$(wildcard ${srcdir}/libxt_*.c)) -pf4_all_mod := $(patsubst ${srcdir}/libipt_%.c,%,$(wildcard ${srcdir}/libipt_*.c)) -pf6_all_mod := $(patsubst ${srcdir}/libip6t_%.c,%,$(wildcard ${srcdir}/libip6t_*.c)) - -# -# Conditional module list -# -pfx_cond_mod := $(foreach i,$(wildcard ${srcdir}/.*-testx),$(shell KERNEL_DIR=${ksourcedir} ${i} provides)) -pf4_cond_mod := $(foreach i,$(wildcard ${srcdir}/.*-test),$(shell KERNEL_DIR=${ksourcedir} ${i} provides)) -pf6_cond_mod := $(foreach i,$(wildcard ${srcdir}/.*-test6),$(shell KERNEL_DIR=${ksourcedir} ${i} provides)) - -# -# Conditional modules to build -# -pfx_bc_mod := $(foreach i,$(wildcard ${srcdir}/.*-testx),$(shell KERNEL_DIR=${ksourcedir} ${i})) -pf4_bc_mod := $(foreach i,$(wildcard ${srcdir}/.*-test),$(shell KERNEL_DIR=${ksourcedir} ${i})) -pf6_bc_mod := $(foreach i,$(wildcard ${srcdir}/.*-test6),$(shell KERNEL_DIR=${ksourcedir} ${i})) - -# -# Total list of modules to build -# -pfx_build_mod := $(filter-out ${pfx_cond_mod},${pfx_all_mod}) ${pfx_bc_mod} -pf4_build_mod := $(filter-out ${pf4_cond_mod},${pf4_all_mod}) ${pf4_bc_mod} -pf6_build_mod := $(filter-out ${pf6_cond_mod},${pf6_all_mod}) ${pf6_bc_mod} +pfx_build_mod := $(patsubst ${srcdir}/libxt_%.c,%,$(wildcard ${srcdir}/libxt_*.c)) +pf4_build_mod := $(patsubst ${srcdir}/libipt_%.c,%,$(wildcard ${srcdir}/libipt_*.c)) +pf6_build_mod := $(patsubst ${srcdir}/libip6t_%.c,%,$(wildcard ${srcdir}/libip6t_*.c)) pfx_objs := $(patsubst %,libxt_%.o,${pfx_build_mod}) pf4_objs := $(patsubst %,libipt_%.o,${pf4_build_mod}) pf6_objs := $(patsubst %,libip6t_%.o,${pf6_build_mod}) diff --git a/extensions/libip6t_condition.c b/extensions/libip6t_condition.c deleted file mode 100644 index 03e27229..00000000 --- a/extensions/libip6t_condition.c +++ /dev/null @@ -1,95 +0,0 @@ -/* Shared library add-on to ip6tables for condition match */ -#include -#include -#include -#include -#include - -#include -#include - -static void condition_help(void) -{ - printf("condition match v%s options:\n" - "--condition [!] filename " - "Match on boolean value stored in /proc file\n", - IPTABLES_VERSION); -} - -static const struct option condition_opts[] = { - { .name = "condition", .has_arg = 1, .flag = 0, .val = 'X' }, - { .name = 0 } -}; - -static int -condition_parse(int c, char **argv, int invert, unsigned int *flags, - const void *entry, struct xt_entry_match **match) -{ - struct condition6_info *info = - (struct condition6_info *) (*match)->data; - - if (c == 'X') { - if (*flags) - exit_error(PARAMETER_PROBLEM, - "Can't specify multiple conditions"); - - check_inverse(optarg, &invert, &optind, 0); - - if (strlen(argv[optind - 1]) < CONDITION6_NAME_LEN) - strcpy(info->name, argv[optind - 1]); - else - exit_error(PARAMETER_PROBLEM, - "File name too long"); - - info->invert = invert; - *flags = 1; - return 1; - } - - return 0; -} - -static void condition_check(unsigned int flags) -{ - if (!flags) - exit_error(PARAMETER_PROBLEM, - "Condition match: must specify --condition"); -} - -static void condition_print(const void *ip, const struct xt_entry_match *match, - int numeric) -{ - const struct condition6_info *info = - (const struct condition6_info *) match->data; - - printf("condition %s%s ", (info->invert) ? "!" : "", info->name); -} - - -static void condition_save(const void *ip, const struct xt_entry_match *match) -{ - const struct condition6_info *info = - (const struct condition6_info *) match->data; - - printf("--condition %s\"%s\" ", (info->invert) ? "! " : "", info->name); -} - -static struct ip6tables_match condition_match6 = { - .name = "condition", - .version = IPTABLES_VERSION, - .size = IP6T_ALIGN(sizeof(struct condition6_info)), - .userspacesize = IP6T_ALIGN(sizeof(struct condition6_info)), - .help = condition_help, - .parse = condition_parse, - .final_check = condition_check, - .print = condition_print, - .save = condition_save, - .extra_opts = condition_opts, -}; - - -void -_init(void) -{ - register_match6(&condition_match6); -} diff --git a/extensions/libip6t_condition.man b/extensions/libip6t_condition.man deleted file mode 100644 index e0bba758..00000000 --- a/extensions/libip6t_condition.man +++ /dev/null @@ -1,4 +0,0 @@ -This matches if a specific /proc filename is '0' or '1'. -.TP -.BR "--condition " "[!] \fIfilename" -Match on boolean value stored in /proc/net/ip6t_condition/filename file diff --git a/extensions/libipt_condition.c b/extensions/libipt_condition.c deleted file mode 100644 index 4a98dd8c..00000000 --- a/extensions/libipt_condition.c +++ /dev/null @@ -1,94 +0,0 @@ -/* Shared library add-on to iptables for condition match */ -#include -#include -#include -#include -#include - -#include -#include - -static void condition_help(void) -{ - printf("condition match v%s options:\n" - "--condition [!] filename " - "Match on boolean value stored in /proc file\n", - IPTABLES_VERSION); -} - -static const struct option condition_opts[] = { - { .name = "condition", .has_arg = 1, .flag = 0, .val = 'X' }, - { .name = 0 } -}; - -static int condition_parse(int c, char **argv, int invert, unsigned int *flags, - const void *entry, struct xt_entry_match **match) -{ - struct condition_info *info = - (struct condition_info *) (*match)->data; - - if (c == 'X') { - if (*flags) - exit_error(PARAMETER_PROBLEM, - "Can't specify multiple conditions"); - - check_inverse(optarg, &invert, &optind, 0); - - if (strlen(argv[optind - 1]) < CONDITION_NAME_LEN) - strcpy(info->name, argv[optind - 1]); - else - exit_error(PARAMETER_PROBLEM, - "File name too long"); - - info->invert = invert; - *flags = 1; - return 1; - } - - return 0; -} - -static void condition_check(unsigned int flags) -{ - if (!flags) - exit_error(PARAMETER_PROBLEM, - "Condition match: must specify --condition"); -} - -static void condition_print(const void *ip, const struct xt_entry_match *match, - int numeric) -{ - const struct condition_info *info = - (const struct condition_info *) match->data; - - printf("condition %s%s ", (info->invert) ? "!" : "", info->name); -} - - -static void condition_save(const void *ip, const struct xt_entry_match *match) -{ - const struct condition_info *info = - (const struct condition_info *) match->data; - - printf("--condition %s\"%s\" ", (info->invert) ? "! " : "", info->name); -} - -static struct iptables_match condition_match = { - .name = "condition", - .version = IPTABLES_VERSION, - .size = IPT_ALIGN(sizeof(struct condition_info)), - .userspacesize = IPT_ALIGN(sizeof(struct condition_info)), - .help = condition_help, - .parse = condition_parse, - .final_check = condition_check, - .print = condition_print, - .save = condition_save, - .extra_opts = condition_opts, -}; - - -void -_init(void) -{ - register_match(&condition_match); -} diff --git a/extensions/libipt_condition.man b/extensions/libipt_condition.man deleted file mode 100644 index ce2aa952..00000000 --- a/extensions/libipt_condition.man +++ /dev/null @@ -1,4 +0,0 @@ -This matches if a specific /proc filename is '0' or '1'. -.TP -.BI "--condition " "[!] \fIfilename\fP" -Match on boolean value stored in /proc/net/ipt_condition/filename file -- cgit v1.2.3