SOURCES (LINUX_2_6): pom-ng-IPMARK-20060829.patch (NEW) - new snap...
cieciwa
cieciwa at pld-linux.org
Tue Aug 29 12:30:49 CEST 2006
Author: cieciwa Date: Tue Aug 29 10:30:49 2006 GMT
Module: SOURCES Tag: LINUX_2_6
---- Log message:
- new snap of IPMARK module.
---- Files affected:
SOURCES:
pom-ng-IPMARK-20060829.patch (NONE -> 1.1.2.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/pom-ng-IPMARK-20060829.patch
diff -u /dev/null SOURCES/pom-ng-IPMARK-20060829.patch:1.1.2.1
--- /dev/null Tue Aug 29 12:30:49 2006
+++ SOURCES/pom-ng-IPMARK-20060829.patch Tue Aug 29 12:30:43 2006
@@ -0,0 +1,155 @@
+ include/linux/netfilter_ipv4/ipt_IPMARK.h | 13 ++++
+ net/ipv4/netfilter/Kconfig | 18 +++++
+ net/ipv4/netfilter/Makefile | 1
+ net/ipv4/netfilter/ipt_IPMARK.c | 96 ++++++++++++++++++++++++++++++
+ 4 files changed, 128 insertions(+)
+
+diff -Nur --exclude '*.orig' linux.org/include/linux/netfilter_ipv4/ipt_IPMARK.h linux/include/linux/netfilter_ipv4/ipt_IPMARK.h
+--- linux.org/include/linux/netfilter_ipv4/ipt_IPMARK.h 1970-01-01 00:00:00.000000000 +0000
++++ linux/include/linux/netfilter_ipv4/ipt_IPMARK.h 2006-08-29 12:27:47.000000000 +0000
+@@ -0,0 +1,13 @@
++#ifndef _IPT_IPMARK_H_target
++#define _IPT_IPMARK_H_target
++
++struct ipt_ipmark_target_info {
++ unsigned long andmask;
++ unsigned long ormask;
++ unsigned char addr;
++};
++
++#define IPT_IPMARK_SRC 0
++#define IPT_IPMARK_DST 1
++
++#endif /*_IPT_IPMARK_H_target*/
+diff -Nur --exclude '*.orig' linux.org/net/ipv4/netfilter/ipt_IPMARK.c linux/net/ipv4/netfilter/ipt_IPMARK.c
+--- linux.org/net/ipv4/netfilter/ipt_IPMARK.c 1970-01-01 00:00:00.000000000 +0000
++++ linux/net/ipv4/netfilter/ipt_IPMARK.c 2006-08-29 12:27:47.000000000 +0000
+@@ -0,0 +1,96 @@
++#include <linux/module.h>
++#include <linux/skbuff.h>
++#include <linux/version.h>
++#include <linux/ip.h>
++#include <net/checksum.h>
++
++#include <linux/netfilter_ipv4/ip_tables.h>
++#include <linux/netfilter_ipv4/ipt_IPMARK.h>
++
++MODULE_AUTHOR("Grzegorz Janoszka <Grzegorz at Janoszka.pl>");
++MODULE_DESCRIPTION("IP tables IPMARK: mark based on ip address");
++MODULE_LICENSE("GPL");
++
++static unsigned int
++target(struct sk_buff **pskb,
++ const struct net_device *in,
++ const struct net_device *out,
++ unsigned int hooknum,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
++ const struct xt_target *target,
++#endif
++ const void *targinfo,
++ void *userinfo)
++{
++ const struct ipt_ipmark_target_info *ipmarkinfo = targinfo;
++ struct iphdr *iph = (*pskb)->nh.iph;
++ unsigned long mark;
++
++ if (ipmarkinfo->addr == IPT_IPMARK_SRC)
++ mark = (unsigned long) ntohl(iph->saddr);
++ else
++ mark = (unsigned long) ntohl(iph->daddr);
++
++ mark &= ipmarkinfo->andmask;
++ mark |= ipmarkinfo->ormask;
++
++ if ((*pskb)->nfmark != mark)
++ (*pskb)->nfmark = mark;
++
++ return IPT_CONTINUE;
++}
++
++static int
++checkentry(const char *tablename,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,16)
++ const void *e,
++#else
++ const struct ipt_entry *e,
++#endif
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
++ const struct xt_target *target,
++#endif
++ void *targinfo,
++ unsigned int targinfosize,
++ unsigned int hook_mask)
++{
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)
++ if (targinfosize != IPT_ALIGN(sizeof(struct ipt_ipmark_target_info))) {
++ printk(KERN_WARNING "IPMARK: targinfosize %u != %Zu\n",
++ targinfosize,
++ IPT_ALIGN(sizeof(struct ipt_ipmark_target_info)));
++ return 0;
++ }
++#endif
++
++ if (strcmp(tablename, "mangle") != 0) {
++ printk(KERN_WARNING "IPMARK: can only be called from \"mangle\" table, not \"%s\"\n", tablename);
++ return 0;
++ }
++
++ return 1;
++}
++
++static struct ipt_target ipt_ipmark_reg = {
++ .name = "IPMARK",
++ .target = target,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,17)
++ .targetsize = sizeof(struct ipt_ipmark_target_info),
++#endif
++ .checkentry = checkentry,
++ .me = THIS_MODULE
++};
++
++static int __init init(void)
++{
++ return ipt_register_target(&ipt_ipmark_reg);
++}
++
++static void __exit fini(void)
++{
++ ipt_unregister_target(&ipt_ipmark_reg);
++}
++
++module_init(init);
++module_exit(fini);
+diff -Nur --exclude '*.orig' linux.org/net/ipv4/netfilter/Kconfig linux/net/ipv4/netfilter/Kconfig
+--- linux.org/net/ipv4/netfilter/Kconfig 2006-06-18 01:49:35.000000000 +0000
++++ linux/net/ipv4/netfilter/Kconfig 2006-08-29 12:27:47.000000000 +0000
+@@ -613,5 +613,23 @@
+ Allows altering the ARP packet payload: source and destination
+ hardware and network addresses.
+
++config IP_NF_TARGET_IPMARK
++ tristate 'IPMARK target support'
++ depends on IP_NF_MANGLE
++ help
++ This option adds a `IPMARK' target, which allows you to create rules
++ in the `mangle' table which alter the netfilter mark field basing
++ on the source or destination ip address of the packet.
++ This is very useful for very fast massive shaping - using only one
++ rule you can direct packets to houndreds different queues.
++ You will probably find it helpful only if your linux machine acts as
++ a shaper for many others computers.
++
++ If you want to compile it as a module, say M here and read
++ <file:Documentation/modules.txt>. The module will be called
++ ipt_IPMARK.o. If unsure, say `N'.
++
++
++
+ endmenu
+
+diff -Nur --exclude '*.orig' linux.org/net/ipv4/netfilter/Makefile linux/net/ipv4/netfilter/Makefile
+--- linux.org/net/ipv4/netfilter/Makefile 2006-06-18 01:49:35.000000000 +0000
++++ linux/net/ipv4/netfilter/Makefile 2006-08-29 12:27:47.000000000 +0000
+@@ -0,0 +0,1 @@
++obj-$(CONFIG_IP_NF_TARGET_IPMARK) += ipt_IPMARK.o
================================================================
More information about the pld-cvs-commit
mailing list