From 0bb09583f24d8fe5d1dac8459c24787110ded019 Mon Sep 17 00:00:00 2001 From: "/C=JP/ST=JP/CN=Yasuyuki Kozakai/emailAddress=yasuyuki@netfilter.org" Date: Sat, 4 Aug 2007 08:24:29 +0000 Subject: Add IPv6 support to DSCP target --- extensions/Makefile | 4 +- extensions/libipt_DSCP.c | 163 ----------------------------- extensions/libxt_DSCP.c | 180 ++++++++++++++++++++++++++++++++ include/linux/netfilter/xt_DSCP.h | 20 ++++ include/linux/netfilter_ipv4/ipt_DSCP.h | 20 ---- 5 files changed, 202 insertions(+), 185 deletions(-) delete mode 100644 extensions/libipt_DSCP.c create mode 100644 extensions/libxt_DSCP.c create mode 100644 include/linux/netfilter/xt_DSCP.h delete mode 100644 include/linux/netfilter_ipv4/ipt_DSCP.h diff --git a/extensions/Makefile b/extensions/Makefile index 53e3e9e..5830faa 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 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 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 CLASSIFY 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 DSCP MARK NFQUEUE NOTRACK TCPMSS TRACE ifeq ($(DO_SELINUX), 1) PF_EXT_SE_SLIB:= diff --git a/extensions/libipt_DSCP.c b/extensions/libipt_DSCP.c deleted file mode 100644 index 029c54f..0000000 --- a/extensions/libipt_DSCP.c +++ /dev/null @@ -1,163 +0,0 @@ -/* Shared library add-on to iptables for DSCP - * - * (C) 2000- 2002 by Matthew G. Marsh , - * Harald Welte - * - * This program is distributed under the terms of GNU GPL v2, 1991 - * - * libipt_DSCP.c borrowed heavily from libipt_TOS.c - * - * --set-class added by Iain Barnes - */ -#include -#include -#include -#include - -#include -#include -#include - -/* This is evil, but it's my code - HW*/ -#include "libipt_dscp_helper.c" - - -static void init(struct xt_entry_target *t, unsigned int *nfcache) -{ -} - -static void help(void) -{ - printf( -"DSCP target options\n" -" --set-dscp value Set DSCP field in packet header to value\n" -" This value can be in decimal (ex: 32)\n" -" or in hex (ex: 0x20)\n" -" --set-dscp-class class Set the DSCP field in packet header to the\n" -" value represented by the DiffServ class value.\n" -" This class may be EF,BE or any of the CSxx\n" -" or AFxx classes.\n" -"\n" -" These two options are mutually exclusive !\n" -); -} - -static const struct option opts[] = { - { "set-dscp", 1, 0, 'F' }, - { "set-dscp-class", 1, 0, 'G' }, - { 0 } -}; - -static void -parse_dscp(const char *s, struct ipt_DSCP_info *dinfo) -{ - unsigned int dscp; - - if (string_to_number(s, 0, 255, &dscp) == -1) - exit_error(PARAMETER_PROBLEM, - "Invalid dscp `%s'\n", s); - - if (dscp > IPT_DSCP_MAX) - exit_error(PARAMETER_PROBLEM, - "DSCP `%d` out of range\n", dscp); - - dinfo->dscp = (u_int8_t )dscp; - return; -} - - -static void -parse_class(const char *s, struct ipt_DSCP_info *dinfo) -{ - unsigned int dscp = class_to_dscp(s); - - /* Assign the value */ - dinfo->dscp = (u_int8_t)dscp; -} - - -static int -parse(int c, char **argv, int invert, unsigned int *flags, - const void *entry, - struct xt_entry_target **target) -{ - struct ipt_DSCP_info *dinfo - = (struct ipt_DSCP_info *)(*target)->data; - - switch (c) { - case 'F': - if (*flags) - exit_error(PARAMETER_PROBLEM, - "DSCP target: Only use --set-dscp ONCE!"); - parse_dscp(optarg, dinfo); - *flags = 1; - break; - case 'G': - if (*flags) - exit_error(PARAMETER_PROBLEM, - "DSCP target: Only use --set-dscp-class ONCE!"); - parse_class(optarg, dinfo); - *flags = 1; - break; - - default: - return 0; - } - - return 1; -} - -static void -final_check(unsigned int flags) -{ - if (!flags) - exit_error(PARAMETER_PROBLEM, - "DSCP target: Parameter --set-dscp is required"); -} - -static void -print_dscp(u_int8_t dscp, int numeric) -{ - printf("0x%02x ", dscp); -} - -/* Prints out the targinfo. */ -static void -print(const void *ip, - const struct xt_entry_target *target, - int numeric) -{ - const struct ipt_DSCP_info *dinfo = - (const struct ipt_DSCP_info *)target->data; - printf("DSCP set "); - print_dscp(dinfo->dscp, 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_DSCP_info *dinfo = - (const struct ipt_DSCP_info *)target->data; - - printf("--set-dscp 0x%02x ", dinfo->dscp); -} - -static struct iptables_target dscp = { - .name = "DSCP", - .version = IPTABLES_VERSION, - .size = IPT_ALIGN(sizeof(struct ipt_DSCP_info)), - .userspacesize = IPT_ALIGN(sizeof(struct ipt_DSCP_info)), - .help = &help, - .init = &init, - .parse = &parse, - .final_check = &final_check, - .print = &print, - .save = &save, - .extra_opts = opts -}; - -void _init(void) -{ - register_target(&dscp); -} diff --git a/extensions/libxt_DSCP.c b/extensions/libxt_DSCP.c new file mode 100644 index 0000000..b062c63 --- /dev/null +++ b/extensions/libxt_DSCP.c @@ -0,0 +1,180 @@ +/* Shared library add-on to iptables for DSCP + * + * (C) 2000- 2002 by Matthew G. Marsh , + * Harald Welte + * + * This program is distributed under the terms of GNU GPL v2, 1991 + * + * libipt_DSCP.c borrowed heavily from libipt_TOS.c + * + * --set-class added by Iain Barnes + */ +#include +#include +#include +#include + +#include +#include +#include + +/* This is evil, but it's my code - HW*/ +#include "libipt_dscp_helper.c" + + +static void init(struct xt_entry_target *t, unsigned int *nfcache) +{ +} + +static void help(void) +{ + printf( +"DSCP target options\n" +" --set-dscp value Set DSCP field in packet header to value\n" +" This value can be in decimal (ex: 32)\n" +" or in hex (ex: 0x20)\n" +" --set-dscp-class class Set the DSCP field in packet header to the\n" +" value represented by the DiffServ class value.\n" +" This class may be EF,BE or any of the CSxx\n" +" or AFxx classes.\n" +"\n" +" These two options are mutually exclusive !\n" +); +} + +static const struct option opts[] = { + { "set-dscp", 1, 0, 'F' }, + { "set-dscp-class", 1, 0, 'G' }, + { 0 } +}; + +static void +parse_dscp(const char *s, struct xt_DSCP_info *dinfo) +{ + unsigned int dscp; + + if (string_to_number(s, 0, 255, &dscp) == -1) + exit_error(PARAMETER_PROBLEM, + "Invalid dscp `%s'\n", s); + + if (dscp > XT_DSCP_MAX) + exit_error(PARAMETER_PROBLEM, + "DSCP `%d` out of range\n", dscp); + + dinfo->dscp = (u_int8_t )dscp; + return; +} + + +static void +parse_class(const char *s, struct xt_DSCP_info *dinfo) +{ + unsigned int dscp = class_to_dscp(s); + + /* Assign the value */ + dinfo->dscp = (u_int8_t)dscp; +} + + +static int +parse(int c, char **argv, int invert, unsigned int *flags, + const void *entry, + struct xt_entry_target **target) +{ + struct xt_DSCP_info *dinfo + = (struct xt_DSCP_info *)(*target)->data; + + switch (c) { + case 'F': + if (*flags) + exit_error(PARAMETER_PROBLEM, + "DSCP target: Only use --set-dscp ONCE!"); + parse_dscp(optarg, dinfo); + *flags = 1; + break; + case 'G': + if (*flags) + exit_error(PARAMETER_PROBLEM, + "DSCP target: Only use --set-dscp-class ONCE!"); + parse_class(optarg, dinfo); + *flags = 1; + break; + + default: + return 0; + } + + return 1; +} + +static void +final_check(unsigned int flags) +{ + if (!flags) + exit_error(PARAMETER_PROBLEM, + "DSCP target: Parameter --set-dscp is required"); +} + +static void +print_dscp(u_int8_t dscp, int numeric) +{ + printf("0x%02x ", dscp); +} + +/* Prints out the targinfo. */ +static void +print(const void *ip, + const struct xt_entry_target *target, + int numeric) +{ + const struct xt_DSCP_info *dinfo = + (const struct xt_DSCP_info *)target->data; + printf("DSCP set "); + print_dscp(dinfo->dscp, 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_DSCP_info *dinfo = + (const struct xt_DSCP_info *)target->data; + + printf("--set-dscp 0x%02x ", dinfo->dscp); +} + +static struct xtables_target dscp = { + .family = AF_INET, + .name = "DSCP", + .version = IPTABLES_VERSION, + .size = XT_ALIGN(sizeof(struct xt_DSCP_info)), + .userspacesize = XT_ALIGN(sizeof(struct xt_DSCP_info)), + .help = &help, + .init = &init, + .parse = &parse, + .final_check = &final_check, + .print = &print, + .save = &save, + .extra_opts = opts, +}; + +static struct xtables_target dscp6 = { + .family = AF_INET6, + .name = "DSCP", + .version = IPTABLES_VERSION, + .size = XT_ALIGN(sizeof(struct xt_DSCP_info)), + .userspacesize = XT_ALIGN(sizeof(struct xt_DSCP_info)), + .help = &help, + .init = &init, + .parse = &parse, + .final_check = &final_check, + .print = &print, + .save = &save, + .extra_opts = opts, +}; + +void _init(void) +{ + xtables_register_target(&dscp); + xtables_register_target(&dscp6); +} diff --git a/include/linux/netfilter/xt_DSCP.h b/include/linux/netfilter/xt_DSCP.h new file mode 100644 index 0000000..3c7c963 --- /dev/null +++ b/include/linux/netfilter/xt_DSCP.h @@ -0,0 +1,20 @@ +/* x_tables module for setting the IPv4/IPv6 DSCP field + * + * (C) 2002 Harald Welte + * based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh + * This software is distributed under GNU GPL v2, 1991 + * + * See RFC2474 for a description of the DSCP field within the IP Header. + * + * xt_DSCP.h,v 1.7 2002/03/14 12:03:13 laforge Exp +*/ +#ifndef _XT_DSCP_TARGET_H +#define _XT_DSCP_TARGET_H +#include + +/* target info */ +struct xt_DSCP_info { + u_int8_t dscp; +}; + +#endif /* _XT_DSCP_TARGET_H */ diff --git a/include/linux/netfilter_ipv4/ipt_DSCP.h b/include/linux/netfilter_ipv4/ipt_DSCP.h deleted file mode 100644 index 678edee..0000000 --- a/include/linux/netfilter_ipv4/ipt_DSCP.h +++ /dev/null @@ -1,20 +0,0 @@ -/* iptables module for setting the IPv4 DSCP field - * - * (C) 2002 Harald Welte - * based on ipt_FTOS.c (C) 2000 by Matthew G. Marsh - * This software is distributed under GNU GPL v2, 1991 - * - * See RFC2474 for a description of the DSCP field within the IP Header. - * - * Id: ipt_DSCP.h,v 1.7 2002/03/14 12:03:13 laforge Exp -*/ -#ifndef _IPT_DSCP_TARGET_H -#define _IPT_DSCP_TARGET_H -#include - -/* target info */ -struct ipt_DSCP_info { - u_int8_t dscp; -}; - -#endif /* _IPT_DSCP_TARGET_H */ -- cgit v1.2.3