From 8338c88a83ac3828459b36332d340cbaa8e0607f Mon Sep 17 00:00:00 2001 From: Yasuyuki KOZAKAIYasuyuki KOZAKAI Date: Sat, 4 Aug 2007 08:21:16 +0000 Subject: Unifies libip[6]t_state into libxt_state --- extensions/.NFLOG-test | 2 - extensions/.NFLOG-test6 | 2 - extensions/.NFLOG-testx | 2 + extensions/libip6t_NFLOG.c | 162 ---------------------------------------- extensions/libipt_NFLOG.c | 162 ---------------------------------------- extensions/libxt_NFLOG.c | 179 +++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 181 insertions(+), 328 deletions(-) delete mode 100755 extensions/.NFLOG-test delete mode 100755 extensions/.NFLOG-test6 create mode 100644 extensions/.NFLOG-testx delete mode 100644 extensions/libip6t_NFLOG.c delete mode 100644 extensions/libipt_NFLOG.c create mode 100644 extensions/libxt_NFLOG.c diff --git a/extensions/.NFLOG-test b/extensions/.NFLOG-test deleted file mode 100755 index 25f0dee7..00000000 --- a/extensions/.NFLOG-test +++ /dev/null @@ -1,2 +0,0 @@ -#! /bin/sh -[ -f $KERNEL_DIR/include/linux/netfilter/xt_NFLOG.h ] && echo NFLOG diff --git a/extensions/.NFLOG-test6 b/extensions/.NFLOG-test6 deleted file mode 100755 index 25f0dee7..00000000 --- a/extensions/.NFLOG-test6 +++ /dev/null @@ -1,2 +0,0 @@ -#! /bin/sh -[ -f $KERNEL_DIR/include/linux/netfilter/xt_NFLOG.h ] && echo NFLOG diff --git a/extensions/.NFLOG-testx b/extensions/.NFLOG-testx new file mode 100644 index 00000000..25f0dee7 --- /dev/null +++ b/extensions/.NFLOG-testx @@ -0,0 +1,2 @@ +#! /bin/sh +[ -f $KERNEL_DIR/include/linux/netfilter/xt_NFLOG.h ] && echo NFLOG diff --git a/extensions/libip6t_NFLOG.c b/extensions/libip6t_NFLOG.c deleted file mode 100644 index 42e20819..00000000 --- a/extensions/libip6t_NFLOG.c +++ /dev/null @@ -1,162 +0,0 @@ -#include -#include -#include -#include -#include - -#include -#include - -enum { - NFLOG_GROUP = 0x1, - NFLOG_PREFIX = 0x2, - NFLOG_RANGE = 0x4, - NFLOG_THRESHOLD = 0x8, -}; - -static const struct option opts[] = { - { "nflog-group", 1, 0, NFLOG_GROUP }, - { "nflog-prefix", 1, 0, NFLOG_PREFIX }, - { "nflog-range", 1, 0, NFLOG_RANGE }, - { "nflog-threshold", 1, 0, NFLOG_THRESHOLD }, - {NULL}, -}; - -static void help(void) -{ - printf("NFLOG v%s options:\n" - " --nflog-group NUM NETLINK group used for logging\n" - " --nflog-range NUM Number of byte to copy\n" - " --nflog-threshold NUM Message threshold of in-kernel queue\n" - " --nflog-prefix STRING Prefix string for log messages\n\n", - IPTABLES_VERSION); -} - -static void init(struct ip6t_entry_target *t, unsigned int *nfcache) -{ - struct xt_nflog_info *info = (struct xt_nflog_info *)t->data; - - info->group = 0; - info->threshold = XT_NFLOG_DEFAULT_THRESHOLD; -} - -static int parse(int c, char **argv, int invert, unsigned int *flags, - const void *entry, - struct xt_entry_target **target) -{ - struct xt_nflog_info *info = (struct xt_nflog_info *)(*target)->data; - int n; - - switch (c) { - case NFLOG_GROUP: - if (*flags & NFLOG_GROUP) - exit_error(PARAMETER_PROBLEM, - "Can't specify --nflog-group twice"); - if (check_inverse(optarg, &invert, NULL, 0)) - exit_error(PARAMETER_PROBLEM, - "Unexpected `!' after --nflog-group"); - - n = atoi(optarg); - if (n < 0) - exit_error(PARAMETER_PROBLEM, - "--nflog-group can not be negative"); - info->group = n; - break; - case NFLOG_PREFIX: - if (*flags & NFLOG_PREFIX) - exit_error(PARAMETER_PROBLEM, - "Can't specify --nflog-prefix twice"); - if (check_inverse(optarg, &invert, NULL, 0)) - exit_error(PARAMETER_PROBLEM, - "Unexpected `!' after --nflog-prefix"); - - n = strlen(optarg); - if (n == 0) - exit_error(PARAMETER_PROBLEM, - "No prefix specified for --nflog-prefix"); - if (n >= sizeof(info->prefix)) - exit_error(PARAMETER_PROBLEM, - "--nflog-prefix too long, max %Zu characters", - sizeof(info->prefix) - 1); - if (n != strlen(strtok(optarg, "\n"))) - exit_error(PARAMETER_PROBLEM, - "Newlines are not allowed in --nflog-prefix"); - strcpy(info->prefix, optarg); - break; - case NFLOG_RANGE: - if (*flags & NFLOG_RANGE) - exit_error(PARAMETER_PROBLEM, - "Can't specify --nflog-range twice"); - n = atoi(optarg); - if (n < 0) - exit_error(PARAMETER_PROBLEM, - "Invalid --nflog-range, must be >= 0"); - info->len = n; - break; - case NFLOG_THRESHOLD: - if (*flags & NFLOG_THRESHOLD) - exit_error(PARAMETER_PROBLEM, - "Can't specify --nflog-threshold twice"); - n = atoi(optarg); - if (n < 1) - exit_error(PARAMETER_PROBLEM, - "Invalid --nflog-threshold, must be >= 1"); - info->threshold = n; - break; - default: - return 0; - } - *flags |= c; - return 1; -} - -static void final_check(unsigned int flags) -{ - return; -} - -static void nflog_print(const struct xt_nflog_info *info, char *prefix) -{ - if (info->prefix[0] != '\0') - printf("%snflog-prefix \"%s\" ", prefix, info->prefix); - if (info->group) - printf("%snflog-group %u ", prefix, info->group); - if (info->len) - printf("%snflog-range %u ", prefix, info->len); - if (info->threshold != XT_NFLOG_DEFAULT_THRESHOLD) - printf("%snflog-threshold %u ", prefix, info->threshold); -} - -static void print(const void *ip, const struct xt_entry_target *target, - int numeric) -{ - const struct xt_nflog_info *info = (struct xt_nflog_info *)target->data; - - nflog_print(info, ""); -} - -static void save(const void *ip, const struct xt_entry_target *target) -{ - const struct xt_nflog_info *info = (struct xt_nflog_info *)target->data; - - nflog_print(info, "--"); -} - -static struct ip6tables_target nflog = { - .name = "NFLOG", - .version = IPTABLES_VERSION, - .size = XT_ALIGN(sizeof(struct xt_nflog_info)), - .userspacesize = XT_ALIGN(sizeof(struct xt_nflog_info)), - .help = help, - .init = init, - .parse = parse, - .final_check = final_check, - .print = print, - .save = save, - .extra_opts = opts, -}; - -void _init(void) -{ - register_target6(&nflog); -} diff --git a/extensions/libipt_NFLOG.c b/extensions/libipt_NFLOG.c deleted file mode 100644 index a672e2d3..00000000 --- a/extensions/libipt_NFLOG.c +++ /dev/null @@ -1,162 +0,0 @@ -#include -#include -#include -#include -#include - -#include -#include - -enum { - NFLOG_GROUP = 0x1, - NFLOG_PREFIX = 0x2, - NFLOG_RANGE = 0x4, - NFLOG_THRESHOLD = 0x8, -}; - -static const struct option opts[] = { - { "nflog-group", 1, 0, NFLOG_GROUP }, - { "nflog-prefix", 1, 0, NFLOG_PREFIX }, - { "nflog-range", 1, 0, NFLOG_RANGE }, - { "nflog-threshold", 1, 0, NFLOG_THRESHOLD }, - {NULL}, -}; - -static void help(void) -{ - printf("NFLOG v%s options:\n" - " --nflog-group NUM NETLINK group used for logging\n" - " --nflog-range NUM Number of byte to copy\n" - " --nflog-threshold NUM Message threshold of in-kernel queue\n" - " --nflog-prefix STRING Prefix string for log messages\n\n", - IPTABLES_VERSION); -} - -static void init(struct xt_entry_target *t, unsigned int *nfcache) -{ - struct xt_nflog_info *info = (struct xt_nflog_info *)t->data; - - info->group = 0; - info->threshold = XT_NFLOG_DEFAULT_THRESHOLD; -} - -static int parse(int c, char **argv, int invert, unsigned int *flags, - const void *entry, - struct xt_entry_target **target) -{ - struct xt_nflog_info *info = (struct xt_nflog_info *)(*target)->data; - int n; - - switch (c) { - case NFLOG_GROUP: - if (*flags & NFLOG_GROUP) - exit_error(PARAMETER_PROBLEM, - "Can't specify --nflog-group twice"); - if (check_inverse(optarg, &invert, NULL, 0)) - exit_error(PARAMETER_PROBLEM, - "Unexpected `!' after --nflog-group"); - - n = atoi(optarg); - if (n < 0) - exit_error(PARAMETER_PROBLEM, - "--nflog-group can not be negative"); - info->group = n; - break; - case NFLOG_PREFIX: - if (*flags & NFLOG_PREFIX) - exit_error(PARAMETER_PROBLEM, - "Can't specify --nflog-prefix twice"); - if (check_inverse(optarg, &invert, NULL, 0)) - exit_error(PARAMETER_PROBLEM, - "Unexpected `!' after --nflog-prefix"); - - n = strlen(optarg); - if (n == 0) - exit_error(PARAMETER_PROBLEM, - "No prefix specified for --nflog-prefix"); - if (n >= sizeof(info->prefix)) - exit_error(PARAMETER_PROBLEM, - "--nflog-prefix too long, max %Zu characters", - sizeof(info->prefix) - 1); - if (n != strlen(strtok(optarg, "\n"))) - exit_error(PARAMETER_PROBLEM, - "Newlines are not allowed in --nflog-prefix"); - strcpy(info->prefix, optarg); - break; - case NFLOG_RANGE: - if (*flags & NFLOG_RANGE) - exit_error(PARAMETER_PROBLEM, - "Can't specify --nflog-range twice"); - n = atoi(optarg); - if (n < 0) - exit_error(PARAMETER_PROBLEM, - "Invalid --nflog-range, must be >= 0"); - info->len = n; - break; - case NFLOG_THRESHOLD: - if (*flags & NFLOG_THRESHOLD) - exit_error(PARAMETER_PROBLEM, - "Can't specify --nflog-threshold twice"); - n = atoi(optarg); - if (n < 1) - exit_error(PARAMETER_PROBLEM, - "Invalid --nflog-threshold, must be >= 1"); - info->threshold = n; - break; - default: - return 0; - } - *flags |= c; - return 1; -} - -static void final_check(unsigned int flags) -{ - return; -} - -static void nflog_print(const struct xt_nflog_info *info, char *prefix) -{ - if (info->prefix[0] != '\0') - printf("%snflog-prefix \"%s\" ", prefix, info->prefix); - if (info->group) - printf("%snflog-group %u ", prefix, info->group); - if (info->len) - printf("%snflog-range %u ", prefix, info->len); - if (info->threshold != XT_NFLOG_DEFAULT_THRESHOLD) - printf("%snflog-threshold %u ", prefix, info->threshold); -} - -static void print(const void *ip, const struct xt_entry_target *target, - int numeric) -{ - const struct xt_nflog_info *info = (struct xt_nflog_info *)target->data; - - nflog_print(info, ""); -} - -static void save(const void *ip, const struct xt_entry_target *target) -{ - const struct xt_nflog_info *info = (struct xt_nflog_info *)target->data; - - nflog_print(info, "--"); -} - -static struct iptables_target nflog = { - .name = "NFLOG", - .version = IPTABLES_VERSION, - .size = XT_ALIGN(sizeof(struct xt_nflog_info)), - .userspacesize = XT_ALIGN(sizeof(struct xt_nflog_info)), - .help = help, - .init = init, - .parse = parse, - .final_check = final_check, - .print = print, - .save = save, - .extra_opts = opts, -}; - -void _init(void) -{ - register_target(&nflog); -} diff --git a/extensions/libxt_NFLOG.c b/extensions/libxt_NFLOG.c new file mode 100644 index 00000000..9c5ea099 --- /dev/null +++ b/extensions/libxt_NFLOG.c @@ -0,0 +1,179 @@ +#include +#include +#include +#include +#include + +#include +#include + +enum { + NFLOG_GROUP = 0x1, + NFLOG_PREFIX = 0x2, + NFLOG_RANGE = 0x4, + NFLOG_THRESHOLD = 0x8, +}; + +static const struct option opts[] = { + { "nflog-group", 1, 0, NFLOG_GROUP }, + { "nflog-prefix", 1, 0, NFLOG_PREFIX }, + { "nflog-range", 1, 0, NFLOG_RANGE }, + { "nflog-threshold", 1, 0, NFLOG_THRESHOLD }, + {NULL}, +}; + +static void help(void) +{ + printf("NFLOG v%s options:\n" + " --nflog-group NUM NETLINK group used for logging\n" + " --nflog-range NUM Number of byte to copy\n" + " --nflog-threshold NUM Message threshold of in-kernel queue\n" + " --nflog-prefix STRING Prefix string for log messages\n\n", + IPTABLES_VERSION); +} + +static void init(struct xt_entry_target *t, unsigned int *nfcache) +{ + struct xt_nflog_info *info = (struct xt_nflog_info *)t->data; + + info->group = 0; + info->threshold = XT_NFLOG_DEFAULT_THRESHOLD; +} + +static int parse(int c, char **argv, int invert, unsigned int *flags, + const void *entry, + struct xt_entry_target **target) +{ + struct xt_nflog_info *info = (struct xt_nflog_info *)(*target)->data; + int n; + + switch (c) { + case NFLOG_GROUP: + if (*flags & NFLOG_GROUP) + exit_error(PARAMETER_PROBLEM, + "Can't specify --nflog-group twice"); + if (check_inverse(optarg, &invert, NULL, 0)) + exit_error(PARAMETER_PROBLEM, + "Unexpected `!' after --nflog-group"); + + n = atoi(optarg); + if (n < 0) + exit_error(PARAMETER_PROBLEM, + "--nflog-group can not be negative"); + info->group = n; + break; + case NFLOG_PREFIX: + if (*flags & NFLOG_PREFIX) + exit_error(PARAMETER_PROBLEM, + "Can't specify --nflog-prefix twice"); + if (check_inverse(optarg, &invert, NULL, 0)) + exit_error(PARAMETER_PROBLEM, + "Unexpected `!' after --nflog-prefix"); + + n = strlen(optarg); + if (n == 0) + exit_error(PARAMETER_PROBLEM, + "No prefix specified for --nflog-prefix"); + if (n >= sizeof(info->prefix)) + exit_error(PARAMETER_PROBLEM, + "--nflog-prefix too long, max %Zu characters", + sizeof(info->prefix) - 1); + if (n != strlen(strtok(optarg, "\n"))) + exit_error(PARAMETER_PROBLEM, + "Newlines are not allowed in --nflog-prefix"); + strcpy(info->prefix, optarg); + break; + case NFLOG_RANGE: + if (*flags & NFLOG_RANGE) + exit_error(PARAMETER_PROBLEM, + "Can't specify --nflog-range twice"); + n = atoi(optarg); + if (n < 0) + exit_error(PARAMETER_PROBLEM, + "Invalid --nflog-range, must be >= 0"); + info->len = n; + break; + case NFLOG_THRESHOLD: + if (*flags & NFLOG_THRESHOLD) + exit_error(PARAMETER_PROBLEM, + "Can't specify --nflog-threshold twice"); + n = atoi(optarg); + if (n < 1) + exit_error(PARAMETER_PROBLEM, + "Invalid --nflog-threshold, must be >= 1"); + info->threshold = n; + break; + default: + return 0; + } + *flags |= c; + return 1; +} + +static void final_check(unsigned int flags) +{ + return; +} + +static void nflog_print(const struct xt_nflog_info *info, char *prefix) +{ + if (info->prefix[0] != '\0') + printf("%snflog-prefix \"%s\" ", prefix, info->prefix); + if (info->group) + printf("%snflog-group %u ", prefix, info->group); + if (info->len) + printf("%snflog-range %u ", prefix, info->len); + if (info->threshold != XT_NFLOG_DEFAULT_THRESHOLD) + printf("%snflog-threshold %u ", prefix, info->threshold); +} + +static void print(const void *ip, const struct xt_entry_target *target, + int numeric) +{ + const struct xt_nflog_info *info = (struct xt_nflog_info *)target->data; + + nflog_print(info, ""); +} + +static void save(const void *ip, const struct xt_entry_target *target) +{ + const struct xt_nflog_info *info = (struct xt_nflog_info *)target->data; + + nflog_print(info, "--"); +} + +static struct xtables_target nflog = { + .family = AF_INET, + .name = "NFLOG", + .version = IPTABLES_VERSION, + .size = XT_ALIGN(sizeof(struct xt_nflog_info)), + .userspacesize = XT_ALIGN(sizeof(struct xt_nflog_info)), + .help = help, + .init = init, + .parse = parse, + .final_check = final_check, + .print = print, + .save = save, + .extra_opts = opts, +}; + +static struct xtables_target nflog6 = { + .family = AF_INET6, + .name = "NFLOG", + .version = IPTABLES_VERSION, + .size = XT_ALIGN(sizeof(struct xt_nflog_info)), + .userspacesize = XT_ALIGN(sizeof(struct xt_nflog_info)), + .help = help, + .init = init, + .parse = parse, + .final_check = final_check, + .print = print, + .save = save, + .extra_opts = opts, +}; + +void _init(void) +{ + xtables_register_target(&nflog); + xtables_register_target(&nflog6); +} -- cgit v1.2.3