diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/linux/linux-2.4/config/brcm | 1 | ||||
| -rw-r--r-- | target/linux/linux-2.4/patches/generic/618-netfilter_time.patch | 238 | ||||
| -rw-r--r-- | target/linux/netfilter.mk | 1 | 
3 files changed, 240 insertions, 0 deletions
| diff --git a/target/linux/linux-2.4/config/brcm b/target/linux/linux-2.4/config/brcm index bc375e0ed..09344cda2 100644 --- a/target/linux/linux-2.4/config/brcm +++ b/target/linux/linux-2.4/config/brcm @@ -378,6 +378,7 @@ CONFIG_IP_NF_MATCH_PKTTYPE=m  CONFIG_IP_NF_MATCH_MARK=y  CONFIG_IP_NF_MATCH_MULTIPORT=y  CONFIG_IP_NF_MATCH_TOS=m +CONFIG_IP_NF_MATCH_TIME=m  CONFIG_IP_NF_MATCH_CONDITION=m  CONFIG_IP_NF_MATCH_RECENT=m  CONFIG_IP_NF_MATCH_ECN=m diff --git a/target/linux/linux-2.4/patches/generic/618-netfilter_time.patch b/target/linux/linux-2.4/patches/generic/618-netfilter_time.patch new file mode 100644 index 000000000..3593571b4 --- /dev/null +++ b/target/linux/linux-2.4/patches/generic/618-netfilter_time.patch @@ -0,0 +1,238 @@ +diff -urN linux-2.4.32.orig/net/ipv4/netfilter/Config.in linux-2.4.32/net/ipv4/netfilter/Config.in +--- linux-2.4.32.orig/net/ipv4/netfilter/Config.in	2006-01-07 12:11:37.000000000 +0100 ++++ linux-2.4.32/net/ipv4/netfilter/Config.in	2006-01-07 12:15:45.000000000 +0100 +@@ -48,6 +48,7 @@ +   dep_tristate '  netfilter MARK match support' CONFIG_IP_NF_MATCH_MARK $CONFIG_IP_NF_IPTABLES +   dep_tristate '  Multiple port match support' CONFIG_IP_NF_MATCH_MULTIPORT $CONFIG_IP_NF_IPTABLES +   dep_tristate '  TOS match support' CONFIG_IP_NF_MATCH_TOS $CONFIG_IP_NF_IPTABLES ++  dep_tristate '  TIME match support (EXPERIMENTAL)' CONFIG_IP_NF_MATCH_TIME $CONFIG_IP_NF_IPTABLES +   dep_tristate '  condition match support' CONFIG_IP_NF_MATCH_CONDITION $CONFIG_IP_NF_IPTABLES +   dep_tristate '  recent match support' CONFIG_IP_NF_MATCH_RECENT $CONFIG_IP_NF_IPTABLES +   dep_tristate '  ECN match support' CONFIG_IP_NF_MATCH_ECN $CONFIG_IP_NF_IPTABLES +diff -urN linux-2.4.32.orig/net/ipv4/netfilter/ipt_time.c linux-2.4.32/net/ipv4/netfilter/ipt_time.c +--- linux-2.4.32.orig/net/ipv4/netfilter/ipt_time.c	1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.32/net/ipv4/netfilter/ipt_time.c	2006-01-07 12:14:32.000000000 +0100 +@@ -0,0 +1,193 @@ ++/* ++  This is a module which is used for time matching ++  It is using some modified code from dietlibc (localtime() function) ++  that you can find at http://www.fefe.de/dietlibc/ ++  This file is distributed under the terms of the GNU General Public ++  License (GPL). Copies of the GPL can be obtained from: ftp://prep.ai.mit.edu/pub/gnu/GPL ++  2001-05-04 Fabrice MARIE <fabrice@netfilter.org> : initial development. ++  2001-21-05 Fabrice MARIE <fabrice@netfilter.org> : bug fix in the match code, ++     thanks to "Zeng Yu" <zengy@capitel.com.cn> for bug report. ++  2001-26-09 Fabrice MARIE <fabrice@netfilter.org> : force the match to be in LOCAL_IN or PRE_ROUTING only. ++  2001-30-11 Fabrice : added the possibility to use the match in FORWARD/OUTPUT with a little hack, ++     added Nguyen Dang Phuoc Dong <dongnd@tlnet.com.vn> patch to support timezones. ++  2004-05-02 Fabrice : added support for date matching, from an idea of Fabien COELHO. ++*/ ++ ++#include <linux/module.h> ++#include <linux/skbuff.h> ++#include <linux/netfilter_ipv4/ip_tables.h> ++#include <linux/netfilter_ipv4/ipt_time.h> ++#include <linux/time.h> ++ ++MODULE_AUTHOR("Fabrice MARIE <fabrice@netfilter.org>"); ++MODULE_DESCRIPTION("Match arrival timestamp/date"); ++MODULE_LICENSE("GPL"); ++ ++struct tm ++{ ++	int tm_sec;                   /* Seconds.     [0-60] (1 leap second) */ ++	int tm_min;                   /* Minutes.     [0-59] */ ++	int tm_hour;                  /* Hours.       [0-23] */ ++	int tm_mday;                  /* Day.         [1-31] */ ++	int tm_mon;                   /* Month.       [0-11] */ ++	int tm_year;                  /* Year - 1900.  */ ++	int tm_wday;                  /* Day of week. [0-6] */ ++	int tm_yday;                  /* Days in year.[0-365] */ ++	int tm_isdst;                 /* DST.         [-1/0/1]*/ ++ ++	long int tm_gmtoff;           /* we don't care, we count from GMT */ ++	const char *tm_zone;          /* we don't care, we count from GMT */ ++}; ++ ++void ++localtime(const time_t *timepr, struct tm *r); ++ ++static int ++match(const struct sk_buff *skb, ++      const struct net_device *in, ++      const struct net_device *out, ++      const void *matchinfo, ++      int offset, ++      const void *hdr, ++      u_int16_t datalen, ++      int *hotdrop) ++{ ++	const struct ipt_time_info *info = matchinfo;   /* match info for rule */ ++	struct tm currenttime;                          /* time human readable */ ++	u_int8_t days_of_week[7] = {64, 32, 16, 8, 4, 2, 1}; ++	u_int16_t packet_time; ++	struct timeval kerneltimeval; ++	time_t packet_local_time; ++ ++	/* if kerneltime=1, we don't read the skb->timestamp but kernel time instead */ ++	if (info->kerneltime) ++	{ ++		do_gettimeofday(&kerneltimeval); ++		packet_local_time = kerneltimeval.tv_sec; ++	} ++	else ++		packet_local_time = skb->stamp.tv_sec; ++ ++	/* First we make sure we are in the date start-stop boundaries */ ++	if ((packet_local_time < info->date_start) || (packet_local_time > info->date_stop)) ++		return 0; /* We are outside the date boundaries */ ++ ++	/* Transform the timestamp of the packet, in a human readable form */ ++	localtime(&packet_local_time, ¤ttime); ++ ++	/* check if we match this timestamp, we start by the days... */ ++	if ((days_of_week[currenttime.tm_wday] & info->days_match) != days_of_week[currenttime.tm_wday]) ++		return 0; /* the day doesn't match */ ++ ++	/* ... check the time now */ ++	packet_time = (currenttime.tm_hour * 60) + currenttime.tm_min; ++	if ((packet_time < info->time_start) || (packet_time > info->time_stop)) ++		return 0; ++ ++	/* here we match ! */ ++	return 1; ++} ++ ++static int ++checkentry(const char *tablename, ++           const struct ipt_ip *ip, ++           void *matchinfo, ++           unsigned int matchsize, ++           unsigned int hook_mask) ++{ ++	struct ipt_time_info *info = matchinfo;   /* match info for rule */ ++ ++	/* First, check that we are in the correct hooks */ ++	if (hook_mask ++            & ~((1 << NF_IP_PRE_ROUTING) | (1 << NF_IP_LOCAL_IN) | (1 << NF_IP_FORWARD) | (1 << NF_IP_LOCAL_OUT))) ++	{ ++		printk("ipt_time: error, only valid for PRE_ROUTING, LOCAL_IN, FORWARD and OUTPUT)\n"); ++		return 0; ++	} ++	/* we use the kerneltime if we are in forward or output */ ++	info->kerneltime = 1; ++	if (hook_mask & ~((1 << NF_IP_FORWARD) | (1 << NF_IP_LOCAL_OUT)))  ++		/* we use the skb time */ ++		info->kerneltime = 0; ++ ++	/* Check the size */ ++	if (matchsize != IPT_ALIGN(sizeof(struct ipt_time_info))) ++		return 0; ++	/* Now check the coherence of the data ... */ ++	if ((info->time_start > 1439) ||        /* 23*60+59 = 1439*/ ++	    (info->time_stop  > 1439)) ++	{ ++		printk(KERN_WARNING "ipt_time: invalid argument\n"); ++		return 0; ++	} ++ ++	return 1; ++} ++ ++static struct ipt_match time_match = { ++	.name		= "time", ++	.match		= match, ++	.checkentry	= checkentry, ++	.me		= THIS_MODULE, ++}; ++ ++static int __init init(void) ++{ ++	printk("ipt_time loading\n"); ++	return ipt_register_match(&time_match); ++} ++ ++static void __exit fini(void) ++{ ++	ipt_unregister_match(&time_match); ++	printk("ipt_time unloaded\n"); ++} ++ ++module_init(init); ++module_exit(fini); ++ ++ ++/* The part below is borowed and modified from dietlibc */ ++ ++/* seconds per day */ ++#define SPD 24*60*60 ++ ++void ++localtime(const time_t *timepr, struct tm *r) { ++	time_t i; ++	time_t timep; ++	extern struct timezone sys_tz; ++	const unsigned int __spm[12] = ++		{ 0, ++		  (31), ++		  (31+28), ++		  (31+28+31), ++		  (31+28+31+30), ++		  (31+28+31+30+31), ++		  (31+28+31+30+31+30), ++		  (31+28+31+30+31+30+31), ++		  (31+28+31+30+31+30+31+31), ++		  (31+28+31+30+31+30+31+31+30), ++		  (31+28+31+30+31+30+31+31+30+31), ++		  (31+28+31+30+31+30+31+31+30+31+30), ++		}; ++	register time_t work; ++ ++	timep = (*timepr) - (sys_tz.tz_minuteswest * 60); ++	work=timep%(SPD); ++	r->tm_sec=work%60; work/=60; ++	r->tm_min=work%60; r->tm_hour=work/60; ++	work=timep/(SPD); ++	r->tm_wday=(4+work)%7; ++	for (i=1970; ; ++i) { ++		register time_t k= (!(i%4) && ((i%100) || !(i%400)))?366:365; ++		if (work>k) ++			work-=k; ++		else ++			break; ++	} ++	r->tm_year=i-1900; ++	for (i=11; i && __spm[i]>work; --i) ; ++	r->tm_mon=i; ++	r->tm_mday=work-__spm[i]+1; ++} +diff -urN linux-2.4.32.orig/net/ipv4/netfilter/Makefile linux-2.4.32/net/ipv4/netfilter/Makefile +--- linux-2.4.32.orig/net/ipv4/netfilter/Makefile	2006-01-07 12:11:37.000000000 +0100 ++++ linux-2.4.32/net/ipv4/netfilter/Makefile	2006-01-07 12:16:07.000000000 +0100 +@@ -118,6 +118,7 @@ + obj-$(CONFIG_IP_NF_MATCH_MULTIPORT) += ipt_multiport.o + obj-$(CONFIG_IP_NF_MATCH_OWNER) += ipt_owner.o + obj-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos.o ++obj-$(CONFIG_IP_NF_MATCH_TIME) += ipt_time.o + obj-$(CONFIG_IP_NF_MATCH_CONDITION) += ipt_condition.o +  + obj-$(CONFIG_IP_NF_MATCH_RECENT) += ipt_recent.o +diff -urN linux-2.4.32.orig/include/linux/netfilter_ipv4/ipt_time.h linux-2.4.32/include/linux/netfilter_ipv4/ipt_time.h +--- linux-2.4.32.orig/include/linux/netfilter_ipv4/ipt_time.h	1970-01-01 01:00:00.000000000 +0100 ++++ linux-2.4.32/include/linux/netfilter_ipv4/ipt_time.h	2006-01-07 12:16:42.000000000 +0100 +@@ -0,0 +1,15 @@ ++#ifndef __ipt_time_h_included__ ++#define __ipt_time_h_included__ ++ ++ ++struct ipt_time_info { ++	u_int8_t  days_match;   /* 1 bit per day. -SMTWTFS                      */ ++	u_int16_t time_start;   /* 0 < time_start < 23*60+59 = 1439             */ ++	u_int16_t time_stop;    /* 0:0 < time_stat < 23:59                      */ ++	u_int8_t  kerneltime;   /* ignore skb time (and use kerneltime) or not. */ ++	time_t    date_start; ++	time_t    date_stop; ++}; ++ ++ ++#endif /* __ipt_time_h_included__ */ diff --git a/target/linux/netfilter.mk b/target/linux/netfilter.mk index f272a8548..c137a08b1 100644 --- a/target/linux/netfilter.mk +++ b/target/linux/netfilter.mk @@ -40,6 +40,7 @@ IPT_IPOPT-$(CONFIG_IP_NF_TARGET_MARK) += ipt_MARK  IPT_IPOPT-$(CONFIG_IP_NF_MATCH_TCPMSS) += ipt_tcpmss  IPT_IPOPT-$(CONFIG_IP_NF_TARGET_TCPMSS) += ipt_TCPMSS  IPT_IPOPT-$(CONFIG_IP_NF_MATCH_TOS) += ipt_tos +IPT_IPOPT-$(CONFIG_IP_NF_MATCH_TIME) += ipt_time  IPT_IPOPT-$(CONFIG_IP_NF_TARGET_TOS) += ipt_TOS  IPT_IPOPT-$(CONFIG_IP_NF_MATCH_TTL) += ipt_ttl  IPT_IPOPT-$(CONFIG_IP_NF_TARGET_TTL) += ipt_TTL | 
