From e4cc20b2367362c2f9c84c0daaccd985e3236118 Mon Sep 17 00:00:00 2001 From: Yasuyuki KOZAKAI Date: Sat, 4 Aug 2007 08:23:13 +0000 Subject: Add IPv6 support to CLASSIFY target --- extensions/Makefile | 4 +- extensions/libipt_CLASSIFY.c | 128 ------------------------ extensions/libxt_CLASSIFY.c | 145 ++++++++++++++++++++++++++++ include/linux/netfilter/xt_CLASSIFY.h | 8 ++ include/linux/netfilter_ipv4/ipt_CLASSIFY.h | 8 -- 5 files changed, 155 insertions(+), 138 deletions(-) delete mode 100644 extensions/libipt_CLASSIFY.c create mode 100644 extensions/libxt_CLASSIFY.c create mode 100644 include/linux/netfilter/xt_CLASSIFY.h delete mode 100644 include/linux/netfilter_ipv4/ipt_CLASSIFY.h diff --git a/extensions/Makefile b/extensions/Makefile index ddde77de..53e3e9eb 100644 --- a/extensions/Makefile +++ b/extensions/Makefile @@ -5,9 +5,9 @@ # header files are present in the include/linux directory of this iptables # package (HW) # -PF_EXT_SLIB:=ah addrtype conntrack ecn helper icmp iprange owner policy realm tos ttl unclean CLASSIFY DNAT DSCP ECN LOG MASQUERADE MIRROR NETMAP REDIRECT REJECT SAME SNAT TOS TTL ULOG +PF_EXT_SLIB:=ah addrtype conntrack ecn helper icmp iprange owner policy realm tos ttl unclean DNAT DSCP ECN LOG MASQUERADE MIRROR NETMAP REDIRECT REJECT SAME SNAT TOS TTL ULOG PF6_EXT_SLIB:=eui64 hl icmp6 owner policy HL LOG -PFX_EXT_SLIB:=connmark connlimit comment dscp esp hashlimit length limit mac mark multiport physdev pkttype sctp state standard tcp tcpmss udp CONNMARK MARK NFQUEUE NOTRACK TCPMSS TRACE +PFX_EXT_SLIB:=connmark connlimit comment dscp esp hashlimit length limit mac mark multiport physdev pkttype sctp state standard tcp tcpmss udp CLASSIFY CONNMARK MARK NFQUEUE NOTRACK TCPMSS TRACE ifeq ($(DO_SELINUX), 1) PF_EXT_SE_SLIB:= diff --git a/extensions/libipt_CLASSIFY.c b/extensions/libipt_CLASSIFY.c deleted file mode 100644 index 3096edc8..00000000 --- a/extensions/libipt_CLASSIFY.c +++ /dev/null @@ -1,128 +0,0 @@ -/* Shared library add-on to iptables to add CLASSIFY target support. */ -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -/* Function which prints out usage message. */ -static void -help(void) -{ - printf( -"CLASSIFY target v%s options:\n" -" --set-class [MAJOR:MINOR] Set skb->priority value\n" -"\n", -IPTABLES_VERSION); -} - -static const struct option opts[] = { - { "set-class", 1, 0, '1' }, - { 0 } -}; - -/* Initialize the target. */ -static void -init(struct xt_entry_target *t, unsigned int *nfcache) -{ -} - -int string_to_priority(const char *s, unsigned int *p) -{ - unsigned int i, j; - - if (sscanf(s, "%x:%x", &i, &j) != 2) - return 1; - - *p = TC_H_MAKE(i<<16, j); - return 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 void *entry, - struct xt_entry_target **target) -{ - struct ipt_classify_target_info *clinfo - = (struct ipt_classify_target_info *)(*target)->data; - - switch (c) { - case '1': - if (string_to_priority(optarg, &clinfo->priority)) - exit_error(PARAMETER_PROBLEM, - "Bad class value `%s'", optarg); - if (*flags) - exit_error(PARAMETER_PROBLEM, - "CLASSIFY: Can't specify --set-class twice"); - *flags = 1; - break; - - default: - return 0; - } - - return 1; -} - -static void -final_check(unsigned int flags) -{ - if (!flags) - exit_error(PARAMETER_PROBLEM, - "CLASSIFY: Parameter --set-class is required"); -} - -static void -print_class(unsigned int priority, int numeric) -{ - printf("%x:%x ", TC_H_MAJ(priority)>>16, TC_H_MIN(priority)); -} - -/* Prints out the targinfo. */ -static void -print(const void *ip, - const struct xt_entry_target *target, - int numeric) -{ - const struct ipt_classify_target_info *clinfo = - (const struct ipt_classify_target_info *)target->data; - printf("CLASSIFY set "); - print_class(clinfo->priority, numeric); -} - -/* Saves the union ipt_targinfo in parsable form to stdout. */ -static void -save(const void *ip, const struct xt_entry_target *target) -{ - const struct ipt_classify_target_info *clinfo = - (const struct ipt_classify_target_info *)target->data; - - printf("--set-class %.4x:%.4x ", - TC_H_MAJ(clinfo->priority)>>16, TC_H_MIN(clinfo->priority)); -} - -static struct iptables_target classify = { - .name = "CLASSIFY", - .version = IPTABLES_VERSION, - .size = IPT_ALIGN(sizeof(struct ipt_classify_target_info)), - .userspacesize = IPT_ALIGN(sizeof(struct ipt_classify_target_info)), - .help = &help, - .init = &init, - .parse = &parse, - .final_check = &final_check, - .print = &print, - .save = &save, - .extra_opts = opts -}; - -void _init(void) -{ - register_target(&classify); -} diff --git a/extensions/libxt_CLASSIFY.c b/extensions/libxt_CLASSIFY.c new file mode 100644 index 00000000..acebd926 --- /dev/null +++ b/extensions/libxt_CLASSIFY.c @@ -0,0 +1,145 @@ +/* Shared library add-on to iptables to add CLASSIFY target support. */ +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +/* Function which prints out usage message. */ +static void +help(void) +{ + printf( +"CLASSIFY target v%s options:\n" +" --set-class [MAJOR:MINOR] Set skb->priority value\n" +"\n", +IPTABLES_VERSION); +} + +static const struct option opts[] = { + { "set-class", 1, 0, '1' }, + { 0 } +}; + +/* Initialize the target. */ +static void +init(struct xt_entry_target *t, unsigned int *nfcache) +{ +} + +int string_to_priority(const char *s, unsigned int *p) +{ + unsigned int i, j; + + if (sscanf(s, "%x:%x", &i, &j) != 2) + return 1; + + *p = TC_H_MAKE(i<<16, j); + return 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 void *entry, + struct xt_entry_target **target) +{ + struct xt_classify_target_info *clinfo + = (struct xt_classify_target_info *)(*target)->data; + + switch (c) { + case '1': + if (string_to_priority(optarg, &clinfo->priority)) + exit_error(PARAMETER_PROBLEM, + "Bad class value `%s'", optarg); + if (*flags) + exit_error(PARAMETER_PROBLEM, + "CLASSIFY: Can't specify --set-class twice"); + *flags = 1; + break; + + default: + return 0; + } + + return 1; +} + +static void +final_check(unsigned int flags) +{ + if (!flags) + exit_error(PARAMETER_PROBLEM, + "CLASSIFY: Parameter --set-class is required"); +} + +static void +print_class(unsigned int priority, int numeric) +{ + printf("%x:%x ", TC_H_MAJ(priority)>>16, TC_H_MIN(priority)); +} + +/* Prints out the targinfo. */ +static void +print(const void *ip, + const struct xt_entry_target *target, + int numeric) +{ + const struct xt_classify_target_info *clinfo = + (const struct xt_classify_target_info *)target->data; + printf("CLASSIFY set "); + print_class(clinfo->priority, numeric); +} + +/* Saves the union ipt_targinfo in parsable form to stdout. */ +static void +save(const void *ip, const struct xt_entry_target *target) +{ + const struct xt_classify_target_info *clinfo = + (const struct xt_classify_target_info *)target->data; + + printf("--set-class %.4x:%.4x ", + TC_H_MAJ(clinfo->priority)>>16, TC_H_MIN(clinfo->priority)); +} + +static struct xtables_target classify = { + .family = AF_INET, + .name = "CLASSIFY", + .version = IPTABLES_VERSION, + .size = XT_ALIGN(sizeof(struct xt_classify_target_info)), + .userspacesize = XT_ALIGN(sizeof(struct xt_classify_target_info)), + .help = &help, + .init = &init, + .parse = &parse, + .final_check = &final_check, + .print = &print, + .save = &save, + .extra_opts = opts, +}; + +static struct xtables_target classify6 = { + .family = AF_INET6, + .name = "CLASSIFY", + .version = IPTABLES_VERSION, + .size = XT_ALIGN(sizeof(struct xt_classify_target_info)), + .userspacesize = XT_ALIGN(sizeof(struct xt_classify_target_info)), + .help = &help, + .init = &init, + .parse = &parse, + .final_check = &final_check, + .print = &print, + .save = &save, + .extra_opts = opts, +}; + +void _init(void) +{ + xtables_register_target(&classify); + xtables_register_target(&classify6); +} diff --git a/include/linux/netfilter/xt_CLASSIFY.h b/include/linux/netfilter/xt_CLASSIFY.h new file mode 100644 index 00000000..58111355 --- /dev/null +++ b/include/linux/netfilter/xt_CLASSIFY.h @@ -0,0 +1,8 @@ +#ifndef _XT_CLASSIFY_H +#define _XT_CLASSIFY_H + +struct xt_classify_target_info { + u_int32_t priority; +}; + +#endif /*_XT_CLASSIFY_H */ diff --git a/include/linux/netfilter_ipv4/ipt_CLASSIFY.h b/include/linux/netfilter_ipv4/ipt_CLASSIFY.h deleted file mode 100644 index 7596e3dd..00000000 --- a/include/linux/netfilter_ipv4/ipt_CLASSIFY.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef _IPT_CLASSIFY_H -#define _IPT_CLASSIFY_H - -struct ipt_classify_target_info { - u_int32_t priority; -}; - -#endif /*_IPT_CLASSIFY_H */ -- cgit v1.2.3