Skip to content

L
linux
Commit 486874ac authored by Adrian Bunk's avatar Adrian Bunk Committed by David S. Miller
Browse files
Options

[NF/IPV6]: Remove all ipv6_ext_hdrs from ip6tables.

parent d21c8bd3
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 84 deletions
include/linux/netfilter_ipv6/ip6_tables.h
View file @ 486874ac
......@@ -449,6 +449,9 @@ extern unsigned int ip6t_do_table(struct sk_buff **pskb,
struct ip6t_table *table,
void *userdata);
/* Check for an extension */
extern int ip6t_ext_hdr(u8 nexthdr);
#define IP6T_ALIGN(s) (((s) + (__alignof__(struct ip6t_entry)-1)) & ~(__alignof__(struct ip6t_entry)-1))
#endif /*__KERNEL__*/
......
net/ipv6/netfilter/ip6t_ah.c
View file @ 486874ac
......@@ -26,17 +26,6 @@ struct ahhdr {
__u32 spi;
};
int ipv6_ext_hdr(u8 nexthdr)
{
return ( (nexthdr == NEXTHDR_HOP) ||
(nexthdr == NEXTHDR_ROUTING) ||
(nexthdr == NEXTHDR_FRAGMENT) ||
(nexthdr == NEXTHDR_AUTH) ||
(nexthdr == NEXTHDR_ESP) ||
(nexthdr == NEXTHDR_NONE) ||
(nexthdr == NEXTHDR_DEST) );
}
/* Returns 1 if the spi is matched by the range, 0 otherwise */
static inline int
spi_match(u_int32_t min, u_int32_t max, u_int32_t spi, int invert)
......@@ -79,7 +68,7 @@ match(const struct sk_buff *skb,
len = skb->len - ptr;
temp = 0;
while (ipv6_ext_hdr(nexthdr)) {
while (ip6t_ext_hdr(nexthdr)) {
struct ipv6_opt_hdr *hdr;
DEBUGP("ipv6_ah header iteration \n");
......
net/ipv6/netfilter/ip6t_dst.c
View file @ 486874ac
......@@ -29,17 +29,6 @@ MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>");
#define DEBUGP(format, args...)
#endif
int ipv6_ext_hdr(u8 nexthdr)
{
return ( (nexthdr == NEXTHDR_HOP) ||
(nexthdr == NEXTHDR_ROUTING) ||
(nexthdr == NEXTHDR_FRAGMENT) ||
(nexthdr == NEXTHDR_AUTH) ||
(nexthdr == NEXTHDR_ESP) ||
(nexthdr == NEXTHDR_NONE) ||
(nexthdr == NEXTHDR_DEST) );
}
/*
* (Type & 0xC0) >> 6
* 0 -> ignorable
......@@ -84,7 +73,7 @@ match(const struct sk_buff *skb,
len = skb->len - ptr;
temp = 0;
while (ipv6_ext_hdr(nexthdr)) {
while (ip6t_ext_hdr(nexthdr)) {
struct ipv6_opt_hdr *hdr;
DEBUGP("ipv6_opts header iteration \n");
......
net/ipv6/netfilter/ip6t_esp.c
View file @ 486874ac
......@@ -23,17 +23,6 @@ struct esphdr {
__u32 spi;
};
int ipv6_ext_hdr(u8 nexthdr)
{
return ( (nexthdr == NEXTHDR_HOP) ||
(nexthdr == NEXTHDR_ROUTING) ||
(nexthdr == NEXTHDR_FRAGMENT) ||
(nexthdr == NEXTHDR_AUTH) ||
(nexthdr == NEXTHDR_ESP) ||
(nexthdr == NEXTHDR_NONE) ||
(nexthdr == NEXTHDR_DEST) );
}
/* Returns 1 if the spi is matched by the range, 0 otherwise */
static inline int
spi_match(u_int32_t min, u_int32_t max, u_int32_t spi, int invert)
......@@ -74,7 +63,7 @@ match(const struct sk_buff *skb,
len = skb->len - ptr;
temp = 0;
while (ipv6_ext_hdr(nexthdr)) {
while (ip6t_ext_hdr(nexthdr)) {
struct ipv6_opt_hdr *hdr;
int hdrlen;
......
net/ipv6/netfilter/ip6t_frag.c
View file @ 486874ac
......@@ -44,17 +44,6 @@ struct fraghdr {
__u32 id;
};
int ipv6_ext_hdr(u8 nexthdr)
{
return ( (nexthdr == NEXTHDR_HOP) ||
(nexthdr == NEXTHDR_ROUTING) ||
(nexthdr == NEXTHDR_FRAGMENT) ||
(nexthdr == NEXTHDR_AUTH) ||
(nexthdr == NEXTHDR_ESP) ||
(nexthdr == NEXTHDR_NONE) ||
(nexthdr == NEXTHDR_DEST) );
}
/* Returns 1 if the id is matched by the range, 0 otherwise */
static inline int
id_match(u_int32_t min, u_int32_t max, u_int32_t id, int invert)
......@@ -93,7 +82,7 @@ match(const struct sk_buff *skb,
len = skb->len - ptr;
temp = 0;
while (ipv6_ext_hdr(nexthdr)) {
while (ip6t_ext_hdr(nexthdr)) {
struct ipv6_opt_hdr *hdr;
DEBUGP("ipv6_frag header iteration \n");
......
net/ipv6/netfilter/ip6t_hbh.c
View file @ 486874ac
......@@ -29,17 +29,6 @@ MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>");
#define DEBUGP(format, args...)
#endif
int ipv6_ext_hdr(u8 nexthdr)
{
return ( (nexthdr == NEXTHDR_HOP) ||
(nexthdr == NEXTHDR_ROUTING) ||
(nexthdr == NEXTHDR_FRAGMENT) ||
(nexthdr == NEXTHDR_AUTH) ||
(nexthdr == NEXTHDR_ESP) ||
(nexthdr == NEXTHDR_NONE) ||
(nexthdr == NEXTHDR_DEST) );
}
/*
* (Type & 0xC0) >> 6
* 0 -> ignorable
......@@ -84,7 +73,7 @@ match(const struct sk_buff *skb,
len = skb->len - ptr;
temp = 0;
while (ipv6_ext_hdr(nexthdr)) {
while (ip6t_ext_hdr(nexthdr)) {
struct ipv6_opt_hdr *hdr;
DEBUGP("ipv6_opts header iteration \n");
......
net/ipv6/netfilter/ip6t_ipv6header.c
View file @ 486874ac
......@@ -24,17 +24,6 @@ MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>");
#define DEBUGP(format, args...)
#endif
int ipv6_ext_hdr(u8 nexthdr)
{
return ( (nexthdr == NEXTHDR_HOP) ||
(nexthdr == NEXTHDR_ROUTING) ||
(nexthdr == NEXTHDR_FRAGMENT) ||
(nexthdr == NEXTHDR_AUTH) ||
(nexthdr == NEXTHDR_ESP) ||
(nexthdr == NEXTHDR_NONE) ||
(nexthdr == NEXTHDR_DEST) );
}
static int
ipv6header_match(const struct sk_buff *skb,
const struct net_device *in,
......@@ -95,7 +84,7 @@ ipv6header_match(const struct sk_buff *skb,
temp = 0;
while (ipv6_ext_hdr(nexthdr)) {
while (ip6t_ext_hdr(nexthdr)) {
struct ipv6_opt_hdr *hdr;
int hdrlen;
......
net/ipv6/netfilter/ip6t_rt.c
View file @ 486874ac
......@@ -21,17 +21,6 @@ MODULE_AUTHOR("Andras Kis-Szabo <kisza@sch.bme.hu>");
#define DEBUGP(format, args...)
#endif
int ipv6_ext_hdr(u8 nexthdr)
{
return ( (nexthdr == NEXTHDR_HOP) ||
(nexthdr == NEXTHDR_ROUTING) ||
(nexthdr == NEXTHDR_FRAGMENT) ||
(nexthdr == NEXTHDR_AUTH) ||
(nexthdr == NEXTHDR_ESP) ||
(nexthdr == NEXTHDR_NONE) ||
(nexthdr == NEXTHDR_DEST) );
}
/* Returns 1 if the id is matched by the range, 0 otherwise */
static inline int
segsleft_match(u_int32_t min, u_int32_t max, u_int32_t id, int invert)
......@@ -71,7 +60,7 @@ match(const struct sk_buff *skb,
len = skb->len - ptr;
temp = 0;
while (ipv6_ext_hdr(nexthdr)) {
while (ip6t_ext_hdr(nexthdr)) {
struct ipv6_opt_hdr *hdr;
DEBUGP("ipv6_rt header iteration \n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7