ip/tunnel: always print all known attributes
Subsystems (2)
PATCH 1/1 ip/tunnel: always print all known attributes
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").
--- 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(-)
ip/iplink_geneve.c +4 -8
@@ -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 ]);
ip/iplink_vxlan.c +4 -8
@@ -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 ]);
ip/link_gre.c +0 -1
@@ -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 );
ip/link_gre6.c +0 -1
@@ -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 ])
ip/link_ip6tnl.c +0 -1
@@ -344,7 +344,6 @@ static void ip6tunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tbif (tb[IFLA_IPTUN_COLLECT_METADATA ]) {print_bool (PRINT_ANY ,"external" ,"external " , true); -return ; }if (tb[IFLA_IPTUN_FLAGS ])
ip/link_iptnl.c +0 -1
@@ -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 ]) {
Signature · 1 line
2.29.2
Quoted 8 lines · On Fri, 16 Jul 2021 16:35:57 +0100 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 <[email protected]>
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.
PATCH v2 1/1 ip/tunnel: always print all known attributes
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").
--- 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(-)
ip/iplink_geneve.c +4 -8
@@ -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 ]);
ip/iplink_vxlan.c +4 -8
@@ -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 ]);
ip/link_gre.c +0 -1
@@ -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 );
ip/link_gre6.c +0 -1
@@ -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 ])
ip/link_ip6tnl.c +0 -1
@@ -344,7 +344,6 @@ static void ip6tunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tbif (tb[IFLA_IPTUN_COLLECT_METADATA ]) {print_bool (PRINT_ANY ,"external" ,"external " , true); -return ; }if (tb[IFLA_IPTUN_FLAGS ])
ip/link_iptnl.c +0 -1
@@ -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 ]) {
Signature · 1 line
2.29.2
PATCH v2 1/1 ip/tunnel: always print all known attributes
In reply to Stephen HemmingerPresently, 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").
--- 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(-)
ip/iplink_geneve.c +4 -8
@@ -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 ]);
ip/iplink_vxlan.c +4 -8
@@ -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 ]);
ip/link_gre.c +0 -1
@@ -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 );
ip/link_gre6.c +0 -1
@@ -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 ])
ip/link_ip6tnl.c +0 -1
@@ -344,7 +344,6 @@ static void ip6tunnel_print_opt(struct link_util *lu, FILE *f, struct rtattr *tbif (tb[IFLA_IPTUN_COLLECT_METADATA ]) {print_bool (PRINT_ANY ,"external" ,"external " , true); -return ; }if (tb[IFLA_IPTUN_FLAGS ])
ip/link_iptnl.c +0 -1
@@ -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 ]) {
Signature · 1 line
2.29.2