From: Zahari Doychev <zahari.doychev@linux.com>
To: netdev@vger.kernel.org
Cc: dsahern@gmail.com, simon.horman@netronome.com, jhs@mojatatu.com,
Zahari Doychev <zahari.doychev@linux.com>
Subject: [iproute2-next] tc flower: use right ethertype in icmp/arp parsing
Date: Mon, 19 Oct 2020 13:47:08 +0200 [thread overview]
Message-ID: <20201019114708.1050421-1-zahari.doychev@linux.com> (raw)
Currently the icmp and arp prsing functions are called with inccorect
ethtype in case of vlan or cvlan filter options. In this case either
cvlan_ethtype or vlan_ethtype has to be used.
Signed-off-by: Zahari Doychev <zahari.doychev@linux.com>
---
tc/f_flower.c | 43 ++++++++++++++++++++++++++-----------------
1 file changed, 26 insertions(+), 17 deletions(-)
diff --git a/tc/f_flower.c b/tc/f_flower.c
index 00c919fd..dd9f3446 100644
--- a/tc/f_flower.c
+++ b/tc/f_flower.c
@@ -1712,7 +1712,10 @@ static int flower_parse_opt(struct filter_util *qu, char *handle,
}
} else if (matches(*argv, "type") == 0) {
NEXT_ARG();
- ret = flower_parse_icmp(*argv, eth_type, ip_proto,
+ ret = flower_parse_icmp(*argv, cvlan_ethtype ?
+ cvlan_ethtype : vlan_ethtype ?
+ vlan_ethtype : eth_type,
+ ip_proto,
FLOWER_ICMP_FIELD_TYPE, n);
if (ret < 0) {
fprintf(stderr, "Illegal \"icmp type\"\n");
@@ -1720,7 +1723,10 @@ static int flower_parse_opt(struct filter_util *qu, char *handle,
}
} else if (matches(*argv, "code") == 0) {
NEXT_ARG();
- ret = flower_parse_icmp(*argv, eth_type, ip_proto,
+ ret = flower_parse_icmp(*argv, cvlan_ethtype ?
+ cvlan_ethtype : vlan_ethtype ?
+ vlan_ethtype : eth_type,
+ ip_proto,
FLOWER_ICMP_FIELD_CODE, n);
if (ret < 0) {
fprintf(stderr, "Illegal \"icmp code\"\n");
@@ -1728,33 +1734,36 @@ static int flower_parse_opt(struct filter_util *qu, char *handle,
}
} else if (matches(*argv, "arp_tip") == 0) {
NEXT_ARG();
- ret = flower_parse_arp_ip_addr(*argv, vlan_ethtype ?
- vlan_ethtype : eth_type,
- TCA_FLOWER_KEY_ARP_TIP,
- TCA_FLOWER_KEY_ARP_TIP_MASK,
- n);
+ ret = flower_parse_arp_ip_addr(*argv, cvlan_ethtype ?
+ cvlan_ethtype : vlan_ethtype ?
+ vlan_ethtype : eth_type,
+ TCA_FLOWER_KEY_ARP_TIP,
+ TCA_FLOWER_KEY_ARP_TIP_MASK,
+ n);
if (ret < 0) {
fprintf(stderr, "Illegal \"arp_tip\"\n");
return -1;
}
} else if (matches(*argv, "arp_sip") == 0) {
NEXT_ARG();
- ret = flower_parse_arp_ip_addr(*argv, vlan_ethtype ?
- vlan_ethtype : eth_type,
- TCA_FLOWER_KEY_ARP_SIP,
- TCA_FLOWER_KEY_ARP_SIP_MASK,
- n);
+ ret = flower_parse_arp_ip_addr(*argv, cvlan_ethtype ?
+ cvlan_ethtype : vlan_ethtype ?
+ vlan_ethtype : eth_type,
+ TCA_FLOWER_KEY_ARP_SIP,
+ TCA_FLOWER_KEY_ARP_SIP_MASK,
+ n);
if (ret < 0) {
fprintf(stderr, "Illegal \"arp_sip\"\n");
return -1;
}
} else if (matches(*argv, "arp_op") == 0) {
NEXT_ARG();
- ret = flower_parse_arp_op(*argv, vlan_ethtype ?
- vlan_ethtype : eth_type,
- TCA_FLOWER_KEY_ARP_OP,
- TCA_FLOWER_KEY_ARP_OP_MASK,
- n);
+ ret = flower_parse_arp_op(*argv, cvlan_ethtype ?
+ cvlan_ethtype : vlan_ethtype ?
+ vlan_ethtype : eth_type,
+ TCA_FLOWER_KEY_ARP_OP,
+ TCA_FLOWER_KEY_ARP_OP_MASK,
+ n);
if (ret < 0) {
fprintf(stderr, "Illegal \"arp_op\"\n");
return -1;
--
2.28.0
next reply other threads:[~2020-10-19 11:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-19 11:47 Zahari Doychev [this message]
2020-10-25 21:18 ` [iproute2-next] tc flower: use right ethertype in icmp/arp parsing David Ahern
2020-10-26 8:48 ` Simon Horman
2020-10-27 9:11 ` Zahari Doychev
2020-10-27 14:12 ` David Ahern
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201019114708.1050421-1-zahari.doychev@linux.com \
--to=zahari.doychev@linux.com \
--cc=dsahern@gmail.com \
--cc=jhs@mojatatu.com \
--cc=netdev@vger.kernel.org \
--cc=simon.horman@netronome.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).