Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH iproute2] ip/tunnel: always print all known attributes
@ 2021-07-16 15:35 Ilya Dmitrichenko
2021-07-22 22:11 ` Stephen Hemminger
0 siblings, 1 reply; 4+ messages in thread
From: Ilya Dmitrichenko @ 2021-07-16 15:35 UTC (permalink / raw)
To: netdev; +Cc: Daniel Borkmann, Ilya Dmitrichenko
Presently, if a Geneve or VXLAN interface was created with 'external',
it's not possible for a user to determine e.g. the value of 'dstport'
after creation. This change fixes that by avoiding early returns.
This change partly reverts 00ff4b8e31af ("ip/tunnel: Be consistent when
printing tunnel collect metadata").
Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
---
ip/iplink_geneve.c | 12 ++++--------
ip/iplink_vxlan.c | 12 ++++--------
ip/link_gre.c | 1 -
ip/link_gre6.c | 1 -
ip/link_ip6tnl.c | 1 -
ip/link_iptnl.c | 1 -
6 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/ip/iplink_geneve.c b/ip/iplink_geneve.c
index 9299236c..eb296367 100644
--- a/ip/iplink_geneve.c
+++ b/ip/iplink_geneve.c
@@ -243,7 +243,6 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv,
static void geneve_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
{
- __u32 vni;
__u8 ttl = 0;
__u8 tos = 0;
@@ -252,15 +251,12 @@ static void geneve_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
if (tb[IFLA_GENEVE_COLLECT_METADATA]) {
print_bool(PRINT_ANY, "external", "external ", true);
- return;
}
- if (!tb[IFLA_GENEVE_ID] ||
- RTA_PAYLOAD(tb[IFLA_GENEVE_ID]) < sizeof(__u32))
- return;
-
- vni = rta_getattr_u32(tb[IFLA_GENEVE_ID]);
- print_uint(PRINT_ANY, "id", "id %u ", vni);
+ if (tb[IFLA_GENEVE_ID] &&
+ RTA_PAYLOAD(tb[IFLA_GENEVE_ID]) >= sizeof(__u32)) {
+ print_uint(PRINT_ANY, "id", "id %u ", rta_getattr_u32(tb[IFLA_GENEVE_ID]));
+ }
if (tb[IFLA_GENEVE_REMOTE]) {
__be32 addr = rta_getattr_u32(tb[IFLA_GENEVE_REMOTE]);
diff --git a/ip/iplink_vxlan.c b/ip/iplink_vxlan.c
index bae9d994..8578fc9d 100644
--- a/ip/iplink_vxlan.c
+++ b/ip/iplink_vxlan.c
@@ -408,7 +408,6 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
{
- __u32 vni;
__u8 ttl = 0;
__u8 tos = 0;
__u32 maxaddr;
@@ -419,15 +418,12 @@ static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
if (tb[IFLA_VXLAN_COLLECT_METADATA] &&
rta_getattr_u8(tb[IFLA_VXLAN_COLLECT_METADATA])) {
print_bool(PRINT_ANY, "external", "external ", true);
- return;
}
- if (!tb[IFLA_VXLAN_ID] ||
- RTA_PAYLOAD(tb[IFLA_VXLAN_ID]) < sizeof(__u32))
- return;
-
- vni = rta_getattr_u32(tb[IFLA_VXLAN_ID]);
- print_uint(PRINT_ANY, "id", "id %u ", vni);
+ if (tb[IFLA_VXLAN_ID] &&
+ RTA_PAYLOAD(tb[IFLA_VXLAN_ID]) >= sizeof(__u32)) {
+ print_uint(PRINT_ANY, "id", "id %u ", rta_getattr_u32(tb[IFLA_VXLAN_ID]));
+ }
if (tb[IFLA_VXLAN_GROUP]) {
__be32 addr = rta_getattr_u32(tb[IFLA_VXLAN_GROUP]);
diff --git a/ip/link_gre.c b/ip/link_gre.c
index 6d4a8be8..f462a227 100644
--- a/ip/link_gre.c
+++ b/ip/link_gre.c
@@ -442,7 +442,6 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
if (tb[IFLA_GRE_COLLECT_METADATA]) {
print_bool(PRINT_ANY, "external", "external ", true);
- return;
}
tnl_print_endpoint("remote", tb[IFLA_GRE_REMOTE], AF_INET);
diff --git a/ip/link_gre6.c b/ip/link_gre6.c
index f33598af..232d9bde 100644
--- a/ip/link_gre6.c
+++ b/ip/link_gre6.c
@@ -461,7 +461,6 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
if (tb[IFLA_GRE_COLLECT_METADATA]) {
print_bool(PRINT_ANY, "external", "external ", true);
- return;
}
if (tb[IFLA_GRE_FLAGS])
diff --git a/ip/link_ip6tnl.c b/ip/link_ip6tnl.c
index c7b49b02..2fcc13ef 100644
--- a/ip/link_ip6tnl.c
+++ b/ip/link_ip6tnl.c
@@ -344,7 +344,6 @@ static void ip6tunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb
if (tb[IFLA_IPTUN_COLLECT_METADATA]) {
print_bool(PRINT_ANY, "external", "external ", true);
- return;
}
if (tb[IFLA_IPTUN_FLAGS])
diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c
index 636cdb2c..b25855ba 100644
--- a/ip/link_iptnl.c
+++ b/ip/link_iptnl.c
@@ -368,7 +368,6 @@ static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[
if (tb[IFLA_IPTUN_COLLECT_METADATA]) {
print_bool(PRINT_ANY, "external", "external ", true);
- return;
}
if (tb[IFLA_IPTUN_PROTO]) {
--
2.29.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH iproute2] ip/tunnel: always print all known attributes
2021-07-16 15:35 [PATCH iproute2] ip/tunnel: always print all known attributes Ilya Dmitrichenko
@ 2021-07-22 22:11 ` Stephen Hemminger
2021-08-09 10:22 ` [PATCH iproute2 v2] " Ilya Dmitrichenko
2021-08-09 10:23 ` Ilya Dmitrichenko
0 siblings, 2 replies; 4+ messages in thread
From: Stephen Hemminger @ 2021-07-22 22:11 UTC (permalink / raw)
To: Ilya Dmitrichenko; +Cc: netdev, Daniel Borkmann
On Fri, 16 Jul 2021 16:35:57 +0100
Ilya Dmitrichenko <errordeveloper@gmail.com> wrote:
> Presently, if a Geneve or VXLAN interface was created with 'external',
> it's not possible for a user to determine e.g. the value of 'dstport'
> after creation. This change fixes that by avoiding early returns.
>
> This change partly reverts 00ff4b8e31af ("ip/tunnel: Be consistent when
> printing tunnel collect metadata").
>
> Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
The patch looks fine, but it doesn't patch checkpatch.
Please fix your editor settings to do whitespace properly.
~/git/iproute2 $ ~/Src/kernel/linux/scripts/checkpatch.pl ~/Downloads/iproute2-ip-tunnel-always-print-all-known-attributes.patch
ERROR: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 00ff4b8e31af ("ip/tunnel: Be consistent when printing tunnel collect metadata")'
#88:
This change partly reverts 00ff4b8e31af ("ip/tunnel: Be consistent when
ERROR: code indent should use tabs where possible
#129: FILE: ip/iplink_geneve.c:259:
+ }$
WARNING: please, no spaces at the start of a line
#129: FILE: ip/iplink_geneve.c:259:
+ }$
ERROR: code indent should use tabs where possible
#161: FILE: ip/iplink_vxlan.c:426:
+ }$
WARNING: please, no spaces at the start of a line
#161: FILE: ip/iplink_vxlan.c:426:
+ }$
total: 3 errors, 2 warnings, 80 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
NOTE: Whitespace errors detected.
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH iproute2 v2] ip/tunnel: always print all known attributes
2021-07-22 22:11 ` Stephen Hemminger
@ 2021-08-09 10:22 ` Ilya Dmitrichenko
2021-08-09 10:23 ` Ilya Dmitrichenko
1 sibling, 0 replies; 4+ messages in thread
From: Ilya Dmitrichenko @ 2021-08-09 10:22 UTC (permalink / raw)
To: netdev; +Cc: Ilya Dmitrichenko, Stephen Hemminger, Daniel Borkmann
Presently, if a Geneve or VXLAN interface was created with 'external',
it's not possible for a user to determine e.g. the value of 'dstport'
after creation. This change fixes that by avoiding early returns.
This change partly reverts commit 00ff4b8e31af ("ip/tunnel: Be consistent
when printing tunnel collect metadata").
Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
---
ip/iplink_geneve.c | 12 ++++--------
ip/iplink_vxlan.c | 12 ++++--------
ip/link_gre.c | 1 -
ip/link_gre6.c | 1 -
ip/link_ip6tnl.c | 1 -
ip/link_iptnl.c | 1 -
6 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/ip/iplink_geneve.c b/ip/iplink_geneve.c
index 9299236c..78fc818e 100644
--- a/ip/iplink_geneve.c
+++ b/ip/iplink_geneve.c
@@ -243,7 +243,6 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv,
static void geneve_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
{
- __u32 vni;
__u8 ttl = 0;
__u8 tos = 0;
@@ -252,15 +251,12 @@ static void geneve_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
if (tb[IFLA_GENEVE_COLLECT_METADATA]) {
print_bool(PRINT_ANY, "external", "external ", true);
- return;
}
- if (!tb[IFLA_GENEVE_ID] ||
- RTA_PAYLOAD(tb[IFLA_GENEVE_ID]) < sizeof(__u32))
- return;
-
- vni = rta_getattr_u32(tb[IFLA_GENEVE_ID]);
- print_uint(PRINT_ANY, "id", "id %u ", vni);
+ if (tb[IFLA_GENEVE_ID] &&
+ RTA_PAYLOAD(tb[IFLA_GENEVE_ID]) >= sizeof(__u32)) {
+ print_uint(PRINT_ANY, "id", "id %u ", rta_getattr_u32(tb[IFLA_GENEVE_ID]));
+ }
if (tb[IFLA_GENEVE_REMOTE]) {
__be32 addr = rta_getattr_u32(tb[IFLA_GENEVE_REMOTE]);
diff --git a/ip/iplink_vxlan.c b/ip/iplink_vxlan.c
index bae9d994..9afa3cca 100644
--- a/ip/iplink_vxlan.c
+++ b/ip/iplink_vxlan.c
@@ -408,7 +408,6 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
{
- __u32 vni;
__u8 ttl = 0;
__u8 tos = 0;
__u32 maxaddr;
@@ -419,15 +418,12 @@ static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
if (tb[IFLA_VXLAN_COLLECT_METADATA] &&
rta_getattr_u8(tb[IFLA_VXLAN_COLLECT_METADATA])) {
print_bool(PRINT_ANY, "external", "external ", true);
- return;
}
- if (!tb[IFLA_VXLAN_ID] ||
- RTA_PAYLOAD(tb[IFLA_VXLAN_ID]) < sizeof(__u32))
- return;
-
- vni = rta_getattr_u32(tb[IFLA_VXLAN_ID]);
- print_uint(PRINT_ANY, "id", "id %u ", vni);
+ if (tb[IFLA_VXLAN_ID] &&
+ RTA_PAYLOAD(tb[IFLA_VXLAN_ID]) >= sizeof(__u32)) {
+ print_uint(PRINT_ANY, "id", "id %u ", rta_getattr_u32(tb[IFLA_VXLAN_ID]));
+ }
if (tb[IFLA_VXLAN_GROUP]) {
__be32 addr = rta_getattr_u32(tb[IFLA_VXLAN_GROUP]);
diff --git a/ip/link_gre.c b/ip/link_gre.c
index 6d4a8be8..f462a227 100644
--- a/ip/link_gre.c
+++ b/ip/link_gre.c
@@ -442,7 +442,6 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
if (tb[IFLA_GRE_COLLECT_METADATA]) {
print_bool(PRINT_ANY, "external", "external ", true);
- return;
}
tnl_print_endpoint("remote", tb[IFLA_GRE_REMOTE], AF_INET);
diff --git a/ip/link_gre6.c b/ip/link_gre6.c
index f33598af..232d9bde 100644
--- a/ip/link_gre6.c
+++ b/ip/link_gre6.c
@@ -461,7 +461,6 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
if (tb[IFLA_GRE_COLLECT_METADATA]) {
print_bool(PRINT_ANY, "external", "external ", true);
- return;
}
if (tb[IFLA_GRE_FLAGS])
diff --git a/ip/link_ip6tnl.c b/ip/link_ip6tnl.c
index c7b49b02..2fcc13ef 100644
--- a/ip/link_ip6tnl.c
+++ b/ip/link_ip6tnl.c
@@ -344,7 +344,6 @@ static void ip6tunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb
if (tb[IFLA_IPTUN_COLLECT_METADATA]) {
print_bool(PRINT_ANY, "external", "external ", true);
- return;
}
if (tb[IFLA_IPTUN_FLAGS])
diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c
index 636cdb2c..b25855ba 100644
--- a/ip/link_iptnl.c
+++ b/ip/link_iptnl.c
@@ -368,7 +368,6 @@ static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[
if (tb[IFLA_IPTUN_COLLECT_METADATA]) {
print_bool(PRINT_ANY, "external", "external ", true);
- return;
}
if (tb[IFLA_IPTUN_PROTO]) {
--
2.29.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH iproute2 v2] ip/tunnel: always print all known attributes
2021-07-22 22:11 ` Stephen Hemminger
2021-08-09 10:22 ` [PATCH iproute2 v2] " Ilya Dmitrichenko
@ 2021-08-09 10:23 ` Ilya Dmitrichenko
1 sibling, 0 replies; 4+ messages in thread
From: Ilya Dmitrichenko @ 2021-08-09 10:23 UTC (permalink / raw)
To: netdev; +Cc: Ilya Dmitrichenko, Stephen Hemminger, Daniel Borkmann
Presently, if a Geneve or VXLAN interface was created with 'external',
it's not possible for a user to determine e.g. the value of 'dstport'
after creation. This change fixes that by avoiding early returns.
This change partly reverts commit 00ff4b8e31af ("ip/tunnel: Be consistent
when printing tunnel collect metadata").
Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>
---
ip/iplink_geneve.c | 12 ++++--------
ip/iplink_vxlan.c | 12 ++++--------
ip/link_gre.c | 1 -
ip/link_gre6.c | 1 -
ip/link_ip6tnl.c | 1 -
ip/link_iptnl.c | 1 -
6 files changed, 8 insertions(+), 20 deletions(-)
diff --git a/ip/iplink_geneve.c b/ip/iplink_geneve.c
index 9299236c..78fc818e 100644
--- a/ip/iplink_geneve.c
+++ b/ip/iplink_geneve.c
@@ -243,7 +243,6 @@ static int geneve_parse_opt(struct link_util *lu, int argc, char **argv,
static void geneve_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
{
- __u32 vni;
__u8 ttl = 0;
__u8 tos = 0;
@@ -252,15 +251,12 @@ static void geneve_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
if (tb[IFLA_GENEVE_COLLECT_METADATA]) {
print_bool(PRINT_ANY, "external", "external ", true);
- return;
}
- if (!tb[IFLA_GENEVE_ID] ||
- RTA_PAYLOAD(tb[IFLA_GENEVE_ID]) < sizeof(__u32))
- return;
-
- vni = rta_getattr_u32(tb[IFLA_GENEVE_ID]);
- print_uint(PRINT_ANY, "id", "id %u ", vni);
+ if (tb[IFLA_GENEVE_ID] &&
+ RTA_PAYLOAD(tb[IFLA_GENEVE_ID]) >= sizeof(__u32)) {
+ print_uint(PRINT_ANY, "id", "id %u ", rta_getattr_u32(tb[IFLA_GENEVE_ID]));
+ }
if (tb[IFLA_GENEVE_REMOTE]) {
__be32 addr = rta_getattr_u32(tb[IFLA_GENEVE_REMOTE]);
diff --git a/ip/iplink_vxlan.c b/ip/iplink_vxlan.c
index bae9d994..9afa3cca 100644
--- a/ip/iplink_vxlan.c
+++ b/ip/iplink_vxlan.c
@@ -408,7 +408,6 @@ static int vxlan_parse_opt(struct link_util *lu, int argc, char **argv,
static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
{
- __u32 vni;
__u8 ttl = 0;
__u8 tos = 0;
__u32 maxaddr;
@@ -419,15 +418,12 @@ static void vxlan_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
if (tb[IFLA_VXLAN_COLLECT_METADATA] &&
rta_getattr_u8(tb[IFLA_VXLAN_COLLECT_METADATA])) {
print_bool(PRINT_ANY, "external", "external ", true);
- return;
}
- if (!tb[IFLA_VXLAN_ID] ||
- RTA_PAYLOAD(tb[IFLA_VXLAN_ID]) < sizeof(__u32))
- return;
-
- vni = rta_getattr_u32(tb[IFLA_VXLAN_ID]);
- print_uint(PRINT_ANY, "id", "id %u ", vni);
+ if (tb[IFLA_VXLAN_ID] &&
+ RTA_PAYLOAD(tb[IFLA_VXLAN_ID]) >= sizeof(__u32)) {
+ print_uint(PRINT_ANY, "id", "id %u ", rta_getattr_u32(tb[IFLA_VXLAN_ID]));
+ }
if (tb[IFLA_VXLAN_GROUP]) {
__be32 addr = rta_getattr_u32(tb[IFLA_VXLAN_GROUP]);
diff --git a/ip/link_gre.c b/ip/link_gre.c
index 6d4a8be8..f462a227 100644
--- a/ip/link_gre.c
+++ b/ip/link_gre.c
@@ -442,7 +442,6 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
if (tb[IFLA_GRE_COLLECT_METADATA]) {
print_bool(PRINT_ANY, "external", "external ", true);
- return;
}
tnl_print_endpoint("remote", tb[IFLA_GRE_REMOTE], AF_INET);
diff --git a/ip/link_gre6.c b/ip/link_gre6.c
index f33598af..232d9bde 100644
--- a/ip/link_gre6.c
+++ b/ip/link_gre6.c
@@ -461,7 +461,6 @@ static void gre_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[])
if (tb[IFLA_GRE_COLLECT_METADATA]) {
print_bool(PRINT_ANY, "external", "external ", true);
- return;
}
if (tb[IFLA_GRE_FLAGS])
diff --git a/ip/link_ip6tnl.c b/ip/link_ip6tnl.c
index c7b49b02..2fcc13ef 100644
--- a/ip/link_ip6tnl.c
+++ b/ip/link_ip6tnl.c
@@ -344,7 +344,6 @@ static void ip6tunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb
if (tb[IFLA_IPTUN_COLLECT_METADATA]) {
print_bool(PRINT_ANY, "external", "external ", true);
- return;
}
if (tb[IFLA_IPTUN_FLAGS])
diff --git a/ip/link_iptnl.c b/ip/link_iptnl.c
index 636cdb2c..b25855ba 100644
--- a/ip/link_iptnl.c
+++ b/ip/link_iptnl.c
@@ -368,7 +368,6 @@ static void iptunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tb[
if (tb[IFLA_IPTUN_COLLECT_METADATA]) {
print_bool(PRINT_ANY, "external", "external ", true);
- return;
}
if (tb[IFLA_IPTUN_PROTO]) {
--
2.29.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-08-09 10:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-16 15:35 [PATCH iproute2] ip/tunnel: always print all known attributes Ilya Dmitrichenko
2021-07-22 22:11 ` Stephen Hemminger
2021-08-09 10:22 ` [PATCH iproute2 v2] " Ilya Dmitrichenko
2021-08-09 10:23 ` Ilya Dmitrichenko
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).