From 8f3864732f38c72c018138269b3e2109c3b3cd40 Mon Sep 17 00:00:00 2001 From: Bart De Schuymer Date: Sat, 3 May 2003 18:13:34 +0000 Subject: update to 2.5.68+pkttype --- kernel/linux2.5/include/linux/netfilter_bridge/ebt_arp.h | 8 +++++++- kernel/linux2.5/include/linux/netfilter_bridge/ebt_pkttype.h | 11 +++++++++++ kernel/linux2.5/include/linux/netfilter_bridge/ebtables.h | 1 + 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 kernel/linux2.5/include/linux/netfilter_bridge/ebt_pkttype.h (limited to 'kernel/linux2.5/include') diff --git a/kernel/linux2.5/include/linux/netfilter_bridge/ebt_arp.h b/kernel/linux2.5/include/linux/netfilter_bridge/ebt_arp.h index 8967dda..537ec6b 100644 --- a/kernel/linux2.5/include/linux/netfilter_bridge/ebt_arp.h +++ b/kernel/linux2.5/include/linux/netfilter_bridge/ebt_arp.h @@ -6,8 +6,10 @@ #define EBT_ARP_PTYPE 0x04 #define EBT_ARP_SRC_IP 0x08 #define EBT_ARP_DST_IP 0x10 +#define EBT_ARP_SRC_MAC 0x20 +#define EBT_ARP_DST_MAC 0x40 #define EBT_ARP_MASK (EBT_ARP_OPCODE | EBT_ARP_HTYPE | EBT_ARP_PTYPE | \ - EBT_ARP_SRC_IP | EBT_ARP_DST_IP) + EBT_ARP_SRC_IP | EBT_ARP_DST_IP | EBT_ARP_SRC_MAC | EBT_ARP_DST_MAC) #define EBT_ARP_MATCH "arp" struct ebt_arp_info @@ -19,6 +21,10 @@ struct ebt_arp_info uint32_t smsk; uint32_t daddr; uint32_t dmsk; + unsigned char smaddr[ETH_ALEN]; + unsigned char smmsk[ETH_ALEN]; + unsigned char dmaddr[ETH_ALEN]; + unsigned char dmmsk[ETH_ALEN]; uint8_t bitmask; uint8_t invflags; }; diff --git a/kernel/linux2.5/include/linux/netfilter_bridge/ebt_pkttype.h b/kernel/linux2.5/include/linux/netfilter_bridge/ebt_pkttype.h new file mode 100644 index 0000000..0d64bbb --- /dev/null +++ b/kernel/linux2.5/include/linux/netfilter_bridge/ebt_pkttype.h @@ -0,0 +1,11 @@ +#ifndef __LINUX_BRIDGE_EBT_PKTTYPE_H +#define __LINUX_BRIDGE_EBT_PKTTYPE_H + +struct ebt_pkttype_info +{ + uint8_t pkt_type; + uint8_t invert; +}; +#define EBT_PKTTYPE_MATCH "pkttype" + +#endif diff --git a/kernel/linux2.5/include/linux/netfilter_bridge/ebtables.h b/kernel/linux2.5/include/linux/netfilter_bridge/ebtables.h index cb6348d..1056e45 100644 --- a/kernel/linux2.5/include/linux/netfilter_bridge/ebtables.h +++ b/kernel/linux2.5/include/linux/netfilter_bridge/ebtables.h @@ -260,6 +260,7 @@ struct ebt_table unsigned int valid_hooks); /* the data used by the kernel */ struct ebt_table_info *private; + struct module *me; }; extern int ebt_register_table(struct ebt_table *table); -- cgit v1.2.3