Skip to content

Commit

Permalink
netfilter: xtables: give xt_ecn its own name
Browse files Browse the repository at this point in the history 
Use the new macro and struct names in xt_ecn.h, and put the old
definitions into a definition-forwarding ipt_ecn.h.

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
  • Loading branch information
Jan Engelhardt authored and Pablo Neira Ayuso committed Dec 27, 2011
1 parent d446a82 commit a4c6f9d
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 24 deletions.
12 changes: 6 additions & 6 deletions include/linux/netfilter/xt_ecn.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
#include <linux/types.h>
#include <linux/netfilter/xt_dscp.h>

#define IPT_ECN_IP_MASK (~XT_DSCP_MASK)
#define XT_ECN_IP_MASK (~XT_DSCP_MASK)

#define IPT_ECN_OP_MATCH_IP 0x01
#define IPT_ECN_OP_MATCH_ECE 0x10
#define IPT_ECN_OP_MATCH_CWR 0x20
#define XT_ECN_OP_MATCH_IP 0x01
#define XT_ECN_OP_MATCH_ECE 0x10
#define XT_ECN_OP_MATCH_CWR 0x20

#define IPT_ECN_OP_MATCH_MASK 0xce
#define XT_ECN_OP_MATCH_MASK 0xce

/* match info */
struct ipt_ecn_info {
struct xt_ecn_info {
__u8 operation;
__u8 invert;
__u8 ip_ect;
Expand Down
11 changes: 10 additions & 1 deletion include/linux/netfilter_ipv4/ipt_ecn.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,14 @@
#define _IPT_ECN_H

#include <linux/netfilter/xt_ecn.h>
#define ipt_ecn_info xt_ecn_info

#endif /* _IPT_ECN_H */
enum {
IPT_ECN_IP_MASK = XT_ECN_IP_MASK,
IPT_ECN_OP_MATCH_IP = XT_ECN_OP_MATCH_IP,
IPT_ECN_OP_MATCH_ECE = XT_ECN_OP_MATCH_ECE,
IPT_ECN_OP_MATCH_CWR = XT_ECN_OP_MATCH_CWR,
IPT_ECN_OP_MATCH_MASK = XT_ECN_OP_MATCH_MASK,
};

#endif /* IPT_ECN_H */
34 changes: 17 additions & 17 deletions net/netfilter/xt_ecn.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@
#include <linux/tcp.h>

#include <linux/netfilter/x_tables.h>
#include <linux/netfilter/xt_ecn.h>
#include <linux/netfilter_ipv4/ip_tables.h>
#include <linux/netfilter_ipv4/ipt_ecn.h>

MODULE_AUTHOR("Harald Welte <laforge@netfilter.org>");
MODULE_DESCRIPTION("Xtables: Explicit Congestion Notification (ECN) flag match for IPv4");
MODULE_LICENSE("GPL");
MODULE_ALIAS("ipt_ecn");

static inline bool match_ip(const struct sk_buff *skb,
const struct ipt_ecn_info *einfo)
const struct xt_ecn_info *einfo)
{
return ((ip_hdr(skb)->tos & IPT_ECN_IP_MASK) == einfo->ip_ect) ^
!!(einfo->invert & IPT_ECN_OP_MATCH_IP);
return ((ip_hdr(skb)->tos & XT_ECN_IP_MASK) == einfo->ip_ect) ^
!!(einfo->invert & XT_ECN_OP_MATCH_IP);
}

static inline bool match_tcp(const struct sk_buff *skb,
const struct ipt_ecn_info *einfo,
const struct xt_ecn_info *einfo,
bool *hotdrop)
{
struct tcphdr _tcph;
Expand All @@ -46,8 +46,8 @@ static inline bool match_tcp(const struct sk_buff *skb,
return false;
}

if (einfo->operation & IPT_ECN_OP_MATCH_ECE) {
if (einfo->invert & IPT_ECN_OP_MATCH_ECE) {
if (einfo->operation & XT_ECN_OP_MATCH_ECE) {
if (einfo->invert & XT_ECN_OP_MATCH_ECE) {
if (th->ece == 1)
return false;
} else {
Expand All @@ -56,8 +56,8 @@ static inline bool match_tcp(const struct sk_buff *skb,
}
}

if (einfo->operation & IPT_ECN_OP_MATCH_CWR) {
if (einfo->invert & IPT_ECN_OP_MATCH_CWR) {
if (einfo->operation & XT_ECN_OP_MATCH_CWR) {
if (einfo->invert & XT_ECN_OP_MATCH_CWR) {
if (th->cwr == 1)
return false;
} else {
Expand All @@ -71,13 +71,13 @@ static inline bool match_tcp(const struct sk_buff *skb,

static bool ecn_mt(const struct sk_buff *skb, struct xt_action_param *par)
{
const struct ipt_ecn_info *info = par->matchinfo;
const struct xt_ecn_info *info = par->matchinfo;

if (info->operation & IPT_ECN_OP_MATCH_IP)
if (info->operation & XT_ECN_OP_MATCH_IP)
if (!match_ip(skb, info))
return false;

if (info->operation & (IPT_ECN_OP_MATCH_ECE|IPT_ECN_OP_MATCH_CWR)) {
if (info->operation & (XT_ECN_OP_MATCH_ECE | XT_ECN_OP_MATCH_CWR)) {
if (!match_tcp(skb, info, &par->hotdrop))
return false;
}
Expand All @@ -87,16 +87,16 @@ static bool ecn_mt(const struct sk_buff *skb, struct xt_action_param *par)

static int ecn_mt_check(const struct xt_mtchk_param *par)
{
const struct ipt_ecn_info *info = par->matchinfo;
const struct xt_ecn_info *info = par->matchinfo;
const struct ipt_ip *ip = par->entryinfo;

if (info->operation & IPT_ECN_OP_MATCH_MASK)
if (info->operation & XT_ECN_OP_MATCH_MASK)
return -EINVAL;

if (info->invert & IPT_ECN_OP_MATCH_MASK)
if (info->invert & XT_ECN_OP_MATCH_MASK)
return -EINVAL;

if (info->operation & (IPT_ECN_OP_MATCH_ECE|IPT_ECN_OP_MATCH_CWR) &&
if (info->operation & (XT_ECN_OP_MATCH_ECE | XT_ECN_OP_MATCH_CWR) &&
(ip->proto != IPPROTO_TCP || ip->invflags & IPT_INV_PROTO)) {
pr_info("cannot match TCP bits in rule for non-tcp packets\n");
return -EINVAL;
Expand All @@ -109,7 +109,7 @@ static struct xt_match ecn_mt_reg __read_mostly = {
.name = "ecn",
.family = NFPROTO_IPV4,
.match = ecn_mt,
.matchsize = sizeof(struct ipt_ecn_info),
.matchsize = sizeof(struct xt_ecn_info),
.checkentry = ecn_mt_check,
.me = THIS_MODULE,
};
Expand Down

0 comments on commit a4c6f9d

Please sign in to comment.