inet: generalize ipv4-only RFC3168 5.3 ecn fragmentation handling for future use by ipv6
Subsystems (3)
PATCH 1/2 inet: generalize ipv4-only RFC3168 5.3 ecn fragmentation handling for future use by ipv6
This patch just moves some code arround to make the ip4_frag_ecn_table and IPFRAG_ECN_* constants accessible from the other reassembly engines. I also renamed ip4_frag_ecn_table to ip_frag_ecn_table.
--- include/net/inet_frag.h | 12 ++++++++++++ net/ipv4/inet_fragment.c | 22 ++++++++++++++++++++++ net/ipv4/ip_fragment.c | 31 +------------------------------ 3 files changed, 35 insertions(+), 30 deletions(-)
include/net/inet_frag.h +12 -0
@@ -153,4 +153,16 @@ static inline void inet_frag_lru_add(struct netns_frags *nf,list_add_tail (&q->lru_list, &nf->lru_list); spin_unlock(&nf->lru_lock); } + +/* RFC 3168 support : +* We want to check ECN values of all fragments, do detect invalid combinations. +* In ipq->ecn, we store the OR value of each ip4_frag_ecn() fragment value. +*/ +#define IPFRAG_ECN_NOT_ECT 0x01/* one frag had ECN_NOT_ECT */ +#define IPFRAG_ECN_ECT_1 0x02/* one frag had ECN_ECT_1 */ +#define IPFRAG_ECN_ECT_0 0x04/* one frag had ECN_ECT_0 */ +#define IPFRAG_ECN_CE 0x08/* one frag had ECN_CE */ + +extern const u8 ip_frag_ecn_table[16 ]; +#endif
net/ipv4/inet_fragment.c +22 -0
@@ -23,6 +23,28 @@#include <net/sock.h> #include <net/inet_frag.h> +#include <net/inet_ecn.h> + +/* Given the OR values of all fragments, apply RFC 3168 5.3 requirements +* Value : 0xff if frame should be dropped. +* 0 or INET_ECN_CE value, to be ORed in to final iph->tos field +*/ +const u8 ip_frag_ecn_table[16 ] = { +/* at least one fragment had CE, and others ECT_0 or ECT_1 */ + [IPFRAG_ECN_CE |IPFRAG_ECN_ECT_0 ] =INET_ECN_CE , + [IPFRAG_ECN_CE |IPFRAG_ECN_ECT_1 ] =INET_ECN_CE , + [IPFRAG_ECN_CE |IPFRAG_ECN_ECT_0 |IPFRAG_ECN_ECT_1 ] =INET_ECN_CE , + +/* invalid combinations : drop frame */ + [IPFRAG_ECN_NOT_ECT |IPFRAG_ECN_CE ] =0xff , + [IPFRAG_ECN_NOT_ECT |IPFRAG_ECN_ECT_0 ] =0xff , + [IPFRAG_ECN_NOT_ECT |IPFRAG_ECN_ECT_1 ] =0xff , + [IPFRAG_ECN_NOT_ECT |IPFRAG_ECN_ECT_0 |IPFRAG_ECN_ECT_1 ] =0xff , + [IPFRAG_ECN_NOT_ECT |IPFRAG_ECN_CE |IPFRAG_ECN_ECT_0 ] =0xff , + [IPFRAG_ECN_NOT_ECT |IPFRAG_ECN_CE |IPFRAG_ECN_ECT_1 ] =0xff , + [IPFRAG_ECN_NOT_ECT |IPFRAG_ECN_CE |IPFRAG_ECN_ECT_0 |IPFRAG_ECN_ECT_1 ] =0xff , +}; +EXPORT_SYMBOL (ip_frag_ecn_table);static void inet_frag_secret_rebuild (unsigned long dummy) {
net/ipv4/ip_fragment.c +1 -30
@@ -79,40 +79,11 @@ struct ipq {struct inet_peer *peer; }; -/* RFC 3168 support : -* We want to check ECN values of all fragments, do detect invalid combinations. -* In ipq->ecn, we store the OR value of each ip4_frag_ecn() fragment value. -*/ -#define IPFRAG_ECN_NOT_ECT 0x01/* one frag had ECN_NOT_ECT */ -#define IPFRAG_ECN_ECT_1 0x02/* one frag had ECN_ECT_1 */ -#define IPFRAG_ECN_ECT_0 0x04/* one frag had ECN_ECT_0 */ -#define IPFRAG_ECN_CE 0x08/* one frag had ECN_CE */ -static inline u8 ip4_frag_ecn (u8 tos) {return 1 << (tos &INET_ECN_MASK ); } -/* Given the OR values of all fragments, apply RFC 3168 5.3 requirements -* Value : 0xff if frame should be dropped. -* 0 or INET_ECN_CE value, to be ORed in to final iph->tos field -*/ -static const u8 ip4_frag_ecn_table[16 ] = { -/* at least one fragment had CE, and others ECT_0 or ECT_1 */ - [IPFRAG_ECN_CE |IPFRAG_ECN_ECT_0 ] =INET_ECN_CE , - [IPFRAG_ECN_CE |IPFRAG_ECN_ECT_1 ] =INET_ECN_CE , - [IPFRAG_ECN_CE |IPFRAG_ECN_ECT_0 |IPFRAG_ECN_ECT_1 ] =INET_ECN_CE , - -/* invalid combinations : drop frame */ - [IPFRAG_ECN_NOT_ECT |IPFRAG_ECN_CE ] =0xff , - [IPFRAG_ECN_NOT_ECT |IPFRAG_ECN_ECT_0 ] =0xff , - [IPFRAG_ECN_NOT_ECT |IPFRAG_ECN_ECT_1 ] =0xff , - [IPFRAG_ECN_NOT_ECT |IPFRAG_ECN_ECT_0 |IPFRAG_ECN_ECT_1 ] =0xff , - [IPFRAG_ECN_NOT_ECT |IPFRAG_ECN_CE |IPFRAG_ECN_ECT_0 ] =0xff , - [IPFRAG_ECN_NOT_ECT |IPFRAG_ECN_CE |IPFRAG_ECN_ECT_1 ] =0xff , - [IPFRAG_ECN_NOT_ECT |IPFRAG_ECN_CE |IPFRAG_ECN_ECT_0 |IPFRAG_ECN_ECT_1 ] =0xff , -}; -static struct inet_frags ip4_frags;int ip_frag_nqueues (struct net *net)
@@ -551,7 +522,7 @@ static int ip_frag_reasm(struct ipq *qp, struct sk_buff *prev,ipq_kill (qp); - ecn = ip4_frag_ecn_table[qp->ecn]; + ecn = ip_frag_ecn_table[qp->ecn];if (unlikely (ecn ==0xff )) { err = -EINVAL ; goto out_fail;
Signature · 1 line
1.8.1.4
Quoted 8 lines · Hannes Frederic Sowa
This patch just moves some code arround to make the
ip4_frag_ecn_tableand IPFRAG_ECN_* constants accessible from the other reassembly engines. I also renamedip4_frag_ecn_tabletoip_frag_ecn_table.Cc Eric Dumazet <[email protected]>Cc Jesper Dangaard Brouer <[email protected]>Cc YOSHIFUJI Hideaki <[email protected]>Signed-off-by Hannes Frederic Sowa <[email protected]>
--yoshfuji
From: Hannes Frederic Sowa <[email protected]>
Date: Fri, 22 Mar 2013 19:24:37 +0100
Quoted 8 lines
This patch just moves some code arround to make the
ip4_frag_ecn_tableand IPFRAG_ECN_* constants accessible from the other reassembly engines. I also renamedip4_frag_ecn_tabletoip_frag_ecn_table.Cc Eric Dumazet <[email protected]>Cc Jesper Dangaard Brouer <[email protected]>Cc YOSHIFUJI Hideaki <[email protected]>Signed-off-by Hannes Frederic Sowa <[email protected]>
Applied.